diff options
Diffstat (limited to 'sip')
202 files changed, 16 insertions, 10014 deletions
diff --git a/sip/qt/qaccel.sip b/sip/qt/qaccel.sip index da17dac..a10a9b9 100644 --- a/sip/qt/qaccel.sip +++ b/sip/qt/qaccel.sip @@ -37,32 +37,19 @@ class TQAccel : TQObject public: TQAccel(TQWidget * /TransferThis/,char * = 0); -%If (TQt_2_1_0 -) TQAccel(TQWidget *,TQObject * /TransferThis/,char * = 0); -%End bool isEnabled(); void setEnabled(bool); uint count(); -%If (- TQt_3_0_0) - int insertItem(int,int = -1); -%End -%If (TQt_3_0_0 -) int insertItem(const TQKeySequence &,int = -1); -%End void removeItem(int); void clear(); -%If (- TQt_3_0_0) - int key(int); - int findKey(int) const; -%End -%If (TQt_3_0_0 -) TQKeySequence key(int); int findKey(const TQKeySequence &) const; -%End bool isItemEnabled(int) const; void setItemEnabled(int,bool); @@ -72,29 +59,18 @@ public: void repairEventFilter(); -%If (TQt_2_00 -) void setWhatsThis(int,const TQString &); TQString whatsThis(int) const; void setIgnoreWhatsThis(bool); bool ignoreWhatsThis() const; -%End -%If (TQt_2_00 - TQt_3_0_0) - static int shortcutKey(const TQString &); - static TQString keyToString(int); - static int stringToKey(const TQString &); -%End -%If (TQt_3_0_0 -) static TQKeySequence shortcutKey(const TQString &); static TQString keyToString(TQKeySequence); static TQKeySequence stringToKey(const TQString &); -%End signals: void activated(int); -%If (TQt_3_1_0 -) void activatedAmbiguously(int); -%End protected: bool eventFilter(TQObject *,TQEvent *); diff --git a/sip/qt/qaction.sip b/sip/qt/qaction.sip index 7b98a09..f74ca72 100644 --- a/sip/qt/qaction.sip +++ b/sip/qt/qaction.sip @@ -36,7 +36,6 @@ %If (TQt_ACTION) -%If (TQt_2_2_0 -) class TQAction : TQObject { @@ -45,35 +44,19 @@ class TQAction : TQObject %End public: -%If (- TQt_3_0_0) - TQAction(TQObject * /TransferThis/ = 0,const char * = 0,bool = 0); - TQAction(const TQString &,const TQIconSet &,const TQString &,int, - TQObject * /TransferThis/,const char * = 0,bool = 0); - TQAction(const TQString &,const TQString &,int,TQObject * /TransferThis/, - const char * = 0,bool = 0); -%End -%If (TQt_3_0_0 - TQt_3_2_0) - TQAction(TQObject * /TransferThis/,const char * = 0,bool = 0); -%End -%If (TQt_3_2_0 -) TQAction(TQObject * /TransferThis/,const char * = 0); TQAction(const TQString &,TQKeySequence,TQObject * /TransferThis/, const char * = 0); TQAction(const TQIconSet &,const TQString &,TQKeySequence, TQObject * /TransferThis/,const char * = 0); -%End -%If (TQt_3_0_0 -) // Obsolete. TQAction(const TQString &,const TQIconSet &,const TQString &,TQKeySequence, TQObject * /TransferThis/,const char * = 0,bool = 0); // Obsolete. TQAction(const TQString &,const TQString &,TQKeySequence, TQObject * /TransferThis/,const char * = 0,bool = 0); -%End -%If (TQt_3_2_0 -) // Obsolete. TQAction(TQObject * /TransferThis/,const char *,bool); -%End virtual void setIconSet(const TQIconSet &); TQIconSet iconSet() const; @@ -87,57 +70,34 @@ public: TQString statusTip() const; virtual void setWhatsThis(const TQString &); TQString whatsThis() const; -%If (- TQt_3_0_0) - virtual void setAccel(int); - int accel() const; -%End -%If (TQt_3_0_0 -) virtual void setAccel(const TQKeySequence &); TQKeySequence accel() const; -%End virtual void setToggleAction(bool); bool isToggleAction() const; -%If (- TQt_3_0_0) - virtual void setOn(bool); -%End bool isOn() const; bool isEnabled() const; -%If (TQt_3_1_0 -) bool isVisible() const; -%End virtual bool addTo(TQWidget *); virtual bool removeFrom(TQWidget *); protected: -%If (TQt_3_0_0 -) virtual void addedTo(TQWidget *,TQWidget *); virtual void addedTo(int,TQPopupMenu *); -%End public slots: -%If (TQt_3_3_0 -) void activate(); -%End -%If (TQt_3_0_0 -) void toggle(); virtual void setOn(bool); -%End virtual void setEnabled(bool); -%If (TQt_3_3_0 -) void setDisabled(bool); -%End -%If (TQt_3_1_0 -) void setVisible(bool); -%End signals: void activated(); void toggled(bool); private: -%If (TQt_3_1_0 -) TQAction(const TQAction &); -%End }; @@ -148,36 +108,20 @@ class TQActionGroup : TQAction %End public: -%If (- TQt_3_0_0) - TQActionGroup(TQWidget * /TransferThis/,const char * = 0,bool = 1); -%End -%If (TQt_3_0_0 - TQt_3_2_0) - TQActionGroup(TQObject * /TransferThis/,const char * = 0,bool = 1); -%End -%If (TQt_3_2_0 -) TQActionGroup(TQObject * /TransferThis/,const char * = 0); // Obsolete. TQActionGroup(TQObject * /TransferThis/,const char *,bool); -%End void setExclusive(bool); bool isExclusive() const; -%If (- TQt_3_0_0) - void insert(TQAction *); -%End -%If (TQt_3_0_0 -) void add(TQAction *); void addSeparator(); -%End bool addTo(TQWidget *); bool removeFrom(TQWidget *); void setEnabled(bool); -%If (TQt_3_2_0 -) void setToggleAction(bool); void setOn(bool); -%End -%If (TQt_3_0_0 -) void setUsesDropDown(bool); bool usesDropDown() const; @@ -186,25 +130,19 @@ public: void setMenuText(const TQString &); void setToolTip(const TQString &); void setWhatsThis(const TQString &); -%End protected: -%If (TQt_3_0_0 -) void childEvent(TQChildEvent *); virtual void addedTo(TQWidget *,TQWidget *,TQAction *); virtual void addedTo(int,TQPopupMenu *,TQAction *); virtual void addedTo(TQWidget *,TQWidget *); virtual void addedTo(int,TQPopupMenu *); -%End signals: void selected(TQAction *); private: -%If (TQt_3_1_0 -) TQActionGroup(const TQActionGroup &); -%End }; %End -%End diff --git a/sip/qt/qarray.sip b/sip/qt/qarray.sip deleted file mode 100644 index 6ce411e..0000000 --- a/sip/qt/qarray.sip +++ /dev/null @@ -1,94 +0,0 @@ -// This is the SIP interface definition for all types based on the TQArray -// template. -// -// Copyright (c) 2007 -// Riverbank Computing Limited <[email protected]> -// -// This file is part of PyTQt. -// -// This copy of PyTQt is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2, or (at your option) any later -// version. -// -// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -// details. -// -// You should have received a copy of the GNU General Public License along with -// PyTQt; see the file LICENSE. If not, write to the Free Software Foundation, -// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%ExportedDoc -<Sect2><Title>TQArray<type> (TQt 1.x, 2.x)</Title> -<Para> -Types based on the <Literal>TQArray</Literal> template are automatically -converted to and from Python lists of the type. -</Para> -</Sect2> -%End - - -%If (- TQt_3_0_0) - -%MappedType TQArray<int> -{ -%TypeHeaderCode -#include <tqarray.h> -%End - -%ConvertFromTypeCode - // Convert to a Python list of integers. - - PyObject *l; - - // Create the list. - - if ((l = PyList_New(sipCpp -> count())) == NULL) - return NULL; - - // Get it. - - for (uint i = 0; i < sipCpp -> count(); ++i) - if (PyList_SetItem(l,i,PyLong_FromLong((long)(sipCpp -> at(i)))) < 0) - { - Py_DECREF(l); - - return NULL; - } - - return l; -%End - -%ConvertToTypeCode - // Convert a Python list of integers to a TQArray<int> on the heap. - - if (sipIsErr == NULL) - return PyList_Check(sipPy); - - TQArray<int> *qa = new TQArray<int>(PyList_GET_SIZE(sipPy)); - - PyErr_Clear(); - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - qa[i] = PyLong_AsLong(PyList_GET_ITEM(sipPy,i)); - - if (PyErr_Occurred() != NULL) - { - delete qa; - *sipIsErr = 1; - - return 0; - } - } - - *sipCppPtr = qa; - - return sipGetState(sipTransferObj); -%End -}; - -%End diff --git a/sip/qt/qassistantclient.sip b/sip/qt/qassistantclient.sip index 34990c4..3815962 100644 --- a/sip/qt/qassistantclient.sip +++ b/sip/qt/qassistantclient.sip @@ -30,7 +30,6 @@ %If (TQt_ASSISTANTCLIENT) -%If (TQt_3_1_0 -) class TQAssistantClient : TQObject { @@ -44,9 +43,7 @@ public: bool isOpen() const; -%If (TQt_3_2_0 -) void setArguments(const TQStringList &); -%End public slots: virtual void openAssistant() /ReleaseGIL/; @@ -60,4 +57,3 @@ signals: }; %End -%End diff --git a/sip/qt/qbitmap.sip b/sip/qt/qbitmap.sip index 544338f..3b499ba 100644 --- a/sip/qt/qbitmap.sip +++ b/sip/qt/qbitmap.sip @@ -37,23 +37,12 @@ class TQBitmap : TQPixmap public: TQBitmap(); -%If (- TQt_2_00) - TQBitmap(int,int,bool = 0); - TQBitmap(const TQSize &,bool = 0); -%End -%If (TQt_2_00 -) TQBitmap(int,int,bool = 0,TQPixmap::Optimization = TQPixmap::DefaultOptim); TQBitmap(const TQSize &,bool = 0,TQPixmap::Optimization = TQPixmap::DefaultOptim); -%End TQBitmap(int,int,uchar *,bool = 0); TQBitmap(const TQSize &,uchar *,bool = 0); TQBitmap(const TQBitmap &); -%If (- TQt_2_00) - TQBitmap(const char *,const char * = 0); -%End -%If (TQt_2_00 -) TQBitmap(const TQString &,const char * = 0); -%End TQBitmap xForm(const TQWMatrix &) const; }; diff --git a/sip/qt/qbrush.sip b/sip/qt/qbrush.sip index 83ddea5..44d8f91 100644 --- a/sip/qt/qbrush.sip +++ b/sip/qt/qbrush.sip @@ -30,54 +30,6 @@ %End -%If (- TQt_2_00) - -enum BrushStyle { - NoBrush, - SolidPattern, - Dense1Pattern, - Dense2Pattern, - Dense3Pattern, - Dense4Pattern, - Dense5Pattern, - Dense6Pattern, - Dense7Pattern, - HorPattern, - VerPattern, - CrossPattern, - BDiagPattern, - FDiagPattern, - DiagCrossPattern, - CustomPattern = 24 -}; - - -class TQBrush -{ -%TypeHeaderCode -#include <tqbrush.h> -%End - -public: - TQBrush(); - TQBrush(BrushStyle); - TQBrush(const TQColor &,BrushStyle = SolidPattern); - TQBrush(const TQColor &,const TQPixmap &); - TQBrush(const TQBrush &); - - BrushStyle style() const; - void setStyle(BrushStyle); - const TQColor &color() const; - void setColor(const TQColor &); - TQPixmap *pixmap() const; - void setPixmap(const TQPixmap &); -}; - -%End - - -%If (TQt_2_00 -) - class TQBrush : TQt { %TypeHeaderCode @@ -101,5 +53,3 @@ public: bool operator==(const TQBrush &) const; bool operator!=(const TQBrush &) const; }; - -%End diff --git a/sip/qt/qbutton.sip b/sip/qt/qbutton.sip index 589d204..47c475f 100644 --- a/sip/qt/qbutton.sip +++ b/sip/qt/qbutton.sip @@ -36,48 +36,18 @@ class TQButton : TQWidget %End public: -%If (- TQt_2_00) - TQButton(TQWidget * /TransferThis/ = 0,const char * = 0); -%End -%If (TQt_2_00 -) TQButton(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); -%End -%If (- TQt_2_00) - const char *text() const; - void setText(const char *); -%End -%If (TQt_2_00 -) TQString text() const; virtual void setText(const TQString &); -%End const TQPixmap *pixmap() const; -%If (- TQt_2_00) - void setPixmap(const TQPixmap &); -%End -%If (TQt_2_00 -) virtual void setPixmap(const TQPixmap &); -%End -%If (- TQt_3_0_0) - int accel() const; -%End -%If (TQt_3_0_0 -) TQKeySequence accel() const; -%End -%If (- TQt_2_00) - void setAccel(int); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setAccel(int); -%End -%If (TQt_3_0_0 -) virtual void setAccel(const TQKeySequence &); -%End bool isToggleButton() const; -%If (TQt_2_00 -) enum ToggleType { SingleShot, @@ -86,19 +56,12 @@ public: }; ToggleType toggleType() const; -%End -%If (- TQt_2_00) - void setDown(bool); -%End -%If (TQt_2_00 -) virtual void setDown(bool); -%End bool isDown() const; bool isOn() const; -%If (TQt_2_00 -) enum ToggleState { Off, @@ -107,37 +70,13 @@ public: }; ToggleState state() const; -%End - -%If (- TQt_3_0_0) - bool autoResize() const; -%End -%If (- TQt_2_00) - void setAutoResize(bool); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setAutoResize(bool); -%End bool autoRepeat() const; -%If (- TQt_2_00) - void setAutoRepeat(bool); -%End -%If (TQt_2_00 -) virtual void setAutoRepeat(bool); -%End -%If (TQt_2_00 -) bool isExclusiveToggle() const; -%End -%If (TQt_2_00 - TQt_3_0_0) - bool focusNextPrevChild(bool); -%End - -%If (TQt_2_00 -) TQButtonGroup *group() const; -%End public slots: void animateClick(); @@ -148,28 +87,20 @@ signals: void released(); void clicked(); void toggled(bool); -%If (TQt_2_00 -) void stateChanged(int); -%End protected: void setToggleButton(bool); -%If (TQt_2_00 -) virtual void setToggleType(ToggleType); -%End void setOn(bool); -%If (TQt_2_00 -) virtual void setState(ToggleState); -%End virtual bool hitButton(const TQPoint &) const; virtual void drawButton(TQPainter *); virtual void drawButtonLabel(TQPainter *); void keyPressEvent(TQKeyEvent *); -%If (TQt_2_1_0 -) void keyReleaseEvent(TQKeyEvent *); -%End void mousePressEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); diff --git a/sip/qt/qbuttongroup.sip b/sip/qt/qbuttongroup.sip index e593e28..74fae53 100644 --- a/sip/qt/qbuttongroup.sip +++ b/sip/qt/qbuttongroup.sip @@ -38,51 +38,30 @@ class TQButtonGroup : TQGroupBox public: TQButtonGroup(TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_2_00) - TQButtonGroup(const char *,TQWidget * /TransferThis/ = 0, - const char * = 0); -%End -%If (TQt_2_00 -) TQButtonGroup(const TQString &,TQWidget * /TransferThis/ = 0, const char * = 0); TQButtonGroup(int,Orientation,TQWidget * /TransferThis/ = 0, const char * = 0); TQButtonGroup(int,Orientation,const TQString &, TQWidget * /TransferThis/ = 0,const char * = 0); -%End bool isExclusive() const; -%If (- TQt_2_00) - void setExclusive(bool); - void setButton(int); -%End -%If (TQt_2_00 -) bool isRadioButtonExclusive() const; virtual void setExclusive(bool); virtual void setRadioButtonExclusive(bool); -%End int insert(TQButton *,int = -1); void remove(TQButton *); TQButton *find(int) const; -%If (TQt_2_00 -) int id(TQButton *) const; int count() const; virtual void setButton(int); virtual void moveFocus(int); -%End -%If (TQt_2_00 - TQt_3_0_0) - TQButton *selected(); -%End -%If (TQt_3_0_0 -) TQButton *selected() const; -%End -%If (TQt_3_2_0 -) int selectedId() const; -%End signals: void pressed(int); @@ -96,9 +75,7 @@ protected slots: void buttonToggled(bool); protected: -%If (TQt_3_1_0 -) bool event(TQEvent *); -%End private: TQButtonGroup(const TQButtonGroup &); diff --git a/sip/qt/qcdestyle.sip b/sip/qt/qcdestyle.sip index 27b714e..b11af4c 100644 --- a/sip/qt/qcdestyle.sip +++ b/sip/qt/qcdestyle.sip @@ -30,7 +30,6 @@ %If (TQt_STYLE_CDE) -%If (TQt_2_00 -) class TQCDEStyle : TQMotifStyle { @@ -41,16 +40,6 @@ class TQCDEStyle : TQMotifStyle public: TQCDEStyle(bool = 0); -%If (- TQt_3_0_0) - int defaultFrameWidth() const; - void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int, - const TQColorGroup &,bool,const TQBrush * = 0); - void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int, - bool = 0,bool = 1); - void drawExclusiveIndicator(TQPainter *,int,int,int,int, - const TQColorGroup &,bool,bool = 0,bool = 1); -%End -%If (TQt_3_0_0 -) int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const; void drawControl(ControlElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags, @@ -61,8 +50,6 @@ public: void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &, const TQColorGroup &,SFlags = Style_Default, const TQStyleOption & = TQStyleOption()) const; -%End }; %End -%End diff --git a/sip/qt/qcheckbox.sip b/sip/qt/qcheckbox.sip index 1f18760..237a4b8 100644 --- a/sip/qt/qcheckbox.sip +++ b/sip/qt/qcheckbox.sip @@ -36,52 +36,27 @@ class TQCheckBox : TQButton %End public: -%If (- TQt_2_00) - TQCheckBox(TQWidget * /TransferThis/ = 0,const char * = 0); - TQCheckBox(const char *,TQWidget * /TransferThis/,const char * = 0); -%End -%If (TQt_2_00 -) TQCheckBox(TQWidget * /TransferThis/,const char * = 0); TQCheckBox(const TQString &,TQWidget * /TransferThis/,const char * = 0); -%End bool isChecked() const; -%If (TQt_2_00 -) void setNoChange(); void setTristate(bool = 1); -%End -%If (TQt_2_2_0 -) bool isTristate() const; -%End TQSize sizeHint() const; -%If (TQt_2_00 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End - -%If (- TQt_3_0_0) - void setChecked(bool); -%End public slots: -%If (TQt_3_0_0 -) void setChecked(bool); -%End protected: -%If (TQt_2_00 -) void resizeEvent(TQResizeEvent *); -%End void drawButton(TQPainter *); void drawButtonLabel(TQPainter *); -%If (TQt_2_00 -) void updateMask(); -%End -%If (TQt_3_2_0 -) bool hitButton(const TQPoint &) const; -%End private: TQCheckBox(const TQCheckBox &); diff --git a/sip/qt/qclipboard.sip b/sip/qt/qclipboard.sip index aa2acbf..73057fa 100644 --- a/sip/qt/qclipboard.sip +++ b/sip/qt/qclipboard.sip @@ -55,26 +55,21 @@ private: ~TQClipboard(); public: -%If (TQt_3_1_0 -) enum Mode { Clipboard, Selection }; void clear(Mode); -%End void clear(); -%If (TQt_3_0_0 -) bool supportsSelection() const; bool ownsSelection() const; bool ownsClipboard() const; void setSelectionMode(bool); bool selectionModeEnabled() const; -%End -%If (TQt_3_1_0 -) TQString text(Mode) const; TQString text(TQCString &,Mode) const; void setText(const TQString &,Mode); @@ -96,17 +91,7 @@ public: void setImage(const TQImage &,Mode); void setPixmap(const TQPixmap &,Mode); %End -%End - -%If (- TQt_2_00) -// void *data(const char *) const; -// void setData(const char *,void *); - const char *text() const; - void setText(const char *); - TQPixmap *pixmap() const; -%End -%If (TQt_2_00 -) %If (TQt_MIMECLIPBOARD) TQMimeSource *data() const; void setData(TQMimeSource * /GetWrapper/); @@ -120,25 +105,20 @@ public: %End %End TQString text() const; -%If (TQt_2_2_0 -) TQString text(TQCString &) const; -%End void setText(const TQString &); %If (TQt_MIMECLIPBOARD) TQImage image() const; TQPixmap pixmap() const; void setImage(const TQImage &); %End -%End %If (TQt_MIMECLIPBOARD) void setPixmap(const TQPixmap &); %End signals: -%If (TQt_3_0_0 -) void selectionChanged(); -%End void dataChanged(); protected: diff --git a/sip/qt/qcolor.sip b/sip/qt/qcolor.sip index bf6ede8..8fb53d2 100644 --- a/sip/qt/qcolor.sip +++ b/sip/qt/qcolor.sip @@ -79,31 +79,6 @@ This takes no parameters and returns the <Literal>r</Literal>, %End -%If (- TQt_2_00) -// The global colours. - -TQColor color0; -TQColor color1; -TQColor black; -TQColor white; -TQColor darkGray; -TQColor gray; -TQColor lightGray; -TQColor red; -TQColor green; -TQColor blue; -TQColor cyan; -TQColor magenta; -TQColor yellow; -TQColor darkRed; -TQColor darkGreen; -TQColor darkBlue; -TQColor darkCyan; -TQColor darkMagenta; -TQColor darkYellow; -%End - - // Related functions. int tqRed(TQRgb); @@ -113,10 +88,8 @@ TQRgb tqRgb(int,int,int); int tqGray(int,int,int); int tqGray(TQRgb); -%If (TQt_2_00 -) int tqAlpha(TQRgb); TQRgb tqRgba(int,int,int,int); -%End class TQColor @@ -135,30 +108,19 @@ public: TQColor(int,int,int); TQColor(int,int,int,Spec); TQColor(TQRgb,uint = 0xffffffff); -%If (TQt_2_00 -) TQColor(const TQString &); -%End TQColor(const char *); TQColor(const TQColor &); bool isValid() const; bool isDirty() const; -%If (- TQt_2_00) - void setNamedColor(const char *); -%End -%If (TQt_2_1_0 -) TQString name() const; -%End -%If (TQt_2_00 -) void setNamedColor(const TQString &); -%End TQRgb rgb() const; void setRgb(int,int,int); void setRgb(TQRgb); -%If (TQt_3_2_0 -) void getRgb(int *,int *,int *) const; -%End // Obsolete and is hidden anyway by the overload above. //void rgb(int *,int *,int *) const; @@ -169,22 +131,13 @@ public: void setHsv(int,int,int); -%If (TQt_3_2_0 -) void getHsv(int *,int *,int *) const; -%End -%If (- TQt_3_2_0) - void getHsv(int &,int &,int &) const; -%End // Obsolete. void hsv(int *,int *,int *) const; TQColor light(int = 150) const; TQColor dark(int = 200) const; -%If (- TQt_3_0_0) - static bool lazyAlloc(); - static void setLazyAlloc(bool); -%End bool operator==(const TQColor &) const; bool operator!=(const TQColor &) const; @@ -197,11 +150,7 @@ public: static void leaveAllocContext(); static int currentAllocContext(); static void destroyAllocContext(int); -%If (TQt_3_0_0 -) -%End static void initialize(); static void cleanup(); -%If (TQt_3_2_0 -) static TQStringList colorNames(); -%End }; diff --git a/sip/qt/qcolordialog.sip b/sip/qt/qcolordialog.sip index 936dc7a..ff77210 100644 --- a/sip/qt/qcolordialog.sip +++ b/sip/qt/qcolordialog.sip @@ -38,7 +38,6 @@ This takes the <Literal>initial</Literal>, <Literal>parent</Literal> and %End -%If (TQt_2_00 -) %If (TQt_COLORDIALOG) class TQColorDialog : TQDialog @@ -48,30 +47,18 @@ class TQColorDialog : TQDialog %End public: -%If (- TQt_3_0_0) - static TQColor getColor(TQColor,TQWidget * = 0,const char * = 0) /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) static TQColor getColor(const TQColor & = TQt::white,TQWidget * = 0, const char * = 0) /ReleaseGIL/; -%End -%If (TQt_2_1_0 -) static TQRgb getRgba(TQRgb,bool * = 0,TQWidget * = 0,const char * = 0) /ReleaseGIL/; static int customCount(); static TQRgb customColor(int); static void setCustomColor(int,TQRgb); -%End -%If (TQt_3_1_0 -) static void setStandardColor(int,TQRgb); -%End private: -%If (TQt_2_1_0 -) TQColorDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0); TQColorDialog(const TQColorDialog &); ~TQColorDialog(); -%End }; %End -%End diff --git a/sip/qt/qcolorgroup.sip b/sip/qt/qcolorgroup.sip index 5ca0c34..8ab220b 100644 --- a/sip/qt/qcolorgroup.sip +++ b/sip/qt/qcolorgroup.sip @@ -39,38 +39,11 @@ public: TQColorGroup(); TQColorGroup(const TQColor &,const TQColor &,const TQColor &,const TQColor &, const TQColor &,const TQColor &,const TQColor &); -%If (TQt_2_00 -) TQColorGroup(const TQBrush &,const TQBrush &,const TQBrush &,const TQBrush &, const TQBrush &,const TQBrush &,const TQBrush &,const TQBrush &, const TQBrush &); -%End TQColorGroup(TQColorGroup&); -%If (- TQt_2_00) - TQColor midlight() const; -%End - -%If (TQt_2_00 - TQt_3_0_0) - enum ColorRole - { - Foreground, - Button, - Light, - Midlight, - Dark, - Mid, - Text, - BrightText, - ButtonText, - Base, - Background, - Shadow, - Highlight, - HighlightedText, - NColorRoles - }; -%End -%If (TQt_3_0_0 -) enum ColorRole { Foreground, @@ -91,35 +64,26 @@ public: LinkVisited, NColorRoles }; -%End -%If (TQt_2_00 -) const TQColor &color(ColorRole) const; const TQBrush &brush(ColorRole) const; void setColor(ColorRole,const TQColor &); void setBrush(ColorRole,const TQBrush &); -%End const TQColor &foreground() const; -%If (TQt_2_00 -) const TQColor &button() const; -%End const TQColor &light() const; const TQColor &dark() const; const TQColor &mid() const; const TQColor &text() const; const TQColor &base() const; const TQColor &background() const; -%If (TQt_2_00 -) const TQColor &midlight() const; const TQColor &brightText() const; const TQColor &buttonText() const; const TQColor &shadow() const; const TQColor &highlight() const; const TQColor &highlightedText() const; -%End -%If (TQt_3_0_0 -) const TQColor &link() const; const TQColor &linkVisited() const; -%End }; diff --git a/sip/qt/qcombobox.sip b/sip/qt/qcombobox.sip index e74dbf6..cc878ed 100644 --- a/sip/qt/qcombobox.sip +++ b/sip/qt/qcombobox.sip @@ -41,116 +41,42 @@ public: int count() const; -%If (TQt_2_00 -) void insertStringList(TQStringList &,int = -1); -%End void insertStrList(const TQStrList *,int = -1); // void insertStrList(const TQStrList &,int = -1); // void insertStrList(const char **,int = -1,int = -1); -%If (- TQt_2_00) - void insertItem(const char *,int = -1); -%End -%If (TQt_2_00 -) void insertItem(const TQString &,int = -1); -%End void insertItem(const TQPixmap &,int = -1); -%If (TQt_2_1_0 -) void insertItem(const TQPixmap &,const TQString &,int = -1); -%End void removeItem(int); -%If (- TQt_3_0_0) - void clear(); -%End - int currentItem() const; -%If (- TQt_2_00) - void setCurrentItem(int); -%End -%If (TQt_2_00 -) virtual void setCurrentItem(int); -%End -%If (- TQt_2_00) - const char *currentText() const; -%End -%If (TQt_2_00 -) TQString currentText() const; -%End -%If (TQt_3_0_0 -) virtual void setCurrentText(const TQString &); -%End -%If (- TQt_2_00) - const char *text(int) const; -%End -%If (TQt_2_00 -) TQString text(int) const; -%End const TQPixmap *pixmap(int) const; -%If (- TQt_2_00) - void changeItem(const char *,int); -%End -%If (TQt_2_00 -) void changeItem(const TQString &,int); -%End void changeItem(const TQPixmap &,int); -%If (TQt_2_1_0 -) void changeItem(const TQPixmap &,const TQString &,int); -%End bool autoResize() const; -%If (- TQt_2_00) - void setAutoResize(bool); -%End -%If (TQt_2_00 -) virtual void setAutoResize(bool); -%End TQSize sizeHint() const; -%If (TQt_2_00 - TQt_3_0_0) - virtual TQSizePolicy sizePolicy() const; -%End -%If (- TQt_2_00) - void setBackgroundColor(const TQColor &); - void setStyle(GUIStyle); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setBackgroundColor(const TQColor &); -%End -%If (- TQt_2_00) void setPalette(const TQPalette &); void setFont(const TQFont &); void setEnabled(bool); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setPalette(const TQPalette &); - virtual void setFont(const TQFont &); - virtual void setEnabled(bool); -%End -%If (TQt_3_0_0 -) - void setPalette(const TQPalette &); - void setFont(const TQFont &); - void setEnabled(bool); -%End -%If (- TQt_2_00) - void setSizeLimit(int); -%End -%If (TQt_2_00 -) virtual void setSizeLimit(int); -%End int sizeLimit() const; -%If (- TQt_2_00) - void setMaxCount(int); -%End -%If (TQt_2_00 -) virtual void setMaxCount(int); -%End int maxCount() const; enum Policy { @@ -162,91 +88,45 @@ public: BeforeCurrent }; -%If (- TQt_2_00) - void setInsertionPolicy(Policy); -%End -%If (TQt_2_00 -) virtual void setInsertionPolicy(Policy); -%End Policy insertionPolicy() const; -%If (- TQt_2_00) - void setValidator(TQValidator *); - TQValidator *validator() const; -%End -%If (TQt_2_00 -) virtual void setValidator(const TQValidator *); const TQValidator *validator() const; -%End -%If (- TQt_2_00) - void setListBox(TQListBox *); -%End -%If (TQt_2_00 -) virtual void setListBox(TQListBox *); -%End TQListBox *listBox() const; -%If (TQt_3_0_0 -) virtual void setLineEdit(TQLineEdit *); -%End -%If (TQt_2_1_0 -) TQLineEdit *lineEdit() const; -%End -%If (- TQt_2_00) - void setAutoCompletion(bool); -%End -%If (TQt_2_00 -) virtual void setAutoCompletion(bool); -%End bool autoCompletion() const; bool eventFilter(TQObject *,TQEvent *); -%If (TQt_2_1_0 -) void setDuplicatesEnabled(bool); bool duplicatesEnabled() const; -%End -%If (TQt_2_2_0 -) bool editable() const; void setEditable(bool); -%End -%If (TQt_3_0_0 -) virtual void popup(); -%End -%If (TQt_3_3_0 -) void hide(); -%End public slots: -%If (TQt_3_0_0 -) void clear(); -%End void clearValidator(); void clearEdit(); -%If (- TQt_2_00) - void setEditText(const char *); -%End -%If (TQt_2_00 -) virtual void setEditText(const TQString &); -%End signals: void activated(int); void highlighted(int); -%If (- TQt_2_00) - void activated(const char *); - void highlighted(const char *); -%End -%If (TQt_2_00 -) void activated(const TQString &); void highlighted(const TQString &); void textChanged(const TQString &); -%End protected: void paintEvent(TQPaintEvent *); @@ -257,20 +137,11 @@ protected: void mouseDoubleClickEvent(TQMouseEvent *); void keyPressEvent(TQKeyEvent *); void focusInEvent(TQFocusEvent *); -%If (TQt_3_1_1 -) void focusOutEvent(TQFocusEvent *); -%End -%If (TQt_3_1_0 -) void wheelEvent(TQWheelEvent *); -%End -%If (- TQt_3_0_0) - void popup(); -%End -%If (TQt_2_00 -) void styleChange(TQStyle &); void updateMask(); -%End private: TQComboBox(const TQComboBox &); diff --git a/sip/qt/qcommonstyle.sip b/sip/qt/qcommonstyle.sip index 63a0959..9eb4463 100644 --- a/sip/qt/qcommonstyle.sip +++ b/sip/qt/qcommonstyle.sip @@ -48,8 +48,6 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the %End -%If (TQt_2_00 -) - class TQCommonStyle : TQStyle { %TypeHeaderCode @@ -57,26 +55,6 @@ class TQCommonStyle : TQStyle %End public: -%If (- TQt_3_0_0) - void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,bool = 0,bool = 1,const TQBrush * = 0); - TQRect comboButtonRect(int,int,int,int); - TQRect comboButtonFocusRect(int,int,int,int); - void drawComboButtonMask(TQPainter *,int,int,int,int); - void drawPushButtonLabel(TQPushButton *,TQPainter *); - void getButtonShift(int &,int &); - int defaultFrameWidth() const; - void tabbarMetrics(const TQTabBar *,int &,int &,int &); - void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool); - void drawTabMask(TQPainter *,const TQTabBar *,TQTab *,bool); - ScrollControl scrollBarPointOver(const TQScrollBar *,int,const TQPoint &); - void drawSliderMask(TQPainter *,int,int,int,int,Orientation,bool,bool); - void drawSliderGrooveMask(TQPainter *,int,int,int,int,TQCOORD,Orientation); - int maximumSliderDragDistance() const; - int popupSubmenuIndicatorWidth(const TQFontMetrics &); -%End - -%If (TQt_3_0_0 -) TQCommonStyle(); void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &, @@ -122,16 +100,6 @@ public: TQPixmap stylePixmap(StylePixmap,const TQStyleControlElementData&,ControlElementFlags, const TQStyleOption & = TQStyleOption(), const TQWidget * = 0) const; -%End - private: -%If (- TQt_3_0_0) - TQCommonStyle(GUIStyle); - ~TQCommonStyle(); -%End -%If (TQt_3_0_0 -) TQCommonStyle(const TQCommonStyle &); -%End }; - -%End diff --git a/sip/qt/qcstring.sip b/sip/qt/qcstring.sip index 9f076b6..099dab5 100644 --- a/sip/qt/qcstring.sip +++ b/sip/qt/qcstring.sip @@ -112,8 +112,6 @@ This returns a tuple of the <Literal>double</Literal> result and the %End -%If (TQt_2_00 -) - class TQCString : TQByteArray { %TypeHeaderCode @@ -160,11 +158,9 @@ public: TQCString &remove(uint,uint); TQCString &replace(uint,uint,const char *); TQCString &replace(const TQRegExp &,const char *); -%If (TQt_3_1_0 -) // TQCString &replace(char,const char *); TQCString &replace(const char *,const char *); // TQCString &replace(char,char); -%End short toShort(bool * = 0) const; ushort toUShort(bool * = 0) const; @@ -219,5 +215,3 @@ public: return 0; %End }; - -%End diff --git a/sip/qt/qcursor.sip b/sip/qt/qcursor.sip index 2256cdb..3a8d9ca 100644 --- a/sip/qt/qcursor.sip +++ b/sip/qt/qcursor.sip @@ -34,78 +34,6 @@ %End -%If (- TQt_2_00) -// Global cursors. - -const TQCursor arrowCursor; -const TQCursor upArrowCursor; -const TQCursor crossCursor; -const TQCursor waitCursor; -const TQCursor ibeamCursor; -const TQCursor sizeVerCursor; -const TQCursor sizeHorCursor; -const TQCursor sizeBDiagCursor; -const TQCursor sizeFDiagCursor; -const TQCursor sizeAllCursor; -const TQCursor blankCursor; -%End - - -%If (- TQt_3_0_0) -enum TQCursorShape { - ArrowCursor, - UpArrowCursor, - CrossCursor, - WaitCursor, - IbeamCursor, - SizeVerCursor, - SizeHorCursor, - SizeBDiagCursor, - SizeFDiagCursor, - SizeAllCursor, - BlankCursor, - LastCursor = BlankCursor, - BitmapCursor = 24 -}; - - -class TQCursor -{ -%TypeHeaderCode -#include <tqcursor.h> -%End - -public: - TQCursor(); - TQCursor(int); - TQCursor(const TQBitmap &,const TQBitmap &,int = -1,int = -1); -%If (TQt_2_00 -) - TQCursor(const TQPixmap &,int = -1,int = -1); -%End - TQCursor(const TQCursor &); - - int shape() const; - void setShape(int); - const TQBitmap *bitmap() const; - const TQBitmap *mask() const; - TQPoint hotSpot() const; -%If (- TQt_2_00) - HANDLE handle() const; -%End -%If (TQt_2_00 -) -%If (WS_X11) - HANDLE handle() const; -%End -%End - static TQPoint pos(); - static void setPos(int,int); - static void setPos(const TQPoint &); - static void initialize(); - static void cleanup(); -}; -%End - -%If (TQt_3_0_0 -) class TQCursor : TQt { %TypeHeaderCode @@ -127,11 +55,9 @@ public: %If (WS_X11) HANDLE handle() const; -%If (TQt_3_3_0 -) // This would have the same Python signature as TQCursor(int). //TQCursor(HANDLE); %End -%End static TQPoint pos(); static void setPos(int,int); static void setPos(const TQPoint &); @@ -141,4 +67,3 @@ public: static int x11Screen(); %End }; -%End diff --git a/sip/qt/qdatastream.sip b/sip/qt/qdatastream.sip index 2c988d6..8a1479b 100644 --- a/sip/qt/qdatastream.sip +++ b/sip/qt/qdatastream.sip @@ -80,9 +80,7 @@ public: TQIODevice *device() const; void setDevice(TQIODevice *); void unsetDevice(); -%If (TQt_2_00 -) bool atEnd() const; -%End bool eof() const; enum ByteOrder { @@ -135,7 +133,6 @@ public: TQDataStream &writeRawBytes(const char * /Array/, uint /ArraySize/) /ReleaseGIL/; -%If (TQt_3_0_0 -) // These are taken from the corresponding class definitions. We limit // them to TQt v3.0.0 and later just to avoid checking earlier versions. @@ -213,11 +210,8 @@ public: TQDataStream &operator<<(const TQWMatrix &); TQDataStream &operator>>(TQWMatrix & /Constrained/); -%End -%If (TQt_3_1_0 -) TQDataStream &operator<<(const TQUuid &); TQDataStream &operator>>(TQUuid & /Constrained/); -%End private: TQDataStream(const TQDataStream &); diff --git a/sip/qt/qdatetime.sip b/sip/qt/qdatetime.sip index 2a62440..3df731d 100644 --- a/sip/qt/qdatetime.sip +++ b/sip/qt/qdatetime.sip @@ -86,38 +86,19 @@ public: int daysInMonth() const; int daysInYear() const; -%If (TQt_3_1_0 -) int weekNumber(int * = 0) const; -%End -%If (- TQt_2_00) - virtual const char *monthName(int) const; - virtual const char *dayName(int) const; -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual TQString monthName(int) const; - virtual TQString dayName(int) const; -%End -%If (TQt_3_0_0 -) static TQString shortMonthName(int); static TQString shortDayName(int); static TQString longMonthName(int); static TQString longDayName(int); -%End -%If (- TQt_3_0_0) - TQString toString() const; -%End -%If (TQt_3_0_0 -) TQString toString(TQt::DateFormat = TQt::TextDate) const; TQString toString(const TQString &) const; -%End bool setYMD(int,int,int); TQDate addDays(int) const; -%If (TQt_3_0_0 -) TQDate addMonths(int) const; TQDate addYears(int) const; -%End int daysTo(const TQDate &) const; int __nonzero__() const; @@ -133,20 +114,14 @@ public: bool operator>=(const TQDate &) const; static TQDate currentDate(); -%If (TQt_3_1_0 -) static TQDate currentDate(TQt::TimeSpec); -%End -%If (TQt_3_0_0 -) static TQDate fromString(const TQString &,TQt::DateFormat = TQt::TextDate); -%End static bool isValid(int,int,int); static bool leapYear(int); -%If (TQt_3_0_0 -) // These are defined in TQt3 but not documented. //static uint gregorianToJulian(int,int,int); //static void julianToGregorian(uint,int &,int &,int &); -%End }; @@ -167,13 +142,8 @@ public: int second() const; int msec() const; -%If (- TQt_3_0_0) - TQString toString() const; -%End -%If (TQt_3_0_0 -) TQString toString(TQt::DateFormat = TQt::TextDate) const; TQString toString(const TQString &) const; -%End bool setHMS(int,int,int,int = 0); @@ -195,22 +165,13 @@ public: bool operator>=(const TQTime &) const; static TQTime currentTime(); -%If (TQt_3_1_0 -) static TQTime currentTime(TQt::TimeSpec); -%End -%If (TQt_3_0_0 -) static TQTime fromString(const TQString &,TQt::DateFormat = TQt::TextDate); -%End static bool isValid(int,int,int,int = 0); void start(); int restart(); -%If (- TQt_3_0_0) - int elapsed(); -%End -%If (TQt_3_0_0 -) int elapsed() const; -%End }; @@ -230,29 +191,18 @@ public: TQDate date() const; TQTime time() const; -%If (TQt_3_1_0 -) uint toTime_t() const; -%End void setDate(const TQDate &); void setTime(const TQTime &); void setTime_t(uint); -%If (TQt_3_1_0 -) void setTime_t(uint,TQt::TimeSpec); -%End -%If (- TQt_3_0_0) - TQString toString() const; -%End -%If (TQt_3_0_0 -) TQString toString(TQt::DateFormat = TQt::TextDate) const; TQString toString(const TQString &) const; -%End TQDateTime addDays(int) const; -%If (TQt_3_0_0 -) TQDateTime addMonths(int) const; TQDateTime addYears(int) const; -%End TQDateTime addSecs(int) const; int daysTo(const TQDateTime &) const; int secsTo(const TQDateTime &) const; @@ -270,11 +220,7 @@ public: bool operator>=(const TQDateTime &) const; static TQDateTime currentDateTime(); -%If (TQt_3_1_0 -) static TQDateTime currentDateTime(TQt::TimeSpec); -%End -%If (TQt_3_0_0 -) static TQDateTime fromString(const TQString &, TQt::DateFormat = TQt::TextDate); -%End }; diff --git a/sip/qt/qdatetimeedit.sip b/sip/qt/qdatetimeedit.sip index 46aa7bf..c32fcef 100644 --- a/sip/qt/qdatetimeedit.sip +++ b/sip/qt/qdatetimeedit.sip @@ -42,8 +42,6 @@ %End -%If (TQt_3_0_0 -) - // TQDateEdit actually inherits TQDateTimeEditBase but that's an internal class // and isn't exported under Windows in all versions. @@ -66,9 +64,6 @@ public: TQSize sizeHint() const; TQSize minimumSizeHint() const; -%If (- TQt_3_1_0) - virtual void setDate(const TQDate &); -%End TQDate date() const; virtual void setOrder(Order); Order order() const; @@ -83,14 +78,10 @@ public: TQString separator() const; virtual void setSeparator(const TQString &); -%If (TQt_3_2_0 -) void removeFirstNumber(int); -%End public slots: -%If (TQt_3_1_0 -) virtual void setDate(const TQDate &); -%End signals: void valueChanged(const TQDate &); @@ -116,9 +107,7 @@ protected slots: void updateButtons(); private: -%If (TQt_3_1_0 -) TQDateEdit(const TQDateEdit &); -%End }; @@ -132,23 +121,18 @@ class TQTimeEdit : TQWidget %End public: -%If (TQt_3_1_0 -) enum Display { Hours, Minutes, Seconds, AMPM }; -%End TQTimeEdit(TQWidget * /TransferThis/ = 0,const char * = 0); TQTimeEdit(const TQTime &,TQWidget * /TransferThis/ = 0,const char * = 0); TQSize sizeHint() const; TQSize minimumSizeHint() const; -%If (- TQt_3_1_0) - virtual void setTime(const TQTime &); -%End TQTime time() const; virtual void setAutoAdvance(bool); bool autoAdvance() const; @@ -161,19 +145,13 @@ public: TQString separator() const; virtual void setSeparator(const TQString &); -%If (TQt_3_1_0 -) uint display() const; void setDisplay(uint); -%End -%If (TQt_3_2_0 -) void removeFirstNumber(int); -%End public slots: -%If (TQt_3_1_0 -) virtual void setTime(const TQTime &); -%End signals: void valueChanged(const TQTime &); @@ -198,9 +176,7 @@ protected slots: void updateButtons(); private: -%If (TQt_3_1_0 -) TQTimeEdit(const TQTimeEdit &); -%End }; @@ -217,9 +193,6 @@ public: TQSize sizeHint() const; TQSize minimumSizeHint() const; -%If (- TQt_3_1_0) - virtual void setDateTime(const TQDateTime &); -%End TQDateTime dateTime() const; TQDateEdit* dateEdit(); @@ -229,9 +202,7 @@ public: bool autoAdvance() const; public slots: -%If (TQt_3_1_0 -) virtual void setDateTime(const TQDateTime &); -%End signals: void valueChanged(const TQDateTime &); @@ -239,18 +210,11 @@ signals: protected: void init(); void resizeEvent(TQResizeEvent *); -%If (- TQt_3_1_2) - void layoutEditors(); -%End protected slots: void newValue(const TQDate &); void newValue(const TQTime &); private: -%If (TQt_3_1_0 -) TQDateTimeEdit(const TQDateTimeEdit &); -%End }; - -%End diff --git a/sip/qt/qdesktopwidget.sip b/sip/qt/qdesktopwidget.sip index 1cd9d14..ff8a3fa 100644 --- a/sip/qt/qdesktopwidget.sip +++ b/sip/qt/qdesktopwidget.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQDesktopWidget : TQWidget { %TypeHeaderCode @@ -51,7 +49,6 @@ public: TQWidget *screen(int = -1); const TQRect &screenGeometry(int = -1) const; -%If (TQt_3_1_0 -) const TQRect &screenGeometry(TQWidget *) const; const TQRect &screenGeometry(const TQPoint &) const; @@ -60,25 +57,14 @@ public: const TQRect &availableGeometry(const TQPoint &) const; void insertChild(TQObject *); -%End signals: -%If (TQt_3_2_0 -) void resized(int); -%End -%If (TQt_3_3_0 -) void workAreaResized(int); -%End protected: -%If (TQt_3_1_0 -) void resizeEvent(TQResizeEvent *); -%End private: -%If (TQt_3_1_0 -) TQDesktopWidget(const TQDesktopWidget &); -%End }; - -%End diff --git a/sip/qt/qdial.sip b/sip/qt/qdial.sip index 3c2d816..d0f8913 100644 --- a/sip/qt/qdial.sip +++ b/sip/qt/qdial.sip @@ -29,7 +29,6 @@ %End -%If (TQt_2_2_0 -) %If (TQt_DIAL) class TQDial : TQWidget, TQRangeControl @@ -39,12 +38,7 @@ class TQDial : TQWidget, TQRangeControl %End public: -%If (- TQt_3_0_0) - TQDial(TQWidget * /TransferThis/ = 0,const char * = 0); -%End -%If (TQt_3_0_0 -) TQDial(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); -%End TQDial(int,int,int,int,TQWidget * /TransferThis/ = 0,const char * = 0); bool tracking() const; @@ -109,4 +103,3 @@ private: }; %End -%End diff --git a/sip/qt/qdialog.sip b/sip/qt/qdialog.sip index ac78030..aa26196 100644 --- a/sip/qt/qdialog.sip +++ b/sip/qt/qdialog.sip @@ -54,31 +54,10 @@ public: Accepted }; -%If (- TQt_3_0_0) - int exec() /PyName=exec_loop, ReleaseGIL, - PreHook=__pyTQtPreEventLoopHook__, - PostHook=__pyTQtPostEventLoopHook__/; -%MethodCode - // Transfer ownership back to Python (a modal dialog will - // probably have the main window as it's parent). This means - // the TQt dialog will be deleted when the Python wrapper is - // garbage collected. Although this is a little inconsistent, - // it saves having to code it explicitly to avoid the memory - // leak. - sipTransferBack(sipSelf); - - Py_BEGIN_ALLOW_THREADS - sipRes = sipCpp->TQDialog::exec(); - Py_END_ALLOW_THREADS -%End -%End - int result() const; void show(); -%If (TQt_2_00 -) void hide(); -%End void move(int,int); void move(const TQPoint &); void resize(int,int); @@ -86,7 +65,6 @@ public: void setGeometry(int,int,int,int); void setGeometry(const TQRect &); -%If (TQt_2_2_0 -) void setOrientation(Orientation); Orientation orientation() const; @@ -98,15 +76,11 @@ public: void setSizeGripEnabled(bool); bool isSizeGripEnabled() const; -%End -%If (TQt_3_2_0 -) void setModal(bool); bool isModal() const; -%End public slots: -%If (TQt_3_0_0 -) int exec() /PyName=exec_loop, ReleaseGIL, PreHook=__pyTQtPreEventLoopHook__, PostHook=__pyTQtPostEventLoopHook__/; @@ -123,35 +97,22 @@ public slots: sipRes = sipCpp->TQDialog::exec(); Py_END_ALLOW_THREADS %End -%End protected slots: virtual void done(int); -%If (- TQt_2_00) - void accept(); - void reject(); -%End -%If (TQt_2_00 -) virtual void accept(); virtual void reject(); -%End -%If (TQt_2_2_0 -) void showExtension(bool); -%End protected: void setResult(int); void keyPressEvent(TQKeyEvent *); void closeEvent(TQCloseEvent *); -%If (TQt_2_2_0 -) void resizeEvent(TQResizeEvent *); -%End -%If (TQt_3_0_0 -) void contextMenuEvent(TQContextMenuEvent *); bool eventFilter(TQObject *,TQEvent *); void adjustPosition(TQWidget *); -%End private: TQDialog(const TQDialog &); diff --git a/sip/qt/qdir.sip b/sip/qt/qdir.sip index 12a98f7..7048399 100644 --- a/sip/qt/qdir.sip +++ b/sip/qt/qdir.sip @@ -158,34 +158,10 @@ public: }; TQDir(); -%If (- TQt_2_00) - TQDir(const char *,const char * = 0,int = Name | IgnoreCase,int = All); -%End -%If (TQt_2_00 -) TQDir(const TQString &,const TQString & = TQString::null, int = Name | IgnoreCase,int = All); -%End TQDir(const TQDir &); -%If (- TQt_2_00) - void setPath(const char *); - const char *path() const; - TQString absPath() const; - TQString canonicalPath() const; - - TQString dirName() const; - TQString filePath(const char *,bool = 1) const; - TQString absFilePath(const char *,bool = 1) const; - - static TQString convertSeparators(const char *); - - bool cd(const char *,bool = 1); - bool cdUp(); - - const char *nameFilter() const; - void setNameFilter(const char *); -%End -%If (TQt_2_00 -) virtual void setPath(const TQString &); virtual TQString path() const; virtual TQString absPath() const; @@ -202,29 +178,13 @@ public: TQString nameFilter() const; virtual void setNameFilter(const TQString &); -%End FilterSpec filter() const; -%If (- TQt_2_00) - void setFilter(int); -%End -%If (TQt_2_00 -) virtual void setFilter(int); -%End SortSpec sorting() const; -%If (- TQt_2_00) - void setSorting(int); -%End -%If (TQt_2_00 -) virtual void setSorting(int); -%End bool matchAllDirs() const; -%If (- TQt_2_00) - void setMatchAllDirs(bool); -%End -%If (TQt_2_00 -) virtual void setMatchAllDirs(bool); -%End uint count() const; @@ -288,16 +248,6 @@ public: Py_END_ALLOW_THREADS %End -%If (- TQt_2_00) - const TQStrList *entryList(int = DefaultFilter,int = DefaultSort) const; - const TQStrList *entryList(const char *,int = DefaultFilter, - int = DefaultSort) const; - const TQFileInfoList *entryInfoList(int = DefaultFilter, - int = DefaultSort) const; - const TQFileInfoList *entryInfoList(const char *,int = DefaultFilter, - int = DefaultSort) const; -%End -%If (TQt_2_00 -) virtual TQStrList encodedEntryList(int = DefaultFilter, int = DefaultSort) const; virtual TQStrList encodedEntryList(const TQString &,int = DefaultFilter, @@ -311,29 +261,9 @@ public: virtual const TQFileInfoList *entryInfoList(const TQString &, int = DefaultFilter, int = DefaultSort) const; -%End static const TQFileInfoList *drives(); -%If (- TQt_2_00) - bool mkdir(const char *,bool = 1) const; - bool rmdir(const char *,bool = 1) const; - - bool isReadable() const; - bool exists() const; - bool isRoot() const; - - bool isRelative() const; - void convertToAbs(); - - bool operator==(const TQDir &) const; - bool operator!=(const TQDir &) const; - - bool remove(const char *,bool = 1); - bool rename(const char *,const char *,bool = 1); - bool exists(const char *,bool = 1); -%End -%If (TQt_2_00 -) virtual bool mkdir(const TQString &,bool = 1) const; virtual bool rmdir(const TQString &,bool = 1) const; @@ -347,16 +277,10 @@ public: virtual bool remove(const TQString &,bool = 1); virtual bool rename(const TQString &,const TQString &,bool = 1); virtual bool exists(const TQString &,bool = 1); -%End static char separator(); -%If (- TQt_2_00) - static bool setCurrent(const char *); -%End -%If (TQt_2_00 -) static bool setCurrent(const TQString &); -%End static TQDir current(); static TQDir home(); static TQDir root(); @@ -364,20 +288,9 @@ public: static TQString homeDirPath(); static TQString rootDirPath(); -%If (- TQt_2_00) - static bool match(const char *,const char *); - static TQString cleanDirPath(const char *); - static bool isRelativePath(const char *); -%End -%If (TQt_2_1_0 -) static bool match(const TQStringList &,const TQString &); -%End -%If (TQt_2_00 -) static bool match(const TQString &,const TQString &); static TQString cleanDirPath(const TQString &); static bool isRelativePath(const TQString &); -%End -%If (TQt_3_1_0 -) void refresh() const; -%End }; diff --git a/sip/qt/qdockarea.sip b/sip/qt/qdockarea.sip index 3e1f6f9..7c01b85 100644 --- a/sip/qt/qdockarea.sip +++ b/sip/qt/qdockarea.sip @@ -35,8 +35,6 @@ TQDockWIndow or -1 if the TQDockArea does not contain the TQDockWindow. %End -%If (TQt_3_0_0 -) - class TQDockArea : TQWidget { %TypeHeaderCode @@ -84,5 +82,3 @@ public slots: private: TQDockArea(const TQDockArea &); }; - -%End diff --git a/sip/qt/qdockwindow.sip b/sip/qt/qdockwindow.sip index 43c7218..1f078aa 100644 --- a/sip/qt/qdockwindow.sip +++ b/sip/qt/qdockwindow.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQDockWindow : TQFrame { %TypeHeaderCode @@ -52,9 +50,7 @@ public: TQDockWindow(Place = InDock,TQWidget * /TransferThis/ = 0, const char * = 0,WFlags = 0); -%If (TQt_3_1_0 -) TQDockWindow(TQWidget * /TransferThis/,const char * = 0,WFlags = 0); -%End virtual void setWidget(TQWidget *); TQWidget *widget() const; @@ -119,17 +115,11 @@ protected: void hideEvent(TQHideEvent *); void contextMenuEvent(TQContextMenuEvent *); -%If (TQt_3_0_1 -) void drawFrame(TQPainter *); -%End -%If (TQt_3_1_0 -) void drawContents(TQPainter *); -%End bool event(TQEvent *); private: TQDockWindow(const TQDockWindow &); }; - -%End diff --git a/sip/qt/qdragobject.sip b/sip/qt/qdragobject.sip index fbd5e29..da9e266 100644 --- a/sip/qt/qdragobject.sip +++ b/sip/qt/qdragobject.sip @@ -67,44 +67,6 @@ %End -%If (- TQt_2_00) - -class TQDragObject : TQObject -{ -%TypeHeaderCode -#include <tqdragobject.h> -%End - -public: - enum DragMode { - DragDefault, - DragCopy, - DragMove, - DragCopyOrMove - }; - - TQDragObject(TQWidget * /TransferThis/ = 0,const char * = 0); - - bool drag(); - bool dragMove(); - void dragCopy(); - virtual bool provides(const char *) const; - virtual const char *format(int) const = 0; - virtual TQByteArray encodedData(const char *) const = 0; - void setPixmap(TQPixmap); - void setPixmap(TQPixmap,TQPoint); - TQPixmap pixmap() const; - TQPoint pixmapHotSpot() const; - TQWidget *source(); - -protected: - virtual bool drag(DragMode); -}; - -%End - -%If (TQt_2_00 -) - class TQDragObject : TQObject, TQMimeSource { %TypeHeaderCode @@ -118,17 +80,10 @@ public: bool drag(); bool dragMove(); void dragCopy(); -%If (TQt_3_0_0 -) void dragLink(); -%End virtual void setPixmap(TQPixmap); -%If (- TQt_3_0_0) - virtual void setPixmap(TQPixmap,TQPoint); -%End -%If (TQt_3_0_0 -) virtual void setPixmap(TQPixmap,const TQPoint &); -%End TQPixmap pixmap() const; TQPoint pixmapHotSpot() const; %End @@ -139,15 +94,6 @@ public: static void setTarget(TQWidget *); %If (TQt_DRAGANDDROP) -%If (- TQt_3_0_0) - enum DragMode { - DragDefault, - DragCopy, - DragMove, - DragCopyOrMove - }; -%End -%If (TQt_3_0_0 -) enum DragMode { DragDefault, DragCopy, @@ -156,7 +102,6 @@ public: DragCopyOrMove }; %End -%End protected: %If (TQt_DRAGANDDROP) @@ -164,13 +109,9 @@ protected: %End private: -%If (TQt_3_1_0 -) TQDragObject(const TQDragObject &); -%End }; -%End - class TQStoredDrag : TQDragObject { @@ -181,44 +122,16 @@ class TQStoredDrag : TQDragObject public: TQStoredDrag(const char *,TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_2_00) - void setEncodedData(const TQByteArray&); -%End -%If (TQt_2_00 -) virtual void setEncodedData(const TQByteArray&); -%End const char *format(int) const; virtual TQByteArray encodedData(const char *) const; private: -%If (TQt_3_1_0 -) TQStoredDrag(const TQStoredDrag &); -%End }; -%If (- TQt_2_00) - -class TQTextDrag : TQStoredDrag -{ -%TypeHeaderCode -#include <tqdragobject.h> -%End - -public: - TQTextDrag(const char *,TQWidget * /TransferThis/ = 0,const char * = 0); - TQTextDrag(TQWidget * /TransferThis/ = 0,const char * = 0); - - void setText(const char *); - static bool canDecode(TQDragMoveEvent *); - static bool decode(TQDropEvent *,TQString &); -}; - -%End - -%If (TQt_2_00 -) - class TQTextDrag : TQDragObject { %TypeHeaderCode @@ -241,13 +154,9 @@ public: static bool decode(const TQMimeSource *,TQString &,TQCString &); private: -%If (TQt_3_1_0 -) TQTextDrag(const TQTextDrag &); -%End }; -%End - class TQImageDrag : TQDragObject { @@ -259,56 +168,19 @@ public: TQImageDrag(TQImage,TQWidget * /TransferThis/ = 0,const char * = 0); TQImageDrag(TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_2_00) - void setImage(TQImage); -%End -%If (TQt_2_00 -) virtual void setImage(TQImage); -%End const char *format(int) const; virtual TQByteArray encodedData(const char *) const; -%If (- TQt_2_00) - static bool canDecode(TQDragMoveEvent *); - static bool decode(TQDropEvent *,TQImage &); - static bool decode(TQDropEvent *,TQPixmap &); -%End -%If (TQt_2_00 -) static bool canDecode(const TQMimeSource *); static bool decode(const TQMimeSource *,TQImage &); static bool decode(const TQMimeSource *,TQPixmap &); -%End private: -%If (TQt_3_1_0 -) TQImageDrag(const TQImageDrag &); -%End -}; - - -%If (- TQt_2_00) - -class TQUrlDrag : TQStoredDrag -{ -%TypeHeaderCode -#include <tqdragobject.h> -%End - -public: - TQUrlDrag(TQStrList,TQWidget * /TransferThis/ = 0,const char * = 0); - TQUrlDrag(TQWidget * /TransferThis/ = 0,const char * = 0); - - void setUrls(TQStrList); - static TQString urlToLocalFile(const char *); - static bool canDecode(TQDragMoveEvent *); - static bool decode(TQDropEvent *,TQStrList &); - static bool decodeLocalFiles(TQDropEvent *,TQStrList &); }; -%End - -%If (TQt_2_00 -) class TQUriDrag : TQStoredDrag { @@ -320,14 +192,8 @@ public: TQUriDrag(TQStrList,TQWidget * /TransferThis/ = 0,const char * = 0); TQUriDrag(TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_3_0_0) - void setFilenames(TQStringList); - void setUnicodeUris(TQStringList); -%End -%If (TQt_3_0_0 -) void setFileNames(const TQStringList &); void setUnicodeUris(const TQStringList &); -%End virtual void setUris(TQStrList); static TQString uriToLocalFile(const char *); @@ -340,15 +206,9 @@ public: static bool decodeLocalFiles(const TQMimeSource *,TQStringList &); private: -%If (TQt_3_1_0 -) TQUriDrag(const TQUriDrag &); -%End }; -%End - - -%If (TQt_2_1_0 -) class TQColorDrag : TQStoredDrag { @@ -367,9 +227,5 @@ public: static bool decode(TQMimeSource *,TQColor &); private: -%If (TQt_3_1_0 -) TQColorDrag(const TQColorDrag &); -%End }; - -%End diff --git a/sip/qt/qdrawutil.sip b/sip/qt/qdrawutil.sip index 4213d4c..34e3033 100644 --- a/sip/qt/qdrawutil.sip +++ b/sip/qt/qdrawutil.sip @@ -54,21 +54,3 @@ void qDrawPlainRect(TQPainter *,int,int,int,int,const TQColor &,int = 1, const TQBrush * = 0); void qDrawPlainRect(TQPainter *,const TQRect &,const TQColor &,int = 1, const TQBrush * = 0); - -%If (- TQt_2_00) -TQRect qItemRect(TQPainter *,GUIStyle,int,int,int,int,int,bool,const TQPixmap *, - const char *,int = -1); - -void qDrawItem(TQPainter *,GUIStyle,int,int,int,int,int,const TQColorGroup &,bool, - const TQPixmap *,const char *,int = -1); - -enum ArrowType { - UpArrow, - DownArrow, - LeftArrow, - RightArrow -}; - -void qDrawArrow(TQPainter *,ArrowType,GUIStyle,bool,int,int,int,int, - const TQColorGroup &,bool); -%End diff --git a/sip/qt/qdropsite.sip b/sip/qt/qdropsite.sip index 5153f30..dd216a9 100644 --- a/sip/qt/qdropsite.sip +++ b/sip/qt/qdropsite.sip @@ -39,13 +39,6 @@ class TQDropSite public: TQDropSite(TQWidget *); - -%If (- TQt_2_00) - virtual void dragEnterEvent(TQDragEnterEvent *); - virtual void dragMoveEvent(TQDragMoveEvent *); - virtual void dragLeaveEvent(TQDragLeaveEvent *); - virtual void dropEvent(TQDropEvent *); -%End }; %End diff --git a/sip/qt/qerrormessage.sip b/sip/qt/qerrormessage.sip index 6e14b5c..b6eb433 100644 --- a/sip/qt/qerrormessage.sip +++ b/sip/qt/qerrormessage.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQErrorMessage : TQDialog { %TypeHeaderCode @@ -49,9 +47,5 @@ protected: void done(int); private: -%If (TQt_3_1_0 -) TQErrorMessage(const TQErrorMessage &); -%End }; - -%End diff --git a/sip/qt/qevent.sip b/sip/qt/qevent.sip index a0fc01d..7fa9592 100644 --- a/sip/qt/qevent.sip +++ b/sip/qt/qevent.sip @@ -175,149 +175,6 @@ passed as the event data and its reference count is increased. %End -%If (- TQt_2_00) - -const int Event_None; -const int Event_Timer; -const int Event_MouseButtonPress; -const int Event_MouseButtonRelease; -const int Event_MouseButtonDblClick; -const int Event_MouseMove; -const int Event_KeyPress; -const int Event_KeyRelease; -const int Event_FocusIn; -const int Event_FocusOut; -const int Event_Enter; -const int Event_Leave; -const int Event_Paint; -const int Event_Move; -const int Event_Resize; -const int Event_Create; -const int Event_Destroy; -const int Event_Show; -const int Event_Hide; -const int Event_Close; -const int Event_Quit; -const int Event_Accel; -const int Event_Clipboard; -const int Event_SockAct; -const int Event_DragEnter; -const int Event_DragMove; -const int Event_DragLeave; -const int Event_Drop; -const int Event_DragResponse; -const int Event_ChildInserted; -const int Event_ChildRemoved; -const int Event_LayoutHint; -const int Event_ActivateControl; -const int Event_DeactivateControl; -const int Event_User; - - -enum ButtonState { - NoButton = 0x00, - LeftButton = 0x01, - RightButton = 0x02, - MidButton = 0x04, - MouseButtonMask = 0x07, - ShiftButton = 0x08, - ControlButton = 0x10, - AltButton = 0x20, - KeyButtonMask = 0x38 -}; - - -class TQEvent -{ -%TypeHeaderCode -#include <tqevent.h> -%End - -public: - TQEvent(int); - TQEvent(TQEvent&); - - int type() const; - -%ConvertToSubClassCode - switch (sipCpp -> type()) - { - case Event_Timer: - sipClass = sipClass_TQTimerEvent; - break; - - case Event_MouseButtonPress: - case Event_MouseButtonRelease: - case Event_MouseButtonDblClick: - case Event_MouseMove: - sipClass = sipClass_TQMouseEvent; - break; - - case Event_KeyPress: - case Event_KeyRelease: - sipClass = sipClass_TQKeyEvent; - break; - - case Event_FocusIn: - case Event_FocusOut: - sipClass = sipClass_TQFocusEvent; - break; - - case Event_Paint: - sipClass = sipClass_TQPaintEvent; - break; - - case Event_Move: - sipClass = sipClass_TQMoveEvent; - break; - - case Event_Resize: - sipClass = sipClass_TQResizeEvent; - break; - - case Event_Close: - sipClass = sipClass_TQCloseEvent; - break; - - case Event_Show: - sipClass = sipClass_TQShowEvent; - break; - - case Event_Hide: - sipClass = sipClass_TQHideEvent; - break; - - case Event_DragMove: - sipClass = sipClass_TQDragMoveEvent; - break; - - case Event_DragEnter: - sipClass = sipClass_TQDragEnterEvent; - break; - - case Event_DragLeave: - sipClass = sipClass_TQDragLeaveEvent; - break; - - case Event_Drop: - sipClass = sipClass_TQDropEvent; - break; - - case Event_ChildInserted: - case Event_ChildRemoved: - sipClass = sipClass_TQChildEvent; - break; - - default: - sipClass = NULL; - } -%End -}; - -%End - -%If (TQt_2_00 -) - class TQEvent : TQt { %TypeHeaderCode @@ -348,7 +205,6 @@ public: Hide, Close, Quit, -%If (TQt_2_1_0 -) Reparent, ShowMinimized, ShowNormal, @@ -357,35 +213,22 @@ public: ShowToParent, HideToParent, ShowMaximized, -%End -%If (TQt_3_0_0 -) ShowFullScreen, -%End Accel, Wheel, AccelAvailable, -%If (TQt_2_1_0 -) CaptionChange, IconChange, ParentFontChange, ApplicationFontChange, ParentPaletteChange, ApplicationPaletteChange, -%End -%If (TQt_3_0_0 -) PaletteChange, -%End Clipboard, -%If (TQt_2_2_0 -) Speech, -%End SockAct, -%If (TQt_2_2_0 -) AccelOverride, -%End -%If (TQt_3_0_0 -) DeferredDelete, -%End DragEnter, DragMove, DragLeave, @@ -394,30 +237,16 @@ public: ChildInserted, ChildRemoved, LayoutHint, -%If (TQt_2_2_0 -) ShowWindowRequest, -%End -%If (TQt_3_3_0 -) WindowBlocked, WindowUnblocked, -%End ActivateControl, DeactivateControl, -%If (TQt_2_1_0 - TQt_2_2_0) - Configure, - ConfigureLayout, -%End -%If (TQt_3_0_0 -) ContextMenu, IMStart, IMCompose, IMEnd, Accessibility, -%End -%If (TQt_3_0_0 - TQt_3_1_0) - Tablet, -%End -%If (TQt_3_1_0 -) TabletMove, LocaleChange, LanguageChange, @@ -425,17 +254,12 @@ public: Style, TabletPress, TabletRelease, -%End -%If (TQt_3_3_0 -) OkRequest, HelpRequest, IconDrag, WindowStateChange, -%End User, -%If (TQt_3_0_0 -) MaxUser, -%End }; TQEvent(Type); @@ -443,9 +267,7 @@ public: virtual ~TQEvent(); Type type() const; -%If (TQt_3_0_0 -) bool spontaneous() const; -%End %ConvertToSubClassCode switch (sipCpp -> type()) @@ -462,9 +284,7 @@ public: break; case TQEvent::Accel: -#if TQT_VERSION >= 220 case TQEvent::AccelOverride: -#endif case TQEvent::KeyPress: case TQEvent::KeyRelease: sipClass = sipClass_TQKeyEvent; @@ -491,11 +311,9 @@ public: sipClass = sipClass_TQCloseEvent; break; -#if TQT_VERSION >= 0x030300 case TQEvent::IconDrag: sipClass = sipClass_TQIconDragEvent; break; -#endif case TQEvent::Wheel: sipClass = sipClass_TQWheelEvent; @@ -532,7 +350,6 @@ public: sipClass = sipClass_TQChildEvent; break; -#if TQT_VERSION >= 0x030000 case TQEvent::ContextMenu: sipClass = sipClass_TQContextMenuEvent; break; @@ -541,19 +358,7 @@ public: case TQEvent::IMEnd: sipClass = sipClass_TQIMEvent; break; -#endif -#if TQT_VERSION >= 0x030000 && TQT_VERSION < 0x030100 - case TQEvent::IMCompose: - sipClass = sipClass_TQIMEvent; - break; - - case TQEvent::Tablet: - sipClass = sipClass_TQTabletEvent; - break; -#endif - -#if TQT_VERSION >= 0x030100 case TQEvent::IMCompose: sipClass = sipClass_TQIMComposeEvent; break; @@ -563,7 +368,6 @@ public: case TQEvent::TabletRelease: sipClass = sipClass_TQTabletEvent; break; -#endif default: sipClass = (sipCpp -> type() < TQEvent::User ? @@ -573,8 +377,6 @@ public: %End }; -%End - class TQTimerEvent : TQEvent { @@ -596,14 +398,8 @@ class TQMouseEvent : TQEvent %End public: -%If (- TQt_2_00) - TQMouseEvent(int,const TQPoint &,int,int); - TQMouseEvent(int,const TQPoint &,const TQPoint &,int,int); -%End -%If (TQt_2_00 -) TQMouseEvent(Type,const TQPoint &,int,int); TQMouseEvent(Type,const TQPoint &,const TQPoint &,int,int); -%End const TQPoint &pos() const; const TQPoint &globalPos() const; @@ -611,25 +407,15 @@ public: int y() const; int globalX() const; int globalY() const; -%If (- TQt_2_00) - int button() const; - int state() const; -%End -%If (TQt_2_00 -) ButtonState button() const; ButtonState state() const; ButtonState stateAfter() const; -%End -%If (TQt_3_0_0 -) bool isAccepted() const; void accept(); void ignore(); -%End }; -%If (TQt_2_00 -) - class TQWheelEvent : TQEvent { %TypeHeaderCode @@ -637,15 +423,9 @@ class TQWheelEvent : TQEvent %End public: -%If (- TQt_3_0_0) - TQWheelEvent(const TQPoint &,int,int); - TQWheelEvent(const TQPoint &,const TQPoint &,int,int); -%End -%If (TQt_3_0_0 -) TQWheelEvent(const TQPoint &,int,int,Orientation = Vertical); TQWheelEvent(const TQPoint &,const TQPoint &,int,int, Orientation = Vertical); -%End int delta() const; const TQPoint &pos() const; @@ -655,18 +435,12 @@ public: int globalX() const; int globalY() const; ButtonState state() const; -%If (TQt_3_0_0 -) Orientation orientation() const; -%End bool isAccepted() const; void accept(); void ignore(); }; -%End - - -%If (TQt_3_0_0 -) class TQTabletEvent : TQEvent { @@ -682,13 +456,8 @@ public: Eraser }; -%If (- TQt_3_1_0) - TQTabletEvent(const TQPoint &,int,int,int,int,const TQPair<int,int> &); -%End -%If (TQt_3_1_0 -) TQTabletEvent(Type,const TQPoint &,const TQPoint &,int,int,int,int, const TQPair<int,int> &); -%End TQTabletEvent(const TQPoint &,const TQPoint &,int,int,int,int, const TQPair<int,int> &); @@ -708,8 +477,6 @@ public: TQPair<int,int> uniqueId(); }; -%End - class TQKeyEvent : TQEvent { @@ -718,13 +485,8 @@ class TQKeyEvent : TQEvent %End public: -%If (- TQt_2_00) - TQKeyEvent(int,int,int,int); -%End -%If (TQt_2_00 -) TQKeyEvent(Type,int,int,int,const TQString & = TQString::null,bool = 0, ushort = 1); -%End int key() const; int ascii() const; @@ -732,17 +494,11 @@ public: void accept(); void ignore(); -%If (- TQt_2_00) - int state() const; -%End - -%If (TQt_2_00 -) ButtonState state() const; ButtonState stateAfter() const; TQString text() const; bool isAutoRepeat() const; int count() const; -%End }; @@ -753,28 +509,11 @@ class TQFocusEvent : TQEvent %End public: -%If (- TQt_2_00) - TQFocusEvent(int); -%End -%If (TQt_2_00 -) TQFocusEvent(Type); -%End bool gotFocus() const; bool lostFocus() const; -%If (TQt_2_1_0 -) -%If (- TQt_3_0_0) - enum Reason { - Mouse, - Tab, - ActiveWindow, - Popup, - Shortcut, - Other - }; -%End -%If (TQt_3_0_0 -) enum Reason { Mouse, Tab, @@ -784,12 +523,10 @@ public: Shortcut, Other }; -%End static Reason reason(); static void setReason(Reason); static void resetReason(); -%End }; @@ -800,22 +537,13 @@ class TQPaintEvent : TQEvent %End public: -%If (- TQt_2_00) - TQPaintEvent(const TQRect &); -%End -%If (TQt_2_00 -) TQPaintEvent(const TQRegion &,bool = 1); TQPaintEvent(const TQRect &,bool = 1); -%End -%If (TQt_3_3_0 -) TQPaintEvent(const TQRegion &,const TQRect &,bool = 1); -%End const TQRect &rect() const; -%If (TQt_2_00 -) const TQRegion ®ion() const; bool erased() const; -%End }; @@ -862,8 +590,6 @@ public: }; -%If (TQt_3_3_0 -) - class TQIconDragEvent : TQEvent { %TypeHeaderCode @@ -878,8 +604,6 @@ public: void ignore(); }; -%End - class TQShowEvent : TQEvent { @@ -888,14 +612,7 @@ class TQShowEvent : TQEvent %End public: -%If (- TQt_3_0_0) - TQShowEvent(bool); - - bool spontaneous() const; -%End -%If (TQt_3_0_0 -) TQShowEvent(); -%End }; @@ -906,19 +623,10 @@ class TQHideEvent : TQEvent %End public: -%If (- TQt_3_0_0) - TQHideEvent(bool); - - bool spontaneous() const; -%End -%If (TQt_3_0_0 -) TQHideEvent(); -%End }; -%If (TQt_3_0_0 -) - class TQContextMenuEvent : TQEvent { %TypeHeaderCode @@ -952,10 +660,6 @@ public: Reason reason() const; }; -%End - - -%If (TQt_3_0_0 -) class TQIMEvent : TQEvent { @@ -971,15 +675,9 @@ public: bool isAccepted() const; void accept(); void ignore(); -%If (TQt_3_1_0 -) int selectionLength() const; -%End }; -%End - - -%If (TQt_3_1_0 -) class TQIMComposeEvent : TQIMEvent { @@ -991,31 +689,7 @@ public: TQIMComposeEvent(Type,const TQString &,int,int); }; -%End - - -%If (- TQt_2_00) - -class TQDropEvent : TQEvent -{ -%TypeHeaderCode -#include <tqevent.h> -%End - -public: - TQDropEvent(const TQPoint &); - - const TQPoint &pos() const; - bool isAccepted() const; - void accept(); - void ignore(); - TQByteArray data(const char *); -}; -%End - - -%If (TQt_2_00 -) %If (TQt_DRAGANDDROP) class TQDropEvent : TQEvent, TQMimeSource @@ -1054,40 +728,9 @@ public: }; %End -%End - - -%If (- TQt_2_00) - -class TQDragMoveEvent : TQEvent -{ -%TypeHeaderCode -#include <tqevent.h> -%End - -public: - TQDragMoveEvent(const TQPoint &); - - const TQPoint &pos() const; - bool isAccepted() const; - void accept(); - void ignore(); - void accept(const TQRect &); - void ignore(const TQRect &); - TQRect answerRect() const; - const char *format(int = 0); - bool provides(const char *); - TQByteArray data(const char *); - -protected: - TQDragMoveEvent(const TQPoint &,int); -}; - -%End %If (TQt_DRAGANDDROP) -%If (TQt_2_00 -) class TQDragMoveEvent : TQDropEvent { @@ -1105,8 +748,6 @@ public: void ignore(); }; -%End - class TQDragEnterEvent : TQDragMoveEvent { @@ -1139,19 +780,9 @@ class TQChildEvent : TQEvent %End public: -%If (- TQt_2_00) - TQChildEvent(int,TQWidget *); -%End -%If (TQt_2_00 -) TQChildEvent(Type,TQObject *); -%End -%If (- TQt_2_00) - TQWidget *child() const; -%End -%If (TQt_2_00 -) TQObject *child() const; -%End bool inserted() const; bool removed() const; }; @@ -1164,15 +795,8 @@ class TQCustomEvent : TQEvent %End public: -%If (- TQt_2_00) - TQCustomEvent(int,SIP_PYOBJECT /Transfer/); -%End -%If (TQt_2_00 -) TQCustomEvent(Type,SIP_PYOBJECT /Transfer/); -%End -%If (TQt_2_1_0 -) TQCustomEvent(int); -%End ~TQCustomEvent(); %VirtualCatcherCode // We need to garbage collect any current data. @@ -1197,7 +821,6 @@ public: Py_INCREF(sipRes); %End -%If (TQt_2_1_0 -) void setData(SIP_PYOBJECT /Transfer/); %MethodCode // We need to garbage collect any current data. @@ -1207,7 +830,6 @@ public: Py_XDECREF(old); %End -%End %GCTraverseCode // Support the Python garbage collector. Although it's not obviously diff --git a/sip/qt/qeventloop.sip b/sip/qt/qeventloop.sip index 009917d..2146996 100644 --- a/sip/qt/qeventloop.sip +++ b/sip/qt/qeventloop.sip @@ -33,8 +33,6 @@ This has been renamed to <Literal>exec_loop</Literal> in Python. %End -%If (TQt_3_1_0 -) - class TQEventLoop : TQObject { %TypeHeaderCode @@ -60,7 +58,6 @@ public: virtual void registerSocketNotifier(TQSocketNotifier *); virtual void unregisterSocketNotifier(TQSocketNotifier *); -%If (TQt_3_1_1 -) // These were present in the X11 version of TQt v3.1.0 but didn't make // it to the Windows version until TQt v3.1.1. void setSocketNotifierPending(TQSocketNotifier *); @@ -68,7 +65,6 @@ public: int activateTimers(); int timeToWait() const; -%End virtual int exec() /PyName=exec_loop, ReleaseGIL, PreHook=__pyTQtPreEventLoopHook__, @@ -85,5 +81,3 @@ signals: void awake(); void aboutToBlock(); }; - -%End diff --git a/sip/qt/qfile.sip b/sip/qt/qfile.sip index 38d91c3..c89e824 100644 --- a/sip/qt/qfile.sip +++ b/sip/qt/qfile.sip @@ -90,44 +90,21 @@ class TQFile : TQIODevice public: TQFile(); -%If (- TQt_2_00) - TQFile(const char *); -%End -%If (TQt_2_00 -) TQFile(const TQString &); -%End -%If (- TQt_2_00) - const char *name() const; - void setName(const char *); -%End -%If (TQt_2_00 -) TQString name() const; void setName(const TQString &); -%End -%If (TQt_2_00 -) static TQCString encodeName(const TQString &); static TQString decodeName(const TQCString &); // static void setEncodingFunction(EncoderFn); // static void setDecodingFunction(DecoderFn); -%End bool exists() const; -%If (- TQt_2_00) - static bool exists(const char *); -%End -%If (TQt_2_00 -) static bool exists(const TQString &); -%End bool remove(); -%If (- TQt_2_00) - static bool remove(const char *); -%End -%If (TQt_2_00 -) static bool remove(const TQString &); -%End bool open(int) /ReleaseGIL/; // bool open(int,FILE *) /ReleaseGIL/; @@ -135,48 +112,11 @@ public: void close(); void flush() /ReleaseGIL/; -%If (- TQt_3_0_0) - uint size() const; - int at() const; - bool at(int); -%End -%If (TQt_3_0_0 -) Offset size() const; Offset at() const; bool at(Offset); -%End bool atEnd() const; -%If (- TQt_3_0_0) - SIP_PYOBJECT readBlock(uint) /ReleaseGIL/ [int (char *,uint)]; -%MethodCode - char *buf; - - if ((buf = (char *)sipMalloc(a0)) == NULL) - sipIsErr = 1; - else - { - int actlen; - - Py_BEGIN_ALLOW_THREADS - actlen = sipSelfWasArg ? sipCpp->TQFile::readBlock(buf,a0) : sipCpp->readBlock(buf,a0); - Py_END_ALLOW_THREADS - - if (actlen < 0) - { - Py_INCREF(Py_None); - sipRes = Py_None; - } - else if ((sipRes = SIPBytes_FromStringAndSize(buf,actlen)) == NULL) - sipIsErr = 1; - - sipFree((void *)buf); - } -%End - - int writeBlock(const char * /Array/,uint /ArraySize/) /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; %MethodCode char *buf; @@ -206,49 +146,8 @@ public: TQ_LONG writeBlock(const char * /Array/, TQ_ULONG /ArraySize/) /ReleaseGIL/; -%End -%If (TQt_2_00 - TQt_3_0_0) - int writeBlock(const TQByteArray &) /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) TQ_LONG writeBlock(const TQByteArray &) /ReleaseGIL/; -%End - -%If (- TQt_3_0_0) - SIP_PYOBJECT readLine(uint) /ReleaseGIL/ [int (char *,uint)]; -%MethodCode - char *buf; - - if ((buf = (char *)sipMalloc(a0)) == NULL) - sipIsErr = 1; - else - { - int actlen; - Py_BEGIN_ALLOW_THREADS - actlen = sipSelfWasArg ? sipCpp->TQFile::readLine(buf,a0) : sipCpp->readLine(buf,a0); - Py_END_ALLOW_THREADS - - if (actlen < 0) - { - sipFree((void *)buf); - - Py_INCREF(Py_None); - sipRes = Py_None; - } - else - { - sipRes = SIPBytes_FromStringAndSize(buf,actlen); - - sipFree((void *)buf); - - if (sipRes == NULL) - sipIsErr = 1; - } - } -%End -%End -%If (TQt_3_0_0 -) SIP_PYOBJECT readLine(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; %MethodCode char *buf; @@ -281,14 +180,8 @@ public: } } %End -%End -%If (TQt_2_00 - TQt_3_0_0) - int readLine(TQString &,uint) /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) TQ_LONG readLine(TQString &,TQ_ULONG) /ReleaseGIL/; -%End int getch(); int putch(int); @@ -296,14 +189,10 @@ public: int handle() const; -%If (TQt_3_2_0 -) TQString errorString() const; -%End protected: -%If (TQt_3_2_0 -) void setErrorString(const TQString &); -%End private: TQFile(const TQFile &); diff --git a/sip/qt/qfiledialog.sip b/sip/qt/qfiledialog.sip index b5a7af8..920a218 100644 --- a/sip/qt/qfiledialog.sip +++ b/sip/qt/qfiledialog.sip @@ -74,13 +74,10 @@ public: virtual const TQPixmap *pixmap(const TQFileInfo &); private: -%If (TQt_2_1_0 -) TQFileIconProvider(const TQFileIconProvider &); -%End }; -%If (TQt_2_1_0 -) class TQFilePreview { %TypeHeaderCode @@ -92,7 +89,6 @@ public: virtual void previewUrl(const TQUrl &) = 0; }; -%End class TQFileDialog : TQDialog @@ -102,66 +98,10 @@ class TQFileDialog : TQDialog %End public: -%If (- TQt_2_00) - TQFileDialog(const char *,const char * = 0,TQWidget * /TransferThis/ = 0, - const char * = 0,bool = 0); -%End -%If (TQt_2_00 -) TQFileDialog(const TQString &,const TQString & = TQString::null, TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0); -%End TQFileDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0); -%If (- TQt_2_00) - static TQString getOpenFileName(const char * = 0,const char * = 0, - TQWidget * = 0, - const char * = 0) /ReleaseGIL/; - static TQString getSaveFileName(const char * = 0,const char * = 0, - TQWidget * = 0, - const char * = 0) /ReleaseGIL/; - static TQString getExistingDirectory(const char * = 0,TQWidget * = 0, - const char * = 0) /ReleaseGIL/; - static TQStrList getOpenFileNames(const char * = 0,const char * = 0, - TQWidget * = 0, - const char * = 0) /ReleaseGIL/; -%End -%If (TQt_2_00 - TQt_3_0_0) - static TQString getOpenFileName(const TQString & = TQString::null, - const TQString & = TQString::null, - TQWidget * = 0, - const char * = 0) /ReleaseGIL/; - static TQString getSaveFileName(const TQString & = TQString::null, - const TQString & = TQString::null, - TQWidget * = 0, - const char * = 0) /ReleaseGIL/; - static TQString getExistingDirectory(const TQString & = TQString::null, - TQWidget * = 0, - const char * = 0) /ReleaseGIL/; - static TQStringList getOpenFileNames(const TQString & = TQString::null, - const TQString & = TQString::null, - TQWidget * = 0, - const char * = 0) /ReleaseGIL/; -%End -%If (TQt_2_1_0 - TQt_3_0_0) - static TQString getOpenFileName(const TQString &,const TQString &, - TQWidget *,const char *, - const TQString &) /ReleaseGIL/; - static TQString getSaveFileName(const TQString &,const TQString &, - TQWidget *,const char *, - const TQString &) /ReleaseGIL/; - static TQString getExistingDirectory(const TQString &,TQWidget *, - const char *, - const TQString &) /ReleaseGIL/; - static TQStringList getOpenFileNames(const TQString &,const TQString &, - TQWidget *,const char *, - const TQString &) /ReleaseGIL/; -%End -%If (TQt_2_2_0 - TQt_3_0_0) - static TQString getExistingDirectory(const TQString &,TQWidget *, - const char *, - const TQString &,bool) /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) static TQString getOpenFileName(const TQString & = TQString::null, const TQString & = TQString::null, TQWidget * = 0,const char * = 0, @@ -186,62 +126,31 @@ public: TQString * = 0, bool = 1) /ReleaseGIL/; -%End - static void setIconProvider(TQFileIconProvider *); static TQFileIconProvider *iconProvider(); TQString selectedFile() const; -%If (TQt_2_1_0 -) TQString selectedFilter() const; -%End -%If (TQt_3_0_0 -) virtual void setSelectedFilter(const TQString &); virtual void setSelectedFilter(int); -%End -%If (- TQt_2_00) - void setSelection(const char *); -%End -%If (TQt_2_00 -) void setSelection(const TQString &); -%End -%If (TQt_2_1_0 -) void selectAll(bool); TQStringList selectedFiles() const; -%End -%If (- TQt_2_00) - const char *dirPath() const; -%End -%If (TQt_2_00 -) TQString dirPath() const; -%End void setDir(const TQDir &); const TQDir* dir() const; -%If (TQt_2_1_0 -) void setShowHiddenFiles(bool); bool showHiddenFiles() const; -%End void rereadDir() /ReleaseGIL/; -%If (TQt_2_1_0 -) void resortDir(); -%End -%If (- TQt_2_2_0) - enum Mode { - AnyFile, - ExistingFile, - Directory, - ExistingFiles - }; -%End -%If (TQt_2_2_0 -) enum Mode { AnyFile, ExistingFile, @@ -249,12 +158,10 @@ public: ExistingFiles, DirectoryOnly }; -%End void setMode(Mode); Mode mode() const; -%If (TQt_2_1_0 -) enum ViewMode { Detail, List @@ -270,11 +177,9 @@ public: ViewMode viewMode() const; void setPreviewMode(PreviewMode); PreviewMode previewMode() const; -%End bool eventFilter(TQObject *,TQEvent *); -%If (TQt_2_1_0 -) bool isInfoPreviewEnabled() const; bool isContentsPreviewEnabled() const; void setInfoPreviewEnabled(bool); @@ -284,75 +189,33 @@ public: void setContentsPreview(TQWidget *,TQFilePreview *); TQUrl url() const; -%End -%If (TQt_3_0_0 -) void addFilter(const TQString &); -%End public slots: -%If (TQt_2_2_0 -) void done(int); -%End -%If (- TQt_2_00) - void setDir(const char *); -%End -%If (TQt_2_00 -) void setDir(const TQString &); -%End -%If (TQt_2_1_0 -) void setUrl(const TQUrlOperator &); -%End -%If (- TQt_2_00) - void setFilter(const char *); -%End -%If (TQt_2_00 -) void setFilter(const TQString &); -%End -%If (TQt_2_1_0 -) void setFilters(const TQString &); -%End // void setFilters(const char **); -%If (- TQt_2_00) - void setFilters(const TQStrList &); -%End -%If (TQt_2_00 -) void setFilters(const TQStringList &); -%End signals: -%If (- TQt_2_00) - void fileHighlighted(const char *); - void fileSelected(const char *); - void dirEntered(const char *); -%End -%If (TQt_2_00 -) void fileHighlighted(const TQString &); void fileSelected(const TQString &); -%End -%If (TQt_3_0_0 -) void filesSelected(const TQStringList &); -%End -%If (TQt_2_00 -) void dirEntered(const TQString &); -%End -%If (TQt_3_0_0 -) void filterSelected(const TQString &); -%End protected: void resizeEvent(TQResizeEvent *); void keyPressEvent(TQKeyEvent *); void addWidgets(TQLabel *,TQWidget *,TQPushButton *); -%If (TQt_2_1_0 -) void addToolButton(TQButton *,bool = 0); void addLeftWidget(TQWidget *); void addRightWidget(TQWidget *); -%End -%If (TQt_2_1_0 - TQt_3_0_0) - void addFilter(const TQString &); -%End private: TQFileDialog(const TQFileDialog &); diff --git a/sip/qt/qfileinfo.sip b/sip/qt/qfileinfo.sip index a2b6869..38b4609 100644 --- a/sip/qt/qfileinfo.sip +++ b/sip/qt/qfileinfo.sip @@ -37,77 +37,38 @@ class TQFileInfo public: enum PermissionSpec { -%If (TQt_3_2_0 -) ReadOwner, WriteOwner, ExeOwner, -%End ReadUser, WriteUser, ExeUser, ReadGroup, WriteGroup, ExeGroup, ReadOther, WriteOther, ExeOther }; TQFileInfo(); -%If (- TQt_2_00) - TQFileInfo(const char *); -%End -%If (TQt_2_00 -) TQFileInfo(const TQString &); -%End TQFileInfo(const TQFile &); -%If (- TQt_2_00) - TQFileInfo(const TQDir &,const char *); -%End -%If (TQt_2_00 -) TQFileInfo(const TQDir &,const TQString &); -%End TQFileInfo(const TQFileInfo &); -%If (- TQt_2_00) - void setFile(const char *); -%End -%If (TQt_2_00 -) void setFile(const TQString &); -%End void setFile(const TQFile &); -%If (- TQt_2_00) - void setFile(const TQDir &,const char *); -%End -%If (TQt_2_00 -) void setFile(const TQDir &,const TQString &); -%End bool exists() const; void refresh() const; bool caching() const; void setCaching(bool); -%If (- TQt_2_00) - const char *filePath() const; -%End -%If (TQt_2_00 -) const TQString filePath() const; -%End TQString fileName() const; TQString absFilePath() const; -%If (- TQt_3_0_0) - TQString baseName() const; -%End -%If (TQt_3_0_0 -) TQString baseName(bool = 1) const; -%End -%If (- TQt_2_00) - TQString extension() const; -%End -%If (TQt_2_00 -) TQString extension(bool = 1) const; -%End TQString dirPath(bool = 0) const; TQDir dir(bool = 0) const; bool isReadable() const; bool isWritable() const; bool isExecutable() const; -%If (TQt_3_1_0 -) bool isHidden() const; -%End bool isRelative() const; bool convertToAbs(); @@ -118,28 +79,16 @@ public: TQString readLink() const /ReleaseGIL/; -%If (- TQt_2_00) - const char *owner() const; -%End -%If (TQt_2_00 -) TQString owner() const; -%End uint ownerId() const; -%If (- TQt_2_00) - const char *group() const; -%End -%If (TQt_2_00 -) TQString group() const; -%End uint groupId() const; bool permission(int) const; uint size() const; -%If (TQt_3_0_0 -) TQDateTime created() const; -%End TQDateTime lastModified() const; TQDateTime lastRead() const; }; diff --git a/sip/qt/qfont.sip b/sip/qt/qfont.sip index cb42fde..cb2fe5c 100644 --- a/sip/qt/qfont.sip +++ b/sip/qt/qfont.sip @@ -37,109 +37,6 @@ class TQFont %End public: -%If (- TQt_2_00) - enum CharSet { - Latin1, ISO_8859_1 = Latin1, AnyCharSet, - Latin2, ISO_8859_2 = Latin2, - Latin3, ISO_8859_3 = Latin3, - Latin4, ISO_8859_4 = Latin4, - Latin5, ISO_8859_5 = Latin5, - Latin6, ISO_8859_6 = Latin6, - Latin7, ISO_8859_7 = Latin7, - Latin8, ISO_8859_8 = Latin8, - Latin9, ISO_8859_9 = Latin9, - KOI8R - }; -%End -%If (TQt_2_00 - TQt_2_1_0) - enum CharSet { - ISO_8859_1, Latin1 = ISO_8859_1, AnyCharSet, - ISO_8859_2, Latin2 = ISO_8859_2, - ISO_8859_3, Latin3 = ISO_8859_3, - ISO_8859_4, Latin4 = ISO_8859_4, - ISO_8859_5, - ISO_8859_6, - ISO_8859_7, - ISO_8859_8, - ISO_8859_9, Latin5 = ISO_8859_9, - ISO_8859_10, Latin6 = ISO_8859_10, - ISO_8859_11, - ISO_8859_12, - ISO_8859_13, Latin7 = ISO_8859_13, - ISO_8859_14, Latin8 = ISO_8859_14, - ISO_8859_15, Latin9 = ISO_8859_15, - KOI8R, - Set_Ja, Set_1 = Set_Ja, - Set_Ko, - Set_Th_TH, - Set_Zh, - Set_Zh_TW, Set_N = Set_Zh_TW, - Unicode - }; -%End -%If (TQt_2_1_0 - TQt_2_2_0) - enum CharSet { - ISO_8859_1, Latin1 = ISO_8859_1, AnyCharSet, - ISO_8859_2, Latin2 = ISO_8859_2, - ISO_8859_3, Latin3 = ISO_8859_3, - ISO_8859_4, Latin4 = ISO_8859_4, - ISO_8859_5, - ISO_8859_6, - ISO_8859_7, - ISO_8859_8, - ISO_8859_9, Latin5 = ISO_8859_9, - ISO_8859_10, Latin6 = ISO_8859_10, - ISO_8859_11, - ISO_8859_12, - ISO_8859_13, Latin7 = ISO_8859_13, - ISO_8859_14, Latin8 = ISO_8859_14, - ISO_8859_15, Latin9 = ISO_8859_15, - KOI8R, - Set_Ja, Set_1 = Set_Ja, - Set_Ko, - Set_Th_TH, - Set_Zh, - Set_Zh_TW, Set_N = Set_Zh_TW, - Unicode, - Set_GBK, - Set_Big5 - }; -%End -%If (TQt_2_2_0 - TQt_3_0_0) - enum CharSet { - ISO_8859_1, Latin1 = ISO_8859_1, AnyCharSet, - ISO_8859_2, Latin2 = ISO_8859_2, - ISO_8859_3, Latin3 = ISO_8859_3, - ISO_8859_4, Latin4 = ISO_8859_4, - ISO_8859_5, - ISO_8859_6, - ISO_8859_7, - ISO_8859_8, - ISO_8859_9, Latin5 = ISO_8859_9, - ISO_8859_10, Latin6 = ISO_8859_10, - ISO_8859_11, - ISO_8859_12, - ISO_8859_13, Latin7 = ISO_8859_13, - ISO_8859_14, Latin8 = ISO_8859_14, - ISO_8859_15, Latin9 = ISO_8859_15, - KOI8R, - Set_Ja, Set_1 = Set_Ja, - Set_Ko, - Set_Th_TH, - Set_Zh, - Set_Zh_TW, Set_N = Set_Zh_TW, - Unicode, - Set_GBK, - Set_Big5, - JIS_X_0201 = 0xa0, - JIS_X_0208 = 0xc0, Enc16 = JIS_X_0208, - KSC_5601, - GB_2312, - Big5, - TSCII - }; -%End - enum StyleHint { Helvetica, Times, @@ -153,7 +50,6 @@ public: Decorative }; -%If (TQt_2_2_0 -) enum StyleStrategy { PreferDefault, PreferBitmap, @@ -162,15 +58,10 @@ public: ForceOutline, PreferMatch, PreferQuality, -%If (TQt_3_0_0 -) PreferAntialias, NoAntialias, -%End -%If (TQt_3_2_0 -) OpenGLCompatible, -%End }; -%End enum Weight { Light, @@ -180,7 +71,6 @@ public: Black }; -%If (TQt_3_2_0 -) enum Stretch { UltraCondensed, ExtraCondensed, @@ -192,29 +82,11 @@ public: ExtraExpanded, UltraExpanded }; -%End TQFont(); -%If (- TQt_2_00) - TQFont(const char *,int = 12,int = Normal,bool = 0); - TQFont(const char *,int,int,bool,CharSet); -%End -%If (TQt_2_00 - TQt_3_2_0) - TQFont(const TQString &,int = 12,int = Normal,bool = 0); -%End -%If (TQt_3_2_0 -) TQFont(const TQString &,int = 12,int = -1,bool = 0); -%End -%If (TQt_2_00 - TQt_3_0_0) - TQFont(const TQString &,int,int,bool,CharSet); -%End TQFont(const TQFont &); -%If (- TQt_2_00) - const char *family() const; - void setFamily(const char *); -%End -%If (TQt_2_00 -) TQString family() const; void setFamily(const TQString &); @@ -224,7 +96,6 @@ public: int pixelSize() const; void setPixelSize(int); void setPixelSizeFloat(float); -%End int pointSize() const; void setPointSize(int); @@ -240,10 +111,8 @@ public: bool underline() const; void setUnderline(bool); -%If (TQt_3_2_0 -) bool overline() const; void setOverline(bool); -%End bool strikeOut() const; void setStrikeOut(bool); @@ -252,29 +121,12 @@ public: void setFixedPitch(bool); StyleHint styleHint() const; -%If (TQt_2_2_0 -) StyleStrategy styleStrategy() const; -%End -%If (- TQt_3_0_0) - void setStyleHint(StyleHint); -%End -%If (TQt_2_2_0 - TQt_3_0_0) - void setStyleHint(StyleHint,StyleStrategy); -%End -%If (TQt_3_0_0 -) void setStyleHint(StyleHint,StyleStrategy = PreferDefault); void setStyleStrategy(StyleStrategy); -%End - -%If (- TQt_3_0_0) - CharSet charSet() const; - void setCharSet(CharSet); -%End -%If (TQt_3_2_0 -) int stretch() const; void setStretch(int); -%End bool rawMode() const; void setRawMode(bool); @@ -286,63 +138,25 @@ public: bool isCopyOf(const TQFont &) const; -%If (- TQt_2_00) - HANDLE handle(HANDLE = 0); - const char *rawName() const; - static const TQFont &defaultFont(); - static const char *substitute(const char *); - static void insertSubstitution(const char *,const char *); - static void removeSubstitution(const char *); - static void listSubstitutions(TQStrList *); -%End - -%If (TQt_2_00 - TQt_3_0_0) - static CharSet charSetForLocale(); -%End - -%If (TQt_2_00 -) -%If (- TQt_3_0_0) -%If (WS_X11) - HANDLE handle() const; -%End -%End -%If (TQt_3_0_0 -) %If (WS_X11) TQt::HANDLE handle() const; %End -%End void setRawName(const TQString &); TQString rawName() const; -%End TQString key() const; -%If (TQt_3_0_0 -) TQString toString() const; bool fromString(const TQString &); -%End -%If (TQt_2_00 - TQt_3_0_0) - static TQString encodingName(CharSet); -%End -%If (TQt_2_00 -) static TQString substitute(const TQString &); -%If (TQt_3_0_0 -) static TQStringList substitutes(const TQString &); -%End static TQStringList substitutions(); static void insertSubstitution(const TQString &,const TQString &); -%If (TQt_3_0_0 -) static void insertSubstitutions(const TQString &,const TQStringList &); -%End static void removeSubstitution(const TQString &); -%If (- TQt_3_0_0) - static void locale_init(); -%End -%End static void initialize(); static void cleanup(); static void cacheStatistics(); -%If (TQt_3_0_0 -) enum Script { Latin, Greek, @@ -399,43 +213,24 @@ public: Unicode, -%If (TQt_3_2_0 -) Tagalog, Hanunoo, Buhid, Tagbanwa, KatakanaHalfWidth, -%End -%If (TQt_3_3_0 -) Limbu, TaiLe, -%End }; TQString defaultFamily() const; TQString lastResortFamily() const; TQString lastResortFont() const; -%End -%If (TQt_2_00 - TQt_3_0_0) - static TQFont defaultFont(); -%End -%If (- TQt_3_0_0) - static void setDefaultFont(const TQFont &); -%End - -%If (TQt_3_2_0 -) TQFont resolve(const TQFont &) const; -%End protected: bool dirty() const; -%If (- TQt_3_0_0) - TQString defaultFamily() const; - TQString lastResortFamily() const; - TQString lastResortFont() const; -%End int deciPointSize() const; }; diff --git a/sip/qt/qfontdatabase.sip b/sip/qt/qfontdatabase.sip index 4a1e07c..da6501f 100644 --- a/sip/qt/qfontdatabase.sip +++ b/sip/qt/qfontdatabase.sip @@ -30,7 +30,6 @@ %If (TQt_FONTDATABASE) -%If (TQt_2_1_0 -) class TQFontDatabase { @@ -43,42 +42,14 @@ public: static TQValueList<int> standardSizes(); -%If (- TQt_3_0_0) - TQStringList charSets(const TQString &,bool = 1 ) const; - TQStringList families(bool = 1) const; - TQStringList styles(const TQString &, - const TQString & = TQString::null) const; - TQValueList<int> pointSizes(const TQString &, - const TQString & = TQString::null, - const TQString & = TQString::null); - TQValueList<int> smoothSizes(const TQString &,const TQString &, - const TQString & = TQString::null); -%End -%If (TQt_3_0_0 -) TQStringList families() const; -%If (TQt_3_2_0 -) TQStringList families(TQFont::Script) const; -%End TQStringList styles(const TQString &) const; TQValueList<int> pointSizes(const TQString &, const TQString & = TQString::null); TQValueList<int> smoothSizes(const TQString &,const TQString &); -%End TQString styleString(const TQFont &); -%If (- TQt_3_0_0) - TQFont font(const TQString,const TQString &,int, - const TQString = TQString::null); - - bool isBitmapScalable(const TQString &,const TQString & = TQString::null, - const TQString & = TQString::null) const; - bool isSmoothlyScalable(const TQString &, - const TQString & = TQString::null, - const TQString & = TQString::null) const; - bool isScalable(const TQString &,const TQString & = TQString::null, - const TQString & = TQString::null) const; -%End -%If (TQt_3_0_0 -) TQFont font(const TQString,const TQString &,int); bool isBitmapScalable(const TQString &, @@ -86,36 +57,15 @@ public: bool isSmoothlyScalable(const TQString &, const TQString & = TQString::null) const; bool isScalable(const TQString &,const TQString & = TQString::null) const; -%End -%If (TQt_2_3_0 - TQt_3_0_0) - bool isFixedPitch(const TQString &,const TQString & = TQString::null, - const TQString & = TQString::null) const; -%End -%If (TQt_3_0_0 -) bool isFixedPitch(const TQString &, const TQString & = TQString::null) const; -%End -%If (- TQt_3_0_0) - bool italic(const TQString &,const TQString &, - const TQString & = TQString::null) const; - bool bold(const TQString &,const TQString &, - const TQString & = TQString::null) const; - int weight(const TQString &,const TQString &, - const TQString & = TQString::null) const; - - static TQString verboseCharSetName(const TQString &); - static TQString charSetSample(const TQString &); -%End -%If (TQt_3_0_0 -) bool italic(const TQString &,const TQString &) const; bool bold(const TQString &,const TQString &) const; int weight(const TQString &,const TQString &) const; static TQString scriptName(TQFont::Script); static TQString scriptSample(TQFont::Script); -%End }; %End -%End diff --git a/sip/qt/qfontdialog.sip b/sip/qt/qfontdialog.sip index d7bb673..fdc0cb8 100644 --- a/sip/qt/qfontdialog.sip +++ b/sip/qt/qfontdialog.sip @@ -50,7 +50,6 @@ and returns a tuple containing the <Literal>TQFont</Literal> result and the %End -%If (TQt_2_00 -) %If (TQt_FONTDIALOG) class TQFontDialog : TQDialog @@ -64,42 +63,11 @@ public: const char * = 0); static TQFont getFont(bool *,TQWidget * = 0,const char * = 0); -signals: -%If (- TQt_3_2_0) - void fontSelected(const TQFont &); - void fontHighlighted(const TQFont &); -%End - -protected: -%If (- TQt_3_2_0) - bool eventFilter(TQObject *,TQEvent *); - - TQListBox *familyListBox() const; - virtual void updateFamilies(); - - TQListBox *styleListBox() const; - virtual void updateStyles(); - - TQListBox *sizeListBox() const; - virtual void updateSizes(); - - TQComboBox *scriptCombo() const; - virtual void updateScripts(); -%End - -protected slots: -%If (- TQt_3_2_0) - void sizeChanged(const TQString &); -%End - private: TQFontDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0, WFlags = 0); -%If (TQt_2_1_0 -) TQFontDialog(const TQFontDialog &); -%End ~TQFontDialog(); }; %End -%End diff --git a/sip/qt/qfontinfo.sip b/sip/qt/qfontinfo.sip index ed85074..7f714d4 100644 --- a/sip/qt/qfontinfo.sip +++ b/sip/qt/qfontinfo.sip @@ -37,34 +37,20 @@ class TQFontInfo public: TQFontInfo(const TQFont &); -%If (TQt_3_2_0 -) TQFontInfo(const TQFont &,TQFont::Script); -%End TQFontInfo(const TQFontInfo &); -%If (- TQt_2_00) - const char *family() const; -%End -%If (TQt_2_00 -) TQString family() const; -%End -%If (TQt_3_0_0 -) int pixelSize() const; -%End int pointSize() const; bool italic() const; int weight() const; bool bold() const; bool underline() const; -%If (TQt_3_2_0 -) bool overline() const; -%End bool strikeOut() const; bool fixedPitch() const; TQFont::StyleHint styleHint() const; -%If (- TQt_3_0_0) - TQFont::CharSet charSet() const; -%End bool rawMode() const; bool exactMatch() const; }; diff --git a/sip/qt/qfontmetrics.sip b/sip/qt/qfontmetrics.sip index 9ab3d89..18e5b4e 100644 --- a/sip/qt/qfontmetrics.sip +++ b/sip/qt/qfontmetrics.sip @@ -61,9 +61,7 @@ class TQFontMetrics public: TQFontMetrics(const TQFont &); -%If (TQt_3_2_0 -) TQFontMetrics(const TQFont &,TQFont::Script); -%End TQFontMetrics(const TQFontMetrics &); int ascent() const; @@ -74,60 +72,12 @@ public: int minLeftBearing() const; int minRightBearing() const; int maxWidth() const; -%If (- TQt_2_00) - bool inFont(char) const; - int leftBearing(char) const; - int rightBearing(char) const; - int width(const char *,int = -1) const; - int width(char) const; - TQRect boundingRect(const char *,int = -1) const; - TQRect boundingRect(char) const; - - TQRect boundingRect(int,int,int,int,int,const char *,int = -1, - SIP_PYLIST /AllowNone/ = 0) const; -%MethodCode - int *tabarray; - - if (intListToArray(a8,&tabarray) < 0) - sipIsErr = 1; - else - { - Py_BEGIN_ALLOW_THREADS - sipRes = new TQRect(sipCpp -> TQFontMetrics::boundingRect(a0,a1,a2,a3,a4,a5,a6,a7,tabarray)); - Py_END_ALLOW_THREADS - - if (tabarray) - sipFree((void *)tabarray); - } -%End - - TQSize size(int,const char *,int = -1,int = 0, - SIP_PYLIST /AllowNone/ = 0) const; -%MethodCode - int *tabarray; - - if (intListToArray(a4,&tabarray) < 0) - sipIsErr = 1; - else - { - Py_BEGIN_ALLOW_THREADS - sipRes = new TQSize(sipCpp -> TQFontMetrics::size(a0,a1,a2,a3,tabarray)); - Py_END_ALLOW_THREADS - - if (tabarray) - sipFree((void *)tabarray); - } -%End -%End -%If (TQt_2_00 -) bool inFont(TQChar) const; int leftBearing(TQChar) const; int rightBearing(TQChar) const; int width(const TQString &,int = -1) const; int width(TQChar) const; -%If (TQt_3_0_0 -) int charWidth(const TQString &,int) const; -%End TQRect boundingRect(const TQString &,int = -1) const; TQRect boundingRect(TQChar) const; @@ -166,12 +116,9 @@ public: sipFree((void *)tabarray); } %End -%End int underlinePos() const; -%If (TQt_3_2_0 -) int overlinePos() const; -%End int strikeOutPos() const; int lineWidth() const; diff --git a/sip/qt/qframe.sip b/sip/qt/qframe.sip index 737e4ae..ca47416 100644 --- a/sip/qt/qframe.sip +++ b/sip/qt/qframe.sip @@ -36,50 +36,16 @@ class TQFrame : TQWidget %End public: -%If (- TQt_3_0_0) - TQFrame(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0, - bool = 1); -%End -%If (TQt_3_0_0 -) TQFrame(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); -%End int frameStyle() const; -%If (- TQt_2_00) - void setFrameStyle(int); -%End -%If (TQt_2_00 -) virtual void setFrameStyle(int); -%End int frameWidth() const; TQRect contentsRect() const; -%If (- TQt_2_00) - bool lineShapesOk() const; -%End - TQSize sizeHint() const; -%If (TQt_2_00 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End -%If (- TQt_2_00) - enum { - NoFrame, - Box, - Panel, - WinPanel, - HLine, - VLine, - MShape, - Plain, - Raised, - Sunken, - MShadow - }; -%End -%If (TQt_2_00 -) enum Shape { NoFrame, Box, @@ -89,91 +55,45 @@ public: VLine, StyledPanel, PopupPanel, -%If (TQt_3_0_0 -) MenuBarPanel, ToolBarPanel, -%End -%If (TQt_3_0_1 -) LineEditPanel, TabWidgetPanel, -%End -%If (TQt_3_1_0 -) GroupBoxPanel, -%End MShape }; -%End -%If (TQt_2_00 -) enum Shadow { Plain, Raised, Sunken, MShadow }; -%End -%If (- TQt_2_00) - int frameShape() const; -%End -%If (TQt_2_00 -) Shape frameShape() const; void setFrameShape(Shape); -%End -%If (- TQt_2_00) - int frameShadow() const; -%End -%If (TQt_2_00 -) Shadow frameShadow() const; void setFrameShadow(Shadow); -%End int lineWidth() const; -%If (- TQt_2_00) - void setLineWidth(int); -%End -%If (TQt_2_00 -) virtual void setLineWidth(int); -%End int margin() const; -%If (- TQt_2_00) - void setMargin(int); -%End -%If (TQt_2_00 -) virtual void setMargin(int); -%End int midLineWidth() const; -%If (- TQt_2_00) - void setMidLineWidth(int); -%End -%If (TQt_2_00 -) virtual void setMidLineWidth(int); -%End TQRect frameRect() const; -%If (TQt_2_00 -) virtual void setFrameRect(const TQRect &); -%End protected: -%If (- TQt_2_00) - void setFrameRect(const TQRect &); -%End void paintEvent(TQPaintEvent *); void resizeEvent(TQResizeEvent *); virtual void drawFrame(TQPainter *); virtual void drawContents(TQPainter *); virtual void frameChanged(); -%If (TQt_2_00 - TQt_3_0_0) - void updateMask(); - virtual void drawFrameMask(TQPainter *); - virtual void drawContentsMask(TQPainter *); -%End -%If (TQt_3_1_0 -) void styleChange(TQStyle &); -%End private: TQFrame(const TQFrame &); diff --git a/sip/qt/qglobal.sip b/sip/qt/qglobal.sip index 59c7017..711f26d 100644 --- a/sip/qt/qglobal.sip +++ b/sip/qt/qglobal.sip @@ -54,10 +54,6 @@ typedef unsigned long long TQ_ULONG; const char *tqVersion(); -%If (TQt_3_0_0 -) -%End - -%If (TQt_3_1_0 -) const char *tqInstallPath(); const char *tqInstallPathDocs(); const char *tqInstallPathHeaders(); @@ -65,10 +61,7 @@ const char *tqInstallPathLibs(); const char *tqInstallPathBins(); const char *tqInstallPathPlugins(); const char *tqInstallPathData(); -%End -%If (TQt_3_2_0 -) const char *tqInstallPathTranslations(); %If (!WS_WIN) const char *tqInstallPathSysconf(); %End -%End diff --git a/sip/qt/qgmanager.sip b/sip/qt/qgmanager.sip deleted file mode 100644 index 9dc97fa..0000000 --- a/sip/qt/qgmanager.sip +++ /dev/null @@ -1,88 +0,0 @@ -// This is the SIP interface definition for TQGManager. -// -// Copyright (c) 2007 -// Riverbank Computing Limited <[email protected]> -// -// This file is part of PyTQt. -// -// This copy of PyTQt is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2, or (at your option) any later -// version. -// -// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -// details. -// -// You should have received a copy of the GNU General Public License along with -// PyTQt; see the file LICENSE. If not, write to the Free Software Foundation, -// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%ExportedDoc -<Sect2><Title>TQGManager (TQt v1.x)</Title> -<Para> -<Literal>TQGManager</Literal> is fully implemented. -</Para> -</Sect2> - -<Sect2><Title>TQChain (TQt v1.x)</Title> -<Para> -<Literal>TQChain</Literal> is implemented as an opaque class. -</Para> -</Sect2> -%End - - -%If (- TQt_2_00) - -class TQChain; - - -class TQGManager : TQObject -{ -%TypeHeaderCode -#include <tqgmanager.h> -%End - -public: - TQGManager(TQWidget *,const char * = 0); - - enum Direction { - LeftToRight, - RightToLeft, - Down, - Up - }; - - enum { - unlimited = TQCOORD_MAX - }; - - void setBorder(int); - TQChain *newSerChain(Direction); - TQChain *newParChain(Direction); - bool add(TQChain *,TQChain *,int = 0); - bool addWidget(TQChain *,TQWidget *,int = 0); - bool addSpacing(TQChain *,int,int = 0,int = unlimited); - bool addBranch(TQChain *,TQChain *,int,int); - void setStretch(TQChain *,int); - bool activate(); - void freeze(int = 0,int = 0); - void unFreeze(); - TQChain *xChain(); - TQChain *yChain(); - void setMenuBar(TQWidget *); - TQWidget *mainWidget(); - void remove(TQWidget *); - void setName(TQChain *,const char *); - -protected: - bool eventFilter(TQObject *,TQEvent *); - -private: - TQGManager(const TQGManager &); -}; - -%End diff --git a/sip/qt/qgrid.sip b/sip/qt/qgrid.sip index d0078ad..9047b70 100644 --- a/sip/qt/qgrid.sip +++ b/sip/qt/qgrid.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQGrid : TQFrame { %TypeHeaderCode @@ -38,35 +36,16 @@ class TQGrid : TQFrame %End public: -%If (- TQt_3_0_0) - enum Direction { - Horizontal, - Vertical - }; -%End - TQGrid(int,TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); -%If (- TQt_3_0_0) - TQGrid(int,Direction,TQWidget * /TransferThis/ = 0,const char * = 0, - WFlags = 0); -%End -%If (TQt_3_0_0 -) TQGrid(int,Orientation,TQWidget * /TransferThis/ = 0,const char * = 0, WFlags = 0); -%End void setSpacing(int); -%If (TQt_2_1_0 -) TQSize sizeHint() const; -%End protected: void frameChanged(); private: -%If (TQt_2_1_0 -) TQGrid(const TQGrid &); -%End }; - -%End diff --git a/sip/qt/qgridview.sip b/sip/qt/qgridview.sip index d251c54..ba73e64 100644 --- a/sip/qt/qgridview.sip +++ b/sip/qt/qgridview.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQGridView : TQScrollView { %TypeHeaderCode @@ -72,5 +70,3 @@ protected: private: TQGridView(const TQGridView &); }; - -%End diff --git a/sip/qt/qgroupbox.sip b/sip/qt/qgroupbox.sip index a6401f5..f4fdc61 100644 --- a/sip/qt/qgroupbox.sip +++ b/sip/qt/qgroupbox.sip @@ -37,98 +37,55 @@ class TQGroupBox : TQFrame public: TQGroupBox(TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_2_00) - TQGroupBox(const char *,TQWidget * /TransferThis/ = 0,const char * = 0); -%End -%If (TQt_2_00 -) TQGroupBox(const TQString &,TQWidget * /TransferThis/ = 0, const char * = 0); TQGroupBox(int,Orientation,TQWidget * /TransferThis/ = 0, const char * = 0); TQGroupBox(int,Orientation,const TQString &,TQWidget * /TransferThis/ = 0, const char * = 0); -%End -%If (TQt_2_00 -) virtual void setColumnLayout(int,Orientation); -%End -%If (- TQt_2_00) - const char *title() const; - void setTitle(const char *); -%End -%If (TQt_2_00 -) TQString title() const; virtual void setTitle(const TQString &); -%End int alignment() const; -%If (- TQt_2_00) - void setAlignment(int); -%End -%If (TQt_2_00 -) virtual void setAlignment(int); -%End -%If (TQt_2_1_0 -) int columns() const; void setColumns(int); Orientation orientation() const; void setOrientation(Orientation); -%End -%If (TQt_3_0_0 -) int insideMargin() const; int insideSpacing() const; void setInsideMargin(int); void setInsideSpacing(int); -%End -%If (TQt_2_1_0 -) void addSpace(int); -%End -%If (TQt_2_2_0 -) TQSize sizeHint() const; -%End -%If (TQt_3_1_0 -) bool isFlat() const; void setFlat(bool); -%End -%If (TQt_3_2_0 -) bool isCheckable() const; void setCheckable(bool); bool isChecked() const; void setEnabled(bool); -%End public slots: -%If (TQt_3_2_0 -) void setChecked(bool); -%End signals: -%If (TQt_3_2_0 -) void toggled(bool); -%End protected: -%If (TQt_2_2_0 -) bool event(TQEvent *); -%End -%If (TQt_2_00 -) void childEvent(TQChildEvent *); void resizeEvent(TQResizeEvent *); -%End void paintEvent(TQPaintEvent *); -%If (TQt_2_00 - TQt_3_0_0) - void updateMask(); -%End -%If (TQt_2_1_0 -) void focusInEvent(TQFocusEvent *); void fontChange(const TQFont &); -%End private: TQGroupBox(const TQGroupBox &); diff --git a/sip/qt/qhbox.sip b/sip/qt/qhbox.sip index 1d5d84c..884db2e 100644 --- a/sip/qt/qhbox.sip +++ b/sip/qt/qhbox.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQHBox : TQFrame { %TypeHeaderCode @@ -38,38 +36,17 @@ class TQHBox : TQFrame %End public: -%If (- TQt_3_0_0) - TQHBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0, - bool = 1); -%End -%If (TQt_3_0_0 -) TQHBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); -%End void setSpacing(int); -%If (TQt_2_1_0 -) bool setStretchFactor(TQWidget *,int); TQSize sizeHint() const; -%End protected: -%If (- TQt_3_0_0) - TQHBox(bool,TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0, - bool = 1); -%End -%If (TQt_3_0_0 - TQt_3_2_0) - TQHBox(bool,TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); -%End -%If (TQt_3_2_0 -) TQHBox(bool,TQWidget * /TransferThis/,const char *,WFlags = 0); -%End void frameChanged(); private: -%If (TQt_3_1_0 -) TQHBox(const TQHBox &); -%End }; - -%End diff --git a/sip/qt/qhbuttongroup.sip b/sip/qt/qhbuttongroup.sip index bad9f30..3cdcd49 100644 --- a/sip/qt/qhbuttongroup.sip +++ b/sip/qt/qhbuttongroup.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQHButtonGroup : TQButtonGroup { %TypeHeaderCode @@ -44,5 +42,3 @@ public: private: TQHButtonGroup(const TQHButtonGroup &); }; - -%End diff --git a/sip/qt/qheader.sip b/sip/qt/qheader.sip index eaf1701..2161dd3 100644 --- a/sip/qt/qheader.sip +++ b/sip/qt/qheader.sip @@ -29,71 +29,6 @@ %End -%If (- TQt_2_00) - -class TQHeader : TQTableView -{ -%TypeHeaderCode -#include <tqheader.h> -%End - -public: - TQHeader(TQWidget * /TransferThis/ = 0,const char * = 0); - TQHeader(int,TQWidget * /TransferThis/ = 0,const char * = 0); - - enum Orientation { - Horizontal, - Vertical - }; - - int addLabel(const char *,int = -1); - void setLabel(int,const char *,int = -1); - const char *label(int); - void setOrientation(Orientation); - Orientation orientation() const; - void setTracking(bool); - bool tracking() const; - void setClickEnabled(bool,int = -1); - void setResizeEnabled(bool,int = -1); - void setMovingEnabled(bool); - void setCellSize(int,int); - int cellSize(int) const; - int cellPos(int) const; - int cellAt(int) const; - int count() const; - int offset() const; - TQSize sizeHint() const; - int mapToLogical(int) const; - int mapToActual(int) const; - -public slots: - void setOffset(int); - -signals: - void sectionClicked(int); - void sizeChange(int,int,int); - void moved(int,int); - -protected: - void resizeEvent(TQResizeEvent *); - TQRect sRect(int); - void paintCell(TQPainter *,int,int); - void setupPainter(TQPainter *); - int cellHeight(int); - int cellWidth(int); - void mousePressEvent(TQMouseEvent *); - void mouseReleaseEvent(TQMouseEvent *); - void mouseMoveEvent(TQMouseEvent *); - -private: - TQHeader(const TQHeader &); -}; - -%End - - -%If (TQt_2_00 -) - class TQHeader : TQWidget { %TypeHeaderCode @@ -106,9 +41,7 @@ public: int addLabel(const TQString &,int = -1); int addLabel(const TQIconSet &,const TQString &,int = -1); -%If (TQt_2_1_0 -) void removeLabel(int); -%End virtual void setLabel(int,const TQString &,int = -1); virtual void setLabel(int,const TQIconSet &,const TQString &,int = -1); @@ -123,146 +56,72 @@ public: virtual void setClickEnabled(bool,int = -1); virtual void setResizeEnabled(bool,int = -1); virtual void setMovingEnabled(bool); -%If (TQt_3_0_0 -) virtual void setStretchEnabled(bool,int); -%End -%If (TQt_2_1_0 -) bool isClickEnabled(int = -1) const; bool isResizeEnabled(int = -1) const; bool isMovingEnabled() const; -%End -%If (TQt_3_0_0 -) bool isStretchEnabled() const; bool isStretchEnabled(int) const; -%End -%If (TQt_2_1_0 -) void resizeSection(int,int); int sectionSize(int) const; int sectionPos(int) const; int sectionAt(int) const; -%End int count() const; -%If (TQt_3_0_0 -) int headerWidth() const; TQRect sectionRect(int) const; -%End - -%If (- TQt_3_0_0) - virtual void setCellSize(int,int); - int cellSize(int) const; - int cellPos(int) const; - int cellAt(int) const; -%End int offset() const; TQSize sizeHint() const; -%If (- TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End -%If (TQt_2_1_0 -) int mapToSection(int) const; int mapToIndex(int) const; -%End -%If (- TQt_3_0_0) - int mapToLogical(int) const; - int mapToActual(int) const; -%End -%If (TQt_2_1_0 -) void moveSection(int,int); -%End -%If (- TQt_3_0_0) - virtual void moveCell(int,int); -%End -%If (TQt_3_2_0 -) // This is placed before the obsolete version below so that it has // precedence. It may still cause problems with old code until SIP // distinguishes between bools and enums. void setSortIndicator(int,SortOrder); int sortIndicatorSection() const; SortOrder sortIndicatorOrder() const; -%End -%If (TQt_2_1_0 -) // Obsolete. void setSortIndicator(int,bool = 1); -%End -%If (TQt_3_0_0 -) void adjustHeaderSize(); -%End public slots: -%If (TQt_2_2_0 -) void setUpdatesEnabled(bool); -%End virtual void setOffset(int); signals: -%If (TQt_2_1_0 -) void clicked(int); void pressed(int); void released(int); -%End void sizeChange(int,int,int); -%If (TQt_2_1_0 -) void indexChange(int,int,int); -%End -%If (- TQt_3_0_0) - void sectionClicked(int); - void moved(int,int); -%End -%If (TQt_3_2_0 -) void sectionHandleDoubleClicked(int); -%End protected: -%If (TQt_2_1_0 -) void paintEvent(TQPaintEvent *); -%End -%If (TQt_2_2_0 -) void showEvent(TQShowEvent *); -%End -%If (- TQt_2_1_0) - void resizeEvent(TQResizeEvent *); -%End -%If (TQt_3_0_0 -) void resizeEvent(TQResizeEvent *); -%End TQRect sRect(int); -%If (- TQt_3_0_0) - void paintSection(TQPainter *,int,TQRect); -%End -%If (TQt_2_1_0 - TQt_3_0_0) - void paintSectionLabel(TQPainter *,int,const TQRect &); -%End -%If (TQt_3_0_0 -) virtual void paintSection(TQPainter *,int,const TQRect &); virtual void paintSectionLabel(TQPainter *,int,const TQRect &); -%End -%If (TQt_3_1_0 -) void fontChange(const TQFont &); -%End void mousePressEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); -%If (TQt_3_2_0 -) void mouseDoubleClickEvent(TQMouseEvent *); -%End -%If (TQt_3_1_0 -) void keyPressEvent(TQKeyEvent *); void keyReleaseEvent(TQKeyEvent *); -%End private: TQHeader(const TQHeader &); }; - -%End diff --git a/sip/qt/qhgroupbox.sip b/sip/qt/qhgroupbox.sip index 5761c17..e287673 100644 --- a/sip/qt/qhgroupbox.sip +++ b/sip/qt/qhgroupbox.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQHGroupBox : TQGroupBox { %TypeHeaderCode @@ -44,5 +42,3 @@ public: private: TQHGroupBox(const TQHGroupBox &); }; - -%End diff --git a/sip/qt/qiconset.sip b/sip/qt/qiconset.sip index 45f8140..8fdba3a 100644 --- a/sip/qt/qiconset.sip +++ b/sip/qt/qiconset.sip @@ -54,73 +54,36 @@ public: Active }; -%If (TQt_3_0_0 -) enum State { On, Off }; -%End -%If (TQt_2_1_0 -) TQIconSet(); -%End TQIconSet(const TQPixmap &,Size = Automatic); -%If (TQt_2_2_0 -) TQIconSet(const TQPixmap &,const TQPixmap &); -%End TQIconSet(const TQIconSet &); void reset(const TQPixmap &,Size); -%If (- TQt_2_00) - void setPixmap(const TQPixmap &,Size,Mode = Normal); - void setPixmap(const char *,Size,Mode = Normal); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setPixmap(const TQPixmap &,Size,Mode = Normal); - virtual void setPixmap(const TQString &,Size,Mode = Normal); -%End -%If (TQt_3_0_0 -) virtual void setPixmap(const TQPixmap &,Size,Mode = Normal,State = Off); virtual void setPixmap(const TQString &,Size,Mode = Normal,State = Off); -%End -%If (- TQt_3_0_0) - TQPixmap pixmap(Size,Mode) const; -%If (TQt_2_1_0 -) -// TQPixmap pixmap(Size,bool) const; -%End -%End -%If (TQt_3_0_0 -) TQPixmap pixmap(Size,Mode,State = Off) const; // TQPixmap pixmap(Size,bool,State = Off) const; -%End TQPixmap pixmap() const; -%If (- TQt_3_0_0) - bool isGenerated(Size,Mode) const; -%End -%If (TQt_3_0_0 -) bool isGenerated(Size,Mode,State = Off) const; void clearGenerated(); -%End -%If (TQt_3_1_0 -) void installIconFactory(TQIconFactory *); -%End -%If (TQt_2_1_0 -) bool isNull() const; -%End void detach(); -%If (TQt_3_0_0 -) static void setIconSize(Size,const TQSize &); static const TQSize &iconSize(Size); -%End }; -%If (TQt_3_1_0 -) - class TQIconFactory { %TypeHeaderCode @@ -142,5 +105,3 @@ public: private: TQIconFactory(const TQIconFactory &); }; - -%End diff --git a/sip/qt/qiconview.sip b/sip/qt/qiconview.sip index a9dc9d5..ceb6791 100644 --- a/sip/qt/qiconview.sip +++ b/sip/qt/qiconview.sip @@ -54,7 +54,6 @@ Not yet implemented. %If (TQt_ICONVIEW) -%If (TQt_2_1_0 -) %If (TQt_DRAGANDDROP) @@ -88,9 +87,7 @@ public: virtual TQByteArray encodedData(const char *) const; private: -%If (TQt_3_1_0 -) TQIconDrag(const TQIconDrag &); -%End }; %End @@ -112,12 +109,10 @@ public: const TQPixmap &); TQIconViewItem(TQIconView * /TransferThis/,TQIconViewItem *, const TQString &,const TQPixmap &); -%If (TQt_3_0_0 -) TQIconViewItem(TQIconView * /TransferThis/,const TQString &, const TQPicture &); TQIconViewItem(TQIconView * /TransferThis/,TQIconViewItem *, const TQString &,const TQPicture &); -%End virtual void setRenameEnabled(bool); virtual void setDragEnabled(bool); @@ -125,9 +120,7 @@ public: virtual TQString text() const; virtual TQPixmap *pixmap() const; -%If (TQt_3_0_0 -) virtual TQPicture *picture() const; -%End virtual TQString key() const; bool renameEnabled() const; @@ -149,19 +142,9 @@ public: virtual void repaint(); -%If (- TQt_3_0_0) - virtual void move(int,int); -%End -%If (TQt_3_0_0 -) virtual bool move(int,int); -%End virtual void moveBy(int,int); -%If (- TQt_3_0_0) - virtual void move(const TQPoint &); -%End -%If (TQt_3_0_0 -) virtual bool move(const TQPoint &); -%End virtual void moveBy(const TQPoint &); TQRect rect() const; @@ -173,14 +156,8 @@ public: TQPoint pos() const; TQRect textRect(bool = 1) const; TQRect pixmapRect(bool = 1) const; -%If (- TQt_3_0_0) - bool contains(TQPoint) const; - bool intersects(TQRect) const; -%End -%If (TQt_3_0_0 -) bool contains(const TQPoint &) const; bool intersects(const TQRect &) const; -%End virtual bool acceptDrop(const TQMimeSource *) const; @@ -190,16 +167,12 @@ public: virtual void setText(const TQString &); virtual void setPixmap(const TQPixmap &); -%If (TQt_3_0_0 -) virtual void setPicture(const TQPicture &); -%End virtual void setText(const TQString &,bool,bool = 1); virtual void setPixmap(const TQPixmap &,bool,bool = 1); virtual void setKey(const TQString &); -%If (TQt_3_0_0 -) virtual int rtti() const; -%End protected: virtual void removeRenameBox(); @@ -215,9 +188,7 @@ protected: void setTextRect(const TQRect &); void setPixmapRect(const TQRect &); void calcTmpText(); -%If (TQt_3_1_0 -) TQString tempText() const; -%End }; @@ -271,21 +242,14 @@ public: SelectionMode selectionMode() const; TQIconViewItem *findItem(const TQPoint &) const; -%If (- TQt_3_0_0) - TQIconViewItem *findItem(const TQString &) const; -%End -%If (TQt_3_0_0 -) TQIconViewItem *findItem(const TQString &, ComparisonFlags = BeginsWith) const; -%End virtual void selectAll(bool); virtual void clearSelection(); virtual void invertSelection(); virtual void repaintItem(TQIconViewItem *); -%If (TQt_3_1_0 -) void repaintSelectedItems(); -%End void ensureItemVisible(TQIconViewItem *); TQIconViewItem* findFirstVisibleItem(const TQRect &) const; @@ -328,9 +292,6 @@ public: bool eventFilter(TQObject *,TQEvent *); TQSize minimumSizeHint() const; -%If (- TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End TQSize sizeHint() const; virtual void sort(bool = 1); @@ -338,9 +299,7 @@ public: virtual void setFont(const TQFont &); virtual void setPalette(const TQPalette &); -%If (TQt_3_0_0 -) bool isRenaming() const; -%End public slots: virtual void arrangeItemsInGrid(const TQSize &,bool = 1); @@ -363,9 +322,7 @@ signals: void rightButtonPressed(TQIconViewItem *,const TQPoint &); void mouseButtonPressed(int,TQIconViewItem *,const TQPoint &); void mouseButtonClicked(int,TQIconViewItem *,const TQPoint &); -%If (TQt_3_0_0 -) void contextMenuRequested(TQIconViewItem *,const TQPoint &); -%End %If (TQt_DRAGANDDROP) void dropped(TQDropEvent *,const TQValueList<TQIconDragItem> &); %End @@ -381,37 +338,13 @@ protected slots: virtual void slotUpdate(); protected: -%If (- TQt_3_0_0) - virtual void drawContents(TQPainter *,int,int,int,int); - virtual void contentsMousePressEvent(TQMouseEvent *); - virtual void contentsMouseReleaseEvent(TQMouseEvent *); - virtual void contentsMouseMoveEvent(TQMouseEvent *); - virtual void contentsMouseDoubleClickEvent(TQMouseEvent *); -%End -%If (TQt_3_0_0 -) void drawContents(TQPainter *,int,int,int,int); void contentsMousePressEvent(TQMouseEvent *); void contentsMouseReleaseEvent(TQMouseEvent *); void contentsMouseMoveEvent(TQMouseEvent *); void contentsMouseDoubleClickEvent(TQMouseEvent *); void contentsContextMenuEvent(TQContextMenuEvent *); -%End - -%If (- TQt_3_0_0) -%If (TQt_DRAGANDDROP) - virtual void contentsDragEnterEvent(TQDragEnterEvent *); - virtual void contentsDragMoveEvent(TQDragMoveEvent *); - virtual void contentsDragLeaveEvent(TQDragLeaveEvent *); - virtual void contentsDropEvent(TQDropEvent *); -%End - virtual void resizeEvent(TQResizeEvent *); - virtual void keyPressEvent(TQKeyEvent *); - virtual void focusInEvent(TQFocusEvent *); - virtual void focusOutEvent(TQFocusEvent *); - virtual void enterEvent(TQEvent *); -%End -%If (TQt_3_0_0 -) %If (TQt_DRAGANDDROP) void contentsDragEnterEvent(TQDragEnterEvent *); void contentsDragMoveEvent(TQDragMoveEvent *); @@ -424,7 +357,6 @@ protected: void focusInEvent(TQFocusEvent *); void focusOutEvent(TQFocusEvent *); void enterEvent(TQEvent *); -%End virtual void drawRubber(TQPainter *); %If (TQt_DRAGANDDROP) @@ -437,21 +369,13 @@ protected: void emitSelectionChanged(TQIconViewItem * = 0); void emitRenamed(TQIconViewItem *); -%If (- TQt_3_0_0) -// TQIconViewItem *makeRowLayout(TQIconViewItem *,int &); -%End -%If (TQt_3_0_0 -) // TQIconViewItem *makeRowLayout(TQIconViewItem *,int &,bool &); -%End void styleChange(TQStyle &); -%If (TQt_3_0_0 -) void windowActivationChange(bool); -%End private: TQIconView(const TQIconView &); }; %End -%End diff --git a/sip/qt/qimage.sip b/sip/qt/qimage.sip index 47f44a0..b1628c5 100644 --- a/sip/qt/qimage.sip +++ b/sip/qt/qimage.sip @@ -149,12 +149,7 @@ public: TQImage(); TQImage(int,int,int,int = 0,Endian = IgnoreEndian); TQImage(const TQSize &,int,int = 0,Endian = IgnoreEndian); -%If (- TQt_2_00) - TQImage(const char *,char * = 0); -%End -%If (TQt_2_00 -) TQImage(const TQString &,char * = 0); -%End TQImage(SIP_PYLIST) [(const char **)]; %MethodCode @@ -177,11 +172,8 @@ public: } %End -%If (TQt_2_00 -) TQImage(const TQByteArray &); -%End -%If (TQt_2_1_0 -) TQImage(uchar *,int,int,int,SIP_PYLIST /AllowNone/,int,Endian) [(uchar *,int,int,int,int,TQRgb *,int,Endian)]; %MethodCode // The Python interface takes a list of TQRgb instances. @@ -235,7 +227,6 @@ public: Py_END_ALLOW_THREADS } %End -%End TQImage(const TQImage &); @@ -245,15 +236,8 @@ public: void detach(); TQImage copy() const; TQImage copy(int,int,int,int,int = 0) const; -%If (- TQt_3_0_0) - TQImage copy(TQRect &) const; -%End -%If (TQt_3_0_0 -) TQImage copy(const TQRect &) const; -%End -%If (TQt_3_1_0 -) static TQImage fromMimeSource(const TQString &); -%End bool isNull() const; int width() const; @@ -290,19 +274,13 @@ public: void reset(); void fill(uint); -%If (TQt_2_00 -) void invertPixels(bool = 1); -%End TQImage convertDepth(int) const; // TQImage convertDepthWithPalette(int,TQRgb *,int,int = 0) const; TQImage convertDepth(int,int) const; TQImage convertBitOrder(Endian) const; -%If (- TQt_3_0_0) - TQImage smoothScale(int,int) const; -%End -%If (TQt_3_0_0 -) enum ScaleMode { ScaleFree, ScaleMin, @@ -316,72 +294,33 @@ public: TQImage scaleWidth(int) const; TQImage scaleHeight(int) const; TQImage xForm(const TQWMatrix &) const; -%End -%If (- TQt_2_00) - TQImage createAlphaMask(bool = 0) const; - TQImage createAlphaMask(int) const; -%End -%If (TQt_2_00 -) TQImage createAlphaMask(int = 0) const; -%End TQImage createHeuristicMask(bool = 1) const; -%If (TQt_2_00 -) TQImage mirror() const; -%End -%If (TQt_2_1_0 -) TQImage mirror(bool,bool) const; -%End -%If (TQt_2_00 -) TQImage swapRGB() const; -%End static Endian systemBitOrder(); static Endian systemByteOrder(); -%If (- TQt_2_00) - static const char *imageFormat(const char *); -%End -%If (TQt_2_00 -) static const char *imageFormat(const TQString &); -%End static TQStrList inputFormats(); static TQStrList outputFormats(); -%If (TQt_2_1_0 -) static TQStringList inputFormatList(); static TQStringList outputFormatList(); -%End -%If (- TQt_2_00) - bool load(const char *,const char * = 0); -%End -%If (TQt_2_00 -) bool load(const TQString &,const char * = 0); -%End bool loadFromData(const uchar * /Array/,uint /ArraySize/, const char * = 0); bool loadFromData(TQByteArray,char * = 0); -%If (- TQt_2_00) - bool save(const char *,const char *) const; -%End -%If (TQt_2_00 - TQt_3_0_0) - bool save(const TQString &,const char *) const; -%End -%If (TQt_2_2_0 - TQt_3_0_0) - bool save(const TQString &,const char *,int) const; -%End -%If (TQt_3_0_0 -) bool save(const TQString &,const char *,int = -1) const; -%End -%If (TQt_3_2_0 -) bool save(TQIODevice *,const char *,int = -1) const; -%End bool valid(int,int) const; int pixelIndex(int,int) const; TQRgb pixel(int,int) const; void setPixel(int,int,uint); -%If (TQt_2_1_0 -) int dotsPerMeterX() const; int dotsPerMeterY() const; void setDotsPerMeterX(int); @@ -396,7 +335,6 @@ public: TQString text(const TQImageTextKeyLang &) const; void setText(const char *,const char *,const TQString &); %End -%End }; @@ -413,60 +351,27 @@ class TQImageIO public: TQImageIO(); TQImageIO(TQIODevice *,const char *); -%If (TQt_2_00 -) TQImageIO(const TQString &,const char *); -%End -%If (- TQt_2_00) - TQImageIO(const char *,const char *); -%End const TQImage &image() const; int status() const; const char *format() const; TQIODevice *ioDevice() const; -%If (TQt_2_00 -) TQString fileName() const; -%End -%If (- TQt_2_00) - const char *fileName() const; -%End -%If (TQt_3_0_0 -) int quality() const; -%End -%If (TQt_2_00 -) TQString description() const; -%End -%If (- TQt_2_00) - const char *description() const; -%End const char *parameters() const; -%If (TQt_3_0_0 -) float gamma() const; -%End void setImage(const TQImage &); void setStatus(int); void setFormat(const char *); void setIODevice(TQIODevice *); -%If (TQt_2_00 -) void setFileName(const TQString &); -%End -%If (- TQt_2_00) - void setFileName(const char *); -%End -%If (TQt_3_0_0 -) void setQuality(int); -%End -%If (TQt_2_00 -) void setDescription(const TQString &); -%End -%If (- TQt_2_00) - void setDescription(const char *); -%End void setParameters(const char *); -%If (TQt_3_0_0 -) void setGamma(float); -%End bool read(); bool write(); @@ -484,7 +389,6 @@ private: }; -%If (TQt_2_1_0 -) %If (TQt_IMAGE_TEXT) class TQImageTextKeyLang @@ -502,7 +406,6 @@ public: }; %End -%End %ModuleHeaderCode diff --git a/sip/qt/qinputdialog.sip b/sip/qt/qinputdialog.sip index 199e29d..f64baa7 100644 --- a/sip/qt/qinputdialog.sip +++ b/sip/qt/qinputdialog.sip @@ -122,7 +122,6 @@ the <Literal>TQString</Literal> result and the <Literal>ok</Literal> flag. %End -%If (TQt_2_1_0 -) %If (TQt_INPUTDIALOG) class TQInputDialog : TQDialog @@ -132,25 +131,10 @@ class TQInputDialog : TQDialog %End public: -%If (TQt_3_0_0 -) static TQString getText(const TQString &,const TQString &, TQLineEdit::EchoMode = TQLineEdit::Normal, const TQString & = TQString::null, bool * = 0,TQWidget * = 0,const char * = 0); -%End - -%If (- TQt_3_0_0) - static TQString getText(const TQString &,const TQString &, - const TQString & = TQString::null, - bool * = 0,TQWidget * = 0,const char * = 0); -%End - -%If (TQt_2_2_0 - TQt_3_0_0) - static TQString getText(const TQString &,const TQString &, - TQLineEdit::EchoMode, - const TQString & = TQString::null, - bool * = 0,TQWidget * = 0,const char * = 0); -%End static int getInteger(const TQString &,const TQString &,int = 0, int = -2147483647,int = 2147483647,int = 1, @@ -171,4 +155,3 @@ private: }; %End -%End diff --git a/sip/qt/qiodevice.sip b/sip/qt/qiodevice.sip index 4fbbb05..75ba7dc 100644 --- a/sip/qt/qiodevice.sip +++ b/sip/qt/qiodevice.sip @@ -72,9 +72,7 @@ const int IO_OpenError; const int IO_ConnectError; const int IO_AbortError; const int IO_TimeOutError; -%If (TQt_2_00 -) const int IO_UnspecifiedError; -%End class TQIODevice @@ -84,9 +82,7 @@ class TQIODevice %End public: -%If (TQt_3_0_0 -) typedef TQ_ULONG Offset; -%End TQIODevice(); @@ -114,80 +110,12 @@ public: virtual void close() = 0; virtual void flush() = 0 /ReleaseGIL/; -%If (- TQt_3_0_0) - virtual uint size() const = 0; - virtual int at() const; - virtual bool at(int); -%End -%If (TQt_3_0_0 -) virtual Offset size() const = 0; virtual Offset at() const; virtual bool at(Offset); -%End virtual bool atEnd() const; bool reset(); -%If (- TQt_3_0_0) - virtual SIP_PYOBJECT readBlock(uint) = 0 /ReleaseGIL/ [int (char *,uint)]; -%MethodCode - char *buf; - - if ((buf = (char *)sipMalloc(a0)) == NULL) - sipIsErr = 1; - else - { - int actlen; - - Py_BEGIN_ALLOW_THREADS - actlen = sipCpp -> readBlock(buf,a0); - Py_END_ALLOW_THREADS - - if (actlen < 0) - { - sipFree((void *)buf); - - Py_INCREF(Py_None); - sipRes = Py_None; - } - else - { - sipRes = SIPBytes_FromStringAndSize(buf,actlen); - - sipFree((void *)buf); - - if (sipRes == NULL) - sipIsErr = 1; - } - } -%End -%VirtualCatcherCode - PyObject *result = sipCallMethod(&sipIsErr,sipMethod,"i",a1); - - if (result != NULL) - { - PyObject *buf; - - sipParseResult(&sipIsErr,sipMethod,result,"O",&buf); - - if (buf == Py_None) - sipRes = -1; - else if (!SIPBytes_Check(buf)) - { - sipBadCatcherResult(sipMethod); - sipIsErr = 1; - } - else - { - memcpy(a0,SIPBytes_AS_STRING(buf),SIPBytes_GET_SIZE(buf)); - sipRes = SIPBytes_GET_SIZE(buf); - } - - Py_DECREF(buf); - Py_DECREF(result); - } -%End -%End -%If (TQt_3_0_0 -) virtual SIP_PYOBJECT readBlock(TQ_ULONG) = 0 /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; %MethodCode char *buf; @@ -246,78 +174,10 @@ public: Py_DECREF(result); } %End -%End -%If (- TQt_3_0_0) - virtual int writeBlock(const char * /Array/, - uint /ArraySize/) = 0 /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) virtual TQ_LONG writeBlock(const char * /Array/, TQ_ULONG /ArraySize/) = 0 /ReleaseGIL/; -%End - -%If (- TQt_3_0_0) - virtual SIP_PYOBJECT readLine(uint) /ReleaseGIL/ [int (char *,uint)]; -%MethodCode - char *buf; - - if ((buf = (char *)sipMalloc(a0)) == NULL) - sipIsErr = 1; - else - { - int actlen; - - Py_BEGIN_ALLOW_THREADS - actlen = sipSelfWasArg ? sipCpp->TQIODevice::readLine(buf, a0) : sipCpp->readLine(buf, a0); - Py_END_ALLOW_THREADS - if (actlen < 0) - { - sipFree((void *)buf); - - Py_INCREF(Py_None); - sipRes = Py_None; - } - else - { - sipRes = SIPBytes_FromStringAndSize(buf,actlen); - - sipFree((void *)buf); - - if (sipRes == NULL) - sipIsErr = 1; - } - } -%End -%VirtualCatcherCode - PyObject *result = sipCallMethod(&sipIsErr,sipMethod,"i",a1); - - if (result != NULL) - { - PyObject *buf; - - sipParseResult(&sipIsErr,sipMethod,result,"O",&buf); - - if (buf == Py_None) - sipRes = -1; - else if (!SIPBytes_Check(buf)) - { - sipBadCatcherResult(sipMethod); - sipIsErr = 1; - } - else - { - memcpy(a0,SIPBytes_AS_STRING(buf),SIPBytes_GET_SIZE(buf)); - sipRes = SIPBytes_GET_SIZE(buf); - } - - Py_DECREF(buf); - Py_DECREF(result); - } -%End -%End -%If (TQt_3_0_0 -) virtual SIP_PYOBJECT readLine(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; %MethodCode char *buf; @@ -376,21 +236,10 @@ public: Py_DECREF(result); } %End -%End -%If (TQt_2_00 - TQt_3_0_0) - int writeBlock(const TQByteArray &) /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) TQ_LONG writeBlock(const TQByteArray &) /ReleaseGIL/; -%End -%If (TQt_2_00 - TQt_3_0_0) - TQByteArray readAll() /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) virtual TQByteArray readAll() /ReleaseGIL/; -%End virtual int getch() = 0 /ReleaseGIL/; virtual int putch(int) = 0 /ReleaseGIL/; diff --git a/sip/qt/qkeycode.sip b/sip/qt/qkeycode.sip deleted file mode 100644 index ca10bd2..0000000 --- a/sip/qt/qkeycode.sip +++ /dev/null @@ -1,286 +0,0 @@ -// This is the SIP interface definition for the key code definitions. -// -// Copyright (c) 2007 -// Riverbank Computing Limited <[email protected]> -// -// This file is part of PyTQt. -// -// This copy of PyTQt is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2, or (at your option) any later -// version. -// -// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -// details. -// -// You should have received a copy of the GNU General Public License along with -// PyTQt; see the file LICENSE. If not, write to the Free Software Foundation, -// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%If (- TQt_2_00) - -%ModuleHeaderCode -#include <tqkeycode.h> -%End - -// Accelerator modifiers. -const uint SHIFT; -const uint CTRL; -const uint ALT; -const uint ASCII_ACCEL; - -// Miscellaneous keys. -const int Key_Escape; -const int Key_Tab; -const int Key_Backtab; -const int Key_Backspace; -const int Key_Return; -const int Key_Enter; -const int Key_Insert; -const int Key_Delete; -const int Key_Pause; -const int Key_Print; -const int Key_SysReq; - -// Cursor keys. -const int Key_Home; -const int Key_End; -const int Key_Left; -const int Key_Up; -const int Key_Right; -const int Key_Down; -const int Key_Prior; -const int Key_PageUp; -const int Key_Next; -const int Key_PageDown; - -// Modifiers. -const int Key_Shift; -const int Key_Control; -const int Key_Meta; -const int Key_Alt; -const int Key_CapsLock; -const int Key_NumLock; -const int Key_ScrollLock; - -// Function keys. -const int Key_F1; -const int Key_F2; -const int Key_F3; -const int Key_F4; -const int Key_F5; -const int Key_F6; -const int Key_F7; -const int Key_F8; -const int Key_F9; -const int Key_F10; -const int Key_F11; -const int Key_F12; -const int Key_F13; -const int Key_F14; -const int Key_F15; -const int Key_F16; -const int Key_F17; -const int Key_F18; -const int Key_F19; -const int Key_F20; -const int Key_F21; -const int Key_F22; -const int Key_F23; -const int Key_F24; -const int Key_F25; -const int Key_F26; -const int Key_F27; -const int Key_F28; -const int Key_F29; -const int Key_F30; -const int Key_F31; -const int Key_F32; -const int Key_F33; -const int Key_F34; -const int Key_F35; - -// Extra keys. -const int Key_Super_L; -const int Key_Super_R; -const int Key_Menu; -%If (TQt_1_43 -) -const int Key_Hyper_L; -const int Key_Hyper_R; -%End - -// The 7 bit printable ASCII keys. -const int Key_Space; -const int Key_Exclam; -const int Key_QuoteDbl; -const int Key_NumberSign; -const int Key_Dollar; -const int Key_Percent; -const int Key_Ampersand; -const int Key_Apostrophe; -const int Key_ParenLeft; -const int Key_ParenRight; -const int Key_Asterisk; -const int Key_Plus; -const int Key_Comma; -const int Key_Minus; -const int Key_Period; -const int Key_Slash; -const int Key_0; -const int Key_1; -const int Key_2; -const int Key_3; -const int Key_4; -const int Key_5; -const int Key_6; -const int Key_7; -const int Key_8; -const int Key_9; -const int Key_Colon; -const int Key_Semicolon; -const int Key_Less; -const int Key_Equal; -const int Key_Greater; -const int Key_Question; -const int Key_At; -const int Key_A; -const int Key_B; -const int Key_C; -const int Key_D; -const int Key_E; -const int Key_F; -const int Key_G; -const int Key_H; -const int Key_I; -const int Key_J; -const int Key_K; -const int Key_L; -const int Key_M; -const int Key_N; -const int Key_O; -const int Key_P; -const int Key_Q; -const int Key_R; -const int Key_S; -const int Key_T; -const int Key_U; -const int Key_V; -const int Key_W; -const int Key_X; -const int Key_Y; -const int Key_Z; -const int Key_BracketLeft; -const int Key_Backslash; -const int Key_BracketRight; -const int Key_AsciiCircum; -const int Key_Underscore; -const int Key_QuoteLeft; -const int Key_BraceLeft; -const int Key_Bar; -const int Key_BraceRight; -const int Key_AsciiTilde; - -// Latin 1 codes. -const int Key_nobreakspace; -const int Key_exclamdown; -const int Key_cent; -const int Key_sterling; -const int Key_currency; -const int Key_yen; -const int Key_brokenbar; -const int Key_section; -const int Key_diaeresis; -const int Key_copyright; -const int Key_ordfeminine; -const int Key_guillemotleft; -const int Key_notsign; -const int Key_hyphen; -const int Key_registered; -const int Key_macron; -const int Key_degree; -const int Key_plusminus; -const int Key_twosuperior; -const int Key_threesuperior; -const int Key_acute; -const int Key_mu; -const int Key_paragraph; -const int Key_periodcentered; -const int Key_cedilla; -const int Key_onesuperior; -const int Key_masculine; -const int Key_guillemotright; -const int Key_onequarter; -const int Key_onehalf; -const int Key_threequarters; -const int Key_questiondown; -const int Key_Agrave; -const int Key_Aacute; -const int Key_Acircumflex; -const int Key_Atilde; -const int Key_Adiaeresis; -const int Key_Aring; -const int Key_AE; -const int Key_Ccedilla; -const int Key_Egrave; -const int Key_Eacute; -const int Key_Ecircumflex; -const int Key_Ediaeresis; -const int Key_Igrave; -const int Key_Iacute; -const int Key_Icircumflex; -const int Key_Idiaeresis; -const int Key_ETH; -const int Key_Ntilde; -const int Key_Ograve; -const int Key_Oacute; -const int Key_Ocircumflex; -const int Key_Otilde; -const int Key_Odiaeresis; -const int Key_multiply; -const int Key_Ooblique; -const int Key_Ugrave; -const int Key_Uacute; -const int Key_Ucircumflex; -const int Key_Udiaeresis; -const int Key_Yacute; -const int Key_THORN; -const int Key_ssharp; -const int Key_agrave; -const int Key_aacute; -const int Key_acircumflex; -const int Key_atilde; -const int Key_adiaeresis; -const int Key_aring; -const int Key_ae; -const int Key_ccedilla; -const int Key_egrave; -const int Key_eacute; -const int Key_ecircumflex; -const int Key_ediaeresis; -const int Key_igrave; -const int Key_iacute; -const int Key_icircumflex; -const int Key_idiaeresis; -const int Key_eth; -const int Key_ntilde; -const int Key_ograve; -const int Key_oacute; -const int Key_ocircumflex; -const int Key_otilde; -const int Key_odiaeresis; -const int Key_division; -const int Key_oslash; -const int Key_ugrave; -const int Key_uacute; -const int Key_ucircumflex; -const int Key_udiaeresis; -const int Key_yacute; -const int Key_thorn; -const int Key_ydiaeresis; - -const int Key_unknown; - -%End diff --git a/sip/qt/qkeysequence.sip b/sip/qt/qkeysequence.sip index 9293ffe..8b94cfd 100644 --- a/sip/qt/qkeysequence.sip +++ b/sip/qt/qkeysequence.sip @@ -32,8 +32,6 @@ integer may be used whenever a <Literal>TQKeySequence</Literal> can be used. %End -%If (TQt_3_0_0 -) - class TQKeySequence : TQt { %TypeHeaderCode @@ -44,7 +42,6 @@ public: TQKeySequence(); TQKeySequence(const TQString &); TQKeySequence(int); -%If (TQt_3_1_0 -) TQKeySequence(int,int,int = 0,int = 0); bool operator==(const TQKeySequence &) const; @@ -53,7 +50,6 @@ public: uint count() const; bool isEmpty() const; TQt::SequenceMatch matches(const TQKeySequence &) const; -%End int __int__() const; @@ -115,5 +111,3 @@ public: return sipGetState(sipTransferObj); %End }; - -%End diff --git a/sip/qt/qlabel.sip b/sip/qt/qlabel.sip index a19541e..849b3a7 100644 --- a/sip/qt/qlabel.sip +++ b/sip/qt/qlabel.sip @@ -37,121 +37,48 @@ class TQLabel : TQFrame %End public: -%If (- TQt_2_00) - TQLabel(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); - TQLabel(const char *,TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); - TQLabel(TQWidget *,const char *,TQWidget * /TransferThis/,const char * = 0,WFlags = 0); -%End -%If (TQt_2_00 -) TQLabel(TQWidget * /TransferThis/,const char * = 0,WFlags = 0); TQLabel(const TQString &,TQWidget * /TransferThis/,const char * = 0,WFlags = 0); TQLabel(TQWidget *,const TQString &,TQWidget * /TransferThis/,const char * = 0,WFlags = 0); -%End -%If (- TQt_2_00) - const char *text() const; -%End -%If (TQt_2_00 -) TQString text() const; -%End TQPixmap *pixmap() const; -%If (TQt_3_0_0 -) TQPicture *picture() const; -%End TQMovie *movie() const; -%If (TQt_2_00 -) TextFormat textFormat() const; void setTextFormat(TextFormat); -%End int alignment() const; -%If (- TQt_2_00) - void setAlignment(int); -%End -%If (TQt_2_00 -) virtual void setAlignment(int); -%End -%If (- TQt_2_00) - int margin() const; - void setMargin(int); -%End -%If (TQt_2_00 -) int indent() const; void setIndent(int); -%End bool autoResize() const; -%If (- TQt_2_00) - void setAutoResize(bool); -%End -%If (TQt_2_00 -) virtual void setAutoResize(bool); -%End -%If (TQt_2_2_0 -) bool hasScaledContents() const; void setScaledContents(bool); -%End -%If (TQt_2_00 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End TQSize sizeHint() const; -%If (TQt_2_1_0 -) TQSize minimumSizeHint() const; -%End -%If (- TQt_2_00) - void setBuddy(TQWidget *); -%End -%If (TQt_2_00 -) virtual void setBuddy(TQWidget *); -%End TQWidget *buddy() const; -%If (TQt_2_00 - TQt_3_0_0) - void setAutoMask(bool); -%End -%If (TQt_2_00 -) int heightForWidth(int) const; -%End -%If (TQt_3_0_0 -) void setFont(const TQFont &); -%End public slots: -%If (- TQt_2_00) - void setText(const char *); - void setPixmap(const TQPixmap &); -%End -%If (TQt_2_00 -) virtual void setText(const TQString &); virtual void setPixmap(const TQPixmap &); -%End -%If (TQt_3_0_0 -) virtual void setPicture(const TQPicture &); -%End -%If (- TQt_2_00) - void setMovie(const TQMovie &); - void setNum(int /Constrained/); - void setNum(double); -%End -%If (TQt_2_00 -) virtual void setMovie(const TQMovie &); virtual void setNum(int /Constrained/); virtual void setNum(double); -%End void clear(); protected: void drawContents(TQPainter *); -%If (TQt_2_00 - TQt_3_0_0) - void drawContentsMask(TQPainter *); -%End -%If (TQt_2_1_0 -) void fontChange(const TQFont &); -%End -%If (TQt_2_2_0 -) void resizeEvent(TQResizeEvent *); -%End private: TQLabel(const TQLabel &); diff --git a/sip/qt/qlayout.sip b/sip/qt/qlayout.sip index 46db606..82b86f2 100644 --- a/sip/qt/qlayout.sip +++ b/sip/qt/qlayout.sip @@ -98,46 +98,6 @@ This is a wrapper around the <Literal>TQLayoutIterator</Literal> %End -%If (- TQt_2_00) - -class TQLayout : TQObject -{ -%TypeHeaderCode -#include <tqlayout.h> -%End - -public: - enum - { - unlimited = TQCOORD_MAX - }; - - int defaultBorder() const; - virtual bool activate(); - void freeze(int,int); - void freeze(); - void setMenuBar(TQMenuBar *); - TQWidget *mainWidget(); - -protected: - TQLayout(TQWidget * /TransferThis/,int,int,const char *); - TQLayout(int = -1,const char * = 0); - - TQGManager *basicManager(); - virtual TQChain *mainVerticalChain() = 0; - virtual TQChain *mainHorizontalChain() = 0; - virtual void initGM() = 0; - void addChildLayout(TQLayout *); - -private: - TQLayout(const TQLayout &); -}; - -%End - - -%If (TQt_2_00 -) - class TQGLayoutIterator { %TypeHeaderCode @@ -272,9 +232,7 @@ public: FreeResize, Minimum, Fixed, -%If (TQt_3_1_0 -) Auto -%End }; TQLayout(TQWidget * /TransferThis/,int = 0,int = -1,const char * = 0); @@ -287,17 +245,9 @@ public: virtual void setMargin(int); virtual void setSpacing(int); -%If (- TQt_3_1_0) - enum { - unlimited - }; -%End - -%If (TQt_3_0_0 -) int defaultBorder() const; void freeze(int,int); void freeze(); -%End void setResizeMode(ResizeMode); ResizeMode resizeMode() const; @@ -311,19 +261,15 @@ public: virtual void setAutoAdd(bool); bool autoAdd() const; -%If (TQt_2_1_0 -) void invalidate(); -%End TQRect geometry() const; bool activate(); void add(TQWidget *); virtual void addItem(TQLayoutItem * /Transfer/) = 0; -%If (TQt_3_1_0 -) void remove(TQWidget *); void removeItem(TQLayoutItem * /TransferBack/); -%End TQSizePolicy::ExpandData expanding() const; TQSize minimumSize() const; @@ -338,34 +284,24 @@ public: TQSize totalSizeHint() const; TQLayout *layout(); -%If (TQt_2_1_0 -) bool supportsMargin() const; -%End -%If (TQt_2_2_0 -) void setEnabled(bool); bool isEnabled() const; -%End protected: bool eventFilter(TQObject *,TQEvent *); -%If (TQt_3_0_0 -) void childEvent(TQChildEvent *); -%End void addChildLayout(TQLayout *); void deleteAllItems(); -%If (TQt_2_1_0 -) void setSupportsMargin(bool); TQRect alignmentRect(const TQRect &) const; -%End private: TQLayout(const TQLayout &); }; -%End - class TQGridLayout : TQLayout { @@ -374,81 +310,47 @@ class TQGridLayout : TQLayout %End public: -%If (- TQt_2_1_0) - TQGridLayout(TQWidget * /TransferThis/,int,int,int = 0,int = -1,const char * = 0); - TQGridLayout(int,int,int = -1,const char * = 0); -%End -%If (TQt_2_00 - TQt_2_1_0) - TQGridLayout(TQLayout * /TransferThis/,int,int,int = -1,const char * = 0); -%End -%If (TQt_2_1_0 -) TQGridLayout(TQWidget * /TransferThis/,int = 1,int = 1,int = 0,int = -1,const char * = 0); TQGridLayout(int = 1,int = 1,int = -1,const char * = 0); TQGridLayout(TQLayout * /TransferThis/,int = 1,int = 1,int = -1,const char * = 0); -%End -%If (TQt_2_00 -) TQSize sizeHint() const; TQSize minimumSize() const; TQSize maximumSize() const; -%End -%If (- TQt_2_00) - void setRowStretch(int,int); - void setColStretch(int,int); -%End -%If (TQt_2_00 -) virtual void setRowStretch(int,int); virtual void setColStretch(int,int); -%End -%If (TQt_2_1_0 -) int rowStretch(int) const; int colStretch(int) const; -%End -%If (TQt_3_2_0 -) void setRowSpacing(int,int); void setColSpacing(int,int); int rowSpacing(int) const; int colSpacing(int) const; -%End int numRows() const; int numCols() const; -%If (TQt_2_1_0 -) TQRect cellGeometry(int,int) const; -%End -%If (TQt_2_00 -) bool hasHeightForWidth() const; int heightForWidth(int) const; -%If (TQt_3_1_0 -) int minimumHeightForWidth(int) const; -%End TQSizePolicy::ExpandData expanding() const; void invalidate(); void addItem(TQLayoutItem * /Transfer/); -%End -%If (TQt_2_1_0 -) void addItem(TQLayoutItem * /Transfer/,int,int); -%End -%If (TQt_2_00 -) void addMultiCell(TQLayoutItem * /Transfer/,int,int,int,int,int = 0); -%End void addWidget(TQWidget *,int,int,int = 0); void addMultiCellWidget(TQWidget *,int,int,int,int,int = 0); void addLayout(TQLayout * /Transfer/,int,int); -%If (TQt_2_2_0 -) void addMultiCellLayout(TQLayout * /Transfer/,int,int,int,int,int = 0); -%End void addRowSpacing(int,int); void addColSpacing(int,int); void expand(int,int); -%If (TQt_2_00 -) enum Corner { TopLeft, TopRight, @@ -457,26 +359,13 @@ public: }; void setOrigin(Corner); -%End -%If (TQt_3_0_0 -) Corner origin() const; -%End -%If (TQt_2_00 -) TQLayoutIterator iterator(); void setGeometry(const TQRect &); -%End protected: -%If (- TQt_2_00) - TQChain *mainVerticalChain(); - TQChain *mainHorizontalChain(); - void initGM(); -%End - -%If (TQt_2_00 -) bool findWidget(TQWidget *,int *,int *); void add(TQLayoutItem * /Transfer/,int,int); -%End private: TQGridLayout(const TQGridLayout &); @@ -500,57 +389,37 @@ public: }; TQBoxLayout(TQWidget * /TransferThis/,Direction,int = 0,int = -1,const char * = 0); -%If (TQt_2_00 -) TQBoxLayout(TQLayout * /TransferThis/,Direction,int = -1,const char * = 0); -%End TQBoxLayout(Direction,int = -1,const char * = 0); Direction direction() const; -%If (TQt_2_1_0 -) void setDirection(Direction); -%End void addSpacing(int); void addStretch(int = 0); -%If (- TQt_2_00) - void addWidget(TQWidget *,int = 0,int = AlignCenter); -%End void addLayout(TQLayout * /Transfer/,int = 0); void addStrut(int); -%If (TQt_2_00 -) void addItem(TQLayoutItem * /Transfer/); void addWidget(TQWidget *,int = 0,int = 0); -%If (TQt_2_1_0 -) void insertSpacing(int,int); void insertStretch(int,int = 0); void insertWidget(int,TQWidget *,int = 0,int = 0); void insertLayout(int,TQLayout * /Transfer/,int = 0); int findWidget(TQWidget *); -%End bool setStretchFactor(TQWidget *,int); TQSize sizeHint() const; TQSize minimumSize() const; TQSize maximumSize() const; bool hasHeightForWidth() const; int heightForWidth(int) const; -%If (TQt_3_1_0 -) int minimumHeightForWidth(int) const; -%End TQSizePolicy::ExpandData expanding() const; void invalidate(); TQLayoutIterator iterator(); void setGeometry(const TQRect &); -%End protected: -%If (- TQt_2_00) - TQChain *mainVerticalChain(); - TQChain *mainHorizontalChain(); - void initGM(); -%End -%If (TQt_2_1_0 -) void insertItem(int,TQLayoutItem * /Transfer/); -%End private: TQBoxLayout(const TQBoxLayout &); @@ -565,15 +434,11 @@ class TQHBoxLayout : TQBoxLayout public: TQHBoxLayout(TQWidget * /TransferThis/,int = 0,int = -1,const char * = 0); -%If (TQt_2_00 -) TQHBoxLayout(TQLayout * /TransferThis/,int = -1,const char * = 0); -%End TQHBoxLayout(int = -1,const char * = 0); private: -%If (TQt_3_1_0 -) TQHBoxLayout(const TQHBoxLayout &); -%End }; @@ -585,13 +450,9 @@ class TQVBoxLayout : TQBoxLayout public: TQVBoxLayout(TQWidget * /TransferThis/,int = 0,int = -1,const char * = 0); -%If (TQt_2_00 -) TQVBoxLayout(TQLayout * /TransferThis/,int = -1,const char * = 0); -%End TQVBoxLayout(int = -1,const char * = 0); private: -%If (TQt_3_1_0 -) TQVBoxLayout(const TQVBoxLayout &); -%End }; diff --git a/sip/qt/qlcdnumber.sip b/sip/qt/qlcdnumber.sip index 2127210..ef8cb79 100644 --- a/sip/qt/qlcdnumber.sip +++ b/sip/qt/qlcdnumber.sip @@ -40,22 +40,12 @@ public: TQLCDNumber(TQWidget * /TransferThis/ = 0,const char * = 0); TQLCDNumber(uint,TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_2_00) - enum Mode { - HEX, - DEC, - OCT, - BIN - }; -%End -%If (TQt_2_00 -) enum Mode { Hex, HEX = Hex, Dec, DEC = Dec, Oct, OCT = Oct, Bin, BIN = Bin }; -%End enum SegmentStyle { Outline, @@ -66,71 +56,36 @@ public: bool smallDecimalPoint() const; int numDigits() const; -%If (- TQt_2_00) - void setNumDigits(int); -%End -%If (TQt_2_00 -) virtual void setNumDigits(int); -%End bool checkOverflow(int /Constrained/) const; bool checkOverflow(double) const; Mode mode() const; -%If (- TQt_2_00) - void setMode(Mode); -%End -%If (TQt_2_00 -) virtual void setMode(Mode); -%End SegmentStyle segmentStyle() const; -%If (- TQt_2_00) - void setSegmentStyle(SegmentStyle); -%End -%If (TQt_2_00 -) virtual void setSegmentStyle(SegmentStyle); -%End double value() const; int intValue() const; TQSize sizeHint() const; -%If (TQt_2_00 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End public slots: -%If (- TQt_2_00) - void display(const char *); -%End -%If (TQt_2_00 -) void display(const TQString &); -%End void display(int /Constrained/); void display(double); -%If (- TQt_2_00) - void setHexMode(); - void setDecMode(); - void setOctMode(); - void setBinMode(); - void setSmallDecimalPoint(bool); -%End -%If (TQt_2_00 -) virtual void setHexMode(); virtual void setDecMode(); virtual void setOctMode(); virtual void setBinMode(); virtual void setSmallDecimalPoint(bool); -%End signals: void overflow(); protected: -%If (- TQt_2_00) - void resizeEvent(TQResizeEvent *); -%End void drawContents(TQPainter *); private: diff --git a/sip/qt/qlibrary.sip b/sip/qt/qlibrary.sip index fa6c3c9..4d0a4cc 100644 --- a/sip/qt/qlibrary.sip +++ b/sip/qt/qlibrary.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQLibrary { %TypeHeaderCode @@ -55,5 +53,3 @@ public: private: TQLibrary(const TQLibrary &); }; - -%End diff --git a/sip/qt/qlineedit.sip b/sip/qt/qlineedit.sip index e7f6372..23488c3 100644 --- a/sip/qt/qlineedit.sip +++ b/sip/qt/qlineedit.sip @@ -54,8 +54,6 @@ This takes no parameters and returns the bool result and the %End -%If (TQt_3_0_0 -) - class TQLineEdit : TQFrame { %TypeHeaderCode @@ -65,10 +63,8 @@ class TQLineEdit : TQFrame public: TQLineEdit(TQWidget * /TransferThis/,const char * = 0); TQLineEdit(const TQString &,TQWidget * /TransferThis/,const char * = 0); -%If (TQt_3_2_0 -) TQLineEdit(const TQString &,const TQString &,TQWidget * /TransferThis/, const char * = 0); -%End TQString text() const; @@ -108,10 +104,8 @@ public: void home(bool); void end(bool); -%If (TQt_3_2_0 -) bool isModified() const; void clearModified(); -%End // Obsolete. bool edited() const; @@ -120,20 +114,16 @@ public: bool hasSelectedText() const; TQString selectedText() const; -%If (TQt_3_2_0 -) int selectionStart() const; -%End bool isUndoAvailable() const; bool isRedoAvailable() const; bool dragEnabled() const; -%If (TQt_3_2_0 -) TQString inputMask() const; void setInputMask(const TQString &); bool hasAcceptableInput() const; -%End public slots: virtual void setText(const TQString &); @@ -164,9 +154,7 @@ public slots: signals: void textChanged(const TQString &); void returnPressed(); -%If (TQt_3_1_0 -) void lostFocus(); -%End void selectionChanged(); protected: @@ -196,10 +184,8 @@ protected: public: // These appeared in v3.0.2 but defined as incompatible 3.0 addons, // until v3.1.0. v3.2.0 then defined them as internal and obsolete. -%If (TQt_3_1_0 -) void setPasswordChar(TQChar); TQChar passwordChar() const; -%End // Obsolete. SIP_PYTUPLE characterAt(int) const; @@ -221,207 +207,3 @@ public: private: TQLineEdit(const TQLineEdit &); }; - -%End - - -%If (- TQt_3_0_0) - -class TQLineEdit : TQWidget -{ -%TypeHeaderCode -#include <tqlineedit.h> -%End - -public: -%If (- TQt_2_00) - TQLineEdit(TQWidget * /TransferThis/ = 0,const char * = 0); -%End -%If (TQt_2_00 -) - TQLineEdit(TQWidget * /TransferThis/,const char * = 0); - TQLineEdit(const TQString &,TQWidget * /TransferThis/,const char * = 0); -%End - -%If (- TQt_2_00) - const char *text() const; -%End -%If (TQt_2_00 -) - TQString text() const; - - TQString displayText() const; -%End - -%If (- TQt_2_00) - void setMaxLength(int); -%End -%If (TQt_2_00 -) - virtual void setMaxLength(int); -%End - int maxLength() const; - -%If (- TQt_2_00) - void setFrame(bool); -%End -%If (TQt_2_00 -) - virtual void setFrame(bool); -%End - bool frame() const; - - enum EchoMode { - Normal, - NoEcho, - Password - }; - -%If (- TQt_2_00) - void setEchoMode(EchoMode); -%End -%If (TQt_2_00 -) - virtual void setEchoMode(EchoMode); -%End - EchoMode echoMode() const; - -%If (TQt_2_1_0 -) - void setReadOnly(bool); -%End -%If (TQt_2_1_0 -) - bool isReadOnly() const; -%End - -%If (- TQt_2_00) - void setValidator(TQValidator *); - TQValidator *validator() const; -%End -%If (TQt_2_00 -) - virtual void setValidator(TQValidator *); -%End -%If (TQt_2_00 -) - const TQValidator *validator() const; -%End - - TQSize sizeHint() const; -%If (TQt_2_00 -) - TQSize minimumSizeHint() const; -%End -%If (TQt_2_00 -) - TQSizePolicy sizePolicy() const; -%End - -%If (- TQt_2_00) - void setCursorPosition(int); -%End -%If (TQt_2_00 -) - virtual void setCursorPosition(int); -%End - int cursorPosition() const; -%If (- TQt_2_00) - bool validateAndSet(const char *,int,int,int); -%End -%If (TQt_2_00 -) - bool validateAndSet(const TQString &,int,int,int); -%End - -%If (TQt_2_00 -) - int alignment() const; -%End - -%If (TQt_2_00 -) - void cursorLeft(bool,int = 1); - void cursorRight(bool,int = 1); - void cursorWordForward(bool); - void cursorWordBackward(bool); - void backspace(); - void del() /PyName=delChar/; - void home(bool); - void end(bool); - - void setEdited(bool); - bool edited() const; -%End - -%If (TQt_2_00 -) - bool hasMarkedText() const; - TQString markedText() const; -%End - -%If (TQt_CLIPBOARD) - void cut(); - void copy() const; - void paste(); -%End - -%If (- TQt_2_00) - void setEnabled(bool); - void setFont(const TQFont &); - void setPalette(const TQPalette &); - void setSelection(int,int); -%End -%If (TQt_2_00 -) - virtual void setEnabled(bool); - virtual void setFont(const TQFont &); - virtual void setPalette(const TQPalette &); - virtual void setSelection(int,int); - - void setAlignment(int); -%End - -public slots: -%If (- TQt_2_00) - void setText(const char *); -%End -%If (TQt_2_00 -) - virtual void setText(const TQString &); -%End - void selectAll(); - void deselect(); - void clearValidator(); -%If (- TQt_2_00) - void insert(const char *); -%End -%If (TQt_2_00 -) - void insert(const TQString &); -%End - void clear(); - -signals: -%If (- TQt_2_00) - void textChanged(const char *); -%End -%If (TQt_2_00 -) - void textChanged(const TQString &); -%End - void returnPressed(); - -protected: -%If (TQt_2_2_0 -) - bool event(TQEvent *); -%End - void mousePressEvent(TQMouseEvent *); - void mouseMoveEvent(TQMouseEvent *); - void mouseReleaseEvent(TQMouseEvent *); - void mouseDoubleClickEvent(TQMouseEvent *); - void keyPressEvent(TQKeyEvent *); - void focusInEvent(TQFocusEvent *); - void focusOutEvent(TQFocusEvent *); - void paintEvent(TQPaintEvent *); - void resizeEvent(TQResizeEvent *); - void leaveEvent(TQEvent *); - void repaintArea(int,int); -%If (- TQt_2_00) - void timerEvent(TQTimerEvent *); - bool event(TQEvent *); - bool hasMarkedText() const; - TQString markedText() const; -%End -%If (TQt_2_00 -) -%If (TQt_DRAGANDDROP) - void dragEnterEvent(TQDragEnterEvent *); - void dropEvent(TQDropEvent *); -%End -%End - -private: - TQLineEdit(const TQLineEdit &); -}; - -%End diff --git a/sip/qt/qlist.sip b/sip/qt/qlist.sip deleted file mode 100644 index 5c6ba26..0000000 --- a/sip/qt/qlist.sip +++ /dev/null @@ -1,111 +0,0 @@ -// This is the SIP interface definition for all types based on the TQPtrList -// template. -// -// Copyright (c) 2007 -// Riverbank Computing Limited <[email protected]> -// -// This file is part of PyTQt. -// -// This copy of PyTQt is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2, or (at your option) any later -// version. -// -// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -// details. -// -// You should have received a copy of the GNU General Public License along with -// PyTQt; see the file LICENSE. If not, write to the Free Software Foundation, -// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%ExportedDoc -<Sect2><Title>TQPtrList<type> (TQt v2)</Title> -<Para> -Types based on the <Literal>TQPtrList</Literal> template are automatically -converted to and from Python lists of the type. -</Para> -</Sect2> -%End - - -%If (TQt_2_1_0 - TQt_3_0_0) - -template<Type> -%MappedType TQPtrList<Type> -{ -%TypeHeaderCode -#include <tqlist.h> -%End - -%ConvertFromTypeCode - Type *tb; - int i; - PyObject *l; - - // Create the list. - - if ((l = PyList_New(sipCpp -> count())) == NULL) - return NULL; - - // Get it. - - i = 0; - - for (tb = sipCpp -> first(); tb != NULL; tb = sipCpp -> next()) - { - PyObject *tbobj; - - if ((tbobj = sipConvertFromInstance(tb,sipClass_Type,sipTransferObj)) == NULL || PyList_SetItem(l,i,tbobj) < 0) - { - Py_XDECREF(tbobj); - Py_DECREF(l); - - return NULL; - } - - ++i; - } - - return l; -%End - -%ConvertToTypeCode - if (sipIsErr == NULL) - { - if (!PyList_Check(sipPy)) - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_Type,0)) - return 0; - - return 1; - } - - TQPtrList<Type> *ql = new TQPtrList<Type>; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - // We apply the transfer to the list itself, not the elements. - // Note that any temporary element will never be destroyed. - // There is nothing that can be done about this. - ql -> append(reinterpret_cast<Type *>(sipConvertToInstance(PyList_GET_ITEM(sipPy,i),sipClass_Type,0,0,0,sipIsErr))); - - if (*sipIsErr) - { - delete ql; - - return 0; - } - } - - *sipCppPtr = ql; - - return sipGetState(sipTransferObj); -%End -}; - -%End diff --git a/sip/qt/qlistbox.sip b/sip/qt/qlistbox.sip index f0724e3..9efb272 100644 --- a/sip/qt/qlistbox.sip +++ b/sip/qt/qlistbox.sip @@ -55,116 +55,6 @@ containing the <Literal>bool</Literal> result and <Literal>yPos</Literal>. %End -%If (- TQt_2_00) - -%ModuleHeaderCode -#include <tqlistbox.h> -%End - -// List box item types. -const int LBI_Undefined; -const int LBI_Text; -const int LBI_Pixmap; -const int LBI_UserDefined; - - -class TQListBox : TQTableView -{ -%TypeHeaderCode -#include <tqlistbox.h> -%End - -public: - TQListBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); - - void setFont(const TQFont &); - uint count() const; - void insertStrList(const TQStrList *,int = -1); -// void insertStrList(const char **,int = -1,int = -1); - void insertItem(const TQListBoxItem * /Transfer/,int = -1); - void insertItem(const char *,int = -1); - void insertItem(const TQPixmap &,int = -1); - void inSort(const TQListBoxItem *); - void inSort(const char *); - void removeItem(int); - void clear(); - const char *text(int) const; - const TQPixmap *pixmap(int) const; - void changeItem(const TQListBoxItem * /Transfer/,int); - void changeItem(const char *,int); - void changeItem(const TQPixmap &,int); - bool autoUpdate() const; - void setAutoUpdate(bool); - int numItemsVisible() const; - void setFixedVisibleLines(int); - int currentItem() const; - void setCurrentItem(int); - void centerCurrentItem(); - int topItem() const; - void setTopItem(int); - void setBottomItem(int); - bool dragSelect() const; - void setDragSelect(bool); - bool autoScroll() const; - void setAutoScroll(bool); - bool autoScrollBar() const; - void setAutoScrollBar(bool); - bool scrollBar() const; - void setScrollBar(bool); - bool autoBottomScrollBar() const; - void setAutoBottomScrollBar(bool); - bool bottomScrollBar() const; - void setBottomScrollBar(bool); - bool smoothScrolling() const; - void setSmoothScrolling(bool); - int itemHeight() const; - int itemHeight(int) const; - long maxItemWidth() const; - bool isMultiSelection() const; - void setMultiSelection(bool); - void setSelected(int,bool); - bool isSelected(int) const; - TQSize sizeHint() const; - -public slots: - void clearSelection(); - -signals: - void highlighted(int); - void selected(int); - void highlighted(const char *); - void selected(const char *); - void selectionChanged(); - -protected: - TQListBoxItem *item(int) const; - bool itemVisible(int); - int cellHeight(int = 0); - void paintCell(TQPainter *,int,int); - void mousePressEvent(TQMouseEvent *); - void mouseReleaseEvent(TQMouseEvent *); - void mouseDoubleClickEvent(TQMouseEvent *); - void mouseMoveEvent(TQMouseEvent *); - void keyPressEvent(TQKeyEvent *); - void focusInEvent(TQFocusEvent *); - void focusOutEvent(TQFocusEvent *); - void resizeEvent(TQResizeEvent *); - void timerEvent(TQTimerEvent *); - int findItem(int) const; - bool itemYPos(int,int *) const; - void updateItem(int,bool = 1); - void clearList(); - void updateCellWidth(); - void toggleCurrentItem(); - -private: - TQListBox(const TQListBox &); -}; - -%End - -%If (TQt_2_00 -) - class TQListBox : TQScrollView { %TypeHeaderCode @@ -184,39 +74,27 @@ public: // void insertStrList(const char **,int = -1,int = -1); void insertItem(const TQListBoxItem * /Transfer/,int = -1); -%If (TQt_2_1_0 -) void insertItem(const TQListBoxItem * /Transfer/,const TQListBoxItem *); -%End void insertItem(const TQString &,int = -1); void insertItem(const TQPixmap &,int = -1); -%If (TQt_2_1_0 -) void insertItem(const TQPixmap &,const TQString &,int = -1); -%End void removeItem(int); -%If (- TQt_3_0_0) - void clear(); -%End - TQString text(int) const; const TQPixmap *pixmap(int) const; void changeItem(const TQListBoxItem * /Transfer/,int); void changeItem(const TQString &,int); void changeItem(const TQPixmap &,int); -%If (TQt_2_1_0 -) void changeItem(const TQPixmap &,const TQString &,int); -%End void takeItem(const TQListBoxItem * /TransferBack/); int numItemsVisible() const; int currentItem() const; -%If (TQt_2_1_0 -) TQString currentText() const; -%End virtual void setCurrentItem(int); virtual void setCurrentItem(TQListBoxItem *); void centerCurrentItem(); @@ -226,21 +104,12 @@ public: long maxItemWidth() const; -%If (- TQt_2_1_0) - enum SelectionMode { - Single, - Multi, - Extended - }; -%End -%If (TQt_2_1_0 -) enum SelectionMode { Single, Multi, Extended, NoSelection }; -%End virtual void setSelectionMode(SelectionMode); SelectionMode selectionMode() const; @@ -252,22 +121,15 @@ public: void setSelected(int,bool); bool isSelected(int) const; bool isSelected(TQListBoxItem *) const; -%If (TQt_3_1_0 -) TQListBoxItem *selectedItem() const; -%End TQSize sizeHint() const; TQSize minimumSizeHint() const; TQListBoxItem *item(int) const; int index(const TQListBoxItem *) const; -%If (TQt_2_1_0 - TQt_3_0_0) - TQListBoxItem *findItem(const TQString &) const; -%End -%If (TQt_3_0_0 -) TQListBoxItem *findItem(const TQString &, ComparisonFlags = BeginsWith) const; -%End void triggerUpdate(bool); @@ -305,26 +167,16 @@ public: TQRect itemRect(TQListBoxItem *) const; -%If (TQt_2_1_0 -) TQListBoxItem *firstItem() const; void sort(bool = 1); -%End public slots: -%If (TQt_3_0_0 -) void clear(); -%End virtual void ensureCurrentVisible(); virtual void clearSelection(); -%If (TQt_2_1_0 - TQt_3_0_0) - void selectAll(bool); - void invertSelection(); -%End -%If (TQt_3_0_0 -) virtual void selectAll(bool); virtual void invertSelection(); -%End signals: void highlighted(int); @@ -335,7 +187,6 @@ signals: void selected(TQListBoxItem *); void selectionChanged(); -%If (TQt_2_1_0 -) void selectionChanged(TQListBoxItem *); void currentChanged(TQListBoxItem *); void clicked(TQListBoxItem *); @@ -349,31 +200,17 @@ signals: void rightButtonPressed(TQListBoxItem *,const TQPoint &); void mouseButtonPressed(int,TQListBoxItem *,const TQPoint &); void mouseButtonClicked(int,TQListBoxItem *,const TQPoint &); -%End -%If (TQt_3_0_0 -) void contextMenuRequested(TQListBoxItem *,const TQPoint &); -%End -%If (TQt_2_1_0 -) void onItem(TQListBoxItem *); void onViewport(); -%End protected: -%If (- TQt_3_0_0) - void viewportMousePressEvent(TQMouseEvent *); - void viewportMouseReleaseEvent(TQMouseEvent *); - void viewportMouseDoubleClickEvent(TQMouseEvent *); - void viewportMouseMoveEvent(TQMouseEvent *); -%End void mousePressEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *); void mouseDoubleClickEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); -%If (TQt_3_0_0 -) - void contentsContextMenuEvent(TQContextMenuEvent *); -%End void keyPressEvent(TQKeyEvent *); void focusInEvent(TQFocusEvent *); @@ -381,9 +218,7 @@ protected: void resizeEvent(TQResizeEvent *); void showEvent(TQShowEvent *); -%If (TQt_3_0_0 -) bool eventFilter(TQObject *,TQEvent *); -%End void updateItem(int); void updateItem(TQListBoxItem *); @@ -391,27 +226,19 @@ protected: virtual void paintCell(TQPainter *,int,int); void toggleCurrentItem(); -%If (TQt_2_2_0 -) bool isRubberSelecting() const; -%End void doLayout() const; -%If (TQt_3_0_0 -) void windowActivationChange(bool); -%End protected slots: -%If (TQt_2_1_0 -) void clearInputString(); -%End private: TQListBox(const TQListBox &); }; -%End - class TQListBoxItem { @@ -420,71 +247,32 @@ class TQListBoxItem %End public: -%If (- TQt_2_00) - TQListBoxItem(); -%End -%If (TQt_2_00 -) TQListBoxItem(TQListBox * /TransferThis/ = 0); -%End -%If (TQt_2_1_0 -) TQListBoxItem(TQListBox * /TransferThis/,TQListBoxItem *); -%End -%If (- TQt_2_00) - virtual const char *text() const; -%End -%If (TQt_2_00 -) virtual TQString text() const; -%End virtual const TQPixmap *pixmap() const; -%If (- TQt_2_00) - virtual int height(const TQListBox *) const = 0; - virtual int width(const TQListBox *) const = 0; -%End -%If (TQt_2_00 -) virtual int height(const TQListBox *) const; virtual int width(const TQListBox *) const; -%End -%If (TQt_2_00 - TQt_3_0_0) - bool selected() const; -%End -%If (TQt_2_1_0 - TQt_3_0_0) - bool current() const; -%End -%If (TQt_3_0_0 -) - bool isSelected() const; + bool isSelected() const; bool isCurrent() const; -%End -%If (TQt_2_00 -) TQListBox *listBox() const; -%End -%If (TQt_2_1_0 -) void setSelectable(bool); bool isSelectable() const; TQListBoxItem *next() const; TQListBoxItem *prev() const; -%End -%If (TQt_3_0_0 -) virtual int rtti() const; -%End protected: virtual void paint(TQPainter *) = 0; -%If (- TQt_2_00) - void setText(const char *); -%End -%If (TQt_2_00 -) virtual void setText(const TQString &); -%End -%If (TQt_2_1_0 -) void setCustomHighlighting(bool); -%End private: TQListBoxItem(const TQListBoxItem &); @@ -497,32 +285,18 @@ class TQListBoxText : TQListBoxItem %End public: -%If (- TQt_2_00) - TQListBoxText(const char * = 0); -%End -%If (TQt_2_00 -) TQListBoxText(TQListBox * /TransferThis/, const TQString & = TQString::null); TQListBoxText(const TQString & = TQString::null); -%End -%If (TQt_2_1_0 -) TQListBoxText(TQListBox * /TransferThis/,const TQString &,TQListBoxItem *); -%End -%If (- TQt_2_00) - void paint(TQPainter *); -%End int height(const TQListBox *) const; int width(const TQListBox *) const; -%If (TQt_3_0_0 -) int rtti() const; -%End protected: -%If (TQt_2_00 -) void paint(TQPainter *); -%End private: TQListBoxText(const TQListBoxText &); @@ -535,11 +309,8 @@ class TQListBoxPixmap : TQListBoxItem %End public: -%If (TQt_2_00 -) TQListBoxPixmap(TQListBox * /TransferThis/,const TQPixmap &); -%End TQListBoxPixmap(const TQPixmap &); -%If (TQt_2_1_0 -) TQListBoxPixmap(TQListBox * /TransferThis/,const TQPixmap &, TQListBoxItem *); TQListBoxPixmap(TQListBox * /TransferThis/,const TQPixmap &, @@ -547,24 +318,15 @@ public: TQListBoxPixmap(const TQPixmap &,const TQString &); TQListBoxPixmap(TQListBox * /TransferThis/,const TQPixmap &, const TQString &,TQListBoxItem *); -%End const TQPixmap *pixmap() const; -%If (TQt_2_00 -) int height(const TQListBox *) const; int width(const TQListBox *) const; -%End -%If (TQt_3_0_0 -) int rtti() const; -%End protected: void paint(TQPainter *); -%If (- TQt_2_00) - int height(const TQListBox *) const; - int width(const TQListBox *) const; -%End private: TQListBoxPixmap(const TQListBoxPixmap &); diff --git a/sip/qt/qlocale.sip b/sip/qt/qlocale.sip index 99fce23..5352ac0 100644 --- a/sip/qt/qlocale.sip +++ b/sip/qt/qlocale.sip @@ -97,8 +97,6 @@ This returns a tuple of the <Literal>double</Literal> result and the %End -%If (TQt_3_3_0 -) - class TQLocale { %TypeHeaderCode @@ -533,5 +531,3 @@ public: static TQLocale c(); static TQLocale system(); }; - -%End diff --git a/sip/qt/qmainwindow.sip b/sip/qt/qmainwindow.sip index 19535ca..b271b6c 100644 --- a/sip/qt/qmainwindow.sip +++ b/sip/qt/qmainwindow.sip @@ -73,12 +73,7 @@ class TQMainWindow : TQWidget %End public: -%If (- TQt_2_00) - TQMainWindow(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); -%End -%If (TQt_2_00 -) TQMainWindow(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = WType_TopLevel); -%End TQMenuBar *menuBar() const; TQStatusBar *statusBar() const; @@ -86,52 +81,7 @@ public: virtual void setCentralWidget(TQWidget *); TQWidget *centralWidget() const; -%If (- TQt_2_1_0) - enum ToolBarDock { - Unmanaged, - TornOff, - Top, - Bottom, - Right, - Left - }; -%End -%If (TQt_2_1_0 - TQt_3_0_0) - enum ToolBarDock { - Unmanaged, - TornOff, - Top, - Bottom, - Right, - Left, - Minimized - }; -%End - -%If (- TQt_2_00) - void setDockEnabled(ToolBarDock,bool); - void addToolBar(TQToolBar *,const char *,ToolBarDock = Top,bool = 0); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setDockEnabled(ToolBarDock,bool); - void addToolBar(TQToolBar *,ToolBarDock = Top,bool = 0); - void addToolBar(TQToolBar *,const TQString &,ToolBarDock = Top,bool = 0); - void moveToolBar(TQToolBar *,ToolBarDock = Top); -%End -%If (TQt_2_1_0 - TQt_3_0_0) - void setDockEnabled(TQToolBar *,ToolBarDock,bool); - bool isDockEnabled(TQToolBar *,ToolBarDock) const; - void moveToolBar(TQToolBar *,ToolBarDock,bool,int,int = -1); - bool toolBarsMovable() const; -%End -%If (TQt_3_0_0 -) virtual void setDockEnabled(Dock,bool); -%End -%If (- TQt_3_0_0) - bool isDockEnabled(ToolBarDock) const; - void removeToolBar(TQToolBar *); -%End -%If (TQt_3_0_0 -) bool isDockEnabled(Dock) const; bool isDockEnabled(TQDockArea *) const; virtual void setDockEnabled(TQDockWindow *,Dock,bool); @@ -144,53 +94,29 @@ public: virtual void moveDockWindow(TQDockWindow *,Dock = DockTop); virtual void moveDockWindow(TQDockWindow *,Dock,bool,int,int = -1); virtual void removeDockWindow(TQDockWindow *); -%End void show(); -%If (TQt_3_1_0 -) void hide(); -%End -%If (TQt_2_1_0 -) TQSize sizeHint() const; TQSize minimumSizeHint() const; -%End bool rightJustification() const; bool usesBigPixmaps() const; -%If (TQt_2_1_0 -) bool usesTextLabel() const; -%End -%If (TQt_3_0_0 -) bool dockWindowsMovable() const; -%End -%If (TQt_2_1_0 -) bool opaqueMoving() const; -%End bool eventFilter(TQObject *,TQEvent *); -%If (TQt_3_0_0 -) bool getLocation(TQDockWindow *,Dock &,int &,bool &,int &) const; -%End -%If (TQt_2_1_0 - TQt_3_0_0) - bool getLocation(TQToolBar *,ToolBarDock &,int &,bool &,int &) const; -%End -%If (TQt_2_1_0 - TQt_3_0_0) - TQPtrList<TQToolBar> toolBars(ToolBarDock) const; -%End -%If (TQt_3_0_0 -) TQPtrList<TQDockWindow> dockWindows(Dock) const; TQPtrList<TQDockWindow> dockWindows() const; void lineUpDockWindows(bool = 0); -%End -%If (TQt_2_1_0 -) void lineUpToolBars(bool = 0); bool isDockMenuEnabled() const; -%End -%If (TQt_3_0_0 -) bool hasDockWindow(TQDockWindow *); TQPtrList<TQToolBar> toolBars(Dock) const; @@ -212,79 +138,34 @@ public: }; TQPopupMenu *createDockWindowMenu(DockWindows = AllDockWindows) const; -%End public slots: -%If (- TQt_2_00) - void setRightJustification(bool); - void setUsesBigPixmaps(bool); -%End -%If (TQt_2_00 -) virtual void setRightJustification(bool); virtual void setUsesBigPixmaps(bool); -%End -%If (TQt_2_1_0 - TQt_3_0_0) - void setUsesTextLabel(bool); - void setToolBarsMovable(bool); - void setOpaqueMoving(bool); - void setDockMenuEnabled(bool); -%End -%If (TQt_3_0_0 -) virtual void setUsesTextLabel(bool); virtual void setDockWindowsMovable(bool); virtual void setOpaqueMoving(bool); virtual void setDockMenuEnabled(bool); -%End -%If (TQt_2_00 - TQt_3_0_0) - void whatsThis(); -%End -%If (TQt_3_0_0 -) virtual void whatsThis(); virtual void setAppropriate(TQDockWindow *,bool); virtual void customize(); -%End signals: void pixmapSizeChanged(bool); -%If (TQt_2_1_0 -) void usesTextLabelChanged(bool); -%End -%If (TQt_2_1_0 - TQt_3_0_0) - void startMovingToolBar(TQToolBar *); - void endMovingToolBar(TQToolBar *); - void toolBarPositionChanged(TQToolBar *); -%End -%If (TQt_3_0_0 -) void dockWindowPositionChanged(TQDockWindow *); -%End protected slots: -%If (- TQt_2_00) - void setUpLayout(); -%End -%If (TQt_2_00 -) virtual void setUpLayout(); -%End -%If (TQt_3_0_0 -) virtual bool showDockMenu(const TQPoint &); void menuAboutToShow(); -%End protected: void paintEvent(TQPaintEvent *); -%If (TQt_2_00 -) void childEvent(TQChildEvent *); -%End bool event(TQEvent *); -%If (TQt_2_00 - TQt_3_0_0) - void resizeEvent(TQResizeEvent *); -%End -%If (TQt_2_00 -) void styleChange(TQStyle &); -%End private: -%If (TQt_2_00 -) TQMainWindow(const TQMainWindow &); -%End }; diff --git a/sip/qt/qmemarray.sip b/sip/qt/qmemarray.sip index d7a4a7b..aebbcb4 100644 --- a/sip/qt/qmemarray.sip +++ b/sip/qt/qmemarray.sip @@ -31,8 +31,6 @@ converted to and from Python lists of the type. %End -%If (TQt_3_0_0 -) - %MappedType TQMemArray<int> { %TypeHeaderCode @@ -164,5 +162,3 @@ template<TYPE> return sipGetState(sipTransferObj); %End }; - -%End diff --git a/sip/qt/qmenubar.sip b/sip/qt/qmenubar.sip index eff2db4..a008e46 100644 --- a/sip/qt/qmenubar.sip +++ b/sip/qt/qmenubar.sip @@ -53,31 +53,18 @@ public: }; Separator separator() const; -%If (- TQt_2_00) - void setSeparator(Separator); -%End -%If (TQt_2_00 -) virtual void setSeparator(Separator); -%End -%If (TQt_2_1_0 -) void setDefaultUp(bool); bool isDefaultUp() const; -%End -%If (TQt_2_00 -) bool customWhatsThis() const; -%End -%If (TQt_2_1_0 -) TQSize sizeHint() const; TQSize minimumSize() const; TQSize minimumSizeHint() const; -%End -%If (TQt_2_2_0 -) void activateItemAt(int); -%End signals: void activated(int); @@ -90,24 +77,16 @@ protected: void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); void keyPressEvent(TQKeyEvent *); -%If (TQt_2_1_0 -) void focusInEvent(TQFocusEvent *); -%End -%If (TQt_2_00 -) void focusOutEvent(TQFocusEvent *); -%End void resizeEvent(TQResizeEvent *); void leaveEvent(TQEvent *); void menuContentsChanged(); void menuStateChanged(); -%If (TQt_2_00 -) void styleChange(TQStyle &); -%End -%If (TQt_3_0_0 -) int itemAtPos(const TQPoint &); void hidePopups(); TQRect itemRect(int); -%End private: void menuInsPopup(TQPopupMenu *); diff --git a/sip/qt/qmenudata.sip b/sip/qt/qmenudata.sip index 01b9868..7363902 100644 --- a/sip/qt/qmenudata.sip +++ b/sip/qt/qmenudata.sip @@ -47,8 +47,6 @@ Not implemented. %End -%If (TQt_3_0_0 -) - // Even though this is an internal class, uic for TQt v3.1.0 generates code that // uses it. class TQMenuItem @@ -66,15 +64,6 @@ private: TQMenuItem(const TQMenuItem &); }; -%End - - -%If (- TQt_3_0_0) - -class TQMenuItem; - -%End - class TQMenuData { @@ -87,29 +76,6 @@ public: uint count(); -%If (- TQt_2_00) - int insertItem(const char *,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0); - int insertItem(const TQPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0); - int insertItem(const TQPixmap &,const char *,SIP_RXOBJ_CON, - SIP_SLOT_CON(int),int = 0); - int insertItem(const char *,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int,int, - int = -1); - int insertItem(const TQPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int,int, - int = -1); - int insertItem(const TQPixmap&,const char *,SIP_RXOBJ_CON,SIP_SLOT_CON(int), - int,int,int = -1); -%End -%If (TQt_2_00 - TQt_3_0_0) - int insertItem(const TQString &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0, - int = -1,int = -1); - int insertItem(const TQIconSet &,const TQString &,SIP_RXOBJ_CON, - SIP_SLOT_CON(int),int = 0,int = -1,int = -1); - int insertItem(const TQPixmap &,SIP_RXOBJ_CON,SIP_SLOT_CON(int),int = 0, - int = -1,int = -1); - int insertItem(const TQIconSet &,const TQPixmap &,SIP_RXOBJ_CON, - SIP_SLOT_CON(int),int = 0,int = -1,int = -1); -%End -%If (TQt_3_0_0 -) int insertItem(const TQString &,SIP_RXOBJ_CON,SIP_SLOT_CON(int), const TQKeySequence & = TQKeySequence(0),int = -1, int = -1); @@ -124,90 +90,47 @@ public: SIP_SLOT_CON(int), const TQKeySequence & = TQKeySequence(0),int = -1, int = -1); -%End -%If (- TQt_2_00) - int insertItem(const char *,int = -1,int = -1); - int insertItem(const char *,TQPopupMenu *,int = -1,int = -1); - int insertItem(const TQPixmap &,const char *,int = -1,int = -1); - int insertItem(const TQPixmap &,const char *,TQPopupMenu *,int = -1, - int = -1); -%End -%If (TQt_2_00 -) int insertItem(const TQString &,int = -1,int = -1); int insertItem(const TQIconSet &,const TQString &,int = -1,int = -1); int insertItem(const TQString &,TQPopupMenu *,int = -1,int = -1); int insertItem(const TQIconSet &,const TQString &,TQPopupMenu *,int = -1, int = -1); -%End int insertItem(const TQPixmap &,int = -1,int = -1); -%If (TQt_2_00 -) int insertItem(const TQIconSet &,const TQPixmap &,int = -1,int = -1); -%End int insertItem(const TQPixmap &,TQPopupMenu *,int = -1,int = -1); -%If (TQt_2_00 -) int insertItem(const TQIconSet &,const TQPixmap &,TQPopupMenu *,int = -1, int = -1); -%End -%If (TQt_2_1_0 -) int insertItem(TQWidget * /Transfer/,int = -1,int = -1); int insertItem(const TQIconSet &,TQCustomMenuItem * /Transfer/,int = -1, int = -1); int insertItem(TQCustomMenuItem * /Transfer/,int = -1,int = -1); -%End -%If (TQt_2_1_0 -) int insertSeparator(int = -1); -%End -%If (- TQt_2_1_0) - void insertSeparator(int = -1); -%End void removeItem(int); void removeItemAt(int); void clear(); -%If (- TQt_3_0_0) - int accel(int) const; - void setAccel(int,int); -%End -%If (TQt_3_0_0 -) TQKeySequence accel(int) const; void setAccel(const TQKeySequence &,int); -%End -%If (- TQt_2_00) - const char *text(int) const; -%End -%If (TQt_2_00 -) TQIconSet *iconSet(int) const; TQString text(int) const; -%End TQPixmap *pixmap(int) const; -%If (TQt_2_00 -) void setWhatsThis(int,const TQString &); TQString whatsThis(int) const; -%End -%If (- TQt_2_00) - void changeItem(const char *,int); - void changeItem(const TQPixmap &,int); - void changeItem(const TQPixmap &,const char *,int); -%End -%If (TQt_2_00 -) void changeItem(int,const TQString &); void changeItem(int,const TQPixmap &); void changeItem(int,const TQIconSet &,const TQString &); void changeItem(int,const TQIconSet &,const TQPixmap &); -%End -%If (TQt_3_0_0 -) bool isItemActive(int) const; -%End bool isItemEnabled(int) const; void setItemEnabled(int,bool); @@ -215,62 +138,40 @@ public: bool isItemChecked(int) const; void setItemChecked(int,bool); -%If (TQt_3_1_0 -) bool isItemVisible(int) const; void setItemVisible(int,bool); -%End virtual void updateItem(int); int indexOf(int) const; int idAt(int) const; -%If (- TQt_2_00) - void setId(int,int); -%End -%If (TQt_2_00 -) virtual void setId(int,int); -%End bool connectItem(int,SIP_RXOBJ_CON,SIP_SLOT_CON(int)); bool disconnectItem(int,SIP_RXOBJ_DIS,SIP_SLOT_DIS(int)); -%If (TQt_2_1_0 -) bool setItemParameter(int,int); int itemParameter(int) const; -%End TQMenuItem *findItem(int) const; // TQMenuItem *findItem(int,TQMenuData **) const; -%If (TQt_3_0_0 -) // Not documented in the TQt3 API (the similar findPopup() was internal in // TQt2). // TQMenuItem *findItem(TQPopupMenu *,int * = 0) const; -%End -%If (TQt_2_2_0 - TQt_3_0_0) - void activateItemAt(int); -%End -%If (TQt_3_0_0 -) virtual void activateItemAt(int); -%End protected: virtual void menuContentsChanged(); virtual void menuStateChanged(); virtual void menuInsPopup(TQPopupMenu *); virtual void menuDelPopup(TQPopupMenu *); -%If (- TQt_3_0_0) -// Documented as internal in the TQt2 API. -// TQMenuItem *findPopup(TQPopupMenu *,int * = 0); -%End private: TQMenuData(const TQMenuData &); }; -%If (TQt_2_1_0 -) - class TQCustomMenuItem : TQt { %TypeHeaderCode @@ -287,5 +188,3 @@ public: int,int) = 0; virtual TQSize sizeHint() = 0; }; - -%End diff --git a/sip/qt/qmessagebox.sip b/sip/qt/qmessagebox.sip index 4070768..5844107 100644 --- a/sip/qt/qmessagebox.sip +++ b/sip/qt/qmessagebox.sip @@ -43,22 +43,13 @@ public: Information, Warning, Critical, -%If (TQt_3_2_0 -) Question, -%End }; TQMessageBox(TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_2_00) - TQMessageBox(const char *,const char *,Icon,int,int,int, - TQWidget * /TransferThis/ = 0,const char * = 0,bool = 1, - WFlags = 0); -%End -%If (TQt_2_00 -) TQMessageBox(const TQString &,const TQString &,Icon,int,int,int, TQWidget * /TransferThis/ = 0,const char * = 0,bool = 1, WFlags = WStyle_DialogBorder); -%End enum { Ok, @@ -68,42 +59,14 @@ public: Abort, Retry, Ignore, -%If (TQt_3_2_0 -) YesAll, NoAll, -%End ButtonMask, Default, Escape, FlagMask }; -%If (- TQt_2_00) - static int information(TQWidget *,const char *,const char *,int,int = 0, - int = 0) /ReleaseGIL/; - static int information(TQWidget *,const char *,const char *, - const char * = "OK",const char * = 0, - const char * = 0,int = 0,int = -1) /ReleaseGIL/; - - static int warning(TQWidget *,const char *,const char *,int,int, - int = 0) /ReleaseGIL/; - static int warning(TQWidget *,const char *,const char *, - const char * = "OK",const char * = 0, - const char * = 0,int = 0,int = -1) /ReleaseGIL/; - - static int critical(TQWidget *,const char *,const char *,int,int, - int = 0) /ReleaseGIL/; - static int critical(TQWidget *,const char *,const char *, - const char * = "OK",const char * = 0, - const char * = 0,int = 0,int = -1) /ReleaseGIL/; - - static void about(TQWidget *,const char *,const char *) /ReleaseGIL/; - static void aboutTQt(TQWidget *,const char * = 0) /ReleaseGIL/; - - const char *text() const; - void setText(const char *); -%End -%If (TQt_2_00 -) static int information(TQWidget *,const TQString &,const TQString &,int, int = 0,int = 0) /ReleaseGIL/; static int information(TQWidget *,const TQString &,const TQString &, @@ -112,7 +75,6 @@ public: const TQString & = TQString::null, int = 0,int = -1) /ReleaseGIL/; -%If (TQt_3_2_0 -) static int question(TQWidget *,const TQString &,const TQString &,int, int = 0,int = 0) /ReleaseGIL/; static int question(TQWidget *,const TQString &,const TQString &, @@ -120,7 +82,6 @@ public: const TQString & = TQString::null, const TQString & = TQString::null, int = 0,int = -1) /ReleaseGIL/; -%End static int warning(TQWidget *,const TQString &,const TQString &,int, int = 0,int = 0) /ReleaseGIL/; @@ -145,57 +106,31 @@ public: TQString text() const; void setText(const TQString &); -%End Icon icon() const; void setIcon(Icon); -%If (TQt_2_00 -) void setIcon(const TQPixmap &); -%End const TQPixmap *iconPixmap() const; void setIconPixmap(const TQPixmap &); -%If (- TQt_2_00) - const char *buttonText(int) const; - void setButtonText(int,const char *); -%End -%If (TQt_2_00 -) TQString buttonText(int) const; void setButtonText(int,const TQString &); -%End void adjustSize(); -%If (- TQt_3_0_0) - static TQPixmap standardIcon(Icon,GUIStyle); -%End -%If (TQt_3_0_0 -) static TQPixmap standardIcon(Icon); -%End -%If (TQt_2_1_0 -) TextFormat textFormat() const; void setTextFormat(TextFormat); -%End - -%If (- TQt_2_00) - void setStyle(GUIStyle); -%End protected: void resizeEvent(TQResizeEvent *); -%If (TQt_3_0_0 -) void showEvent(TQShowEvent *); -%End -%If (TQt_3_2_0 -) void closeEvent(TQCloseEvent *); -%End void keyPressEvent(TQKeyEvent *); -%If (TQt_2_00 -) void styleChanged(TQStyle &); -%End private: TQMessageBox(const TQMessageBox &); diff --git a/sip/qt/qmetaobject.sip b/sip/qt/qmetaobject.sip index 5960339..56e96e6 100644 --- a/sip/qt/qmetaobject.sip +++ b/sip/qt/qmetaobject.sip @@ -58,7 +58,6 @@ public: const char *superClassName() const; TQMetaObject *superClass() const; -%If (TQt_2_1_0 -) bool inherits(const char *) const; int numSlots(bool = 0) const; @@ -72,18 +71,12 @@ public: const char *classInfo(const char *,bool = 0) const; %If (TQt_PROPERTIES) -%If (TQt_3_0_0 -) const TQMetaProperty *property(int,bool = 0) const; int findProperty(const char *,bool = 0) const; int numProperties(bool = 0) const; -%End -%If (- TQt_3_0_0) - const TQMetaProperty *property(const char *,bool = 0) const; -%End TQStrList propertyNames(bool = 0) const; %End -%End private: TQMetaObject(const TQMetaObject &); @@ -91,7 +84,6 @@ private: %If (TQt_PROPERTIES) -%If (TQt_2_1_0 -) class TQMetaProperty { @@ -103,12 +95,7 @@ public: const char *type() const; const char *name() const; -%If (TQt_2_2_0 -) bool writable() const; -%End -%If (- TQt_3_0_0) - bool writeable() const; -%End bool isValid() const; bool isSetType() const; @@ -120,51 +107,11 @@ public: int keysToValue(const TQStrList &) const; TQStrList valueToKeys(int) const; -%If (TQt_3_1_0 -) bool designable(TQObject * = 0) const; bool scriptable(TQObject * = 0) const; bool stored(TQObject * = 0) const; -%End -%If (TQt_3_0_0 - TQt_3_1_0) - bool designable(TQObject *) const; - bool scriptable(TQObject *) const; - bool stored(TQObject *) const; -%End -%If (TQt_3_0_0 -) bool reset(TQObject *) const; -%End - -%If (- TQt_3_0_0) - bool stored(TQObject *) const; - bool designable() const; - - enum Specification { - Unspecified, - Class, - Reference, - Pointer, - ConstCharStar - }; - - enum Flags { - UnresolvedEnum, - UnresolvedSet, - UnresolvedEnumOrSet, - UnresolvedStored, - UnresolvedDesignable, - NotDesignable, - NotStored, -%If (TQt_2_2_0 -) - StdSet, -%End - }; - - bool testFlags(uint) const; - void setFlags(uint); - void clearFlags(uint); -%End }; %End -%End diff --git a/sip/qt/qmime.sip b/sip/qt/qmime.sip index f0ce87f..630b6f2 100644 --- a/sip/qt/qmime.sip +++ b/sip/qt/qmime.sip @@ -42,8 +42,6 @@ %End -%If (TQt_2_00 -) - class TQMimeSource { %TypeHeaderCode @@ -51,16 +49,12 @@ class TQMimeSource %End public: -%If (TQt_3_0_0 -) TQMimeSource(); -%End virtual const char *format(int = 0) const = 0; virtual bool provides(const char *) const; virtual TQByteArray encodedData(const char *) const = 0; -%If (TQt_3_0_0 -) int serialNumber() const; -%End }; @@ -75,11 +69,9 @@ public: static TQMimeSourceFactory *defaultFactory(); static void setDefaultFactory(TQMimeSourceFactory * /Transfer/); -%If (TQt_3_0_0 -) static TQMimeSourceFactory *takeDefaultFactory() /TransferBack/; static void addFactory(TQMimeSourceFactory *); static void removeFactory(TQMimeSourceFactory *); -%End virtual const TQMimeSource *data(const TQString &) const; virtual TQString makeAbsolute(const TQString &,const TQString &) const; @@ -90,15 +82,7 @@ public: virtual void setPixmap(const TQString &,const TQPixmap &); virtual void setData(const TQString &,TQMimeSource * /Transfer/); virtual void setFilePath(const TQStringList &); -%If (TQt_2_1_0 -) virtual TQStringList filePath() const; void addFilePath(const TQString &); -%End virtual void setExtensionType(const TQString &,const char *); }; - -%End - - -%If (TQt_3_0_0 -) -%End diff --git a/sip/qt/qmotifplusstyle.sip b/sip/qt/qmotifplusstyle.sip index 08b92df..d4d847b 100644 --- a/sip/qt/qmotifplusstyle.sip +++ b/sip/qt/qmotifplusstyle.sip @@ -51,7 +51,6 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the %If (TQt_STYLE_MOTIFPLUS) -%If (TQt_2_2_0 -) class TQMotifPlusStyle : TQMotifStyle { @@ -60,12 +59,7 @@ class TQMotifPlusStyle : TQMotifStyle %End public: -%If (- TQt_3_0_5) - TQMotifPlusStyle(bool = 0); -%End -%If (TQt_3_0_5 -) TQMotifPlusStyle(bool = 1); -%End void polish(TQPalette &pal); void polish(const TQStyleControlElementData&, ControlElementFlags, void *); @@ -74,45 +68,6 @@ public: void applicationPolish(const TQStyleControlElementData&, ControlElementFlags, void *); void applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *); -%If (- TQt_3_0_0) - int defaultFrameWidth() const; - void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int, - const TQColorGroup &,bool,const TQBrush * = 0); - void drawMenuBarItem(TQPainter *,int,int,int,int,TQMenuItem *, - TQColorGroup &,bool,bool); - void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *, - const TQPalette &,bool,bool,int,int,int,int); - void drawPushButton(TQPushButton *,TQPainter *); - void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0, - const TQBrush * = 0); - void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,const TQBrush * = 0); - - void getButtonShift(int &,int &); - - void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,bool = 0,bool = 1,const TQBrush * = 0); - TQRect comboButtonRect(int,int,int,int); - TQRect comboButtonFocusRect(int,int,int,int); - void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int, - bool = 0,bool = 1); - TQSize indicatorSize() const; - void drawExclusiveIndicator(TQPainter *,int,int,int,int, - const TQColorGroup &,bool,bool = 0,bool = 1); - TQSize exclusiveIndicatorSize() const; - void drawPanel(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0, - int = 1,const TQBrush * = 0); - - void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &); - - void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint); - void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool); - void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &, - Orientation,bool,bool); - void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &, - TQCOORD,Orientation); -%End -%If (TQt_3_0_0 -) void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &, const TQColorGroup &,SFlags = Style_Default, const TQStyleOption & = TQStyleOption()) const; @@ -139,11 +94,9 @@ public: int styleHint(StyleHint,const TQStyleControlElementData&,ControlElementFlags, const TQStyleOption & = TQStyleOption(), TQStyleHintReturn * = 0, const TQWidget * = 0) const; -%End protected: bool eventFilter(TQObject *,TQEvent *); }; %End -%End diff --git a/sip/qt/qmotifstyle.sip b/sip/qt/qmotifstyle.sip index c849433..e018a8e 100644 --- a/sip/qt/qmotifstyle.sip +++ b/sip/qt/qmotifstyle.sip @@ -53,7 +53,6 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the %End -%If (TQt_2_00 -) %If (TQt_STYLE_MOTIF) class TQMotifStyle : TQCommonStyle @@ -74,57 +73,6 @@ public: void polishPopupMenu( const TQStyleControlElementData&, ControlElementFlags, void * ); -%If (- TQt_3_0_0) - void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0, - const TQBrush * = 0); - void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,const TQBrush * = 0); - void drawFocusRect(TQPainter *,const TQRect &,const TQColorGroup &, - const TQColor * =0,bool = 0); - -%If (TQt_2_1_0 -) - void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,bool = 0,bool = 1,const TQBrush * = 0); - TQRect comboButtonRect(int,int,int,int); - TQRect comboButtonFocusRect(int,int,int,int); -%End - - void drawPushButton(TQPushButton *,TQPainter *); - void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int, - const TQColorGroup &,bool,const TQBrush * = 0); - TQSize indicatorSize() const; - void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int, - bool = 0,bool = 1); - TQSize exclusiveIndicatorSize() const; - void drawExclusiveIndicator(TQPainter *,int,int,int,int, - const TQColorGroup &,bool,bool = 0,bool = 1); - void drawExclusiveIndicatorMask(TQPainter *,int,int,int,int,bool); - - void tabbarMetrics(const TQTabBar *,int &,int &,int &); - - void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool); - void drawTabMask(TQPainter *,const TQTabBar *,TQTab *,bool); - - void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &); - - void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint); - int sliderLength() const; - void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &, - Orientation,bool,bool); - void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &, - TQCOORD,Orientation); - int splitterWidth() const; - void drawSplitter(TQPainter *,int,int,int,int,const TQColorGroup &, - Orientation); - void drawCheckMark(TQPainter *,int,int,int,int,const TQColorGroup &,bool, - bool); - void polishPopupMenu(TQPopupMenu *); - int extraPopupMenuItemWidth(bool,int,TQMenuItem *,const TQFontMetrics &); - int popupMenuItemHeight(bool,TQMenuItem *,const TQFontMetrics &); - void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *, - const TQPalette &,bool,bool,int,int,int,int); -%End -%If (TQt_3_0_0 -) void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &, const TQColorGroup &,SFlags = Style_Default, const TQStyleOption & = TQStyleOption()) const; @@ -156,13 +104,9 @@ public: int styleHint(StyleHint,const TQStyleControlElementData&,ControlElementFlags, const TQStyleOption & = TQStyleOption(), TQStyleHintReturn * = 0, const TQWidget * = 0) const; -%End private: -%If (TQt_3_0_0 -) TQMotifStyle(const TQMotifStyle &); -%End }; %End -%End diff --git a/sip/qt/qmovie.sip b/sip/qt/qmovie.sip index b3fef65..6107321 100644 --- a/sip/qt/qmovie.sip +++ b/sip/qt/qmovie.sip @@ -52,30 +52,19 @@ class TQMovie public: TQMovie(); -%If (TQt_2_2_0 -) TQMovie(int); -%End // TQMovie(TQDataSource *,int = 1024); -%If (- TQt_2_00) - TQMovie(const char *,int = 1024); -%End -%If (TQt_2_00 -) TQMovie(const TQString &,int = 1024); -%End TQMovie(TQByteArray,int = 1024); TQMovie(const TQMovie &); -%If (TQt_2_2_0 -) int pushSpace() const; void pushData(const uchar * /Array/,int /ArraySize/); -%End const TQColor &backgroundColor() const; void setBackgroundColor(const TQColor &); const TQRect &getValidRect() const; const TQPixmap &framePixmap() const; -%If (TQt_2_2_0 -) const TQImage &frameImage() const; -%End bool isNull() const; int frameNumber() const; int steps() const; diff --git a/sip/qt/qmultilinedit.sip b/sip/qt/qmultilinedit.sip index cc3f347..4b3b4f7 100644 --- a/sip/qt/qmultilinedit.sip +++ b/sip/qt/qmultilinedit.sip @@ -66,8 +66,6 @@ This takes no parameters and returns a tuple of the bool result and the %End -%If (TQt_3_0_0 -) - class TQMultiLineEdit : TQTextEdit { %TypeHeaderCode @@ -81,22 +79,12 @@ public: int numLines() const; virtual void insertLine(const TQString &,int = -1); -%If (TQt_3_1_0 -) virtual void insertAt(const TQString &,int,int); virtual void insertAt(const TQString &,int,int,bool); -%End -%If (- TQt_3_1_0) - virtual void insertAt(const TQString &,int,int,bool = 0); -%End virtual void removeLine(int); -%If (TQt_3_1_0 -) virtual void setCursorPosition(int,int); virtual void setCursorPosition(int,int,bool); -%End -%If (- TQt_3_1_0) - virtual void setCursorPosition(int,int,bool = 0); -%End bool atBeginning() const; bool atEnd() const; @@ -144,231 +132,3 @@ protected: private: TQMultiLineEdit(const TQMultiLineEdit &); }; - -%End - - -%If (- TQt_3_0_0) - -class TQMultiLineEdit : TQTableView -{ -%TypeHeaderCode -#include <tqmultilinedit.h> -%End - -public: - TQMultiLineEdit(TQWidget * /TransferThis/ = 0,const char * = 0); - - int numLines() const; - virtual void removeLine(int); - - void cursorPosition(int *,int *) const; - void getCursorPosition(int *,int *) const; - - bool atBeginning() const; - bool atEnd() const; - int maxLineWidth() const; - bool autoUpdate() const; - bool isReadOnly() const; - bool isOverwriteMode() const; - TQString text() const; - -%If (- TQt_2_00) - const char *textLine(int) const; - void setFont(const TQFont &); - virtual void insertLine(const char *,int = -1); - virtual void insertAt(const char *,int,int); - void setCursorPosition(int,int,bool = 0); - void setFixedVisibleLines(int); - void setAutoUpdate(bool); -%End - -%If (TQt_2_00 -) - TQString textLine(int) const; - TQSize sizeHint() const; - TQSize minimumSizeHint() const; - TQSizePolicy sizePolicy() const; - virtual void setFont(const TQFont &); - virtual void insertLine(const TQString &,int = -1); - virtual void insertAt(const TQString &,int,int,bool = 0); - virtual void setCursorPosition(int,int,bool = 0); - virtual void setFixedVisibleLines(int); - void setAlignment(int); - int alignment() const; - virtual void setValidator(const TQValidator *); - const TQValidator *validator() const; - void setEdited(bool); - bool edited() const; - void cursorWordForward(bool); - void cursorWordBackward(bool); - - enum EchoMode - { - Normal, - NoEcho, - Password - }; - - virtual void setEchoMode(EchoMode); - EchoMode echoMode() const; - virtual void setMaxLineLength(int); - int maxLineLength() const; - virtual void setMaxLines(int); - int maxLines() const; - virtual void setHMargin(int); - int hMargin() const; - virtual void setSelection(int,int,int,int); - virtual void setAutoUpdate(bool); -%End - -%If (TQt_2_1_0 -) - void setMaxLength(int); - int maxLength() const; - - enum WordWrap { - NoWrap, - WidgetWidth, - FixedPixelWidth, - FixedColumnWidth - }; - - void setWordWrap(WordWrap); - WordWrap wordWrap() const; - void setWrapColumnOrWidth(int); - int wrapColumnOrWidth() const; - - enum WrapPolicy { - AtWhiteSpace, - Anywhere - }; - - void setWrapPolicy(WrapPolicy); - WrapPolicy wrapPolicy() const; - void setUndoEnabled(bool); - bool isUndoEnabled() const; - void setUndoDepth(int); - int undoDepth() const; - int length() const; - static void setDefaultTabStop(int); - static int defaultTabStop(); -%End - -public slots: - void clear(); - void deselect(); - void selectAll(); -%If (TQt_CLIPBOARD) - void paste(); -%If (TQt_2_2_0 -) - void pasteSubType(const TQCString &); -%End - void cut(); -%End -%If (- TQt_2_00) - void setText(const char *); - void setReadOnly(bool); - void setOverwriteMode(bool); - void append(const char *); - void copyText(); -%End -%If (TQt_2_00 -) - virtual void setText(const TQString &); - virtual void setReadOnly(bool); - virtual void setOverwriteMode(bool); - void append(const TQString &); -%If (TQt_CLIPBOARD) - void copyText() const; - void copy() const; -%End - void insert(const TQString &); -%End -%If (TQt_2_1_0 -) - void undo(); - void redo(); -%End - -signals: - void textChanged(); - void returnPressed(); -%If (TQt_2_1_0 -) - void undoAvailable(bool); - void redoAvailable(bool); -%End -%If (TQt_2_2_0 -) - void copyAvailable(bool); -%End - -protected: - void paintCell(TQPainter *,int,int); -%If (TQt_2_2_0 -) - bool event(TQEvent *); -%End - void mousePressEvent(TQMouseEvent *); - void mouseMoveEvent(TQMouseEvent *); - void mouseReleaseEvent(TQMouseEvent *); - void mouseDoubleClickEvent(TQMouseEvent *); -%If (TQt_2_00 -) - void wheelEvent(TQWheelEvent *); -%End - void keyPressEvent(TQKeyEvent *); - void focusInEvent(TQFocusEvent *); - void focusOutEvent(TQFocusEvent *); - void timerEvent(TQTimerEvent *); - void leaveEvent(TQEvent *); - void resizeEvent(TQResizeEvent *); -%If (TQt_DRAGANDDROP) -%If (TQt_2_00 -) - void dragMoveEvent(TQDragMoveEvent *); -%End -%If (TQt_2_1_0 -) - void dragEnterEvent(TQDragEnterEvent *); -%End -%If (TQt_2_00 -) - void dropEvent(TQDropEvent *); - void dragLeaveEvent(TQDragLeaveEvent *); -%End -%End - bool hasMarkedText() const; - TQString markedText() const; - int textWidth(int); -%If (- TQt_2_00) - int textWidth(TQString *); -%End -%If (TQt_2_00 -) - int textWidth(const TQString &); -%End - TQPoint cursorPoint() const; -%If (- TQt_2_00) - virtual void insertChar(char); -%End -%If (TQt_2_00 -) - virtual void insert(const TQString &,bool); -%End - virtual void newLine(); - virtual void killLine(); - virtual void pageUp(bool = 0); - virtual void pageDown(bool = 0); - virtual void cursorLeft(bool = 0,bool = 1); - virtual void cursorRight(bool = 0,bool = 1); - virtual void cursorUp(bool = 0); - virtual void cursorDown(bool = 0); - virtual void backspace(); - virtual void del() /PyName=delChar/; - virtual void home(bool = 0); - virtual void end(bool = 0); - bool getMarkedRegion(int *,int *,int *,int *) const; - int lineLength(int) const; - TQString *getString(int) const; -%If (TQt_2_1_0 -) - bool isEndOfParagraph(int) const; -%End -%If (TQt_2_00 -) - TQString stringShown(int) const; - void insertChar(TQChar); -%End - -private: - TQMultiLineEdit(const TQMultiLineEdit &); -}; - -%End diff --git a/sip/qt/qmutex.sip b/sip/qt/qmutex.sip index 38104d5..9d2051c 100644 --- a/sip/qt/qmutex.sip +++ b/sip/qt/qmutex.sip @@ -37,8 +37,6 @@ %If (TQt_THREAD_SUPPORT) -%If (TQt_3_0_0 -) - class TQMutex { %TypeHeaderCode @@ -57,32 +55,6 @@ private: TQMutex(const TQMutex &); }; -%End - - -%If (TQt_2_2_0 - TQt_3_0_0) - -class TQMutex : TQt -{ -%TypeHeaderCode -#include <tqthread.h> -%End - -public: - TQMutex(bool = 0); - - void lock() /ReleaseGIL/; - void unlock(); - bool locked(); - -private: - TQMutex(const TQMutex &); -}; - -%End - - -%If (TQt_3_1_0 -) class TQMutexLocker { @@ -100,5 +72,3 @@ private: }; %End - -%End diff --git a/sip/qt/qnamespace.sip b/sip/qt/qnamespace.sip index 3d65485..695c71f 100644 --- a/sip/qt/qnamespace.sip +++ b/sip/qt/qnamespace.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQt { %TypeHeaderCode @@ -67,13 +65,9 @@ public: ShiftButton, ControlButton, AltButton, -%If (TQt_3_0_0 -) MetaButton, -%End KeyButtonMask, -%If (TQt_2_2_0 -) Keypad, -%End }; enum Orientation { @@ -81,32 +75,11 @@ public: Vertical }; -%If (TQt_3_2_0 -) enum SortOrder { Ascending, Descending }; -%End - -%If (- TQt_3_0_0) - enum AlignmentFlags { - AlignLeft, - AlignRight, - AlignHCenter, - AlignTop, - AlignBottom, - AlignVCenter, - AlignCenter, - - SingleLine, - DontClip, - ExpandTabs, - ShowPrefix, - WordBreak - }; -%End -%If (TQt_3_0_0 -) enum AlignmentFlags { AlignAuto, AlignLeft, @@ -139,18 +112,12 @@ public: enum WidgetState { WState_Polished }; -%End typedef uint WFlags; enum WidgetFlags { WType_TopLevel, -%If (- TQt_3_0_0) - WType_Modal, -%End -%If (TQt_3_0_0 -) WType_Dialog, -%End WType_Popup, WType_Desktop, WType_Mask, @@ -166,22 +133,8 @@ public: WStyle_MinMax, WStyle_Tool, WStyle_StaysOnTop, -%If (- TQt_3_0_0) - WStyle_Dialog, -%End -%If (- TQt_2_1_0) - WStyle_Reserved2, - WStyle_Reserved3, -%End -%If (TQt_2_1_0 -) WStyle_ContextHelp, -%End -%If (TQt_2_1_0 - TQt_3_0_0) - WStyle_NoBorderEx, -%End -%If (TQt_3_0_0 -) WStyle_Reserved, -%End WStyle_Mask, WDestructiveClose, @@ -190,38 +143,18 @@ public: WPaintClever, WResizeNoErase, // Obsolete WMouseNoMask, -%If (- TQt_3_0_0) - WNorthWestGravity, -%End -%If (TQt_3_0_0 -) WStaticContents, -%End -%If (TQt_2_1_0 -) WRepaintNoErase, // Obsolete WX11BypassWM, -%End -%If (TQt_3_0_0 -) WWinOwnDC, -%End -%If (TQt_2_2_0 -) WGroupLeader, -%End -%If (TQt_3_0_0 -) WShowModal, WNoMousePropagation, WSubWindow, -%End -%If (TQt_3_1_0 -) WStyle_Splash, -%End -%If (TQt_3_2_0 -) WNoAutoErase, -%End }; - -%If (TQt_3_3_0 -) - enum WindowState { WindowNoState, WindowMinimized, @@ -230,8 +163,6 @@ public: WindowActive }; -%End - enum ImageConversionFlags { ColorMode_Mask, AutoColor, @@ -259,41 +190,19 @@ public: OpaqueMode }; -%If (- TQt_3_0_0) - enum PaintUnit { - PixelUnit, - LoMetricUnit, - HiMetricUnit, - LoEnglishUnit, - HiEnglishUnit, - TwipsUnit - }; -%End - enum GUIStyle { -%If (- TQt_3_0_0) - MacStyle, -%End WindowsStyle, -%If (- TQt_3_0_0) - Win3Style, - PMStyle, -%End MotifStyle }; -%If (TQt_3_1_0 -) enum SequenceMatch { NoMatch, PartialMatch, Identical }; -%End enum Modifier { -%If (TQt_3_1_0 -) META, -%End SHIFT, CTRL, ALT, @@ -316,9 +225,7 @@ public: Key_Pause, Key_Print, Key_SysReq, -%If (TQt_3_1_0 -) Key_Clear, -%End Key_Home, Key_End, @@ -380,11 +287,9 @@ public: Key_Menu, Key_Hyper_L, Key_Hyper_R, -%If (TQt_3_0_0 -) Key_Help, Key_Direction_L, Key_Direction_R, -%End Key_Space, Key_Any, @@ -554,7 +459,6 @@ public: Key_thorn, Key_ydiaeresis, -%If (TQt_3_1_0 -) Key_Back, Key_Forward, Key_Stop, @@ -601,7 +505,6 @@ public: Key_LaunchF, Key_MediaLast, -%End Key_unknown }; @@ -642,12 +545,9 @@ public: DotLine, DashDotLine, DashDotDotLine, -%If (TQt_2_1_0 -) MPenStyle -%End }; -%If (TQt_2_1_0 -) enum PenCapStyle { FlatCap, SquareCap, @@ -661,7 +561,6 @@ public: RoundJoin, MPenJoinStyle }; -%End enum BrushStyle { NoBrush, @@ -682,73 +581,42 @@ public: CustomPattern }; -%If (TQt_3_1_0 -) enum MacintoshVersion { MV_Unknown, MV_9, -%If (TQt_3_2_0 -) MV_10_DOT_0, -%End MV_10_DOT_1, MV_10_DOT_2, -%If (TQt_3_2_0 -) MV_10_DOT_3, -%End -%If (TQt_3_3_5 -) MV_10_DOT_4, -%End -%If (TQt_3_2_0 -) MV_CHEETAH, MV_PUMA, -%End MV_JAGUAR, -%If (TQt_3_2_0 -) MV_PANTHER, -%End -%If (TQt_3_3_5 -) MV_TIGER, -%End }; -%End enum WindowsVersion { WV_32s, WV_95, WV_98, -%If (TQt_3_0_0 -) WV_Me, -%End -%If (TQt_2_1_0 -) WV_DOS_based, -%End WV_NT, -%If (TQt_2_1_0 -) WV_2000, -%End -%If (TQt_3_0_0 -) WV_XP, -%End -%If (TQt_3_3_0 -) WV_2003, -%End -%If (TQt_3_3_6 -) WV_VISTA, -%End -%If (TQt_2_1_0 -) WV_NT_based, -%End -%If (TQt_3_3_0 -) WV_CE, WV_CENET, WV_CE_based, -%End }; -%If (TQt_2_2_0 -) enum UIEffect { UI_General, UI_AnimateMenu, @@ -756,13 +624,9 @@ public: UI_AnimateCombo, UI_AnimateTooltip, UI_FadeTooltip, -%If (TQt_3_2_0 -) UI_AnimateToolBox, -%End }; -%End -%If (TQt_3_0_0 -) enum CursorShape { ArrowCursor, UpArrowCursor, @@ -780,13 +644,10 @@ public: PointingHandCursor, ForbiddenCursor, WhatsThisCursor, -%If (TQt_3_3_0 -) BusyCursor, -%End LastCursor, BitmapCursor }; -%End static const TQCursor &arrowCursor; static const TQCursor &upArrowCursor; @@ -802,33 +663,22 @@ public: static const TQCursor &splitVCursor; static const TQCursor &splitHCursor; static const TQCursor &pointingHandCursor; -%If (TQt_2_1_0 -) static const TQCursor &forbiddenCursor; -%End -%If (TQt_3_0_0 -) static const TQCursor &whatsThisCursor; -%End -%If (TQt_3_3_0 -) static const TQCursor &busyCursor; -%End enum TextFormat { PlainText, RichText, AutoText, -%If (TQt_3_1_0 -) LogText, -%End }; -%If (TQt_3_1_0 -) enum AnchorAttribute { AnchorName, AnchorHref }; -%End -%If (TQt_3_0_0 -) enum Dock { DockUnmanaged, DockTornOff, @@ -845,12 +695,10 @@ public: LocalDate }; -%If (TQt_3_1_0 -) enum TimeSpec { LocalTime, UTC }; -%End enum BackgroundMode { FixedColor, @@ -885,19 +733,14 @@ public: ExactMatch }; -%If (TQt_3_2_0 -) enum Corner { TopLeft, TopRight, BottomLeft, BottomRight }; -%End %If (WS_X11) typedef unsigned long HANDLE; %End -%End }; - -%End diff --git a/sip/qt/qnetworkprotocol.sip b/sip/qt/qnetworkprotocol.sip index d8f9d1e..034f0f3 100644 --- a/sip/qt/qnetworkprotocol.sip +++ b/sip/qt/qnetworkprotocol.sip @@ -43,7 +43,6 @@ %If (TQt_NETWORKPROTOCOL) -%If (TQt_2_1_0 -) class TQNetworkProtocolFactoryBase { @@ -72,17 +71,6 @@ public: StStopped }; -%If (- TQt_3_0_0) - enum Operation { - OpListChildren, - OpMkdir, - OpRemove, - OpRename, - OpGet, - OpPut - }; -%End -%If (TQt_3_0_0 -) enum Operation { OpListChildren, OpMkDir, @@ -91,7 +79,6 @@ public: OpGet, OpPut }; -%End enum ConnectionState { ConHostFound, @@ -99,26 +86,6 @@ public: ConClosed }; -%If (- TQt_3_0_0) - enum Error { - NoError, - ErrValid, - ErrUnknownProtocol, - ErrUnsupported, - ErrParse, - ErrLoginIncorrect, - ErrHostNotFound, - ErrListChlidren, - ErrMkdir, - ErrRemove, - ErrRename, - ErrGet, - ErrPut, - ErrFileNotExisting, - ErrPermissionDenied - }; -%End -%If (TQt_3_0_0 -) enum Error { NoError, ErrValid, @@ -136,7 +103,6 @@ public: ErrFileNotExisting, ErrPermissionDenied }; -%End TQNetworkProtocol(); @@ -178,15 +144,11 @@ protected: virtual void operationRename(TQNetworkOperation *); virtual void operationGet(TQNetworkOperation *); virtual void operationPut(TQNetworkOperation *); -%If (TQt_3_0_0 -) virtual void operationPutChunk(TQNetworkOperation *); -%End virtual bool checkConnection(TQNetworkOperation *); private: -%If (TQt_3_1_0 -) TQNetworkProtocol(const TQNetworkProtocol &); -%End }; @@ -218,10 +180,7 @@ public: void free(); private: -%If (TQt_3_1_0 -) TQNetworkOperation(const TQNetworkOperation &); -%End }; %End -%End diff --git a/sip/qt/qobject.sip b/sip/qt/qobject.sip index 0f3a23e..fcc1d89 100644 --- a/sip/qt/qobject.sip +++ b/sip/qt/qobject.sip @@ -58,8 +58,6 @@ supported. %End -%If (TQt_2_00 -) - class TQObject : TQt { %TypeHeaderCode @@ -77,60 +75,48 @@ public: int yes, no; } graph[] = { {sipName_TQWidget, &sipClass_TQWidget, 25, 1}, -#if TQT_VERSION >= 0x030100 && defined(SIP_FEATURE_TQt_ASSISTANTCLIENT) +#if defined(SIP_FEATURE_TQt_ASSISTANTCLIENT) {sipName_TQAssistantClient, &sipClass_TQAssistantClient, -1, 2}, #else {NULL, NULL, -1, 2}, #endif {sipName_TQSessionManager, &sipClass_TQSessionManager, -1, 3}, {sipName_TQTranslator, &sipClass_TQTranslator, -1, 4}, -#if TQT_VERSION >= 0x030000 {sipName_TQProcess, &sipClass_TQProcess, -1, 5}, -#else - {NULL, NULL, -1, 5}, -#endif {sipName_TQToolTipGroup, &sipClass_TQToolTipGroup, -1, 6}, #if defined(SIP_FEATURE_TQt_FILEDIALOG) {sipName_TQFileIconProvider, &sipClass_TQFileIconProvider, -1, 7}, #else {NULL, NULL, -1, 7}, #endif -#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION) +#if defined(SIP_FEATURE_TQt_ACTION) {sipName_TQAction, &sipClass_TQAction, 89, 8}, #else {NULL, NULL, -1, 8}, #endif -#if TQT_VERSION >= 0x030000 {sipName_TQObjectCleanupHandler, &sipClass_TQObjectCleanupHandler, -1, 9}, -#else - {NULL, NULL, -1, 9}, -#endif {sipName_TQTimer, &sipClass_TQTimer, -1, 10}, {sipName_TQLayout, &sipClass_TQLayout, 90, 11}, -#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL) +#if defined(SIP_FEATURE_TQt_NETWORKPROTOCOL) {sipName_TQUrlOperator, &sipClass_TQUrlOperator, -1, 12}, #else {NULL, NULL, -1, 12}, #endif {sipName_TQStyleSheet, &sipClass_TQStyleSheet, -1, 13}, {sipName_TQValidator, &sipClass_TQValidator, 94, 14}, -#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL) +#if defined(SIP_FEATURE_TQt_NETWORKPROTOCOL) {sipName_TQNetworkOperation, &sipClass_TQNetworkOperation, -1, 15}, #else {NULL, NULL, -1, 15}, #endif {sipName_TQAccel, &sipClass_TQAccel, -1, 16}, -#if TQT_VERSION >= 0x030100 {sipName_TQEventLoop, &sipClass_TQEventLoop, -1, 17}, -#else - {NULL, NULL, -1, 17}, -#endif -#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_NETWORKPROTOCOL) +#if defined(SIP_FEATURE_TQt_NETWORKPROTOCOL) {sipName_TQNetworkProtocol, &sipClass_TQNetworkProtocol, -1, 18}, #else {NULL, NULL, -1, 18}, #endif -#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_SOUND) +#if defined(SIP_FEATURE_TQt_SOUND) {sipName_TQSound, &sipClass_TQSound, -1, 19}, #else {NULL, NULL, -1, 19}, @@ -152,25 +138,13 @@ public: {NULL, NULL, -1, 27}, #endif {sipName_TQTabWidget, &sipClass_TQTabWidget, -1, 28}, -#if TQT_VERSION >= 0x030000 {sipName_TQDateEdit, &sipClass_TQDateEdit, -1, 29}, -#else - {NULL, NULL, -1, 29}, -#endif {sipName_TQMainWindow, &sipClass_TQMainWindow, -1, 30}, -#if TQT_VERSION >= 0x030000 {sipName_TQDateTimeEdit, &sipClass_TQDateTimeEdit, -1, 31}, -#else - {NULL, NULL, -1, 31}, -#endif -#if TQT_VERSION >= 0x030000 {sipName_TQTimeEdit, &sipClass_TQTimeEdit, -1, 32}, -#else - {NULL, NULL, -1, 32}, -#endif {sipName_TQFrame, &sipClass_TQFrame, 46, 33}, {sipName_TQScrollBar, &sipClass_TQScrollBar, -1, 34}, -#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_DIAL) +#if defined(SIP_FEATURE_TQt_DIAL) {sipName_TQDial, &sipClass_TQDial, -1, 35}, #else {NULL, NULL, -1, 35}, @@ -180,41 +154,21 @@ public: {sipName_TQDialog, &sipClass_TQDialog, 79, 38}, {sipName_TQComboBox, &sipClass_TQComboBox, -1, 39}, {sipName_TQHeader, &sipClass_TQHeader, -1, 40}, -#if TQT_VERSION >= 0x030000 {sipName_TQDockArea, &sipClass_TQDockArea, -1, 41}, -#else - {NULL, NULL, -1, 41}, -#endif -#if TQT_VERSION >= 0x030200 {sipName_TQSplashScreen, &sipClass_TQSplashScreen, -1, 42}, -#else - {NULL, NULL, -1, 42}, -#endif {sipName_TQSlider, &sipClass_TQSlider, -1, 43}, {sipName_TQSpinBox, &sipClass_TQSpinBox, -1, 44}, -#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_WORKSPACE) +#if defined(SIP_FEATURE_TQt_WORKSPACE) {sipName_TQWorkspace, &sipClass_TQWorkspace, -1, 45}, #else {NULL, NULL, -1, 45}, #endif -#if TQT_VERSION >= 0x030000 {sipName_TQDesktopWidget, &sipClass_TQDesktopWidget, -1, -1}, -#else - {NULL, NULL, -1, -1}, -#endif {sipName_TQGrid, &sipClass_TQGrid, -1, 47}, {sipName_TQLineEdit, &sipClass_TQLineEdit, -1, 48}, -#if TQT_VERSION >= 0x030200 {sipName_TQToolBox, &sipClass_TQToolBox, -1, 49}, -#else - {NULL, NULL, -1, 49}, -#endif {sipName_TQWidgetStack, &sipClass_TQWidgetStack, -1, 50}, -#if TQT_VERSION >= 0x030000 {sipName_TQDockWindow, &sipClass_TQDockWindow, 60, 51}, -#else - {NULL, NULL, -1, 51}, -#endif {sipName_TQMenuBar, &sipClass_TQMenuBar, -1, 52}, {sipName_TQLabel, &sipClass_TQLabel, -1, 53}, {sipName_TQGroupBox, &sipClass_TQGroupBox, 61, 54}, @@ -234,23 +188,15 @@ public: {sipName_TQVGroupBox, &sipClass_TQVGroupBox, -1, -1}, {sipName_TQVButtonGroup, &sipClass_TQVButtonGroup, -1, 65}, {sipName_TQHButtonGroup, &sipClass_TQHButtonGroup, -1, -1}, -#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW) +#if defined(SIP_FEATURE_TQt_ICONVIEW) {sipName_TQIconView, &sipClass_TQIconView, -1, 67}, #else {NULL, NULL, -1, 67}, #endif {sipName_TQListView, &sipClass_TQListView, -1, 68}, {sipName_TQListBox, &sipClass_TQListBox, -1, 69}, -#if TQT_VERSION >= 0x030000 {sipName_TQGridView, &sipClass_TQGridView, -1, 70}, -#else - {NULL, NULL, -1, 70}, -#endif -#if TQT_VERSION >= 0x030000 {sipName_TQTextEdit, &sipClass_TQTextEdit, 71, -1}, -#else - {NULL, NULL, -1, -1}, -#endif {sipName_TQTextBrowser, &sipClass_TQTextBrowser, -1, 72}, {sipName_TQMultiLineEdit, &sipClass_TQMultiLineEdit, -1, 73}, {sipName_TQTextView, &sipClass_TQTextView, -1, -1}, @@ -264,12 +210,8 @@ public: #else {NULL, NULL, -1, 80}, #endif -#if TQT_VERSION >= 0x030000 {sipName_TQErrorMessage, &sipClass_TQErrorMessage, -1, 81}, -#else - {NULL, NULL, -1, 81}, -#endif -#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_INPUTDIALOG) +#if defined(SIP_FEATURE_TQt_INPUTDIALOG) {sipName_TQInputDialog, &sipClass_TQInputDialog, -1, 82}, #else {NULL, NULL, -1, 82}, @@ -309,7 +251,7 @@ public: #else {NULL, NULL, -1, -1}, #endif -#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_ACTION) +#if defined(SIP_FEATURE_TQt_ACTION) {sipName_TQActionGroup, &sipClass_TQActionGroup, -1, -1}, #else {NULL, NULL, -1, -1}, @@ -320,24 +262,16 @@ public: {sipName_TQVBoxLayout, &sipClass_TQVBoxLayout, -1, -1}, {sipName_TQDoubleValidator, &sipClass_TQDoubleValidator, -1, 95}, {sipName_TQIntValidator, &sipClass_TQIntValidator, -1, 96}, -#if TQT_VERSION >= 0x030000 {sipName_TQRegExpValidator, &sipClass_TQRegExpValidator, -1, -1}, -#else - {NULL, NULL, -1, -1}, -#endif {sipName_TQTextDrag, &sipClass_TQTextDrag, -1, 98}, {sipName_TQStoredDrag, &sipClass_TQStoredDrag, 101, 99}, -#if TQT_VERSION >= 210 && defined(SIP_FEATURE_TQt_ICONVIEW) && defined(SIP_FEATURE_TQt_DRAGANDDROP) +#if defined(SIP_FEATURE_TQt_ICONVIEW) && defined(SIP_FEATURE_TQt_DRAGANDDROP) {sipName_TQIconDrag, &sipClass_TQIconDrag, -1, 100}, #else {NULL, NULL, -1, 100}, #endif {sipName_TQImageDrag, &sipClass_TQImageDrag, -1, -1}, -#if TQT_VERSION >= 210 {sipName_TQColorDrag, &sipClass_TQColorDrag, -1, 102}, -#else - {NULL, NULL, -1, 102}, -#endif {sipName_TQUriDrag, &sipClass_TQUriDrag, -1, -1}, {sipName_TQCommonStyle, &sipClass_TQCommonStyle, 104, -1}, #if defined(SIP_FEATURE_TQt_STYLE_WINDOWS) @@ -360,12 +294,12 @@ public: #else {NULL, NULL, -1, 108}, #endif -#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_MOTIFPLUS) +#if defined(SIP_FEATURE_TQt_STYLE_MOTIFPLUS) {sipName_TQMotifPlusStyle, &sipClass_TQMotifPlusStyle, -1, 109}, #else {NULL, NULL, -1, 109}, #endif -#if TQT_VERSION >= 220 && defined(SIP_FEATURE_TQt_STYLE_SGI) +#if defined(SIP_FEATURE_TQt_STYLE_SGI) {sipName_TQSGIStyle, &sipClass_TQSGIStyle, -1, -1}, #else {NULL, NULL, -1, -1}, @@ -410,19 +344,6 @@ public: #endif %End -%If (- TQt_3_0_0) - static TQString tr(const char *) /AutoGen=TQt_TRANSLATION/; -%End -%If (TQt_2_2_0 - TQt_2_3_1) - // There was an apparent bug in moc prior to TQt v2.3.1 where this - // method wasn't automatically generated. - - static TQString tr(const char *,const char *); -%End -%If (TQt_2_3_1 - TQt_3_0_0) - static TQString tr(const char *,const char *) /AutoGen=TQt_TRANSLATION/; -%End -%If (TQt_3_0_0 -) // Note that tr() and trUtf8() are really static methods. We pretend // they aren't so that we can use self to get hold of the class name. // We could mimic moc's behaviour more accurately by creating tr() and @@ -494,7 +415,6 @@ public: } } %End -%End virtual TQMetaObject *metaObject() const /AutoGen/; virtual bool event(TQEvent *); virtual bool eventFilter(TQObject *,TQEvent *); @@ -540,9 +460,6 @@ public: #endif %End -%If (- TQt_3_0_0) - TQStringList superClasses(bool = 0) const; -%End const char *name() const; const char *name(const char *) const; virtual void setName(const char *); @@ -553,21 +470,10 @@ public: int startTimer(int); void killTimer(int); void killTimers(); -%If (- TQt_3_0_0) - TQObject *child(const char *,const char * = 0); -%End -%If (TQt_3_0_0 -) TQObject *child(const char *,const char * = 0,bool = 1); -%End const TQObjectList *children() const; -%If (TQt_2_1_0 -) static const TQObjectList *objectTrees(); -%End -%If (- TQt_3_0_0) - TQObjectList *queryList(char * = 0,char * = 0,bool = 1,bool = 1); -%End -%If (TQt_3_0_0 -) TQObjectList *queryList(char * = 0,char * = 0,bool = 1,bool = 1) const; %MethodCode // The TQt implementation doesn't know anything about Python @@ -617,7 +523,6 @@ public: Py_END_ALLOW_THREADS #endif %End -%End virtual void insertChild(TQObject * /Transfer/); virtual void removeChild(TQObject * /TransferBack/); @@ -662,26 +567,16 @@ public: %End %If (TQt_PROPERTIES) -%If (TQt_2_1_0 - TQt_3_0_0) - bool setProperty(const char *,const TQVariant &); - TQVariant property(const char *) const; -%End -%If (TQt_3_0_0 -) virtual bool setProperty(const char *,const TQVariant &); virtual TQVariant property(const char *) const; %End -%End signals: void destroyed(); -%If (TQt_3_0_0 -) void destroyed(TQObject *); -%End public slots: -%If (TQt_3_0_0 -) void deleteLater(); -%End public: // This is actually protected, but we never need to call the real @@ -694,9 +589,7 @@ public: protected: virtual void timerEvent(TQTimerEvent *); virtual void childEvent(TQChildEvent *); -%If (TQt_3_0_0 -) virtual void customEvent(TQCustomEvent *); -%End private: TQObject(const TQObject &); @@ -716,183 +609,6 @@ SIP_PYOBJECT QT_TRANSLATE_NOOP(SIP_PYOBJECT,SIP_PYOBJECT); sipRes = a1; %End -%End - - -%If (- TQt_2_00) - -class TQObject -{ -%TypeHeaderCode -#include <tqobject.h> -%End - -public: - TQObject(TQObject * /TransferThis/ = 0,const char * = 0); - -%ConvertToSubClassCode - // The table of Python class objects indexed by their names. The table - // must be sorted by name. - - static sipStringTypeClassMap map[] = { - {sipName_TQAccel, &sipClass_TQAccel}, - {sipName_TQApplication, &sipClass_TQApplication}, - {sipName_TQBoxLayout, &sipClass_TQBoxLayout}, - {sipName_TQButton, &sipClass_TQButton}, - {sipName_TQButtonGroup, &sipClass_TQButtonGroup}, - {sipName_TQCheckBox, &sipClass_TQCheckBox}, -#if defined(SIP_FEATURE_TQt_CLIPBOARD) - {sipName_TQClipboard, &sipClass_TQClipboard}, -#endif - {sipName_TQComboBox, &sipClass_TQComboBox}, - {sipName_TQDialog, &sipClass_TQDialog}, - {sipName_TQDoubleValidator, &sipClass_TQDoubleValidator}, - {sipName_TQDragObject, &sipClass_TQDragObject}, -#if defined(SIP_FEATURE_TQt_FILEDIALOG) - {sipName_TQFileDialog, &sipClass_TQFileDialog}, - {sipName_TQFileIconProvider, &sipClass_TQFileIconProvider}, -#endif - {sipName_TQFrame, &sipClass_TQFrame}, - {sipName_TQGridLayout, &sipClass_TQGridLayout}, - {sipName_TQGroupBox, &sipClass_TQGroupBox}, - {sipName_TQHBoxLayout, &sipClass_TQHBoxLayout}, - {sipName_TQHeader, &sipClass_TQHeader}, - {sipName_TQImageDrag, &sipClass_TQImageDrag}, - {sipName_TQIntValidator, &sipClass_TQIntValidator}, - {sipName_TQLCDNumber, &sipClass_TQLCDNumber}, - {sipName_TQLabel, &sipClass_TQLabel}, - {sipName_TQLayout, &sipClass_TQLayout}, - {sipName_TQLineEdit, &sipClass_TQLineEdit}, - {sipName_TQListBox, &sipClass_TQListBox}, - {sipName_TQListView, &sipClass_TQListView}, - {sipName_TQMainWindow, &sipClass_TQMainWindow}, - {sipName_TQMenuBar, &sipClass_TQMenuBar}, -#if defined(SIP_FEATURE_TQt_MESSAGEBOX) - {sipName_TQMessageBox, &sipClass_TQMessageBox}, -#endif - {sipName_TQMultiLineEdit, &sipClass_TQMultiLineEdit}, - {sipName_TQPopupMenu, &sipClass_TQPopupMenu}, -#if defined(WS_X11) && defined(SIP_FEATURE_TQt_PRINTDIALOG) - {sipName_TQPrintDialog, &sipClass_TQPrintDialog}, -#endif - {sipName_TQProgressBar, &sipClass_TQProgressBar}, -#if defined(SIP_FEATURE_TQt_PROGRESSDIALOG) - {sipName_TQProgressDialog, &sipClass_TQProgressDialog}, -#endif - {sipName_TQPushButton, &sipClass_TQPushButton}, - {sipName_TQRadioButton, &sipClass_TQRadioButton}, - {sipName_TQScrollBar, &sipClass_TQScrollBar}, - {sipName_TQScrollView, &sipClass_TQScrollView}, - {sipName_TQSlider, &sipClass_TQSlider}, - {sipName_TQSocketNotifier, &sipClass_TQSocketNotifier}, - {sipName_TQSpinBox, &sipClass_TQSpinBox}, -#if defined(SIP_FEATURE_TQt_SPLITTER) - {sipName_TQSplitter, &sipClass_TQSplitter}, -#endif - {sipName_TQStatusBar, &sipClass_TQStatusBar}, - {sipName_TQStoredDrag, &sipClass_TQStoredDrag}, - {sipName_TQTabBar, &sipClass_TQTabBar}, - {sipName_TQTextDrag, &sipClass_TQTextDrag}, - {sipName_TQTimer, &sipClass_TQTimer}, - {sipName_TQToolBar, &sipClass_TQToolBar}, - {sipName_TQToolButton, &sipClass_TQToolButton}, - {sipName_TQToolTipGroup, &sipClass_TQToolTipGroup}, - {sipName_TQVBoxLayout, &sipClass_TQVBoxLayout}, - {sipName_TQValidator, &sipClass_TQValidator}, - {sipName_TQWidget, &sipClass_TQWidget}, - {sipName_TQWidgetStack, &sipClass_TQWidgetStack} - }; - - sipClass = sipMapStringToClass(sipCpp -> className(),map,sizeof (map)/sizeof (map[0])); -%End - - static SIP_PYOBJECT connect(SIP_QOBJECT,SIP_SIGNAL,SIP_QOBJECT,SIP_SLOT); -%MethodCode - sipRes = sipConnectRx(a0,a1,a2,a3,0); -%End - - static SIP_PYOBJECT connect(SIP_QOBJECT,SIP_SIGNAL,SIP_PYCALLABLE); -%MethodCode - sipRes = sipConnectRx(a0,a1,a2,0,0); -%End - - static SIP_PYOBJECT disconnect(SIP_QOBJECT,SIP_SIGNAL,SIP_QOBJECT,SIP_SLOT); -%MethodCode - sipRes = sipDisconnectRx(a0,a1,a2,a3); -%End - - static SIP_PYOBJECT disconnect(SIP_QOBJECT,SIP_SIGNAL,SIP_PYCALLABLE); -%MethodCode - sipRes = sipDisconnectRx(a0,a1,a2,0); -%End - - virtual bool event(TQEvent *); - virtual bool eventFilter(TQObject *,TQEvent *); - const char *tr(const char *) const; - virtual TQMetaObject *metaObject() const /AutoGen/; - - // This is actually virtual. However, with the way we are implementing - // it we can ignore it. - SIP_PYOBJECT className() const; -%MethodCode -#if PY_MAJOR_VERSION >= 3 - sipRes = PyUnicode_FromString(sipSelf->ob_type->tp_name); -#else - sipRes = sipClassName(sipSelf); -#endif -%End - - bool isA(const char *) const; - bool inherits(const char *) const; - const char *name() const; - const char *name(const char *) const; - void setName(const char *); - bool isWidgetType() const; - bool highPriority() const; - bool signalsBlocked() const; - void blockSignals(bool); - int startTimer(int); - void killTimer(int); - void killTimers(); - const TQObjectList *children() const; - TQObjectList *queryList(char * = 0,char * = 0,bool = 1,bool = 1); - void insertChild(TQObject * /Transfer/); - void removeChild(TQObject * /TransferBack/); - void installEventFilter(const TQObject *); - void removeEventFilter(const TQObject *); -// bool connect(TQObject *,const char *,const char *); -// bool disconnect(const char * = 0,const TQObject * = 0,const char * = 0); -// bool disconnect(const TQObject *,const char * = 0); - void dumpObjectTree(); - void dumpObjectInfo(); - TQObject *parent() const; - - void emit(SIP_SIGNAL,SIP_PYTUPLE); -%MethodCode - if (sipEmitSignal(sipSelf,a0,a1) < 0) - sipIsErr = 1; -%End - -signals: - void destroyed(); - -public: - // This is actually protected, but we never need to call the real - // method. - SIP_PYOBJECT sender(); -%MethodCode - sipRes = pyqt3GetSender(); -%End - -protected: - virtual void timerEvent(TQTimerEvent *); - -private: - TQObject(const TQObject &); -}; - -%End - SIP_PYOBJECT SLOT(const char * /Encoding="ASCII"/) /TypeHint="QT_SLOT"/; %MethodCode @@ -1495,11 +1211,7 @@ static PyObject *py_sender = 0; TQMetaObject *UniversalSlot::metaObj = 0; -#if TQT_VERSION >= 0x030100 static TQMetaObjectCleanUp cleanUp_UniversalSlot("UniversalSlot", &UniversalSlot::staticMetaObject); -#else -static TQMetaObjectCleanUp cleanUp_UniversalSlot; -#endif TQObject *UniversalSlot::lastSender = 0; UniversalSlot *UniversalSlot::unislots = 0; diff --git a/sip/qt/qobjectcleanuphandler.sip b/sip/qt/qobjectcleanuphandler.sip index 83abc8e..f633e3b 100644 --- a/sip/qt/qobjectcleanuphandler.sip +++ b/sip/qt/qobjectcleanuphandler.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQObjectCleanupHandler : TQObject { %TypeHeaderCode @@ -45,5 +43,3 @@ public: bool isEmpty() const; void clear(); }; - -%End diff --git a/sip/qt/qpaintdevice.sip b/sip/qt/qpaintdevice.sip index dc2ad64..80a2765 100644 --- a/sip/qt/qpaintdevice.sip +++ b/sip/qt/qpaintdevice.sip @@ -40,34 +40,6 @@ Not implemented. %End -%If (- TQt_2_00) - -// Painter device types. - -const int PDT_UNDEF; -const int PDT_WIDGET; -const int PDT_PIXMAP; -const int PDT_PRINTER; -const int PDT_PICTURE; -const int PDT_MASK; - -// Painter device flags. - -const int PDF_EXTDEV; -const int PDF_PAINTACTIVE; - - -void bitBlt(TQPaintDevice *,int,int,const TQPaintDevice *,int = 0,int = 0, - int = -1,int = -1,RasterOp = CopyROP,bool = 0); -void bitBlt(TQPaintDevice *,int,int,const TQImage *,int = 0,int = 0,int = -1, - int = -1,int = 0); -void bitBlt(TQPaintDevice *,const TQPoint &,const TQPaintDevice *, - const TQRect & = TQRect(0,0,-1,-1),RasterOp = CopyROP,bool = 0); - -%End - -%If (TQt_2_00 -) - void bitBlt(TQPaintDevice *,int,int,const TQPaintDevice *,int = 0,int = 0, int = -1,int = -1,TQt::RasterOp = TQt::CopyROP,bool = 0); void bitBlt(TQPaintDevice *,int,int,const TQImage *,int = 0,int = 0,int = -1, @@ -76,8 +48,6 @@ void bitBlt(TQPaintDevice *,const TQPoint &,const TQPaintDevice *, const TQRect & = TQRect(0,0,-1,-1),TQt::RasterOp = TQt::CopyROP, bool = 0); -%End - class TQPaintDevice { @@ -90,44 +60,17 @@ public: bool isExtDev() const; bool paintingActive() const; -%If (TQt_3_0_0 -) virtual void setResolution(int); virtual int resolution() const; -%End - -%If (- TQt_2_00) - HANDLE handle() const; -%If (WS_X11) - Display *x11Display() const; - static int x11Screen(); - static int x11Depth(); - static int x11Cells(); - static HANDLE x11Colormap(); - static bool x11DefaultColormap(); - static void *x11Visual(); - static bool x11DefaultVisual(); -%End -%End -%If (TQt_2_00 -) %If (WS_X11) -%If (- TQt_3_0_0) - HANDLE handle() const; -%End -%If (TQt_3_0_0 -) TQt::HANDLE handle() const; TQt::HANDLE x11RenderHandle() const; -%End Display *x11Display() const; int x11Screen() const; int x11Depth() const; int x11Cells() const; -%If (- TQt_3_0_0) - HANDLE x11Colormap() const; -%End -%If (TQt_3_0_0 -) TQt::HANDLE x11Colormap() const; -%End bool x11DefaultColormap() const; void *x11Visual() const; bool x11DefaultVisual() const; @@ -137,26 +80,16 @@ public: static int x11AppDpiX(); static int x11AppDpiY(); -%If (TQt_2_1_0 -) static void x11SetAppDpiX(int); static void x11SetAppDpiY(int); -%End static int x11AppDepth(); static int x11AppCells(); -%If (TQt_3_1_0 -) static TQt::HANDLE x11AppRootWindow(); -%End -%If (TQt_3_0_0 -) static TQt::HANDLE x11AppColormap(); -%End -%If (- TQt_3_0_0) - static HANDLE x11AppColormap(); -%End static bool x11AppDefaultColormap(); static void *x11AppVisual(); static bool x11AppDefaultVisual(); -%If (TQt_3_1_0 -) static int x11AppDepth(int); static int x11AppCells(int); static TQt::HANDLE x11AppRootWindow(int); @@ -169,7 +102,6 @@ public: static void x11SetAppDpiX(int,int); static void x11SetAppDpiY(int,int); %End -%End enum PDevCmd { @@ -188,21 +120,14 @@ public: PdcDrawLineSegments, PdcDrawPolyline, PdcDrawPolygon, -%If (TQt_3_0_0 -) PdcDrawCubicBezier, -%End -%If (- TQt_3_0_0) - PdcDrawQuadBezier, -%End PdcDrawText, PdcDrawTextFormatted, PdcDrawPixmap, PdcDrawImage, PdcDrawText2, PdcDrawText2Formatted, -%If (TQt_3_2_0 -) PdcDrawTextItem, -%End PdcDrawLast, PdcBegin, @@ -233,8 +158,6 @@ public: PdcReservedStop }; -%End - protected: TQPaintDevice(uint); // virtual bool cmd(int,TQPainter *,TQPDevCmdParam *); diff --git a/sip/qt/qpaintdevicemetrics.sip b/sip/qt/qpaintdevicemetrics.sip index ecabb8b..a0358c8 100644 --- a/sip/qt/qpaintdevicemetrics.sip +++ b/sip/qt/qpaintdevicemetrics.sip @@ -42,14 +42,10 @@ public: int height() const; int widthMM() const; int heightMM() const; -%If (TQt_2_00 -) int logicalDpiX() const; int logicalDpiY() const; -%End -%If (TQt_3_0_0 -) int physicalDpiX() const; int physicalDpiY() const; -%End int numColors() const; int depth() const; }; diff --git a/sip/qt/qpainter.sip b/sip/qt/qpainter.sip index 17c359f..8111400 100644 --- a/sip/qt/qpainter.sip +++ b/sip/qt/qpainter.sip @@ -97,260 +97,6 @@ This returns a list of tab stops. %End -%If (- TQt_2_00) - -%ModuleHeaderCode -#include <tqpainter.h> -%End - -enum BGMode { - TransparentMode, - OpaqueMode -}; - -enum PaintUnit { - PixelUnit, - LoMetricUnit, - HiMetricUnit, - LoEnglishUnit, - HiEnglishUnit, - TwipsUnit -}; - - -class TQPainter -{ -%TypeHeaderCode -#include <tqpainter.h> -%End - -public: - TQPainter(); - TQPainter(const TQPaintDevice *); - TQPainter(const TQPaintDevice *,const TQWidget *); - - bool begin(const TQPaintDevice *); - bool begin(const TQPaintDevice *,const TQWidget *); - bool end(); - TQPaintDevice *device() const; - - static void redirect(TQPaintDevice *,TQPaintDevice *); -%If (TQt_3_2_0 -) - static TQPaintDevice *redirect(TQPaintDevice *); -%End - - bool isActive() const; - void flush(); - void save(); - void restore(); - TQFontMetrics fontMetrics() const; - TQFontInfo fontInfo() const; - const TQFont &font() const; - void setFont(const TQFont&); - const TQPen &pen() const; - void setPen(const TQPen &); - void setPen(PenStyle); - void setPen(const TQColor &); - const TQBrush &brush() const; - void setBrush(const TQBrush &); - void setBrush(BrushStyle); - void setBrush(const TQColor &); - const TQColor &backgroundColor() const; - void setBackgroundColor(const TQColor &); - BGMode backgroundMode() const; - void setBackgroundMode(BGMode); - RasterOp rasterOp() const; - void setRasterOp(RasterOp); - const TQPoint &brushOrigin() const; - void setBrushOrigin(int,int); - void setBrushOrigin(const TQPoint &); - - bool hasViewXForm() const; - bool hasWorldXForm() const; - - void setViewXForm(bool); - TQRect window() const; - void setWindow(const TQRect &); - void setWindow(int,int,int,int); - TQRect viewport() const; - void setViewport(const TQRect &); - void setViewport(int,int,int,int); - - void setWorldXForm(bool); - const TQWMatrix &worldMatrix() const; - void setWorldMatrix(const TQWMatrix &,bool = 0); - - void scale(float,float); - void shear(float,float); - void rotate(float); - - void translate(float,float); - void resetXForm(); - - TQPoint xForm(TQPoint &) const; - TQRect xForm(TQRect &) const; - TQPointArray xForm(TQPointArray &) const; - TQPointArray xForm(TQPointArray &,int,int) const; - TQPoint xFormDev(TQPoint &) const; - TQRect xFormDev(TQRect &) const; - TQPointArray xFormDev(TQPointArray &) const; - TQPointArray xFormDev(TQPointArray &,int,int) const; - void setClipping(bool); - bool hasClipping() const; - const TQRegion &clipRegion() const; - void setClipRect(const TQRect &); - void setClipRect(int,int,int,int); - void setClipRegion(const TQRegion &); - void drawPoint(int,int); - void drawPoint(const TQPoint &); - void drawPoints(const TQPointArray &,int,int = -1); - void moveTo(int,int); - void moveTo(const TQPoint &); - void lineTo(int,int); - void lineTo(const TQPoint &); - void drawLine(int,int,int,int); - void drawLine(const TQPoint &,const TQPoint &); - void drawRect(int,int,int,int); - void drawRect(const TQRect &); - void drawWinFocusRect(int,int,int,int); - void drawWinFocusRect(int,int,int,int,const TQColor &); - void drawWinFocusRect(const TQRect &); - void drawWinFocusRect(const TQRect &,const TQColor &); - void drawRoundRect(int,int,int,int,int,int); - void drawRoundRect(const TQRect &,int,int); - void drawEllipse(int,int,int,int); - void drawEllipse(const TQRect &); - void drawArc(int,int,int,int,int,int); - void drawArc(const TQRect &,int,int); - void drawPie(int,int,int,int,int,int); - void drawPie(const TQRect &,int,int); - void drawChord(int,int,int,int,int,int); - void drawChord(const TQRect &,int,int); - void drawLineSegments(const TQPointArray &,int = 0,int = -1); - void drawPolyline(const TQPointArray &,int = 0,int = -1); - void drawPolygon(const TQPointArray &,bool = 0,int = 0,int = -1); - void drawQuadBezier(const TQPointArray &,int = 0); - void drawPixmap(int,int,const TQPixmap &,int = 0,int = 0,int = -1,int = -1); - void drawPixmap(const TQPoint &,const TQPixmap &,const TQRect &); - void drawPixmap(const TQPoint &,const TQPixmap &); - void drawImage(int,int,const TQImage &,int = 0,int = 0,int = -1,int = -1); - void drawImage(const TQPoint &,const TQImage &,const TQRect &); - void drawImage(const TQPoint &,const TQImage &); - void drawTiledPixmap(int,int,int,int,const TQPixmap &,int = 0,int = 0); - void drawTiledPixmap(const TQRect &,const TQPixmap &,const TQPoint &); - void drawTiledPixmap(const TQRect &,const TQPixmap &); - void drawPicture(const TQPicture &); - void fillRect(int,int,int,int,const TQBrush &); - void fillRect(const TQRect &,const TQBrush &); - void eraseRect(int,int,int,int); - void eraseRect(const TQRect &); - void drawText(int,int,char *,int = -1); - void drawText(const TQPoint &,const char *,int = -1); - void drawText(int,int,int,int,int,const char *,int = -1,TQRect * = 0); - void drawText(const TQRect &,int,const char *,int = -1,TQRect * = 0); - -%If (TQt_3_2_0 -) - void drawTextItem(int,int,const TQTextItem &,int = 0); - void drawTextItem(const TQPoint &,const TQTextItem &,int = 0); -%End - - TQRect boundingRect(int,int,int,int,int,const char *,int = -1); - TQRect boundingRect(const TQRect &,int,const char *,int = -1); - - int tabStops() const; - void setTabStops(int); - - SIP_PYLIST tabArray() const; -%MethodCode - int *tabs; - - Py_BEGIN_ALLOW_THREADS - tabs = sipCpp -> tabArray(); - Py_END_ALLOW_THREADS - - int len = 0; - - if (tabs) - { - int *tp = tabs; - - do - ++len; - while (*tp++ != 0); - } - - if ((sipRes = PyList_New(len)) == NULL) - sipIsErr = 1; - else if (tabs) - { - int *tp = tabs; - - len = 0; - - do - { - if (PyList_SetItem(sipRes,len,PyLong_FromLong((long)*tp)) < 0) - { - Py_DECREF(sipRes); - sipIsErr = 1; - break; - } - - ++len; - } - while (*tp++ != 0); - } -%End - - void setTabArray(SIP_PYLIST); -%MethodCode - int len, *tabs; - - len = PyList_GET_SIZE(a0); - - // Allocate space for the array. Note, this memory is never - // reclaimed. - if ((tabs = (int *)sipMalloc(len * sizeof (int))) == NULL) - sipIsErr = 1; - else - { - // Convert the list. - - long *tp = tabs; - - for (int i = 0; i < len; ++i) - { - *tp++ = PyLong_AsLong(PyList_GET_ITEM(a0,i)); - - if (PyErr_Occurred() != NULL) - { - sipFree((void *)tabs); - sipIsErr = 1; - break; - } - } - - if (!sipIsErr) - { - Py_BEGIN_ALLOW_THREADS - sipCpp -> setTabArray(tabs); - Py_END_ALLOW_THREADS - } - } -%End - - HANDLE handle() const; - static void initialize(); - static void cleanup(); - -private: - TQPainter(const TQPainter &); -}; - -%End - -%If (TQt_2_00 -) - class TQPainter : TQt { %TypeHeaderCode @@ -358,31 +104,17 @@ class TQPainter : TQt %End public: -%If (TQt_3_0_0 -) enum CoordinateMode { CoordDevice, CoordPainter }; -%End TQPainter(); -%If (- TQt_3_0_0) - TQPainter(const TQPaintDevice *); - TQPainter(const TQPaintDevice *,const TQWidget *); -%End -%If (TQt_3_0_0 -) TQPainter(const TQPaintDevice *,bool = 0); TQPainter(const TQPaintDevice *,const TQWidget *,bool = 0); -%End -%If (- TQt_3_0_0) - bool begin(const TQPaintDevice *); - bool begin(const TQPaintDevice *,const TQWidget *); -%End -%If (TQt_3_0_0 -) bool begin(const TQPaintDevice *,bool = 0); bool begin(const TQPaintDevice *,const TQWidget *,bool = 0); -%End bool end(); TQPaintDevice *device() const; @@ -390,9 +122,7 @@ public: bool isActive() const; -%If (TQt_3_0_0 -) void flush(const TQRegion &,CoordinateMode = CoordDevice); -%End void flush(); void save(); void restore(); @@ -410,9 +140,6 @@ public: void setBrush(const TQBrush &); void setBrush(BrushStyle); void setBrush(const TQColor &); -%If (TQt_2_1_0 -) - // The omission of this from TQt/Embedded is probably a bug. -%End const TQColor &backgroundColor() const; void setBackgroundColor(const TQColor &); @@ -449,10 +176,8 @@ public: %End void translate(double,double); void resetXForm(); -%If (TQt_3_0_0 -) double translationX() const; double translationY() const; -%End TQPoint xForm(const TQPoint &) const; TQRect xForm(const TQRect &) const; @@ -465,18 +190,10 @@ public: void setClipping(bool); bool hasClipping() const; -%If (- TQt_3_0_0) - const TQRegion &clipRegion() const; - void setClipRect(const TQRect &); - void setClipRect(int,int,int,int); - void setClipRegion(const TQRegion &); -%End -%If (TQt_3_0_0 -) TQRegion clipRegion(CoordinateMode = CoordDevice) const; void setClipRect(const TQRect &,CoordinateMode = CoordDevice); void setClipRect(int,int,int,int,CoordinateMode = CoordDevice); void setClipRegion(const TQRegion &,CoordinateMode = CoordDevice); -%End void drawPoint(int,int); void drawPoint(const TQPoint &); @@ -493,14 +210,8 @@ public: void drawWinFocusRect(int,int,int,int,const TQColor &); void drawWinFocusRect(const TQRect &); void drawWinFocusRect(const TQRect &,const TQColor &); -%If (- TQt_3_0_0) - void drawRoundRect(int,int,int,int,int,int); - void drawRoundRect(const TQRect &,int,int); -%End -%If (TQt_3_0_0 -) void drawRoundRect(int,int,int,int,int = 25,int = 25); void drawRoundRect(const TQRect &,int = 25,int = 25); -%End void drawEllipse(int,int,int,int); void drawEllipse(const TQRect &); void drawArc(int,int,int,int,int,int); @@ -512,69 +223,44 @@ public: void drawLineSegments(const TQPointArray &,int = 0,int = -1); void drawPolyline(const TQPointArray &,int = 0,int = -1); void drawPolygon(const TQPointArray &,bool = 0,int = 0,int = -1); -%If (- TQt_3_0_0) - void drawQuadBezier(const TQPointArray &,int = 0); -%End -%If (TQt_3_0_0 -) void drawConvexPolygon(const TQPointArray &,int = 0,int = -1); void drawCubicBezier(const TQPointArray &,int = 0); -%End void drawPixmap(int,int,const TQPixmap &,int = 0,int = 0,int = -1, int = -1); void drawPixmap(const TQPoint &,const TQPixmap &,const TQRect &); void drawPixmap(const TQPoint &,const TQPixmap &); -%If (TQt_3_0_0 -) void drawPixmap(const TQRect &,const TQPixmap &); -%End -%If (- TQt_3_0_0) - void drawImage(int,int,const TQImage &,int = 0,int = 0,int = -1, - int = -1); - void drawImage(const TQPoint &,const TQImage &,const TQRect &); - void drawImage(const TQPoint &,const TQImage &); -%End -%If (TQt_3_0_0 -) void drawImage(int,int,const TQImage &,int = 0,int = 0,int = -1, int = -1,int = 0); void drawImage(const TQPoint &,const TQImage &,const TQRect &,int = 0); void drawImage(const TQPoint &,const TQImage &,int = 0); void drawImage(const TQRect &,const TQImage &); -%End void drawTiledPixmap(int,int,int,int,const TQPixmap &,int = 0,int = 0); void drawTiledPixmap(const TQRect &,const TQPixmap &,const TQPoint &); void drawTiledPixmap(const TQRect &,const TQPixmap &); %If (TQt_PICTURE) void drawPicture(const TQPicture &); -%If (TQt_3_0_0 -) void drawPicture(int,int,const TQPicture &); void drawPicture(const TQPoint &,const TQPicture &); %End -%End void fillRect(int,int,int,int,const TQBrush &); void fillRect(const TQRect &,const TQBrush &); void eraseRect(int,int,int,int); void eraseRect(const TQRect &); -%If (TQt_3_0_0 -) enum TextDirection { Auto, RTL, LTR }; -%End -%If (- TQt_3_0_0) - void drawText(int,int,const TQString &,int = -1); - void drawText(const TQPoint &,const TQString &,int = -1); -%End -%If (TQt_3_0_0 -) void drawText(int,int,const TQString &,int = -1,TextDirection = Auto); void drawText(const TQPoint &,const TQString &,int = -1, TextDirection = Auto); void drawText(int,int,const TQString &,int,int,TextDirection = Auto); void drawText(const TQPoint &,const TQString &,int,int, TextDirection = Auto); -%End void drawText(int,int,int,int,int,const TQString &,int = -1,TQRect * = 0); void drawText(const TQRect &,int,const TQString &,int = -1,TQRect * = 0); @@ -672,5 +358,3 @@ public: private: TQPainter(const TQPainter &); }; - -%End diff --git a/sip/qt/qpair.sip b/sip/qt/qpair.sip index 5065d2a..1744b58 100644 --- a/sip/qt/qpair.sip +++ b/sip/qt/qpair.sip @@ -31,8 +31,6 @@ converted to and from Python tuples of two elements. %End -%If (TQt_3_0_0 -) - %MappedType TQPair<int,int> { %TypeHeaderCode @@ -79,5 +77,3 @@ converted to and from Python tuples of two elements. return 1; %End }; - -%End diff --git a/sip/qt/qpalette.sip b/sip/qt/qpalette.sip index f1489de..6e4bd98 100644 --- a/sip/qt/qpalette.sip +++ b/sip/qt/qpalette.sip @@ -39,21 +39,10 @@ class TQPalette public: TQPalette(); TQPalette(const TQColor &); -%If (TQt_2_00 -) TQPalette(const TQColor &,const TQColor &); -%End TQPalette(const TQColorGroup &,const TQColorGroup &,const TQColorGroup &); TQPalette(const TQPalette &); -%If (TQt_2_00 - TQt_2_1_0) - enum ColorGroup { - Normal, - Disabled, - Active, - NColorGroups - }; -%End -%If (TQt_2_1_0 -) enum ColorGroup { Normal, Disabled, @@ -61,31 +50,24 @@ public: Inactive, NColorGroups }; -%End -%If (TQt_2_00 -) const TQColor &color(ColorGroup,TQColorGroup::ColorRole) const; const TQBrush &brush(ColorGroup,TQColorGroup::ColorRole) const; void setColor(ColorGroup,TQColorGroup::ColorRole,const TQColor &); void setBrush(ColorGroup,TQColorGroup::ColorRole,const TQBrush &); void setColor(TQColorGroup::ColorRole,const TQColor &); void setBrush(TQColorGroup::ColorRole,const TQBrush &); -%End TQPalette copy() const; const TQColorGroup &active() const; const TQColorGroup &disabled() const; -%If (TQt_2_1_0 -) const TQColorGroup &inactive() const; -%End const TQColorGroup &normal() const; void setActive(const TQColorGroup &); void setDisabled(const TQColorGroup &); -%If (TQt_2_1_0 -) void setInactive(const TQColorGroup &); -%End void setNormal(const TQColorGroup &); bool operator==(const TQPalette &) const; @@ -94,9 +76,7 @@ public: bool isCopyOf(const TQPalette &); int serialNumber() const; -%If (TQt_3_0_0 -) // These are defined in TQt3, but don't appear in the documentation. //static TQColorGroup::ColorRole foregroundRoleFromMode(TQt::BackgroundMode); //static TQColorGroup::ColorRole backgroundRoleFromMode(TQt::BackgroundMode); -%End }; diff --git a/sip/qt/qpen.sip b/sip/qt/qpen.sip index e6c9774..b80752b 100644 --- a/sip/qt/qpen.sip +++ b/sip/qt/qpen.sip @@ -30,42 +30,6 @@ %End -%If (- TQt_2_00) - -enum PenStyle { - NoPen, - SolidLine, - DashLine, - DotLine, - DashDotLine, - DashDotDotLine -}; - - -class TQPen -{ -%TypeHeaderCode -#include <tqpen.h> -%End - -public: - TQPen(); - TQPen(PenStyle); - TQPen(const TQColor &,uint = 0,PenStyle = SolidLine); - TQPen(const TQPen &); - - PenStyle style() const; - void setStyle(PenStyle); - uint width() const; - void setWidth(uint); - const TQColor &color() const; - void setColor(const TQColor &); -}; - -%End - -%If (TQt_2_00 -) - class TQPen : TQt { %TypeHeaderCode @@ -76,9 +40,7 @@ public: TQPen(); TQPen(PenStyle); TQPen(const TQColor &,uint = 0,PenStyle = SolidLine); -%If (TQt_2_1_0 -) TQPen(const TQColor &,uint,PenStyle,PenCapStyle,PenJoinStyle); -%End TQPen(const TQPen &); PenStyle style() const; @@ -87,15 +49,11 @@ public: void setWidth(uint); const TQColor &color() const; void setColor(const TQColor &); -%If (TQt_2_1_0 -) PenCapStyle capStyle() const; void setCapStyle(PenCapStyle); PenJoinStyle joinStyle() const; void setJoinStyle(PenJoinStyle); -%End bool operator==(const TQPen &) const; bool operator!=(const TQPen &) const; }; - -%End diff --git a/sip/qt/qpicture.sip b/sip/qt/qpicture.sip index bc93254..9bcd839 100644 --- a/sip/qt/qpicture.sip +++ b/sip/qt/qpicture.sip @@ -52,60 +52,30 @@ class TQPicture : TQPaintDevice %End public: -%If (- TQt_2_00) - TQPicture(); -%End -%If (TQt_2_00 - TQt_3_0_0) - TQPicture(int = 0); -%End -%If (TQt_3_0_0 -) TQPicture(int = -1); TQPicture(const TQPicture &); -%End bool isNull() const; uint size() const; // const char *data() const; -%If (- TQt_2_00) - void setData(const char * /Array/,uint /ArraySize/); -%End -%If (TQt_2_00 -) virtual void setData(const char * /Array/,uint /ArraySize/); -%End bool play(TQPainter *); -%If (- TQt_2_00) - bool load(const char *); - bool save(const char *); -%End -%If (TQt_2_00 - TQt_3_0_0) - bool load(const TQString &); - bool save(const TQString &); -%End -%If (TQt_3_0_0 -) bool load(TQIODevice *,const char * = 0); bool load(const TQString &,const char * = 0); bool save(TQIODevice *,const char * = 0); bool save(const TQString &,const char * = 0); TQRect boundingRect() const; -%End -%If (TQt_3_1_0 -) void setBoundingRect(const TQRect &); -%End protected: -%If (TQt_3_0_0 -) void detach(); TQPicture copy() const; -%End private: -%If (- TQt_3_0_0) - TQPicture(const TQPicture &); -%End }; %End diff --git a/sip/qt/qpixmap.sip b/sip/qt/qpixmap.sip index ce409fd..da18766 100644 --- a/sip/qt/qpixmap.sip +++ b/sip/qt/qpixmap.sip @@ -56,103 +56,6 @@ Not implemented. %End -%If (- TQt_2_00) - -class TQPixmap : TQPaintDevice -{ -%TypeHeaderCode -#include <tqpixmap.h> -%End - -public: - enum ColorMode - { - Auto, - Color, - Mono - }; - - TQPixmap(); - TQPixmap(int,int,int = -1); - TQPixmap(const TQSize &,int = -1); - TQPixmap(const char *,const char * = 0,ColorMode = Auto); - TQPixmap(const char *,const char *,int); - - TQPixmap(SIP_PYLIST) [(const char **)]; -%MethodCode - // The Python interface is a list of strings that make up the - // image. - - const char **str; - - if ((str = PyTQt_qt_ListToArray(a0)) == NULL) - sipIsErr = 1; - else - { - Py_BEGIN_ALLOW_THREADS - sipCpp = new sipTQPixmap(str); - Py_END_ALLOW_THREADS - - sipFree((void *)str); - } -%End - - TQPixmap(const TQPixmap &); - - bool isNull() const; - int width() const; - int height() const; - TQSize size() const; - TQRect rect() const; - int depth() const; - static int defaultDepth(); - void fill(const TQColor & = white); - void fill(const TQWidget *,int,int); - void fill(const TQWidget *,const TQPoint &); - void resize(int,int); - void resize(const TQSize &); - const TQBitmap *mask() const; - void setMask(const TQBitmap &); - bool selfMask() const; - TQBitmap createHeuristicMask(bool = 1) const; - static TQPixmap grabWindow(WId,int = 0,int = 0,int = -1,int = -1); - TQPixmap xForm(const TQWMatrix &) const; - static TQWMatrix trueMatrix(const TQWMatrix &,int,int); - TQImage convertToImage() const; - bool convertFromImage(const TQImage &,ColorMode = Auto); - bool convertFromImage(const TQImage &,int); - static const char *imageFormat(const char *); - bool load(const char *,const char * = 0,ColorMode = Auto); - bool load(const char *,const char *,int); - bool loadFromData(const uchar * /Array/,uint /ArraySize/, - const char * = 0,ColorMode = Auto); -// bool loadFromData(const uchar *,uint,const char *,int); - bool loadFromData(TQByteArray,const char * = 0,int = 0); - bool save(const char *,const char *) const; - int serialNumber() const; - - enum Optimization - { - NoOptim, - NormalOptim, - BestOptim - }; - - Optimization optimization() const; - void setOptimization(Optimization); - static Optimization defaultOptimization(); - static void setDefaultOptimization(Optimization); - virtual void detach(); - bool isTQBitmap() const; - -protected: - TQPixmap(int,int,const uchar *,bool); -}; - -%End - -%If (TQt_2_00 -) - class TQPixmap : TQPaintDevice, TQt { %TypeHeaderCode @@ -177,9 +80,7 @@ public: }; TQPixmap(); -%If (TQt_3_0_0 -) TQPixmap(const TQImage &); -%End TQPixmap(int,int,int = -1,Optimization = DefaultOptim); TQPixmap(const TQSize &,int = -1,Optimization = DefaultOptim); TQPixmap(const TQString &,const char * = 0,ColorMode = Auto); @@ -222,20 +123,12 @@ public: const TQBitmap *mask() const; void setMask(const TQBitmap &); bool selfMask() const; -%If (TQt_3_1_0 -) bool hasAlpha() const; -%End -%If (TQt_3_2_0 -) bool hasAlphaChannel() const; -%End TQBitmap createHeuristicMask(bool = 1) const; -%If (TQt_3_1_0 -) static TQPixmap fromMimeSource(const TQString &); -%End static TQPixmap grabWindow(WId,int = 0,int = 0,int = -1,int = -1); -%If (TQt_2_1_0 -) static TQPixmap grabWidget(TQWidget *,int = 0,int = 0,int = -1,int = -1); -%End TQPixmap xForm(const TQWMatrix &) const; static TQWMatrix trueMatrix(const TQWMatrix &,int,int); @@ -249,18 +142,8 @@ public: const char * = 0,ColorMode = Auto); // bool loadFromData(const uchar *,uint,const char *,int); bool loadFromData(TQByteArray,const char * = 0,int = 0); -%If (- TQt_3_0_0) - bool save(const TQString &,const char *) const; -%End -%If (TQt_2_2_0 - TQt_3_0_0) - bool save(const TQString &,const char *,int) const; -%End -%If (TQt_3_0_0 -) bool save(const TQString &,const char *,int = -1) const; -%End -%If (TQt_3_2_0 -) bool save(TQIODevice *,const char *,int = -1) const; -%End int serialNumber() const; Optimization optimization() const; void setOptimization(Optimization); @@ -269,20 +152,14 @@ public: virtual void detach(); bool isTQBitmap() const; -%If (TQt_3_0_0 -) %If (WS_X11) static int x11SetDefaultScreen(int); void x11SetScreen(int); %End -%End protected: TQPixmap(int,int,const uchar *,bool); }; -%End - -%If (TQt_3_2_0 -) void copyBlt(TQPixmap *,int,int,const TQPixmap *,int = 0,int = 0,int = -1, int = -1); -%End diff --git a/sip/qt/qpixmapcache.sip b/sip/qt/qpixmapcache.sip index 773397e..c8a6c30 100644 --- a/sip/qt/qpixmapcache.sip +++ b/sip/qt/qpixmapcache.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQPixmapCache { %TypeHeaderCode @@ -44,10 +42,6 @@ public: static bool find(const TQString &,TQPixmap &); // static bool insert(const TQString &,TQPixmap *); static bool insert(const TQString &,const TQPixmap &); -%If (TQt_3_2_0 -) static void remove(const TQString &); -%End static void clear(); }; - -%End diff --git a/sip/qt/qplatinumstyle.sip b/sip/qt/qplatinumstyle.sip index f684e9f..78da451 100644 --- a/sip/qt/qplatinumstyle.sip +++ b/sip/qt/qplatinumstyle.sip @@ -40,7 +40,6 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the %End -%If (TQt_2_00 -) %If (TQt_STYLE_PLATINUM) class TQPlatinumStyle : TQWindowsStyle @@ -52,48 +51,6 @@ class TQPlatinumStyle : TQWindowsStyle public: TQPlatinumStyle(); -%If (- TQt_3_0_0) - void drawPopupPanel(TQPainter *,int,int,int,int,const TQColorGroup &, - int = 2,const TQBrush * = 0); - void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0, - const TQBrush * = 0); - TQRect buttonRect(int,int,int,int); - void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,const TQBrush * = 0); - void drawPushButton(TQPushButton *,TQPainter *); - void drawPushButtonLabel(TQPushButton *,TQPainter *); - - void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &); - - void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint); - ScrollControl scrollBarPointOver(const TQScrollBar *,int,const TQPoint &); - TQSize indicatorSize() const; - void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int, - bool = 0,bool = 1); - void drawIndicatorMask(TQPainter *,int,int,int,int,int); - TQSize exclusiveIndicatorSize() const; - void drawExclusiveIndicator(TQPainter *,int,int,int,int, - const TQColorGroup &,bool,bool = 0,bool = 1); - void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,bool = 0,bool = 1,const TQBrush * = 0); - TQRect comboButtonRect(int,int,int,int); - TQRect comboButtonFocusRect(int,int,int,int); - int sliderLength() const; - void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &, - Orientation,bool,bool); - void drawSliderMask(TQPainter *,int,int,int,int,Orientation,bool,bool); - void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &, - TQCOORD,Orientation); - int maximumSliderDragDistance() const; - void drawCheckMark(TQPainter *,int,int,int,int,const TQColorGroup &, - bool,bool); - void polishPopupMenu(TQPopupMenu *); - int extraPopupMenuItemWidth(bool,int,TQMenuItem *,const TQFontMetrics &); - int popupMenuItemHeight(bool,TQMenuItem *,const TQFontMetrics &); - void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *, - const TQPalette &,bool,bool,int,int,int,int); -%End -%If (TQt_3_0_0 -) void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &, const TQColorGroup &,SFlags = Style_Default, const TQStyleOption & = TQStyleOption()) const; @@ -115,28 +72,14 @@ public: int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const; TQRect subRect(SubRect,const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const; -%End protected: -%If (- TQt_3_0_0) - void drawScrollBarBackground(TQPainter *,int,int,int,int, - const TQColorGroup &,bool, - const TQBrush * = 0); -%End TQColor mixedColor(const TQColor &,const TQColor &) const; -%If (- TQt_3_0_0) - void drawRiffles(TQPainter *,int,int,int,int,const TQColorGroup &,bool); -%End -%If (TQt_3_0_0 -) void drawRiffles(TQPainter *,int,int,int,int,const TQColorGroup &, bool) const; -%End private: -%If (TQt_3_0_0 -) TQPlatinumStyle(const TQPlatinumStyle &); -%End }; %End -%End diff --git a/sip/qt/qpoint.sip b/sip/qt/qpoint.sip index 53de29f..d82f529 100644 --- a/sip/qt/qpoint.sip +++ b/sip/qt/qpoint.sip @@ -66,9 +66,7 @@ public: int y() const; void setX(int); void setY(int); -%If (TQt_2_00 -) int manhattanLength() const; -%End // TQCOORD &rx(); // TQCOORD &ry(); diff --git a/sip/qt/qpointarray.sip b/sip/qt/qpointarray.sip index 5112a2f..e0c83b8 100644 --- a/sip/qt/qpointarray.sip +++ b/sip/qt/qpointarray.sip @@ -203,27 +203,14 @@ public: %End // bool putPoints(int,int,int,int,...); -%If (TQt_3_0_0 -) bool putPoints(int,int,const TQPointArray &,int = 0); -%End - -%If (- TQt_2_00) - TQPoint at(uint) const; -%End void makeArc(int,int,int,int,int,int); void makeEllipse(int,int,int,int); %If (TQt_TRANSFORMATIONS) -%If (TQt_2_00 -) void makeArc(int,int,int,int,int,int,const TQWMatrix &); %End -%End -%If (- TQt_3_0_0) - TQPointArray quadBezier() const; -%End -%If (TQt_3_0_0 -) TQPointArray cubicBezier() const; -%End // These are actually in TQArray, which isn't implemented so pretend // they are here. @@ -235,13 +222,9 @@ public: uint size() const; bool truncate(uint); bool fill(const TQPoint &,int = -1); -%If (TQt_2_00 -) TQPoint &at(uint) const; -%End -%If (TQt_2_1_0 -) void sort(); int bsearch(const TQPoint &) const; -%End int find(const TQPoint &,uint = 0) const; int contains(const TQPoint &) const; }; diff --git a/sip/qt/qpopupmenu.sip b/sip/qt/qpopupmenu.sip index 7d52991..0e08bf5 100644 --- a/sip/qt/qpopupmenu.sip +++ b/sip/qt/qpopupmenu.sip @@ -56,97 +56,6 @@ ensures that the menu is deleted without having to explicity code it using %End -%If (- TQt_2_00) - -class TQPopupMenu : TQTableView, TQMenuData -{ -%TypeHeaderCode -#include <tqpopupmenu.h> -%End - -public: - TQPopupMenu(TQWidget * /TransferThis/ = 0,const char * = 0); - - void popup(const TQPoint &,int = 0); - void updateItem(int); - void setCheckable(bool); - bool isCheckable() const; - void setFont(const TQFont &); - void show(); - void hide(); - - int exec() /PyName=exec_loop, ReleaseGIL, - PreHook=__pyTQtPreEventLoopHook__, - PostHook=__pyTQtPostEventLoopHook__/; -%MethodCode - // Transfer ownership back to Python (a modal menu will - // probably have the main window as it's parent). This means - // the TQt menu will be deleted when the Python wrapper is - // garbage collected. Although this is a little inconsistent, - // it saves having to code it explicitly to avoid the memory - // leak. - sipTransferBack(sipSelf); - - Py_BEGIN_ALLOW_THREADS - sipRes = sipCpp->TQPopupMenu::exec(); - Py_END_ALLOW_THREADS -%End - - int exec(const TQPoint &,int = 0) /PyName=exec_loop, ReleaseGIL, - PreHook=__pyTQtPreEventLoopHook__, - PostHook=__pyTQtPostEventLoopHook__/; -%MethodCode - // Transfer ownership back to Python (a modal menu will - // probably have the main window as it's parent). This means - // the TQt menu will be deleted when the Python wrapper is - // garbage collected. Although this is a little inconsistent, - // it saves having to code it explicitly to avoid the memory - // leak. - sipTransferBack(sipSelf); - - Py_BEGIN_ALLOW_THREADS - sipRes = sipCpp->TQPopupMenu::exec(*a0,a1); - Py_END_ALLOW_THREADS -%End - - void setActiveItem(int); - int idAt(int) const; -%If (TQt_1_43 -) - int idAt(const TQPoint &) const; -%End - -signals: - void activated(int); - void highlighted(int); - void activatedRedirect(int); - void highlightedRedirect(int); - void aboutToShow(); - -protected: - int cellHeight(int); - int cellWidth(int); - void paintCell(TQPainter *,int,int); - void paintEvent(TQPaintEvent *); - void mousePressEvent(TQMouseEvent *); - void mouseReleaseEvent(TQMouseEvent *); - void mouseMoveEvent(TQMouseEvent *); - void keyPressEvent(TQKeyEvent *); - void timerEvent(TQTimerEvent *); - -private: - TQPopupMenu(const TQPopupMenu &); - void menuContentsChanged(); - void menuStateChanged(); - void menuInsPopup(TQPopupMenu *); - void menuDelPopup(TQPopupMenu *); - void frameChanged(); -}; - -%End - - -%If (TQt_2_00 -) - class TQPopupMenu : TQFrame, TQMenuData { %TypeHeaderCode @@ -156,12 +65,7 @@ class TQPopupMenu : TQFrame, TQMenuData public: TQPopupMenu(TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_3_0_5) - void popup(const TQPoint &,int = 0); -%End -%If (TQt_3_0_5 -) void popup(const TQPoint &,int = -1); -%End void updateItem(int); virtual void setCheckable(bool); @@ -213,16 +117,10 @@ public: bool customWhatsThis() const; -%If (TQt_2_1_0 -) int insertTearOffHandle(int = -1,int = -1); -%End -%If (TQt_2_2_0 -) void activateItemAt(int); -%End -%If (TQt_3_0_0 -) TQRect itemGeometry(int); -%End signals: void activated(int); @@ -230,9 +128,7 @@ signals: void activatedRedirect(int); void highlightedRedirect(int); void aboutToShow(); -%If (TQt_2_2_0 -) void aboutToHide(); -%End protected: int itemHeight(int) const; @@ -247,27 +143,17 @@ protected: void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); void keyPressEvent(TQKeyEvent *); -%If (TQt_2_1_0 -) void focusInEvent(TQFocusEvent *); void focusOutEvent(TQFocusEvent *); -%End void timerEvent(TQTimerEvent *); -%If (TQt_3_0_0 -) void leaveEvent(TQEvent *); -%End void styleChange(TQStyle &); -%If (TQt_3_1_0 -) void enabledChange(bool); -%End -%If (TQt_2_1_0 -) int columns() const; bool focusNextPrevChild(bool); -%End -%If (TQt_3_0_0 -) int itemAtPos(const TQPoint &,bool = 1) const; -%End private: TQPopupMenu(const TQPopupMenu &); @@ -278,5 +164,3 @@ private: void menuDelPopup(TQPopupMenu *); void frameChanged(); }; - -%End diff --git a/sip/qt/qprintdialog.sip b/sip/qt/qprintdialog.sip index c7d2513..ad2e952 100644 --- a/sip/qt/qprintdialog.sip +++ b/sip/qt/qprintdialog.sip @@ -41,20 +41,13 @@ class TQPrintDialog : TQDialog public: TQPrintDialog(TQPrinter *,TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_3_0_0) - static bool getPrinterSetup(TQPrinter *); -%End -%If (TQt_3_0_0 -) static bool getPrinterSetup(TQPrinter *,TQWidget * = 0); static void setGlobalPrintDialog(TQPrintDialog *); -%End void setPrinter(TQPrinter *,bool = 0); TQPrinter *printer() const; -%If (TQt_2_1_0 -) void addButton(TQPushButton *); -%End private: TQPrintDialog(const TQPrintDialog &); diff --git a/sip/qt/qprinter.sip b/sip/qt/qprinter.sip index b1bdd96..fbe7709 100644 --- a/sip/qt/qprinter.sip +++ b/sip/qt/qprinter.sip @@ -38,21 +38,14 @@ class TQPrinter : TQPaintDevice %End public: -%If (TQt_3_0_0 -) enum PrinterMode { ScreenResolution, PrinterResolution, HighResolution, Compatible }; -%End -%If (- TQt_3_0_0) - TQPrinter(); -%End -%If (TQt_3_0_0 -) TQPrinter(PrinterMode = ScreenResolution); -%End enum Orientation { Portrait, @@ -63,12 +56,8 @@ public: A4, B5, Letter, Legal, Executive, A0, A1, A2, A3, A5, A6, A7, A8, A9, B0, B1, B10, B2, B3, B4, B6, B7, B8, B9, C5E, Comm10E, DLE, Folio, Ledger, Tabloid, -%If (TQt_2_3_1 -) Custom, -%End -%If (TQt_2_00 -) NPageSize -%End }; enum PageOrder { @@ -81,7 +70,6 @@ public: Color }; -%If (TQt_3_0_0 -) enum PaperSource { OnlyOne, Lower, @@ -97,9 +85,7 @@ public: Cassette, FormSource }; -%End -%If (TQt_3_2_0 -) enum PrintRange { AllPages, Selection, @@ -111,31 +97,10 @@ public: PrintSelection, PrintPageRange }; -%End -%If (- TQt_2_00) - const char *printerName() const; - void setPrinterName(const char *); -%End -%If (TQt_2_00 -) TQString printerName() const; virtual void setPrinterName(const TQString &); -%End bool outputToFile() const; -%If (- TQt_2_00) - void setOutputToFile(bool); - const char *outputFileName() const; - void setOutputFileName(const char *); - - const char *printProgram() const; - void setPrintProgram(const char *); - - const char *docName() const; - void setDocName(const char *); - const char *creator() const; - void setCreator(const char *); -%End -%If (TQt_2_00 -) virtual void setOutputToFile(bool); TQString outputFileName() const; virtual void setOutputFileName(const TQString &); @@ -150,88 +115,45 @@ public: virtual void setDocName(const TQString &); TQString creator() const; virtual void setCreator(const TQString &); -%End Orientation orientation() const; -%If (- TQt_2_00) - void setOrientation(Orientation); -%End -%If (TQt_2_00 -) virtual void setOrientation(Orientation); -%End PageSize pageSize() const; -%If (- TQt_2_00) - void setPageSize(PageSize); - - void setPageOrder(PageOrder); -%End -%If (TQt_2_00 -) virtual void setPageSize(PageSize); virtual void setPageOrder(PageOrder); -%End PageOrder pageOrder() const; -%If (TQt_3_0_0 -) void setResolution(int); int resolution() const; -%End -%If (- TQt_2_00) - void setColorMode(ColorMode); -%End -%If (TQt_2_00 -) virtual void setColorMode(ColorMode); -%End ColorMode colorMode() const; -%If (TQt_2_00 -) virtual void setFullPage(bool); bool fullPage() const; TQSize margins() const; -%End -%If (TQt_3_1_0 -) void setMargins(uint,uint,uint,uint); // void margins(uint *,uint *,uint *,uint *) const; -%End int fromPage() const; int toPage() const; -%If (- TQt_2_00) - void setFromTo(int,int); -%End -%If (TQt_2_00 -) virtual void setFromTo(int,int); -%End int minPage() const; int maxPage() const; -%If (- TQt_2_00) - void setMinMax(int,int); -%End -%If (TQt_2_00 -) virtual void setMinMax(int,int); -%End int numCopies() const; -%If (- TQt_2_00) - void setNumCopies(int); -%End -%If (TQt_2_00 -) virtual void setNumCopies(int); -%End -%If (TQt_3_0_0 -) bool collateCopiesEnabled() const; void setCollateCopiesEnabled(bool); bool collateCopies() const; void setCollateCopies(bool); -%End -%If (TQt_3_2_0 -) PrintRange printRange() const; void setPrintRange(PrintRange); -%End bool newPage(); bool abort(); @@ -239,15 +161,11 @@ public: bool setup(TQWidget * = 0); -%If (TQt_3_0_0 -) PaperSource paperSource() const; virtual void setPaperSource(PaperSource); -%End -%If (TQt_3_2_0 -) void setOptionEnabled(PrinterOption,bool); bool isOptionEnabled(PrinterOption); -%End private: TQPrinter(const TQPrinter &); diff --git a/sip/qt/qprocess.sip b/sip/qt/qprocess.sip index 2877471..8581534 100644 --- a/sip/qt/qprocess.sip +++ b/sip/qt/qprocess.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQProcess : TQObject { %TypeHeaderCode @@ -104,9 +102,5 @@ protected: void disconnectNotify(const char *); private: -%If (TQt_3_1_0 -) TQProcess(const TQProcess &); -%End }; - -%End diff --git a/sip/qt/qprogressbar.sip b/sip/qt/qprogressbar.sip index 4f4b5d4..0bae238 100644 --- a/sip/qt/qprogressbar.sip +++ b/sip/qt/qprogressbar.sip @@ -41,15 +41,9 @@ public: int totalSteps() const; int progress() const; -%If (TQt_3_0_0 -) const TQString &progressString() const; -%End TQSize sizeHint() const; -%If (TQt_2_00 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End -%If (TQt_2_00 -) TQSize minimumSizeHint() const; void setCenterIndicator(bool); @@ -57,38 +51,22 @@ public: void setIndicatorFollowsStyle(bool); bool indicatorFollowsStyle() const; -%End -%If (TQt_3_0_0 -) bool percentageVisible() const; void setPercentageVisible(bool); -%End void show(); public slots: void reset(); -%If (- TQt_2_00) - void setTotalSteps(int); - void setProgress(int); -%End -%If (TQt_2_00 -) virtual void setTotalSteps(int); virtual void setProgress(int); -%End -%If (TQt_3_1_0 -) void setProgress(int,int); -%End protected: void drawContents(TQPainter *); virtual bool setIndicator(TQString &,int,int); -%If (TQt_2_00 - TQt_3_0_0) - void drawContentsMask(TQPainter *); -%End -%If (TQt_2_00 -) void styleChange(TQStyle &); -%End private: TQProgressBar(const TQProgressBar &); diff --git a/sip/qt/qprogressdialog.sip b/sip/qt/qprogressdialog.sip index 07ec294..4b21b55 100644 --- a/sip/qt/qprogressdialog.sip +++ b/sip/qt/qprogressdialog.sip @@ -32,8 +32,6 @@ value. %If (TQt_PROGRESSDIALOG) -%If (TQt_3_0_0 -) - class TQProgressDialog : TQDialog { %TypeHeaderCode @@ -52,9 +50,7 @@ public: void setBar(TQProgressBar *); bool wasCancelled() const; -%If (TQt_3_2_0 -) bool wasCanceled() const; -%End int totalSteps() const; int progress() const; @@ -75,9 +71,7 @@ public slots: void reset(); void setTotalSteps(int); void setProgress(int); -%If (TQt_3_1_0 -) void setProgress(int,int); -%End void setLabelText(const TQString &); void setCancelButtonText(const TQString &); @@ -85,9 +79,7 @@ public slots: signals: void cancelled(); -%If (TQt_3_2_0 -) void canceled(); -%End protected: void resizeEvent(TQResizeEvent *); @@ -103,92 +95,3 @@ private: }; %End - - -%If (- TQt_3_0_0) - -class TQProgressDialog : TQSemiModal -{ -%TypeHeaderCode -#include <tqprogressdialog.h> -%End - -public: - TQProgressDialog(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0, - WFlags = 0); -%If (- TQt_2_00) - TQProgressDialog(const char *,const char *,int,TQWidget * /TransferThis/ = 0, - const char * = 0,bool = 0,WFlags = 0); -%End -%If (TQt_2_00 -) - TQProgressDialog(const TQString &,const TQString &,int, - TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0, - WFlags = 0); -%End - - void setLabel(TQLabel *); - void setCancelButton(TQPushButton *); - void setBar(TQProgressBar *); - - bool wasCancelled() const; - - int totalSteps() const; - int progress() const; - - TQSize sizeHint() const; - - int minimumDuration() const; - -%If (TQt_2_1_0 -) - TQString labelText() const; - - void setAutoReset(bool); - bool autoReset() const; - void setAutoClose(bool); - bool autoClose() const; -%End - -public slots: - void cancel(); - void reset(); - void setTotalSteps(int); - void setProgress(int); -%If (- TQt_2_00) - void setLabelText(const char *); - void setCancelButtonText(const char *); -%End -%If (TQt_2_00 -) - void setLabelText(const TQString &); - void setCancelButtonText(const TQString &); -%End - - void setMinimumDuration(int); - -signals: - void cancelled(); - -protected: - void resizeEvent(TQResizeEvent *); -%If (- TQt_2_00) - void styleChange(GUIStyle); -%End -%If (TQt_2_00 -) - void closeEvent(TQCloseEvent *); - void styleChange(TQStyle &); -%End -%If (TQt_2_1_0 -) - void showEvent(TQShowEvent *); -%End - -protected slots: -%If (TQt_2_2_0 -) - void forceShow(); -%End - -private: - TQProgressDialog(const TQProgressDialog &); -}; - -%End - -%End diff --git a/sip/qt/qptrlist.sip b/sip/qt/qptrlist.sip index 3ecff8c..5250eb8 100644 --- a/sip/qt/qptrlist.sip +++ b/sip/qt/qptrlist.sip @@ -31,8 +31,6 @@ converted to and from Python lists of the type. %End -%If (TQt_2_00 -) - template<Type> %MappedType TQPtrList<Type> { @@ -107,5 +105,3 @@ template<Type> return sipGetState(sipTransferObj); %End }; - -%End diff --git a/sip/qt/qpushbutton.sip b/sip/qt/qpushbutton.sip index 4fb26b1..77c4d7a 100644 --- a/sip/qt/qpushbutton.sip +++ b/sip/qt/qpushbutton.sip @@ -37,107 +37,46 @@ class TQPushButton : TQButton %End public: -%If (- TQt_2_00) - TQPushButton(TQWidget * /TransferThis/ = 0,const char * = 0); - TQPushButton(const char *,TQWidget * /TransferThis/ = 0,const char * = 0); -%End -%If (TQt_2_00 -) TQPushButton(TQWidget * /TransferThis/,const char * = 0); TQPushButton(const TQString &,TQWidget * /TransferThis/,const char * = 0); -%End -%If (TQt_2_1_0 -) TQPushButton(const TQIconSet &,const TQString &,TQWidget * /TransferThis/,const char * = 0); -%End TQSize sizeHint() const; -%If (TQt_2_00 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End void move(int,int); void move(const TQPoint &); void resize(int,int); void resize(const TQSize &); -%If (- TQt_2_00) - void setGeometry(int,int,int,int); - - void setGeometry(const TQRect &); - - void setToggleButton(bool); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setGeometry(int,int,int,int); - - virtual void setGeometry(const TQRect &); - - virtual void setToggleButton(bool); -%End -%If (TQt_3_0_0 -) void setGeometry(int,int,int,int); void setGeometry(const TQRect &); void setToggleButton(bool); -%End bool autoDefault() const; -%If (- TQt_2_00) - void setAutoDefault(bool); -%End -%If (TQt_2_00 -) virtual void setAutoDefault(bool); -%End bool isDefault() const; -%If (- TQt_2_00) - void setDefault(bool); -%End -%If (TQt_2_00 -) virtual void setDefault(bool); -%End - -%If (- TQt_2_00) - void setIsMenuButton(bool); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setIsMenuButton(bool); -%End -%If (- TQt_3_0_0) - bool isMenuButton() const; -%End -%If (TQt_2_1_0 -) void setPopup(TQPopupMenu *); TQPopupMenu *popup() const; void setIconSet(const TQIconSet &); TQIconSet *iconSet() const; -%End -%If (TQt_2_2_0 -) void setFlat(bool); bool isFlat() const; -%End public slots: -%If (- TQt_2_00) - void setOn(bool); -%End -%If (TQt_2_00 -) virtual void setOn(bool); -%End -%If (- TQt_3_0_0) - void toggle(); -%End protected: void drawButton(TQPainter *); void drawButtonLabel(TQPainter *); void focusInEvent(TQFocusEvent *); -%If (TQt_2_00 -) void focusOutEvent(TQFocusEvent *); void resizeEvent(TQResizeEvent *); void updateMask(); -%End private: TQPushButton(const TQPushButton &); diff --git a/sip/qt/qradiobutton.sip b/sip/qt/qradiobutton.sip index e30fedd..ea5c5d3 100644 --- a/sip/qt/qradiobutton.sip +++ b/sip/qt/qradiobutton.sip @@ -36,48 +36,23 @@ class TQRadioButton : TQButton %End public: -%If (- TQt_2_00) - TQRadioButton(TQWidget * /TransferThis/ = 0,const char * = 0); - TQRadioButton(const char *,TQWidget * /TransferThis/ = 0,const char * = 0); -%End -%If (TQt_2_00 -) TQRadioButton(TQWidget * /TransferThis/,const char * = 0); TQRadioButton(const TQString &,TQWidget * /TransferThis/,const char * = 0); -%End bool isChecked() const; TQSize sizeHint() const; -%If (- TQt_2_00) - void setChecked(bool); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setChecked(bool); - TQSizePolicy sizePolicy() const; -%End - public slots: -%If (TQt_3_0_0 -) virtual void setChecked(bool); -%End protected: bool hitButton(const TQPoint &) const; void drawButton(TQPainter *); void drawButtonLabel(TQPainter *); -%If (- TQt_2_00) - void mouseReleaseEvent(TQMouseEvent *); - void keyPressEvent(TQKeyEvent *); -%End -%If (TQt_2_00 -) void updateMask(); void resizeEvent(TQResizeEvent *); -%End -%If (TQt_2_00 - TQt_3_0_0) - void focusInEvent(TQFocusEvent *); -%End private: TQRadioButton(const TQRadioButton &); diff --git a/sip/qt/qrangecontrol.sip b/sip/qt/qrangecontrol.sip index 77b38d4..f6e760d 100644 --- a/sip/qt/qrangecontrol.sip +++ b/sip/qt/qrangecontrol.sip @@ -49,24 +49,18 @@ public: int minValue() const; int maxValue() const; void setRange(int,int); -%If (TQt_3_0_0 -) void setMinValue(int); void setMaxValue(int); -%End int lineStep() const; int pageStep() const; void setSteps(int,int); -%If (TQt_2_00 -) int bound(int) const; -%End protected: -%If (TQt_2_00 -) int positionFromValue(int,int) const; int valueFromPosition(int,int) const; -%End void directSetValue(int); int prevValue() const; diff --git a/sip/qt/qrect.sip b/sip/qt/qrect.sip index 0026b97..f045752 100644 --- a/sip/qt/qrect.sip +++ b/sip/qt/qrect.sip @@ -109,12 +109,10 @@ public: int right() const; int bottom() const; -%If (TQt_2_00 -) // TQCOORD &rLeft(); // TQCOORD &rTop(); // TQCOORD &rRight(); // TQCOORD &rBottom(); -%End int x() const; int y() const; @@ -125,12 +123,10 @@ public: void setX(int); void setY(int); -%If (TQt_3_1_0 -) void setTopLeft(const TQPoint &); void setBottomRight(const TQPoint &); void setTopRight(const TQPoint &); void setBottomLeft(const TQPoint &); -%End TQPoint topLeft() const; TQPoint bottomRight() const; @@ -141,12 +137,10 @@ public: void rect(int *,int *,int *,int *) const; void coords(int *,int *,int *,int *) const; -%If (TQt_3_1_0 -) void moveLeft(int); void moveTop(int); void moveRight(int); void moveBottom(int); -%End void moveTopLeft(const TQPoint &); void moveBottomLeft(const TQPoint &); void moveTopRight(const TQPoint &); @@ -156,9 +150,7 @@ public: void setRect(int,int,int,int); void setCoords(int,int,int,int); -%If (TQt_3_0_0 -) void addCoords(int,int,int,int); -%End TQSize size() const; int width() const; @@ -184,13 +176,8 @@ public: sipRes = sipCpp -> contains(*a0); %End -%If (TQt_3_1_0 -) bool contains(int,int) const; bool contains(int,int,bool) const; -%End -%If (TQt_2_2_0 - TQt_3_1_0) - bool contains(int,int,bool = 0) const; -%End bool contains(const TQRect &,bool = 0) const; int __contains__(const TQRect &) const; diff --git a/sip/qt/qregexp.sip b/sip/qt/qregexp.sip index 3bb3b0e..02feb48 100644 --- a/sip/qt/qregexp.sip +++ b/sip/qt/qregexp.sip @@ -61,21 +61,14 @@ class TQRegExp %End public: -%If (TQt_3_1_0 -) enum CaretMode { CaretAtZero, CaretAtOffset, CaretWontMatch }; -%End TQRegExp(); -%If (- TQt_2_00) - TQRegExp(const char *,bool = 1,bool = 0); -%End -%If (TQt_2_00 -) TQRegExp(const TQString &,bool = 1,bool = 0); -%End TQRegExp(const TQRegExp &); bool operator==(const TQRegExp &) const; @@ -83,57 +76,27 @@ public: bool isEmpty() const; bool isValid() const; -%If (- TQt_2_00) - const char *pattern() const; -%End -%If (TQt_2_00 -) TQString pattern() const; -%End -%If (TQt_2_2_0 -) void setPattern(const TQString &); -%End bool caseSensitive() const; void setCaseSensitive(bool); bool wildcard() const; void setWildcard(bool); -%If (TQt_3_0_0 -) bool minimal() const; void setMinimal(bool); bool exactMatch(const TQString &) const; -%End -%If (- TQt_2_00) - int match(const char *,int = 0,int * = 0) const; -%End -%If (TQt_2_00 - TQt_3_0_0) - int match(const TQString &,int = 0,int * = 0) const; -%End - -%If (TQt_2_2_0 - TQt_3_0_0) - int find(const TQString &,int); -%End - -%If (TQt_3_0_0 -) int search(const TQString &,int = 0) const; -%If (TQt_3_1_0 -) int search(const TQString &,int,CaretMode) const; -%End int searchRev(const TQString &,int = -1) const; -%If (TQt_3_1_0 -) int searchRev(const TQString &,int,CaretMode) const; -%End int matchedLength() const; -%If (TQt_3_1_0 -) int numCaptures() const; -%End TQStringList capturedTexts(); TQString cap(int = 0); int pos(int = 0); -%End -%If (TQt_3_1_0 -) TQString errorString(); static TQString escape(const TQString &); -%End }; diff --git a/sip/qt/qregion.sip b/sip/qt/qregion.sip index 45d64b5..9ac4b3f 100644 --- a/sip/qt/qregion.sip +++ b/sip/qt/qregion.sip @@ -71,9 +71,7 @@ public: TQRegion(const TQRect &,RegionType = Rectangle); TQRegion(const TQPointArray &,bool = 0); TQRegion(const TQRegion &); -%If (TQt_1_43 -) TQRegion(const TQBitmap &); -%End bool isNull() const; bool isEmpty() const; @@ -100,12 +98,8 @@ public: TQRegion eor(const TQRegion &) const; TQRect boundingRect() const; -%If (TQt_3_0_0 -) TQMemArray<TQRect> rects() const; -%End -%If (TQt_2_2_0 -) // void setRects(const TQRect *,int); -%End const TQRegion operator|(const TQRegion &) const; const TQRegion operator+(const TQRegion &) const; diff --git a/sip/qt/qscrollbar.sip b/sip/qt/qscrollbar.sip index 57abc14..dc6a096 100644 --- a/sip/qt/qscrollbar.sip +++ b/sip/qt/qscrollbar.sip @@ -36,66 +36,23 @@ class TQScrollBar : TQWidget, TQRangeControl %End public: -%If (- TQt_2_00) - enum Orientation { - Horizontal, - Vertical - }; -%End - -%If (- TQt_2_00) - TQScrollBar(TQWidget * /TransferThis/ = 0,const char * = 0); - TQScrollBar(Orientation,TQWidget * /TransferThis/ = 0,const char * = 0); - TQScrollBar(int,int,int,int,int,Orientation, - TQWidget * /TransferThis/ = 0,const char * = 0); -%End -%If (TQt_2_00 -) TQScrollBar(TQWidget * /TransferThis/,const char * = 0); TQScrollBar(Orientation,TQWidget * /TransferThis/,const char * = 0); TQScrollBar(int,int,int,int,int,Orientation,TQWidget * /TransferThis/, const char * = 0); -%End -%If (- TQt_2_00) - void setOrientation(Orientation); -%End -%If (TQt_2_00 -) virtual void setOrientation(Orientation); -%End Orientation orientation() const; -%If (- TQt_2_00) - void setTracking(bool); -%End -%If (TQt_2_00 -) virtual void setTracking(bool); -%End bool tracking() const; bool draggingSlider() const; -%If (TQt_2_00 -) virtual void setPalette(const TQPalette &); -%End -%If (- TQt_2_00) - void setPalette(const TQPalette &); -%End -%If (TQt_3_1_0 -) virtual TQSize sizeHint() const; -%End -%If (- TQt_3_1_0) - TQSize sizeHint() const; -%End -%If (TQt_3_1_0 -) virtual void setSizePolicy(TQSizePolicy); -%End -%If (TQt_3_2_0 -) void setSizePolicy(TQSizePolicy::SizeType,TQSizePolicy::SizeType, bool = 0); -%End -%If (TQt_2_00 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End -%If (TQt_2_1_0 -) int minValue() const; int maxValue() const; void setMinValue(int); @@ -105,20 +62,12 @@ public: void setLineStep(int); void setPageStep(int); int value() const; -%End -%If (- TQt_3_0_0) - void setValue(int); -%End -%If (TQt_3_0_0 -) int sliderStart() const; TQRect sliderRect() const; -%End public slots: -%If (TQt_3_0_0 -) void setValue(int); -%End signals: void valueChanged(int); @@ -131,9 +80,7 @@ signals: void prevPage(); protected: -%If (TQt_2_00 -) void wheelEvent(TQWheelEvent *); -%End void keyPressEvent(TQKeyEvent *); void resizeEvent(TQResizeEvent *); void paintEvent(TQPaintEvent *); @@ -141,29 +88,14 @@ protected: void mousePressEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); -%If (TQt_3_0_0 -) void contextMenuEvent(TQContextMenuEvent *); -%End -%If (TQt_3_0_4 -) void hideEvent(TQHideEvent *); -%End void valueChange(); void stepChange(); void rangeChange(); -%If (- TQt_3_0_0) - int sliderStart() const; - TQRect sliderRect() const; -%End - -%If (- TQt_2_00) - void timerEvent(TQTimerEvent *); -%End - -%If (TQt_2_00 -) void styleChange(TQStyle &); -%End private: TQScrollBar(const TQScrollBar &); diff --git a/sip/qt/qscrollview.sip b/sip/qt/qscrollview.sip index 47cfd84..91a4a16 100644 --- a/sip/qt/qscrollview.sip +++ b/sip/qt/qscrollview.sip @@ -64,34 +64,20 @@ public: Default, Manual, AutoOne, -%If (TQt_2_3_0 -) AutoOneFit, -%End }; virtual void setResizePolicy(ResizePolicy); ResizePolicy resizePolicy() const; -%If (TQt_2_1_0 -) void styleChange(TQStyle &); -%End // The child was reparented when it was added, and it stays that way, // so we don't transfer it back here. void removeChild(TQWidget *); -%If (- TQt_2_00) - void addChild(TQWidget * /Transfer/); - virtual void addChild(TQWidget * /Transfer/,int,int); -%End -%If (TQt_2_00 -) virtual void addChild(TQWidget * /Transfer/,int = 0,int = 0); -%End virtual void moveChild(TQWidget *,int,int); int childX(TQWidget *); int childY(TQWidget *); -%If (- TQt_3_0_0) - bool childIsVisible(TQWidget *); - void showChild(TQWidget *,bool = 1); -%End enum ScrollBarMode { Auto, @@ -108,12 +94,6 @@ public: TQWidget *cornerWidget() const; virtual void setCornerWidget(TQWidget * /Transfer/); -%If (- TQt_2_00) - TQScrollBar *horizontalScrollBar(); - TQScrollBar *verticalScrollBar(); - TQWidget *viewport(); -%End -%If (TQt_2_00 -) TQScrollBar *horizontalScrollBar() const; TQScrollBar *verticalScrollBar() const; TQWidget *viewport() const; @@ -121,7 +101,6 @@ public: int visibleWidth() const; int visibleHeight() const; -%End int contentsWidth() const; int contentsHeight() const; @@ -132,111 +111,63 @@ public: void resize(const TQSize &); void show(); -%If (TQt_2_00 -) void updateContents(int,int,int,int); -%End -%If (TQt_2_1_0 -) void updateContents(const TQRect &); -%End -%If (TQt_3_0_0 -) void updateContents(); -%End -%If (TQt_2_00 -) void repaintContents(int,int,int,int,bool = 1); -%End -%If (TQt_2_1_0 -) void repaintContents(const TQRect &,bool = 1); -%End -%If (TQt_3_0_0 -) void repaintContents(bool = 1); -%End -%If (TQt_2_00 -) // Note that this wasn't actually const until TQt v3.0.0. void contentsToViewport(int,int,int &,int &) const; // Note that this wasn't actually const until TQt v3.0.0. void viewportToContents(int,int,int &,int &) const; -%If (- TQt_3_0_0) - TQPoint contentsToViewport(const TQPoint &); - TQPoint viewportToContents(const TQPoint &); -%End -%If (TQt_3_0_0 -) TQPoint contentsToViewport(const TQPoint &) const; TQPoint viewportToContents(const TQPoint &) const; -%End void enableClipper(bool); -%If (TQt_2_2_0 -) void setStaticBackground(bool); bool hasStaticBackground() const; -%End TQSize viewportSize(int,int) const; -%If (TQt_2_1_0 -) TQSize sizeHint() const; -%End -%If (- TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End TQSize minimumSizeHint() const; void removeChild(TQObject * /TransferBack/); -%End -%If (TQt_3_1_0 -) bool isHorizontalSliderPressed(); bool isVerticalSliderPressed(); -%End %If (TQt_DRAGANDDROP) -%If (TQt_2_1_0 - TQt_3_0_0) - void setDragAutoScroll(bool); -%End -%If (TQt_3_0_0 -) virtual void setDragAutoScroll(bool); -%End -%If (TQt_2_1_0 -) bool dragAutoScroll() const; %End -%End signals: void contentsMoving(int,int); -%If (TQt_3_1_0 -) void horizontalSliderPressed(); void horizontalSliderReleased(); void verticalSliderPressed(); void verticalSliderReleased(); -%End public slots: virtual void resizeContents(int,int); void scrollBy(int,int); -%If (- TQt_2_00) - void setContentsPos(int,int); -%End -%If (TQt_2_00 -) virtual void setContentsPos(int,int); -%End void ensureVisible(int,int); void ensureVisible(int,int,int,int); void center(int,int); void center(int,int,float,float); void updateScrollBars(); -%If (TQt_2_00 -) void setEnabled(bool); -%End protected: -%If (TQt_2_00 -) virtual void drawContents(TQPainter *,int,int,int,int); -%End virtual void drawContentsOffset(TQPainter *,int,int,int,int,int,int); -%If (TQt_2_00 -) virtual void contentsMousePressEvent(TQMouseEvent *); virtual void contentsMouseReleaseEvent(TQMouseEvent *); virtual void contentsMouseDoubleClickEvent(TQMouseEvent *); @@ -248,20 +179,14 @@ protected: virtual void contentsDropEvent(TQDropEvent *); %End virtual void contentsWheelEvent(TQWheelEvent *); -%End -%If (TQt_3_0_0 -) virtual void contentsContextMenuEvent(TQContextMenuEvent *); -%End virtual void viewportPaintEvent(TQPaintEvent *); -%If (TQt_2_00 -) virtual void viewportResizeEvent(TQResizeEvent *); -%End virtual void viewportMousePressEvent(TQMouseEvent *); virtual void viewportMouseReleaseEvent(TQMouseEvent *); virtual void viewportMouseDoubleClickEvent(TQMouseEvent *); virtual void viewportMouseMoveEvent(TQMouseEvent *); -%If (TQt_2_00 -) %If (TQt_DRAGANDDROP) virtual void viewportDragEnterEvent(TQDragEnterEvent *); virtual void viewportDragMoveEvent(TQDragMoveEvent *); @@ -269,19 +194,11 @@ protected: virtual void viewportDropEvent(TQDropEvent *); %End virtual void viewportWheelEvent(TQWheelEvent *); -%End -%If (TQt_3_0_0 -) virtual void viewportContextMenuEvent(TQContextMenuEvent *); -%End void frameChanged(); -%If (- TQt_2_00) - void setMargins(int,int,int,int); -%End -%If (TQt_2_00 -) virtual void setMargins(int,int,int,int); -%End int leftMargin() const; int topMargin() const; int rightMargin() const; @@ -289,37 +206,25 @@ protected: bool focusNextPrevChild(bool); -%If (TQt_2_00 -) virtual void setHBarGeometry(TQScrollBar &,int,int,int,int); virtual void setVBarGeometry(TQScrollBar &,int,int,int,int); -%End void resizeEvent(TQResizeEvent *); -%If (TQt_3_0_0 -) void mousePressEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *); void mouseDoubleClickEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); -%End -%If (TQt_2_00 -) void wheelEvent(TQWheelEvent *); -%End -%If (TQt_3_0_0 -) void contextMenuEvent(TQContextMenuEvent *); -%End bool eventFilter(TQObject *,TQEvent *); -%If (TQt_3_1_0 -) void setCachedSizeHint(const TQSize &) const; TQSize cachedSizeHint() const; void fontChange(const TQFont &); -%End private: TQScrollView(const TQScrollView &); public: -%If (TQt_3_1_0 -) void disableSizeHintCaching(); -%End }; diff --git a/sip/qt/qsemaphore.sip b/sip/qt/qsemaphore.sip index 82052a0..d164046 100644 --- a/sip/qt/qsemaphore.sip +++ b/sip/qt/qsemaphore.sip @@ -33,8 +33,6 @@ Python v2.0 or later. %If (TQt_THREAD_SUPPORT) -%If (TQt_3_0_0 -) - class TQSemaphore { %TypeHeaderCode @@ -84,29 +82,3 @@ private: }; %End - - -%If (TQt_2_2_0 - TQt_3_0_0) - -class TQSemaphore : TQt -{ -%TypeHeaderCode -#include <tqthread.h> -%End - -public: - TQSemaphore(int); - - int available() const; - int total() const; - - TQSemaphore &operator+=(int); - TQSemaphore &operator-=(int); - -private: - TQSemaphore(const TQSemaphore &); -}; - -%End - -%End diff --git a/sip/qt/qsemimodal.sip b/sip/qt/qsemimodal.sip deleted file mode 100644 index ee7537e..0000000 --- a/sip/qt/qsemimodal.sip +++ /dev/null @@ -1,63 +0,0 @@ -// This is the SIP interface definition for TQSemiModal. -// -// Copyright (c) 2007 -// Riverbank Computing Limited <[email protected]> -// -// This file is part of PyTQt. -// -// This copy of PyTQt is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2, or (at your option) any later -// version. -// -// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -// details. -// -// You should have received a copy of the GNU General Public License along with -// PyTQt; see the file LICENSE. If not, write to the Free Software Foundation, -// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%ExportedDoc -<Sect2><Title>TQSemiModal (TQt v1, v2)</Title> -<Para> -<Literal>TQSemiModal</Literal> is fully implemented. -</Para> -</Sect2> -%End - - -%If (TQt_SEMIMODAL) -%If (- TQt_3_0_0) - -class TQSemiModal : TQWidget -{ -%TypeHeaderCode -#include <tqsemimodal.h> -%End - -public: - TQSemiModal(TQWidget * /TransferThis/ = 0,const char * = 0,bool = 0,WFlags = 0); - - void show(); - void move(int,int); - void move(const TQPoint &); - void resize(int,int); - void resize(const TQSize &); -%If (- TQt_2_00) - void setGeometry(int,int,int,int); - void setGeometry(const TQRect &); -%End -%If (TQt_2_00 -) - virtual void setGeometry(int,int,int,int); - virtual void setGeometry(const TQRect &); -%End - -private: - TQSemiModal(const TQSemiModal &); -}; - -%End -%End diff --git a/sip/qt/qsessionmanager.sip b/sip/qt/qsessionmanager.sip index c6882d6..e282963 100644 --- a/sip/qt/qsessionmanager.sip +++ b/sip/qt/qsessionmanager.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQSessionManager : TQObject { %TypeHeaderCode @@ -39,9 +37,7 @@ class TQSessionManager : TQObject public: TQString sessionId() const; -%If (TQt_3_1_0 -) TQString sessionKey() const; -%End bool allowsInteraction(); bool allowsErrorInteraction(); @@ -64,26 +60,13 @@ public: void setDiscardCommand(const TQStringList &); TQStringList discardCommand() const; -%If (- TQt_3_0_0) - void setProperty(const TQString &,const TQString &); - void setProperty(const TQString &,const TQStringList &); -%End -%If (TQt_3_0_0 -) void setManagerProperty(const TQString &,const TQString &); void setManagerProperty(const TQString &,const TQStringList &); -%End bool isPhase2() const; void requestPhase2(); private: -%If (TQt_3_1_0 -) TQSessionManager(TQApplication * /TransferThis/,TQString &,TQString &); -%End -%If (- TQt_3_1_0) - TQSessionManager(TQApplication * /TransferThis/,TQString &); -%End ~TQSessionManager(); }; - -%End diff --git a/sip/qt/qsettings.sip b/sip/qt/qsettings.sip index 75c02f2..3831bfd 100644 --- a/sip/qt/qsettings.sip +++ b/sip/qt/qsettings.sip @@ -99,8 +99,6 @@ Not implemented. %End -%If (TQt_3_0_0 -) - class TQSettings { %TypeHeaderCode @@ -108,12 +106,10 @@ class TQSettings %End public: -%If (TQt_3_1_0 -) enum Format { Native, Ini }; -%End enum System { Unix, @@ -121,17 +117,13 @@ public: Mac }; -%If (TQt_3_1_0 -) enum Scope { User, Global }; -%End TQSettings(); -%If (TQt_3_1_0 -) TQSettings(Format); -%End // bool writeEntry(const TQString &,bool); bool writeEntry(const TQString &,int /Constrained/); @@ -157,21 +149,15 @@ public: void insertSearchPath(System,const TQString &); void removeSearchPath(System,const TQString &); -%If (TQt_3_1_0 -) void setPath(const TQString &,const TQString &,Scope = Global); void beginGroup(const TQString &); void endGroup(); void resetGroup(); TQString group() const; -%End -%If (TQt_3_2_0 -) bool sync(); -%End private: TQSettings(const TQSettings &); }; - -%End diff --git a/sip/qt/qsgistyle.sip b/sip/qt/qsgistyle.sip index fc2f05c..0dbba8f 100644 --- a/sip/qt/qsgistyle.sip +++ b/sip/qt/qsgistyle.sip @@ -41,7 +41,6 @@ This takes only the <Literal>sb</Literal> parameter and returns a tuple of the %If (TQt_STYLE_SGI) -%If (TQt_2_2_0 -) class TQSGIStyle : TQMotifStyle { @@ -57,68 +56,6 @@ public: void applicationPolish( const TQStyleControlElementData&, ControlElementFlags, void * ); void applicationUnPolish( const TQStyleControlElementData&, ControlElementFlags, void * ); -%If (- TQt_3_0_0) - void polish(TQPalette &); - - int defaultFrameWidth() const; - - void drawPanel(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0, - int = 1,const TQBrush * = 0); - void drawSeparator(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 1,int = 1,int = 0); - void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0, - const TQBrush * = 0); - void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,const TQBrush * = 0); - void drawPushButton(TQPushButton *,TQPainter *); - void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int, - const TQColorGroup &,bool,const TQBrush * = 0); - - TQSize indicatorSize() const; - void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &,int, - bool = 0,bool = 1); - void drawCheckMark(TQPainter *,int,int,int,int,const TQColorGroup &, - bool,bool); - void drawIndicatorMask(TQPainter *,int,int,int,int,int); - - TQSize exclusiveIndicatorSize() const; - void drawExclusiveIndicator(TQPainter *,int,int,int,int, - const TQColorGroup &,bool,bool = 0,bool = 1); - void drawExclusiveIndicatorMask(TQPainter *,int,int,int,int,bool); - - void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,bool = 0,bool = 1,const TQBrush * = 0); - TQRect comboButtonRect(int,int,int,int); - TQRect comboButtonFocusRect(int,int,int,int); - - void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &); - - void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint); - - void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &, - Orientation,bool,bool); - void drawSliderMask(TQPainter *,int,int,int,int,Orientation,bool,bool); - void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &, - TQCOORD,Orientation); - void drawSliderGrooveMask(TQPainter *,int,int,int,int,TQCOORD, - Orientation); - - void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool); - void drawTabMask(TQPainter *,const TQTabBar *,TQTab *,bool); - - int splitterWidth() const; - void drawSplitter(TQPainter *,int,int,int,int,const TQColorGroup &, - Orientation); - - int popupMenuItemHeight(bool,TQMenuItem *,const TQFontMetrics &); - void drawPopupPanel(TQPainter *,int,int,int,int,const TQColorGroup &, - int = 2,const TQBrush * = 0); - void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *, - const TQPalette &,bool,bool,int,int,int,int); - void drawMenuBarItem(TQPainter *,int,int,int,int,TQMenuItem *, - TQColorGroup &,bool,bool); -%End -%If (TQt_3_0_0 -) void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &, const TQColorGroup &,SFlags = Style_Default, const TQStyleOption & = TQStyleOption()) const; @@ -144,7 +81,6 @@ public: TQRect querySubControlMetrics(ComplexControl,const TQStyleControlElementData&,ControlElementFlags, SubControl, const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; -%End protected: bool eventFilter(TQObject *,TQEvent *); @@ -154,4 +90,3 @@ private: }; %End -%End diff --git a/sip/qt/qsimplerichtext.sip b/sip/qt/qsimplerichtext.sip index 9d9386c..cc21df5 100644 --- a/sip/qt/qsimplerichtext.sip +++ b/sip/qt/qsimplerichtext.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQSimpleRichText { %TypeHeaderCode @@ -41,51 +39,26 @@ public: TQSimpleRichText(const TQString &,const TQFont &, const TQString & = TQString::null, const TQStyleSheet * = 0); -%If (TQt_2_1_0 -) TQSimpleRichText(const TQString &,const TQFont &,const TQString &, const TQStyleSheet *,const TQMimeSourceFactory *, int = -1,const TQColor & = TQt::blue,bool = 1); -%End -%If (TQt_2_1_0 -) void setWidth(int); -%End void setWidth(TQPainter *,int); -%If (TQt_3_0_0 -) void setDefaultFont(const TQFont &); -%End int width() const; int widthUsed() const; int height() const; -%If (TQt_2_1_0 -) void adjustSize(); -%End -%If (- TQt_3_0_0) - void draw(TQPainter *,int,int,const TQRegion &,const TQPalette &, - const TQBrush * = 0) const; - void draw(TQPainter *,int,int,const TQRegion &,const TQColorGroup &, - const TQBrush * = 0) const; -%End -%If (TQt_3_0_0 -) void draw(TQPainter *,int,int,const TQRect &,const TQColorGroup &, const TQBrush * = 0) const; -%End TQString context() const; -%If (- TQt_3_0_0) - TQString anchor(TQPainter *,const TQPoint &); -%End -%If (TQt_2_1_0 -) TQString anchorAt(const TQPoint &) const; bool inText(const TQPoint &) const; -%End private: -%If (TQt_3_0_0 -) TQSimpleRichText(const TQSimpleRichText &); -%End }; - -%End diff --git a/sip/qt/qsize.sip b/sip/qt/qsize.sip index a1d9704..c5d34ef 100644 --- a/sip/qt/qsize.sip +++ b/sip/qt/qsize.sip @@ -58,13 +58,11 @@ class TQSize %End public: -%If (TQt_3_1_0 -) enum ScaleMode { ScaleFree, ScaleMin, ScaleMax }; -%End TQSize(); TQSize(int,int); @@ -79,10 +77,8 @@ public: void setHeight(int); void transpose(); -%If (TQt_3_1_0 -) void scale(int,int,ScaleMode); void scale(const TQSize &,ScaleMode); -%End TQSize expandedTo(const TQSize &) const; TQSize boundedTo(const TQSize &) const; diff --git a/sip/qt/qsizegrip.sip b/sip/qt/qsizegrip.sip index b2c9420..505f90b 100644 --- a/sip/qt/qsizegrip.sip +++ b/sip/qt/qsizegrip.sip @@ -29,7 +29,6 @@ %End -%If (TQt_2_00 -) %If (TQt_SIZEGRIP) class TQSizeGrip : TQWidget @@ -42,19 +41,13 @@ public: TQSizeGrip(TQWidget * /TransferThis/,const char * = 0); TQSize sizeHint() const; -%If (- TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End protected: void paintEvent(TQPaintEvent *); void mousePressEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); -%If (TQt_3_0_0 -) bool eventFilter(TQObject *,TQEvent *); -%End }; %End -%End diff --git a/sip/qt/qsizepolicy.sip b/sip/qt/qsizepolicy.sip index a82c066..4f981e4 100644 --- a/sip/qt/qsizepolicy.sip +++ b/sip/qt/qsizepolicy.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQSizePolicy { %TypeHeaderCode @@ -46,32 +44,22 @@ public: Preferred, MinimumExpanding, Expanding, -%If (TQt_3_0_0 -) Ignored -%End }; enum ExpandData { NoDirection, -%If (TQt_3_0_0 -) Horizontally, Vertically, -%End -%If (- TQt_3_0_0) - Horizontal, - Vertical, -%End BothDirections }; TQSizePolicy(); TQSizePolicy(SizeType,SizeType,bool = 0); -%If (TQt_3_0_0 -) // Note that TQt defines the 2nd and 3rd parameters as uchar, but it's // really using them as numbers, not characters. TQSizePolicy(SizeType,SizeType,uint,uint,bool = 0); -%End SizeType horData() const; SizeType verData() const; @@ -89,15 +77,9 @@ public: void setHeightForWidth(bool); bool hasHeightForWidth() const; -%If (TQt_3_0_0 -) uint horStretch() const; uint verStretch() const; void setHorStretch(uint); void setVerStretch(uint); -%End -%If (TQt_3_1_0 -) void transpose(); -%End }; - -%End diff --git a/sip/qt/qslider.sip b/sip/qt/qslider.sip index e23e950..28d42e5 100644 --- a/sip/qt/qslider.sip +++ b/sip/qt/qslider.sip @@ -36,12 +36,6 @@ class TQSlider : TQWidget, TQRangeControl %End public: -%If (- TQt_2_00) - enum Orientation { - Horizontal, - Vertical - }; -%End enum TickSetting { NoMarks = 0, @@ -52,54 +46,24 @@ public: Both = 3 }; -%If (- TQt_2_00) - TQSlider(TQWidget * /TransferThis/ = 0,const char * = 0); - TQSlider(Orientation,TQWidget * /TransferThis/ = 0,const char * = 0); - TQSlider(int,int,int,int,Orientation,TQWidget * /TransferThis/ = 0,const char * = 0); -%End -%If (TQt_2_00 -) TQSlider(TQWidget * /TransferThis/,const char * = 0); TQSlider(Orientation,TQWidget * /TransferThis/,const char * = 0); TQSlider(int,int,int,int,Orientation,TQWidget * /TransferThis/,const char * = 0); -%End -%If (- TQt_2_00) - void setOrientation(Orientation); -%End -%If (TQt_2_00 -) virtual void setOrientation(Orientation); -%End Orientation orientation() const; -%If (- TQt_2_00) - void setTracking(bool); -%End -%If (TQt_2_00 -) virtual void setTracking(bool); -%End bool tracking() const; -%If (- TQt_2_00) - void setPalette(const TQPalette &); -%End -%If (TQt_2_00 -) virtual void setPalette(const TQPalette &); -%End -%If (TQt_3_0_0 -) int sliderStart() const; -%End TQRect sliderRect() const; TQSize sizeHint() const; -%If (TQt_3_1_0 -) void setSizePolicy(TQSizePolicy); -%End -%If (TQt_3_2_0 -) void setSizePolicy(TQSizePolicy::SizeType,TQSizePolicy::SizeType, bool = 0); -%End -%If (TQt_2_00 -) TQSizePolicy sizePolicy() const; TQSize minimumSizeHint() const; -%End virtual void setTickmarks(TickSetting); TickSetting tickmarks() const; @@ -107,7 +71,6 @@ public: virtual void setTickInterval(int); int tickInterval() const; -%If (TQt_2_1_0 -) int minValue() const; int maxValue() const; void setMinValue(int); @@ -117,21 +80,13 @@ public: void setLineStep(int); void setPageStep(int); int value() const; -%End public slots: -%If (- TQt_2_00) - void setValue(int); -%End -%If (TQt_2_00 -) virtual void setValue(int); -%End void addStep(); void subtractStep(); -%If (TQt_3_1_0 -) void addLine(); void subtractLine(); -%End signals: void valueChanged(int); @@ -147,41 +102,18 @@ protected: void mousePressEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); -%If (TQt_2_00 -) void wheelEvent(TQWheelEvent *); -%End void focusInEvent(TQFocusEvent *); -%If (TQt_2_00 -) void focusOutEvent(TQFocusEvent *); -%End -%If (TQt_2_00 -) void styleChange(TQStyle &); -%End void valueChange(); void rangeChange(); -%If (- TQt_3_0_0) - void drawWinGroove(TQPainter *,TQCOORD); - void drawTicks(TQPainter *,int,int,int = 1) const; - virtual int thickness() const; -%End - -%If (- TQt_2_00) - virtual void paintSlider(TQPainter *,const TQRect &); -%End -%If (TQt_2_00 - TQt_3_0_0) - void updateMask(); - virtual void paintSlider(TQPainter *,const TQColorGroup &,const TQRect &); - void drawTicks(TQPainter *,const TQColorGroup &,int,int,int = 1) const; -%End - private: -%If (TQt_2_00 -) int positionFromValue(int) const; int valueFromPosition(int) const; -%End TQSlider(const TQSlider &); }; diff --git a/sip/qt/qsocketnotifier.sip b/sip/qt/qsocketnotifier.sip index 7a6e31e..0f2d27d 100644 --- a/sip/qt/qsocketnotifier.sip +++ b/sip/qt/qsocketnotifier.sip @@ -48,12 +48,7 @@ public: Type type() const; bool isEnabled() const; -%If (- TQt_2_00) - void setEnabled(bool); -%End -%If (TQt_2_00 -) virtual void setEnabled(bool); -%End signals: void activated(int); diff --git a/sip/qt/qsound.sip b/sip/qt/qsound.sip index d204348..d0c442e 100644 --- a/sip/qt/qsound.sip +++ b/sip/qt/qsound.sip @@ -30,7 +30,6 @@ %If (TQt_SOUND) -%If (TQt_2_2_0 -) class TQSound : TQObject { @@ -41,29 +40,19 @@ class TQSound : TQObject public: TQSound(const TQString &,TQObject * /TransferThis/ = 0,const char * = 0); -%If (- TQt_3_0_0) - static bool available(); -%End -%If (TQt_3_0_0 -) static bool isAvailable(); -%End static void play(const TQString &); -%If (TQt_3_0_0 -) int loops() const; int loopsRemaining() const; void setLoops(int); TQString fileName() const; bool isFinished() const; -%End public slots: void play(); -%If (TQt_3_0_0 -) void stop(); -%End }; %End -%End diff --git a/sip/qt/qspinbox.sip b/sip/qt/qspinbox.sip index ae6ed4e..447ec7c 100644 --- a/sip/qt/qspinbox.sip +++ b/sip/qt/qspinbox.sip @@ -34,8 +34,6 @@ This returns a tuple of the <Literal>int</Literal> result and the modified %End -%If (TQt_3_0_0 -) - class TQSpinBox : TQWidget, TQRangeControl { %TypeHeaderCode @@ -122,147 +120,3 @@ protected slots: private: TQSpinBox(const TQSpinBox &); }; - -%End - - -%If (- TQt_3_0_0) - -class TQSpinBox : TQFrame, TQRangeControl -{ -%TypeHeaderCode -#include <tqspinbox.h> -%End - -public: - TQSpinBox(TQWidget * /TransferThis/ = 0,const char * = 0); - TQSpinBox(int,int,int = 1,TQWidget * /TransferThis/ = 0,const char * = 0); - -%If (- TQt_2_00) - const char *text() const; - - virtual const char *prefix() const; - virtual const char *suffix() const; -%End -%If (TQt_2_00 -) - TQString text() const; - - virtual TQString prefix() const; - virtual TQString suffix() const; -%End - virtual TQString cleanText() const; - -%If (- TQt_2_00) - void setSpecialValueText(const char *); - const char *specialValueText() const; - - void setWrapping(bool); -%End -%If (TQt_2_00 -) - virtual void setSpecialValueText(const TQString &); - TQString specialValueText() const; - - virtual void setWrapping(bool); -%End - bool wrapping() const; - -%If (TQt_2_1_0 -) - enum ButtonSymbols { - UpDownArrows, - PlusMinus - }; -%End - -%If (TQt_2_1_0 -) - void setButtonSymbols(ButtonSymbols); - ButtonSymbols buttonSymbols() const; -%End - -%If (- TQt_2_00) - void setValidator(TQValidator *); -%End -%If (TQt_2_00 -) - virtual void setValidator(const TQValidator *); - const TQValidator *validator() const; -%End - - TQSize sizeHint() const; -%If (TQt_2_00 -) - TQSizePolicy sizePolicy() const; -%End - -%If (TQt_2_1_0 -) - int minValue() const; - int maxValue() const; - void setMinValue(int); - void setMaxValue(int); - int lineStep() const; - void setLineStep(int); - int value() const; -%End - -public slots: - virtual void setValue(int); -%If (- TQt_2_00) - virtual void setPrefix(const char *); - virtual void setSuffix(const char *); -%End -%If (TQt_2_00 -) - virtual void setPrefix(const TQString &); - virtual void setSuffix(const TQString &); -%End - virtual void stepUp(); - virtual void stepDown(); -%If (TQt_2_00 -) - virtual void setEnabled(bool); -%End - -signals: - void valueChanged(int); -%If (- TQt_2_00) - void valueChanged(const char *); -%End -%If (TQt_2_00 -) - void valueChanged(const TQString &); -%End - -protected: - virtual TQString mapValueToText(int); - virtual int mapTextToValue(bool *); - TQString currentValueText(); - - virtual void updateDisplay(); - virtual void interpretText(); - - TQPushButton *upButton() const; - TQPushButton *downButton() const; - - TQLineEdit *editor() const; - - virtual void valueChange(); - virtual void rangeChange(); - - bool eventFilter(TQObject *,TQEvent *); - void resizeEvent(TQResizeEvent *); -%If (- TQt_2_00) - void paletteChange(const TQPalette &); - void enabledChange(bool); - void fontChange(const TQFont &); - void styleChange(GUIStyle); -%End -%If (TQt_2_00 -) - void wheelEvent(TQWheelEvent *); - void styleChange(TQStyle &); -%End -%If (TQt_2_1_0 -) - void leaveEvent(TQEvent *); -%End - -protected slots: - void textChanged(); - -private: - TQSpinBox(const TQSpinBox &); -}; - -%End diff --git a/sip/qt/qsplashscreen.sip b/sip/qt/qsplashscreen.sip index 5cbb700..5ef5433 100644 --- a/sip/qt/qsplashscreen.sip +++ b/sip/qt/qsplashscreen.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_2_0 -) - class TQSplashScreen : TQWidget { %TypeHeaderCode @@ -57,5 +55,3 @@ protected: virtual void drawContents(TQPainter *); void mousePressEvent(TQMouseEvent *); }; - -%End diff --git a/sip/qt/qsplitter.sip b/sip/qt/qsplitter.sip index 30f28b8..182b706 100644 --- a/sip/qt/qsplitter.sip +++ b/sip/qt/qsplitter.sip @@ -45,116 +45,58 @@ class TQSplitter : TQFrame %End public: -%If (- TQt_2_00) - enum Orientation { - Horizontal, - Vertical - }; -%End - enum ResizeMode { Stretch, KeepSize, -%If (TQt_2_1_0 -) FollowSizeHint, -%End -%If (TQt_3_1_0 -) Auto -%End }; TQSplitter(TQWidget * /TransferThis/ = 0,const char * = 0); TQSplitter(Orientation,TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_2_00) - void setOrientation(Orientation); -%End -%If (TQt_2_00 -) virtual void setOrientation(Orientation); -%End Orientation orientation() const; -%If (TQt_3_2_0 -) void setChildrenCollapsible(bool); bool childrenCollapsible() const; void setCollapsible(TQWidget *,bool); -%End -%If (- TQt_2_00) - void setResizeMode(TQWidget *,ResizeMode); - void setOpaqueResize(bool = 1); -%End -%If (TQt_2_00 -) virtual void setResizeMode(TQWidget *,ResizeMode); virtual void setOpaqueResize(bool = 1); -%End bool opaqueResize() const; void moveToFirst(TQWidget *); void moveToLast(TQWidget *); void refresh(); -%If (TQt_2_00 -) TQSize sizeHint() const; TQSize minimumSizeHint() const; -%End -%If (TQt_2_00 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End -%If (TQt_2_00 -) TQValueList<int> sizes() const; void setSizes(TQValueList<int>); -%End -%If (TQt_3_2_0 -) int handleWidth() const; void setHandleWidth(int); -%End - -%If (- TQt_2_00) - bool event(TQEvent *); -%End protected: -%If (TQt_2_00 -) void childEvent(TQChildEvent *); bool event(TQEvent *); -%End void resizeEvent(TQResizeEvent *); -%If (- TQt_2_00) - void childInsertEvent(TQChildEvent *); - void childRemoveEvent(TQChildEvent *); - void layoutHintEvent(TQEvent *); - - void moveSplitter(TQCOORD); -%End -%If (TQt_2_00 -) int idAfter(TQWidget *) const; void moveSplitter(TQCOORD,int); -%End virtual void drawSplitter(TQPainter *,TQCOORD,TQCOORD,TQCOORD,TQCOORD); -%If (TQt_2_1_0 -) void styleChange(TQStyle &); -%End -%If (- TQt_2_00) - int adjustPos(int); - void setRubberband(int); -%End -%If (TQt_2_00 -) int adjustPos(int,int); virtual void setRubberband(int); void getRange(int,int *,int *); -%End private: -%If (TQt_2_1_0 -) TQSplitter(const TQSplitter &); -%End }; %End diff --git a/sip/qt/qstatusbar.sip b/sip/qt/qstatusbar.sip index fda6701..d1fadcf 100644 --- a/sip/qt/qstatusbar.sip +++ b/sip/qt/qstatusbar.sip @@ -38,57 +38,28 @@ class TQStatusBar : TQWidget public: TQStatusBar(TQWidget * /TransferThis/ = 0,const char * = 0); -%If (- TQt_2_1_0) - void addWidget(TQWidget * /Transfer/,int,bool = 0); -%End -%If (TQt_2_1_0 - TQt_3_0_0) - void addWidget(TQWidget * /Transfer/,int = 0,bool = 0); -%End -%If (TQt_3_0_0 -) virtual void addWidget(TQWidget * /Transfer/,int = 0,bool = 0); -%End -%If (- TQt_3_0_0) - void removeWidget(TQWidget * /TransferBack/); -%End -%If (TQt_3_0_0 -) virtual void removeWidget(TQWidget * /TransferBack/); -%End -%If (TQt_2_1_0 -) void setSizeGripEnabled(bool); bool isSizeGripEnabled() const; -%End public slots: -%If (- TQt_2_00) - void message(const char *); - void message(const char *,int); -%End -%If (TQt_2_00 -) void message(const TQString &); void message(const TQString &,int); -%End void clear(); signals: -%If (TQt_3_1_0 -) void messageChanged(const TQString &); -%End protected: void paintEvent(TQPaintEvent *); -%If (TQt_2_1_0 -) void resizeEvent(TQResizeEvent *); -%End void reformat(); void hideOrShow(); -%If (TQt_2_1_0 -) bool event(TQEvent *); -%End private: -%If (TQt_2_1_0 -) TQStatusBar(const TQStatusBar &); -%End }; diff --git a/sip/qt/qstring.sip b/sip/qt/qstring.sip index 581bb0a..13bf0a1 100644 --- a/sip/qt/qstring.sip +++ b/sip/qt/qstring.sip @@ -172,8 +172,6 @@ This returns a tuple of the <Literal>double</Literal> result and the %End -%If (TQt_2_00 -) - class TQChar { %TypeHeaderCode @@ -747,8 +745,6 @@ bool operator<=(const TQString &,const TQString &); bool operator>(const TQString &,const TQString &); bool operator>=(const TQString &,const TQString &); -%End - %ModuleHeaderCode extern PyObject *PyTQt_qt_PyObject_FromTQString(const TQString *qstr); diff --git a/sip/qt/qstringlist.sip b/sip/qt/qstringlist.sip index ead39dc..d7ece81 100644 --- a/sip/qt/qstringlist.sip +++ b/sip/qt/qstringlist.sip @@ -49,8 +49,6 @@ This does not return a value. %End -%If (TQt_2_00 -) - class TQStringList { %TypeHeaderCode @@ -63,7 +61,6 @@ public: TQStringList(const TQString &); void sort(); -%If (TQt_2_1_0 -) static TQStringList fromStrList(const TQStrList &); static TQStringList split(const TQString &,const TQString &,bool = 0); static TQStringList split(const TQChar &,const TQString &,bool = 0); @@ -71,12 +68,9 @@ public: TQString join(const TQString &) const; TQStringList grep(const TQString &,bool = 1) const; TQStringList grep(const TQRegExp &) const; -%End -%If (TQt_3_2_0 -) TQStringList &gres(const TQString &,const TQString &,bool = 1); TQStringList &gres(const TQRegExp &,const TQString &); -%End // These are actually in TQValueList, which isn't implemented so // pretend they are here. @@ -243,5 +237,3 @@ public: bool operator==(const TQStringList &); bool operator!=(const TQStringList &); }; - -%End diff --git a/sip/qt/qstyle.sip b/sip/qt/qstyle.sip index 9a15be5..0630d81 100644 --- a/sip/qt/qstyle.sip +++ b/sip/qt/qstyle.sip @@ -69,8 +69,6 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the %End -%If (TQt_3_0_0 -) - class TQStyleOption { %TypeHeaderCode @@ -85,9 +83,7 @@ public: TQStyleOption(StyleOptionDefault /Constrained/ = Default); -%If (TQt_3_2_0 -) TQStyleOption(int); -%End TQStyleOption(int,int); TQStyleOption(int,int,int,int); TQStyleOption(TQMenuItem *); @@ -96,29 +92,21 @@ public: TQStyleOption(const TQColor &); TQStyleOption(TQTab *); TQStyleOption(TQListViewItem *); -%If (TQt_3_1_0 -) TQStyleOption(TQCheckListItem *); -%End TQStyleOption(TQt::ArrowType /Constrained/); -%If (TQt_3_1_0 -) TQStyleOption(const TQRect &); TQStyleOption(TQWidget *); -%End bool isDefault() const; -%If (TQt_3_3_0 -) int day() const; -%End int lineWidth() const; int midLineWidth() const; int frameShape() const; int frameShadow() const; -%If (TQt_3_2_0 -) int headerSection() const; -%End TQMenuItem* menuItem() const; int maxIconWidth() const; int tabWidth() const; @@ -127,25 +115,17 @@ public: TQTab *tab() const; -%If (TQt_3_1_0 -) TQCheckListItem *checkListItem() const; -%End TQListViewItem *listViewItem() const; TQt::ArrowType arrowType() const; -%If (TQt_3_1_0 -) TQRect rect() const; TQWidget *widget() const; -%End }; -%End - -%If (TQt_3_0_0 -) // Not yet defined in TQt v3Beta5. class TQStyleHintReturn; -%End typedef TQMap<TQ_UINT32, TQSize> DialogButtonSizeMap; typedef TQMap<TQ_INT32, TQ_INT32> TabIdentifierIndexMap; @@ -186,8 +166,6 @@ public: typedef TQStyleWidgetActionRequestData TQStyleApplicationActionRequestData; -%If (TQt_2_00 -) - class TQStyle : TQObject { %TypeHeaderCode @@ -196,13 +174,7 @@ class TQStyle : TQObject %End public: -%If (TQt_3_0_0 -) TQStyle(); -%End - -%If (- TQt_3_0_0) - GUIStyle guiStyle() const; -%End enum ControlElementFlags { CEF_None = 0x00000000, @@ -246,157 +218,16 @@ public: virtual void polish(TQPalette &); -%If (TQt_3_0_0 -) virtual void polishPopupMenu(TQPopupMenu *) = 0; virtual void polishPopupMenu(const TQStyleControlElementData&, ControlElementFlags, void *) = 0; -%End -%If (- TQt_3_0_0) - virtual TQRect itemRect(TQPainter *,int,int,int,int,int,bool, - const TQPixmap *,const TQString &,int = -1); - - virtual void drawItem(TQPainter *,int,int,int,int,int, - const TQColorGroup &,bool,const TQPixmap *, - const TQString &,int = -1,const TQColor * = 0); -%End -%If (TQt_3_0_0 -) virtual TQRect itemRect(TQPainter *,const TQRect &,int,bool, const TQPixmap *,const TQString &,int = -1) const; virtual void drawItem(TQPainter *,const TQRect &,int,const TQColorGroup &, bool,const TQPixmap *,const TQString &,int = -1, const TQColor * = 0) const; -%End - -%If (- TQt_3_0_0) - virtual void drawSeparator(TQPainter *,int,int,int,int, - const TQColorGroup &,bool = 1,int = 1, - int = 0); - virtual void drawRect(TQPainter *,int,int,int,int,const TQColor &, - int = 1,const TQBrush * = 0); - virtual void drawRectStrong(TQPainter *,int,int,int,int, - const TQColorGroup &,bool = 0,int = 1, - int = 0,const TQBrush * = 0); - virtual void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,const TQBrush * = 0) = 0; - virtual TQRect buttonRect(int,int,int,int); - virtual void drawButtonMask(TQPainter *,int,int,int,int); - virtual void drawBevelButton(TQPainter *,int,int,int,int, - const TQColorGroup &,bool = 0, - const TQBrush * = 0) = 0; -%If (TQt_2_1_0 -) - TQRect bevelButtonRect(int,int,int,int); -%End - virtual void drawToolButton(TQPainter *,int,int,int,int, - const TQColorGroup &,bool = 0, - const TQBrush * = 0); -%If (TQt_2_1_0 -) - void drawToolButton(TQToolButton *,TQPainter *); - TQRect toolButtonRect(int,int,int,int); -%End - virtual void drawPanel(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,int = 1,const TQBrush * = 0); - virtual void drawPopupPanel(TQPainter *,int,int,int,int, - const TQColorGroup &,int = 2, - const TQBrush * = 0); - virtual void drawArrow(TQPainter *,TQt::ArrowType,bool,int,int,int,int, - const TQColorGroup &,bool,const TQBrush * = 0) = 0; - virtual TQSize exclusiveIndicatorSize() const = 0; - virtual void drawExclusiveIndicator(TQPainter *,int,int,int,int, - const TQColorGroup &,bool,bool = 0, - bool = 1) = 0; - virtual void drawExclusiveIndicatorMask(TQPainter *,int,int,int,int, - bool); - virtual TQSize indicatorSize() const = 0; - virtual void drawIndicator(TQPainter *,int,int,int,int, - const TQColorGroup &,int,bool = 0, - bool = 1) = 0; - virtual void drawIndicatorMask(TQPainter *,int,int,int,int,int); - virtual void drawFocusRect(TQPainter *,const TQRect &,const TQColorGroup &, - const TQColor * = 0,bool = 0) = 0; - virtual void drawComboButton(TQPainter *,int,int,int,int, - const TQColorGroup &,bool = 0,bool = 0, - bool = 1,const TQBrush * = 0) = 0; - virtual TQRect comboButtonRect(int,int,int,int) = 0; - virtual TQRect comboButtonFocusRect(int,int,int,int) = 0; - virtual void drawComboButtonMask(TQPainter *,int,int,int,int) = 0; - virtual void drawPushButton(TQPushButton *,TQPainter *) = 0; - virtual void drawPushButtonLabel(TQPushButton *,TQPainter *) = 0; - -%If (TQt_2_1_0 -) - TQRect pushButtonContentsRect(TQPushButton *); - int menuButtonIndicatorWidth(int); -%End - - virtual void getButtonShift(int &,int &) = 0; - virtual int defaultFrameWidth() const = 0; - virtual void tabbarMetrics(const TQTabBar *,int &,int &,int &) = 0; - virtual void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool) = 0; - virtual void drawTabMask(TQPainter *,const TQTabBar* ,TQTab* ,bool) = 0; - - enum ScrollControl - { - AddLine = 0x1, - SubLine = 0x2, - AddPage = 0x4, - SubPage = 0x8, - First = 0x10, - Last = 0x20, - Slider = 0x40, - NoScroll = 0x80 - }; - - virtual void scrollBarMetrics(const TQScrollBar *,int &,int &,int &, - int &) = 0; - virtual void drawScrollBarControls(TQPainter *,const TQScrollBar *,int, - uint,uint) = 0; - virtual ScrollControl scrollBarPointOver(const TQScrollBar *,int, - const TQPoint &) = 0; - virtual int sliderLength() const = 0; - virtual void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &, - Orientation,bool,bool) = 0; - virtual void drawSliderMask(TQPainter *,int,int,int,int,Orientation, - bool,bool) = 0; - virtual void drawSliderGroove(TQPainter *,int,int,int,int, - const TQColorGroup &,TQCOORD, - Orientation) = 0; - virtual void drawSliderGrooveMask(TQPainter *,int,int,int,int,TQCOORD, - Orientation) = 0; - virtual int maximumSliderDragDistance() const = 0; - virtual int splitterWidth() const = 0; - virtual void drawSplitter(TQPainter *,int,int,int,int, - const TQColorGroup &,Orientation) = 0; - virtual void drawCheckMark(TQPainter *,int,int,int,int, - const TQColorGroup &,bool,bool) = 0; - virtual void polishPopupMenu(TQPopupMenu *) = 0; - virtual int extraPopupMenuItemWidth(bool,int,TQMenuItem *, - const TQFontMetrics &) = 0; - virtual int popupSubmenuIndicatorWidth(const TQFontMetrics &) = 0; - virtual int popupMenuItemHeight(bool,TQMenuItem *, - const TQFontMetrics &) = 0; - virtual void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *, - const TQPalette &,bool, bool,int,int,int, - int) = 0; -%If (TQt_2_2_0 -) - virtual void drawMenuBarItem(TQPainter *,int,int,int,int,TQMenuItem *, - TQColorGroup &,bool,bool); -%End -%If (TQt_2_1_0 -) - TQSize scrollBarExtent(); - int buttonDefaultIndicatorWidth() const; -%If (TQt_2_2_0 -) - int buttonMargin() const; - int toolBarHandleExtent() const; - int sliderThickness() const; -%End - int toolBarHandleExtend() const; - void drawToolBarHandle(TQPainter *,const TQRect &,TQt::Orientation,bool, - const TQColorGroup &,bool = 0); -%End - -%End -%If (TQt_3_0_0 -) enum PrimitiveElement { PE_ButtonCommand, PE_ButtonDefault, @@ -456,25 +287,16 @@ public: PE_ProgressBarChunk, -%If (TQt_3_0_1 -) PE_PanelLineEdit, PE_PanelTabWidget, PE_WindowFrame, -%End -%If (TQt_3_1_0 -) PE_CheckListController, PE_CheckListIndicator, PE_CheckListExclusiveIndicator, PE_PanelGroupBox, -%End -%If (TQt_3_0_4 - TQt_3_0_5) - PE_PopupMenuScroller, -%End -%If (TQt_3_3_0 -) PE_RubberBand, -%End PE_CustomBase }; @@ -528,22 +350,14 @@ public: CE_MenuBarItem, CE_ToolButtonLabel, -%If (TQt_3_1_0 -) CE_MenuBarEmptyArea, -%End -%If (TQt_3_0_5 -) CE_PopupMenuScroller, -%End -%If (TQt_3_1_0 -) CE_DockWindowEmptyArea, -%End -%If (TQt_3_2_0 -) CE_PopupMenuVerticalExtra, CE_PopupMenuHorizontalExtra, CE_ToolBoxTab, CE_HeaderLabel, -%End CE_CustomBase }; @@ -580,7 +394,6 @@ public: SR_ToolButtonContents, -%If (TQt_3_2_0 -) SR_DialogButtonAccept, SR_DialogButtonReject, SR_DialogButtonApply, @@ -592,7 +405,6 @@ public: SR_DialogButtonCustom, SR_ToolBoxTabContents, -%End SR_CustomBase }; @@ -632,9 +444,7 @@ public: SC_ComboBoxFrame, SC_ComboBoxEditField, SC_ComboBoxArrow, -%If (TQt_3_1_0 -) SC_ComboBoxListBoxPopup, -%End SC_SliderGroove, SC_SliderHandle, @@ -720,13 +530,8 @@ public: PM_IndicatorHeight, PM_ExclusiveIndicatorWidth, PM_ExclusiveIndicatorHeight, -%If (TQt_3_0_4 -) PM_PopupMenuScrollerHeight, -%End -%If (TQt_3_1_0 -) PM_CheckListButtonSize, -%End -%If (TQt_3_2_0 -) PM_CheckListControllerSize, PM_PopupMenuFrameHorizontalExtra, PM_PopupMenuFrameVerticalExtra, @@ -742,13 +547,10 @@ public: PM_HeaderGripMargin, PM_TabBarTabShiftHorizontal, PM_TabBarTabShiftVertical, -%End -%If (TQt_3_3_0 -) PM_TabBarScrollButtonWidth, PM_MenuBarItemSpacing, PM_ToolBarItemSpacing, -%End PM_CustomBase }; @@ -765,19 +567,15 @@ public: CT_DockWindow, CT_ProgressBar, CT_PopupMenuItem, -%If (TQt_3_1_0 -) CT_TabBarTab, CT_Slider, CT_Header, CT_LineEdit, CT_MenuBar, CT_SpinBox, -%End -%If (TQt_3_2_0 -) CT_SizeGrip, CT_TabWidget, CT_DialogButtons, -%End CT_CustomBase }; @@ -839,31 +637,22 @@ public: SH_ComboBox_Popup, -%If (TQt_3_0_1 -) SH_TitleBar_NoBorder, SH_ScrollBar_StopMouseOverSlider, -%End -%If (TQt_3_0_2 -) SH_BlinkCursorWhenTextSelected, SH_RichText_FullWidthSelection, -%End -%If (TQt_3_0_4 -) SH_PopupMenu_Scrollable, -%End -%If (TQt_3_1_0 -) SH_GroupBox_TextLabelVerticalAlignment, SH_GroupBox_TextLabelColor, SH_PopupMenu_SloppySubMenus, -%End -%If (TQt_3_2_0 -) SH_Table_GridLineColor, SH_LineEdit_PasswordCharacter, @@ -877,13 +666,10 @@ public: SH_ScrollBar_LeftClickAbsolutePosition, SH_ListViewExpand_SelectMouseType, -%End -%If (TQt_3_3_0 -) SH_UnderlineAccelerator, SH_ToolButton_Uses3D, -%End SH_CustomBase }; @@ -903,9 +689,7 @@ public: SP_MessageBoxInformation, SP_MessageBoxWarning, SP_MessageBoxCritical, -%If (TQt_3_2_0 -) SP_MessageBoxQuestion, -%End SP_CustomBase }; @@ -916,7 +700,6 @@ public: static TQRect visualRect(const TQRect &,const TQWidget *); static TQRect visualRect(const TQRect &,const TQRect &); -%End // New API virtual void drawPrimitive( PrimitiveElement, @@ -1053,20 +836,6 @@ public: //void setApplicationActionRequestHook( ApplicationActionRequestHook ); virtual bool applicationActionRequest( const TQStyleControlElementData&, ControlElementFlags, void*, ApplicationActionRequest, TQStyleApplicationActionRequestData = TQStyleApplicationActionRequestData() ); -protected: -%If (TQt_2_1_0 - TQt_3_0_0) - void setScrollBarExtent(int,int = -1); - void setButtonDefaultIndicatorWidth(int); -%End - private: -%If (- TQt_3_0_0) - TQStyle(); - TQStyle(GUIStyle); -%End -%If (TQt_2_1_0 -) TQStyle(const TQStyle &); -%End }; - -%End diff --git a/sip/qt/qstylefactory.sip b/sip/qt/qstylefactory.sip index 99858bb..5e1bd1c 100644 --- a/sip/qt/qstylefactory.sip +++ b/sip/qt/qstylefactory.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQStyleFactory { %TypeHeaderCode @@ -41,5 +39,3 @@ public: static TQStringList keys(); static TQStyle *create(const TQString &) /Factory/; }; - -%End diff --git a/sip/qt/qstylesheet.sip b/sip/qt/qstylesheet.sip index 397757e..8f1d546 100644 --- a/sip/qt/qstylesheet.sip +++ b/sip/qt/qstylesheet.sip @@ -35,8 +35,6 @@ %End -%If (TQt_2_00 -) - class TQStyleSheetItem : TQt { %TypeHeaderCode @@ -68,7 +66,6 @@ public: int alignment() const; void setAlignment(int); -%If (TQt_3_0_0 -) enum VerticalAlignment { VAlignBaseline, VAlignSub, @@ -77,7 +74,6 @@ public: VerticalAlignment verticalAlignment() const; void setVerticalAlignment(VerticalAlignment); -%End int fontWeight() const; void setFontWeight(int); @@ -108,44 +104,22 @@ public: void setFontUnderline(bool); bool definesFontUnderline() const; -%If (TQt_3_0_5 -) bool fontStrikeOut() const; void setFontStrikeOut(bool); bool definesFontStrikeOut() const; -%End bool isAnchor() const; void setAnchor(bool); -%If (- TQt_2_1_0) - enum WhiteSpaceMode { - WhiteSpaceNormal, - WhiteSpacePre - }; -%End -%If (TQt_2_1_0 -) enum WhiteSpaceMode { WhiteSpaceNormal, WhiteSpacePre, WhiteSpaceNoWrap }; -%End WhiteSpaceMode whiteSpaceMode() const; void setWhiteSpaceMode(WhiteSpaceMode); -%If (- TQt_3_0_0) - enum Margin { - MarginLeft, - MarginRight, - MarginTop, - MarginBottom, - MarginAll, - MarginVertical, - MarginHorizontal - }; -%End -%If (TQt_3_0_0 -) enum Margin { MarginLeft, MarginRight, @@ -156,7 +130,6 @@ public: MarginVertical, MarginHorizontal }; -%End int margin(Margin) const; void setMargin(Margin,int); @@ -180,10 +153,8 @@ public: bool selfNesting() const; void setSelfNesting(bool); -%If (TQt_3_0_0 -) void setLineSpacing(int); int lineSpacing() const; -%End }; @@ -204,36 +175,20 @@ public: void insert(TQStyleSheetItem *); -%If (- TQt_3_0_0) -// virtual TQTextNode *tag(const TQString &,const TQMap<TQString,TQString> &, -// const TQString &,const TQMimeSourceFactory &, -// bool = 0) const; -%End -%If (TQt_3_0_0 -) // virtual TQTextCustomItem *tag(const TQString &, // const TQMap<TQString,TQString> &, // const TQString &, // const TQMimeSourceFactory &,bool, // TQTextDocument *) const; -%End -%If (TQt_3_0_0 -) static TQString escape(const TQString &); static TQString convertFromPlainText(const TQString &, TQStyleSheetItem::WhiteSpaceMode = TQStyleSheetItem::WhiteSpacePre); -%End -%If (- TQt_3_0_0) - static TQString convertFromPlainText(const TQString &); -%End static bool mightBeRichText(const TQString &); virtual void scaleFont(TQFont &,int) const; virtual void error(const TQString &) const; private: -%If (TQt_3_1_0 -) TQStyleSheet(const TQStyleSheet &); -%End }; - -%End diff --git a/sip/qt/qsyntaxhighlighter.sip b/sip/qt/qsyntaxhighlighter.sip index a6d7c24..c07cd0c 100644 --- a/sip/qt/qsyntaxhighlighter.sip +++ b/sip/qt/qsyntaxhighlighter.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_1_0 -) - class TQSyntaxHighlighter : TQt { %TypeHeaderCode @@ -49,9 +47,5 @@ public: void rehighlight(); -%If (TQt_3_2_0 -) int currentParagraph() const; -%End }; - -%End diff --git a/sip/qt/qtabbar.sip b/sip/qt/qtabbar.sip index 09850e4..10e886d 100644 --- a/sip/qt/qtabbar.sip +++ b/sip/qt/qtabbar.sip @@ -39,8 +39,6 @@ This returns a list of <Literal>TQTab</Literal> instances. %End -%If (TQt_3_0_0 -) - class TQTab : TQt { %TypeHeaderCode @@ -65,34 +63,6 @@ public: int identifier() const; }; -%End - -%If (- TQt_3_0_0) - -class TQTab -{ -%TypeHeaderCode -#include <tqtabbar.h> -%End - -public: - TQTab(); -%If (TQt_2_1_0 -) - TQTab(const TQString &); - TQTab(const TQIconSet &,const TQString & = TQString::null); -%End - virtual ~TQTab(); - - TQString label; - TQRect r; - bool enabled; - int id; - TQIconSet *iconset; -}; - -%End - - class TQTabBar : TQWidget { %TypeHeaderCode @@ -110,115 +80,61 @@ public: }; Shape shape() const; -%If (- TQt_2_00) - void setShape(Shape); -%End -%If (TQt_2_00 -) virtual void setShape(Shape); -%End void show(); virtual int addTab(TQTab * /Transfer/); -%If (TQt_2_00 -) virtual int insertTab(TQTab * /Transfer/,int = -1); virtual void removeTab(TQTab *); -%End -%If (- TQt_2_00) - void setTabEnabled(int,bool); -%End -%If (TQt_2_00 -) virtual void setTabEnabled(int,bool); -%End bool isTabEnabled(int) const; TQSize sizeHint() const; -%If (TQt_2_2_0 -) TQSize minimumSizeHint() const; -%End -%If (TQt_2_00 -) TQSizePolicy sizePolicy() const; -%End int currentTab() const; int keyboardFocusTab() const; -%If (- TQt_3_0_0) - TQTab *tab(int); -%End -%If (TQt_3_0_0 -) TQTab *tab(int) const; TQTab *tabAt(int) const; int indexOf(int) const; -%End -%If (TQt_2_2_0 -) int count() const; -%End -%If (TQt_2_00 -) virtual void layoutTabs(); -%End -%If (TQt_3_0_0 -) virtual TQTab *selectTab(const TQPoint &) const; void removeToolTip(int); void setToolTip(int,const TQString &); TQString toolTip(int) const; -%End public slots: -%If (- TQt_2_00) - void setCurrentTab(int); - void setCurrentTab(TQTab *); -%End -%If (TQt_2_00 -) virtual void setCurrentTab(int); virtual void setCurrentTab(TQTab *); -%End signals: void selected(int); -%If (TQt_3_2_0 -) void layoutChanged(); -%End protected: virtual void paint(TQPainter *,TQTab *,bool) const; -%If (TQt_2_00 -) virtual void paintLabel(TQPainter *,const TQRect &,TQTab *,bool) const; -%End - -%If (- TQt_3_0_0) - virtual TQTab *selectTab(const TQPoint &) const; -%End -%If (TQt_2_00 - TQt_3_0_0) - void updateMask(); -%End -%If (TQt_2_1_0 -) void focusInEvent(TQFocusEvent *); void focusOutEvent(TQFocusEvent *); void resizeEvent(TQResizeEvent *); -%End void paintEvent(TQPaintEvent *); void mousePressEvent(TQMouseEvent *); -%If (TQt_3_0_0 -) void mouseMoveEvent(TQMouseEvent *); -%End void mouseReleaseEvent(TQMouseEvent *); void keyPressEvent(TQKeyEvent *); -%If (TQt_2_1_0 -) void styleChange(TQStyle &); -%End -%If (TQt_3_0_0 -) void fontChange(const TQFont &); -%End -%If (TQt_3_1_0 -) bool event(TQEvent *); -%End SIP_PYLIST tabList() [TQPtrList<TQTab> *()]; %MethodCode @@ -260,7 +176,5 @@ protected: %End private: -%If (TQt_2_1_0 -) TQTabBar(const TQTabBar &); -%End }; diff --git a/sip/qt/qtabdialog.sip b/sip/qt/qtabdialog.sip index 609e748..0cfe69a 100644 --- a/sip/qt/qtabdialog.sip +++ b/sip/qt/qtabdialog.sip @@ -44,97 +44,50 @@ public: void show(); void setFont(const TQFont &); -%If (- TQt_2_00) - void addTab(TQWidget *,const char *); -%End -%If (TQt_2_00 -) void addTab(TQWidget *,const TQString &); void addTab(TQWidget *,const TQIconSet &,const TQString &); -%End void addTab(TQWidget *,TQTab *); -%If (TQt_2_00 -) void insertTab(TQWidget *,const TQString &,int = -1); void insertTab(TQWidget *,const TQIconSet &,const TQString &,int = -1); void insertTab(TQWidget *,TQTab *,int = -1); void changeTab(TQWidget *,const TQString &); void changeTab(TQWidget *,const TQIconSet &,const TQString &); -%End -%If (TQt_2_00 -) bool isTabEnabled(TQWidget *) const; void setTabEnabled(TQWidget *,bool); -%End -%If (- TQt_3_0_0) - bool isTabEnabled(const char *) const; - void setTabEnabled(const char *,bool); -%End void showPage(TQWidget *); -%If (TQt_2_00 -) void removePage(TQWidget *); TQString tabLabel(TQWidget *); -%End -%If (- TQt_2_00) - const char *tabLabel(TQWidget *); -%End -%If (TQt_2_00 -) TQWidget *currentPage() const; -%End -%If (- TQt_2_00) - void setDefaultButton(const char * = "Defaults"); -%End -%If (TQt_2_00 -) void setDefaultButton(const TQString &); void setDefaultButton(); -%End bool hasDefaultButton() const; -%If (TQt_2_00 -) void setHelpButton(const TQString &); void setHelpButton(); bool hasHelpButton() const; -%End -%If (- TQt_2_00) - void setCancelButton(const char * = "Cancel"); -%End -%If (TQt_2_00 -) void setCancelButton(const TQString &); void setCancelButton(); -%End bool hasCancelButton() const; -%If (- TQt_2_00) - void setApplyButton(const char * = "Apply"); -%End -%If (TQt_2_00 -) void setApplyButton(const TQString &); void setApplyButton(); -%End bool hasApplyButton() const; -%If (- TQt_2_00) - void setOkButton(const char * = "OK"); -%End -%If (TQt_2_00 -) void setOkButton(const TQString &); void setOkButton(); -%End bool hasOkButton() const; protected: void paintEvent(TQPaintEvent *); void resizeEvent(TQResizeEvent *); -%If (- TQt_2_00) - void styleChange(GUIStyle); -%End -%If (TQt_2_00 -) void styleChange(TQStyle &); -%End void setTabBar(TQTabBar *); TQTabBar *tabBar() const; @@ -144,24 +97,12 @@ signals: void applyButtonPressed(); void cancelButtonPressed(); void defaultButtonPressed(); -%If (TQt_2_00 -) void helpButtonPressed(); -%End -%If (TQt_2_2_0 -) void currentChanged(TQWidget *); -%End -%If (- TQt_2_00) - void selected(const char *); -%End -%If (TQt_2_00 - TQt_3_0_0) - void selected(const TQString &); -%End private: -%If (TQt_2_1_0 -) TQTabDialog(const TQTabDialog &); -%End }; %End diff --git a/sip/qt/qtableview.sip b/sip/qt/qtableview.sip deleted file mode 100644 index 2b099e5..0000000 --- a/sip/qt/qtableview.sip +++ /dev/null @@ -1,185 +0,0 @@ -// This is the SIP interface definition for TQTableView. -// -// Copyright (c) 2007 -// Riverbank Computing Limited <[email protected]> -// -// This file is part of PyTQt. -// -// This copy of PyTQt is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2, or (at your option) any later -// version. -// -// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -// details. -// -// You should have received a copy of the GNU General Public License along with -// PyTQt; see the file LICENSE. If not, write to the Free Software Foundation, -// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%ExportedDoc -<Sect2><Title>TQTableView (TQt 1.x, TQt 2.x)</Title> -<FuncSynopsis> - <FuncDef>bool <Function>colXPos</Function></FuncDef> - <ParamDef>int <Parameter>col</Parameter></ParamDef> - <ParamDef>int *<Parameter>xPos</Parameter></ParamDef> -</FuncSynopsis> -<Para> -This takes the <Literal>col</Literal> parameter and returns a tuple containing -the <Literal>bool</Literal> result and <Literal>xPos</Literal>. -</Para> - -<FuncSynopsis> - <FuncDef>bool <Function>rowYPos</Function></FuncDef> - <ParamDef>int <Parameter>row</Parameter></ParamDef> - <ParamDef>int *<Parameter>yPos</Parameter></ParamDef> -</FuncSynopsis> -<Para> -This takes the <Literal>row</Literal> parameter and returns a tuple containing -the <Literal>bool</Literal> result and <Literal>yPos</Literal>. -</Para> -</Sect2> -%End - - -%If (TQt_TABLEVIEW) -%If (- TQt_3_0_0) - -%ModuleHeaderCode -#include <tqtableview.h> -%End - -const uint Tbl_vScrollBar; -const uint Tbl_hScrollBar; -const uint Tbl_autoVScrollBar; -const uint Tbl_autoHScrollBar; -const uint Tbl_autoScrollBars; - -const uint Tbl_clipCellPainting; -const uint Tbl_cutCellsV; -const uint Tbl_cutCellsH; -const uint Tbl_cutCells; - -const uint Tbl_scrollLastHCell; -const uint Tbl_scrollLastVCell; -const uint Tbl_scrollLastCell; - -const uint Tbl_smoothHScrolling; -const uint Tbl_smoothVScrolling; -const uint Tbl_smoothScrolling; - -const uint Tbl_snapToHGrid; -const uint Tbl_snapToVGrid; -const uint Tbl_snapToGrid; - - -class TQTableView : TQFrame -{ -%TypeHeaderCode -#include <tqtableview.h> -%End - -public: -%If (- TQt_2_00) - void setBackgroundColor(const TQColor &); - void setPalette(const TQPalette &); -%End -%If (TQt_2_00 -) - virtual void setBackgroundColor(const TQColor &); - virtual void setPalette(const TQPalette &); -%End - void show(); - void repaint(bool = 1); - void repaint(int,int,int,int,bool = 1); - void repaint(const TQRect &,bool = 1); - -protected: - TQTableView(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); - ~TQTableView(); - - int numRows() const; - int numCols() const; - int topCell() const; - int leftCell() const; - int xOffset() const; - int yOffset() const; - virtual int cellWidth(int); - virtual int cellHeight(int); - int cellWidth() const; - int cellHeight() const; - virtual int totalWidth(); - virtual int totalHeight(); - uint tableFlags() const; - bool testTableFlags(uint) const; - void clearTableFlags(uint = ~0); - bool autoUpdate() const; - void updateCell(int,int,bool = 1); - TQRect cellUpdateRect() const; - TQRect viewRect() const; - int lastRowVisible() const; - int lastColVisible() const; - bool rowIsVisible(int) const; - bool colIsVisible(int) const; - const TQScrollBar *verticalScrollBar() const; - const TQScrollBar *horizontalScrollBar() const; - virtual void paintCell(TQPainter *,int,int) = 0; - virtual void setupPainter(TQPainter *); - void paintEvent(TQPaintEvent *); - void resizeEvent(TQResizeEvent *); - int findRow(int) const; - int findCol(int) const; - bool rowYPos(int,int *) const; - bool colXPos(int,int *) const; - int maxXOffset(); - int maxYOffset(); - int maxColOffset(); - int maxRowOffset(); - int minViewX() const; - int minViewY() const; - int maxViewX() const; - int maxViewY() const; - int viewWidth() const; - int viewHeight() const; - void scroll(int,int); - void updateScrollBars(); - void updateTableSize(); - -%If (- TQt_2_00) - void setNumRows(int); - void setNumCols(int); - void setTopCell(int); - void setLeftCell(int); - void setTopLeftCell(int,int); - void setXOffset(int); - void setYOffset(int); - void setOffset(int,int,bool = 1); - void setCellWidth(int); - void setCellHeight(int); - void setTableFlags(uint); - void setAutoUpdate(bool); -%End - -%If (TQt_2_00 -) - virtual void setNumRows(int); - virtual void setNumCols(int); - virtual void setTopCell(int); - virtual void setLeftCell(int); - virtual void setTopLeftCell(int,int); - virtual void setXOffset(int); - virtual void setYOffset(int); - virtual void setOffset(int,int,bool = 1); - virtual void setCellWidth(int); - virtual void setCellHeight(int); - virtual void setTableFlags(uint); - virtual void setAutoUpdate(bool); -%End - -private: - TQTableView(const TQTableView &); -}; - -%End -%End diff --git a/sip/qt/qtabwidget.sip b/sip/qt/qtabwidget.sip index 9049644..9435402 100644 --- a/sip/qt/qtabwidget.sip +++ b/sip/qt/qtabwidget.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQTabWidget : TQWidget { %TypeHeaderCode @@ -38,28 +36,9 @@ class TQTabWidget : TQWidget %End public: -%If (TQt_3_0_0 -) TQTabWidget(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); -%End -%If (TQt_2_1_0 - TQt_3_0_0) - TQTabWidget(TQWidget * /TransferThis/,const char *,WFlags); -%End -%If (- TQt_3_0_0) - TQTabWidget(TQWidget * /TransferThis/ = 0,const char * = 0); -%End // The TQWidget is passed to TQWidgetStack::addWidget(). -%If (- TQt_3_0_0) - void addTab(TQWidget * /Transfer/,const TQString &); - void addTab(TQWidget * /Transfer/,const TQIconSet &,const TQString &); - void addTab(TQWidget * /Transfer/,TQTab *); - - void insertTab(TQWidget * /Transfer/,const TQString &,int = -1); - void insertTab(TQWidget * /Transfer/,const TQIconSet &,const TQString &, - int = -1); - void insertTab(TQWidget * /Transfer/,TQTab *,int = -1); -%End -%If (TQt_3_0_0 -) virtual void addTab(TQWidget * /Transfer/,const TQString &); virtual void addTab(TQWidget * /Transfer/,const TQIconSet &, const TQString &); @@ -69,7 +48,6 @@ public: virtual void insertTab(TQWidget * /Transfer/,const TQIconSet &, const TQString &,int = -1); virtual void insertTab(TQWidget * /Transfer/,TQTab *,int = -1); -%End void changeTab(TQWidget *,const TQString &); void changeTab(TQWidget *,const TQIconSet &,const TQString &); @@ -77,18 +55,9 @@ public: bool isTabEnabled(TQWidget *) const; void setTabEnabled(TQWidget *,bool); -%If (TQt_3_2_0 -) void setCornerWidget(TQWidget *,TQt::Corner = TQt::TopRight); TQWidget *cornerWidget(TQt::Corner = TQt::TopRight) const; -%End - -%If (- TQt_3_0_0) - void showPage(TQWidget *); - void removePage(TQWidget *); - TQString tabLabel(TQWidget *); -%End -%If (TQt_3_0_0 -) TQString tabLabel(TQWidget *) const; void setTabLabel(TQWidget *,const TQString &); @@ -98,22 +67,12 @@ public: void removeTabToolTip(TQWidget *); void setTabToolTip(TQWidget *,const TQString &); TQString tabToolTip(TQWidget *) const; -%End TQWidget *currentPage() const; -%If (TQt_3_0_0 -) TQWidget *page(int) const; TQString label(int) const; -%End -%If (TQt_2_2_0 -) int currentPageIndex() const; -%End -%If (TQt_2_2_0 - TQt_3_0_0) - void setCurrentPage(int); -%End -%If (TQt_3_0_0 -) int indexOf(TQWidget *) const; -%End TQSize sizeHint() const; TQSize minimumSizeHint() const; @@ -126,7 +85,6 @@ public: TabPosition tabPosition() const; void setTabPosition(TabPosition); -%If (TQt_2_2_0 -) enum TabShape { Rounded, Triangular @@ -134,25 +92,16 @@ public: TabShape tabShape() const; void setTabShape(TabShape); -%End int margin() const; void setMargin(int); -%If (TQt_2_1_0 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End - -%If (TQt_3_0_0 -) int count() const; -%End public slots: -%If (TQt_3_0_0 -) void setCurrentPage(int); virtual void showPage(TQWidget *); virtual void removePage(TQWidget *); -%End protected: void showEvent(TQShowEvent *); @@ -164,14 +113,8 @@ protected: bool eventFilter(TQObject *,TQEvent *); signals: -%If (TQt_2_2_0 -) void currentChanged(TQWidget *); -%End private: -%If (TQt_2_1_0 -) TQTabWidget(const TQTabWidget &); -%End }; - -%End diff --git a/sip/qt/qtextbrowser.sip b/sip/qt/qtextbrowser.sip index ccd7da4..3b0a11c 100644 --- a/sip/qt/qtextbrowser.sip +++ b/sip/qt/qtextbrowser.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQTextBrowser : TQTextEdit { %TypeHeaderCode @@ -54,14 +52,10 @@ public slots: signals: void backwardAvailable(bool); void forwardAvailable(bool); -%If (TQt_3_1_0 -) void sourceChanged(const TQString &); -%End void highlighted(const TQString &); void linkClicked(const TQString &); -%If (TQt_3_1_0 -) void anchorClicked(const TQString &,const TQString &); -%End protected: void keyPressEvent(TQKeyEvent *); @@ -69,46 +63,3 @@ protected: private: TQTextBrowser(const TQTextBrowser &); }; - -%End - -%If (TQt_2_00 - TQt_3_0_0) - -class TQTextBrowser : TQTextView -{ -%TypeHeaderCode -#include <tqtextbrowser.h> -%End - -public: - TQTextBrowser(TQWidget * /TransferThis/ = 0,const char * = 0); - - virtual void setSource(const TQString &); - TQString source() const; - void setText(const TQString &,const TQString & = TQString::null); - void scrollToAnchor(const TQString &); - -public slots: - virtual void backward(); - virtual void forward(); - virtual void home(); - -signals: - void backwardAvailable(bool); - void forwardAvailable(bool); - void highlighted(const TQString &); - void textChanged(); - -protected: - void viewportMousePressEvent(TQMouseEvent *); - void viewportMouseReleaseEvent(TQMouseEvent *); - void viewportMouseMoveEvent(TQMouseEvent *); - void keyPressEvent(TQKeyEvent *); - -private: -%If (TQt_2_1_0 -) - TQTextBrowser(const TQTextBrowser &); -%End -}; - -%End diff --git a/sip/qt/qtextcodec.sip b/sip/qt/qtextcodec.sip index 792d938..7a18efe 100644 --- a/sip/qt/qtextcodec.sip +++ b/sip/qt/qtextcodec.sip @@ -54,8 +54,6 @@ updated <Literal>lenInOut</Literal>. %End -%If (TQt_2_00 -) - class TQTextEncoder { %TypeHeaderCode @@ -94,25 +92,19 @@ public: static TQTextCodec *codecForContent(const char *,int); static TQTextCodec *codecForIndex(int); static TQTextCodec *codecForLocale(); -%If (TQt_3_0_0 -) static void setCodecForLocale(TQTextCodec *); -%End -%If (TQt_3_1_0 -) static TQTextCodec *codecForTr(); static void setCodecForTr(TQTextCodec *); static TQTextCodec *codecForCStrings(); static void setCodecForCStrings(TQTextCodec *); -%End static void deleteAllCodecs(); static const char *locale(); virtual const char *name() const = 0; -%If (TQt_3_0_0 -) virtual const char *mimeName() const; -%End virtual int mibEnum() const = 0; virtual TQTextDecoder *makeDecoder() const /Factory/; @@ -123,10 +115,8 @@ public: TQCString fromUnicode(const TQString &) const; TQString toUnicode(const TQByteArray &,int) const; TQString toUnicode(const TQByteArray &) const; -%If (TQt_3_0_0 -) TQString toUnicode(const TQCString &,int) const; TQString toUnicode(const TQCString &) const; -%End TQString toUnicode(const char *) const; virtual bool canEncode(TQChar) const; virtual bool canEncode(const TQString &) const; @@ -134,13 +124,9 @@ public: virtual int heuristicContentMatch(const char *,int) const = 0; virtual int heuristicNameMatch(const char *) const; -%If (TQt_3_0_0 -) virtual TQByteArray fromUnicode(const TQString &,int,int) const; virtual unsigned short characterFromUnicode(const TQString &,int) const; -%End protected: TQTextCodec(); }; - -%End diff --git a/sip/qt/qtextedit.sip b/sip/qt/qtextedit.sip index 81cf063..ef0f80c 100644 --- a/sip/qt/qtextedit.sip +++ b/sip/qt/qtextedit.sip @@ -83,8 +83,6 @@ the <Literal>paraFrom</Literal>, <Literal>indexFrom</Literal>, %End -%If (TQt_3_0_0 -) - // These aren't part of the public API in the TQt3 beta, so define them as // opaque for the moment. @@ -110,28 +108,22 @@ public: AtWordBoundary, Anywhere, AtWhiteSpace, -%If (TQt_3_1_0 -) AtWordOrDocumentBoundary -%End }; -%If (TQt_3_1_0 -) enum AutoFormatting { AutoNone, AutoBulletList, AutoAll }; -%End enum KeyboardAction { ActionBackspace, ActionDelete, ActionReturn, ActionKill, -%If (TQt_3_1_0 -) ActionWordBackspace, ActionWordDelete -%End }; enum CursorAction { @@ -155,13 +147,11 @@ public: AlignSubScript }; -%If (TQt_3_1_0 -) enum TextInsertionFlags { RedoIndentation, CheckNewLines, RemoveSelected }; -%End TQTextEdit(const TQString &,const TQString & = TQString::null, TQWidget * /TransferThis/ = 0,const char * = 0); @@ -226,9 +216,7 @@ public: int tabStopWidth() const; TQString anchorAt(const TQPoint &); -%If (TQt_3_1_0 -) TQString anchorAt(const TQPoint &,AnchorAttribute); -%End TQSize sizeHint() const; @@ -244,9 +232,7 @@ public: int pointSize() const; TQColor color() const; TQFont font() const; -%If (TQt_3_1_0 -) TQFont currentFont() const; -%End int alignment() const; int undoDepth() const; @@ -263,7 +249,6 @@ public: bool isUndoRedoEnabled() const; bool eventFilter(TQObject *,TQEvent *); -%If (TQt_3_1_0 -) bool tabChangesFocus() const; // TQt defines the following as uint rather than int because it uses the @@ -274,10 +259,7 @@ public: // and let the compiler handle it. void setAutoFormatting(int); int autoFormatting() const; -%End -%If (TQt_3_3_0 -) TQSyntaxHighlighter *syntaxHighlighter() const; -%End public slots: void setEnabled(bool); @@ -347,13 +329,8 @@ public slots: virtual void scrollToBottom(); -%If (TQt_3_1_0 -) void insert(const TQString &,uint = CheckNewLines | RemoveSelected); virtual void insert(const TQString &,bool,bool = 1,bool = 1); -%End -%If (- TQt_3_1_0) - virtual void insert(const TQString &,bool = 0,bool = 1,bool = 1); -%End virtual void insertAt(const TQString &,int,int); virtual void removeParagraph(int); virtual void insertParagraph(const TQString &,int); @@ -362,15 +339,11 @@ public slots: virtual void clearParagraphBackground(int); virtual void setUndoRedoEnabled(bool); -%If (TQt_3_1_0 -) void setTabChangesFocus(bool); void polish(); -%End -%If (TQt_3_2_0 -) void setMaxLogLines(int); int maxLogLines(); -%End signals: void textChanged(); @@ -386,10 +359,8 @@ signals: void cursorPositionChanged(int,int); void returnPressed(); void modificationChanged(bool); -%If (TQt_3_1_0 -) void clicked(int,int); void doubleClicked(int,int); -%End protected: void repaintChanged(); @@ -424,14 +395,8 @@ protected: protected slots: virtual void doChangeInterval(); -%If (TQt_3_1_0 -) void sliderReleased(); -%End private: -%If (TQt_3_1_0 -) TQTextEdit(const TQTextEdit &); -%End }; - -%End diff --git a/sip/qt/qtextstream.sip b/sip/qt/qtextstream.sip index d0e351b..83778c3 100644 --- a/sip/qt/qtextstream.sip +++ b/sip/qt/qtextstream.sip @@ -82,17 +82,6 @@ class TQTextStream %End public: -%If (TQt_2_00 - TQt_2_2_0) - enum Encoding { - Locale, - Latin1, - Unicode, - UnicodeNetworkOrder, - UnicodeReverse, - RawUnicode - }; -%End -%If (TQt_2_2_0 -) enum Encoding { Locale, Latin1, @@ -102,41 +91,30 @@ public: RawUnicode, UnicodeUTF8 }; -%End TQTextStream(); TQTextStream(TQIODevice *); -%If (TQt_2_00 -) TQTextStream(TQString *,int); -%End TQTextStream(TQByteArray,int); // TQTextStream(FILE *,int); -%If (TQt_2_00 -) void setEncoding(Encoding); void setCodec(TQTextCodec *); -%End -%If (TQt_3_1_0 -) TQTextCodec *codec(); -%End TQIODevice *device() const; void setDevice(TQIODevice *); void unsetDevice(); -%If (TQt_2_00 -) bool atEnd() const; -%End bool eof() const; // TQTextStream &readRawBytes(char *,uint) /ReleaseGIL/; // TQTextStream &writeRawBytes(const char *,uint) /ReleaseGIL/; TQString readLine() /ReleaseGIL/; -%If (TQt_2_00 -) TQString read() /ReleaseGIL/; void skipWhiteSpace(); -%End enum { skipws, @@ -174,7 +152,6 @@ public: int precision() const; int precision(int); -%If (TQt_3_0_0 -) // These are defined in qmainwindow.h as global operators so we have // to implement them here and pretend they are class operators. TQTextStream &operator<<(const TQMainWindow &); @@ -184,15 +161,12 @@ public: // to implement them here and pretend they are class operators. TQTextStream &operator<<(const TQDockArea &); TQTextStream &operator>>(TQDockArea &); -%End private: TQTextStream(const TQTextStream &); }; -%If (TQt_2_00 -) - class TQTextIStream : TQTextStream { %TypeHeaderCode @@ -205,9 +179,7 @@ public: // TQTextIStream(FILE *); private: -%If (TQt_3_1_0 -) TQTextIStream(const TQTextIStream &); -%End }; @@ -223,9 +195,5 @@ public: // TQTextOStream(FILE *); private: -%If (TQt_3_1_0 -) TQTextOStream(const TQTextOStream &); -%End }; - -%End diff --git a/sip/qt/qtextview.sip b/sip/qt/qtextview.sip index 8f71e26..1d30dad 100644 --- a/sip/qt/qtextview.sip +++ b/sip/qt/qtextview.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQTextView : TQTextEdit { %TypeHeaderCode @@ -43,86 +41,5 @@ public: TQWidget * /TransferThis/ = 0,const char * = 0); private: -%If (TQt_3_1_0 -) - TQTextView(const TQTextView &); -%End -}; - -%End - - -%If (TQt_2_00 - TQt_3_0_0) - -class TQTextView : TQScrollView -{ -%TypeHeaderCode -#include <tqtextview.h> -%End - -public: - TQTextView(TQWidget * /TransferThis/ = 0,const char * = 0); - TQTextView(const TQString &,const TQString & = TQString::null, - TQWidget * /TransferThis/ = 0,const char * = 0); - -%If (- TQt_2_1_0) - virtual void setText(const TQString &,const TQString & = TQString::null); -%End -%If (TQt_2_1_0 -) - virtual void setText(const TQString &,const TQString &); - void setText(const TQString &); -%End - virtual TQString text() const; - virtual TQString context() const; - TQt::TextFormat textFormat() const; - void setTextFormat(TQt::TextFormat); - TQStyleSheet *styleSheet() const; - void setStyleSheet(TQStyleSheet *); - void setPaper(const TQBrush &); - const TQBrush &paper(); - void setPaperColorGroup(const TQColorGroup &); - const TQColorGroup &paperColorGroup() const; - void setLinkColor(const TQColor &); - const TQColor &linkColor() const; - void setLinkUnderline(bool); - bool linkUnderline() const; - void setMimeSourceFactory(TQMimeSourceFactory *); - TQMimeSourceFactory *mimeSourceFactory() const; - TQString documentTitle() const; - int heightForWidth(int) const; -%If (TQt_2_1_0 -) - void append(const TQString &); - bool hasSelectedText() const; - TQString selectedText() const; -%End - -public slots: -%If (TQt_2_1_0 -) -%If (TQt_CLIPBOARD) - void copy(); -%End - void selectAll(); -%End - -protected: - void drawContentsOffset(TQPainter *,int,int,int,int,int,int); - void resizeEvent(TQResizeEvent *); - void viewportResizeEvent(TQResizeEvent *); - void viewportMousePressEvent(TQMouseEvent *); - void viewportMouseReleaseEvent(TQMouseEvent *); - void viewportMouseMoveEvent(TQMouseEvent *); - void keyPressEvent(TQKeyEvent *); -%If (TQt_2_1_0 -) - void showEvent(TQShowEvent *); - void focusInEvent(TQFocusEvent *); - void focusOutEvent(TQFocusEvent *); -%End -// TQRichText &richText() const; - void paletteChange(const TQPalette &); - -private: -%If (TQt_2_1_0 -) TQTextView(const TQTextView &); -%End }; - -%End diff --git a/sip/qt/qthread.sip b/sip/qt/qthread.sip index e457535..b95301a 100644 --- a/sip/qt/qthread.sip +++ b/sip/qt/qthread.sip @@ -30,7 +30,6 @@ %If (TQt_THREAD_SUPPORT) -%If (TQt_2_2_0 -) class TQThread : TQt /CreatesThread/ { @@ -39,28 +38,18 @@ class TQThread : TQt /CreatesThread/ %End public: -%If (- TQt_3_0_0) - static HANDLE currentThread(); -%End -%If (TQt_3_0_0 -) static TQt::HANDLE currentThread(); -%End static void postEvent(TQObject *,TQEvent * /Transfer/) /ReleaseGIL/; -%If (TQt_3_0_0 -) static void initialize(); static void cleanup(); -%End static void exit() /ReleaseGIL/; -%If (TQt_3_1_0 -) TQThread(unsigned int); -%End TQThread(); bool wait(unsigned long = ULONG_MAX) /ReleaseGIL/; -%If (TQt_3_2_0 -) enum Priority { IdlePriority, LowestPriority, @@ -73,12 +62,9 @@ public: }; void start(Priority) /ReleaseGIL/; -%End void start() /ReleaseGIL/; -%If (TQt_3_1_0 -) void terminate(); -%End bool finished() const; bool running() const; @@ -95,4 +81,3 @@ private: }; %End -%End diff --git a/sip/qt/qtimer.sip b/sip/qt/qtimer.sip index eba5c57..6dd2249 100644 --- a/sip/qt/qtimer.sip +++ b/sip/qt/qtimer.sip @@ -44,9 +44,7 @@ public: void stop(); static void singleShot(int,SIP_RXOBJ_CON,SIP_SLOT_CON()); -%If (TQt_3_1_0 -) int timerId() const; -%End signals: void timeout(); diff --git a/sip/qt/qtmod.sip b/sip/qt/qtmod.sip index 5085eb8..883b650 100644 --- a/sip/qt/qtmod.sip +++ b/sip/qt/qtmod.sip @@ -80,7 +80,6 @@ static const char *PYTQT_VERSION_STR = "3.18.1"; %Include qaccel.sip %Include qaction.sip %Include qapplication.sip -%Include qarray.sip %Include qassistantclient.sip %Include qbrush.sip %Include qbutton.sip @@ -120,7 +119,6 @@ static const char *PYTQT_VERSION_STR = "3.18.1"; %Include qfontinfo.sip %Include qfontmetrics.sip %Include qframe.sip -%Include qgmanager.sip %Include qgrid.sip %Include qgridview.sip %Include qgroupbox.sip @@ -134,14 +132,12 @@ static const char *PYTQT_VERSION_STR = "3.18.1"; %Include qinputdialog.sip %Include qinterlacestyle.sip %Include qiodevice.sip -%Include qkeycode.sip %Include qkeysequence.sip %Include qlabel.sip %Include qlayout.sip %Include qlcdnumber.sip %Include qlibrary.sip %Include qlineedit.sip -%Include qlist.sip %Include qlistbox.sip %Include qlistview.sip %Include qlocale.sip @@ -186,7 +182,6 @@ static const char *PYTQT_VERSION_STR = "3.18.1"; %Include qscrollbar.sip %Include qscrollview.sip %Include qsemaphore.sip -%Include qsemimodal.sip %Include qsessionmanager.sip %Include qsettings.sip %Include qsgistyle.sip @@ -209,7 +204,6 @@ static const char *PYTQT_VERSION_STR = "3.18.1"; %Include qsyntaxhighlighter.sip %Include qtabbar.sip %Include qtabdialog.sip -%Include qtableview.sip %Include qtabwidget.sip %Include qtextbrowser.sip %Include qtextcodec.sip @@ -238,7 +232,6 @@ static const char *PYTQT_VERSION_STR = "3.18.1"; %Include qwidget.sip %Include qwidgetlist.sip %Include qwidgetstack.sip -%Include qwindow.sip %Include qwindowsstyle.sip %Include qwindowsxpstyle.sip %Include qwizard.sip diff --git a/sip/qt/qtoolbar.sip b/sip/qt/qtoolbar.sip index 31bf3d0..5bab07f 100644 --- a/sip/qt/qtoolbar.sip +++ b/sip/qt/qtoolbar.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQToolBar : TQDockWindow { %TypeHeaderCode @@ -73,88 +71,3 @@ protected: private: TQToolBar(const TQToolBar &); }; - -%End - - -%If (- TQt_3_0_0) - -class TQToolBar : TQWidget -{ -%TypeHeaderCode -#include <tqtoolbar.h> -%End - -public: -%If (- TQt_2_00) - TQToolBar(const char *,TQMainWindow * /TransferThis/, - TQMainWindow::ToolBarDock = TQMainWindow::Top, - bool = 0,const char * = 0); - TQToolBar(const char *,TQMainWindow *,TQWidget * /TransferThis/,bool = 0, - const char * = 0,WFlags = 0); -%End -%If (TQt_2_00 -) - TQToolBar(const TQString &,TQMainWindow * /TransferThis/, - TQMainWindow::ToolBarDock = TQMainWindow::Top,bool = 0, - const char * = 0); - TQToolBar(const TQString &,TQMainWindow *,TQWidget * /TransferThis/,bool = 0, - const char * = 0,WFlags = 0); -%End - TQToolBar(TQMainWindow * /TransferThis/ = 0,const char * = 0); - - void addSeparator(); - -%If (- TQt_2_00) - enum Orientation - { - Horizontal, - Vertical - }; -%End - - virtual void setOrientation(Orientation); - Orientation orientation() const; - void show(); - TQMainWindow *mainWindow(); - bool event(TQEvent *); -%If (- TQt_2_00) - void setStretchableWidget(TQWidget *); -%End -%If (TQt_2_00 -) - virtual void setStretchableWidget(TQWidget *); - bool eventFilter(TQObject *,TQEvent *); - virtual void setLabel(const TQString &); - TQString label() const; -%End -%If (TQt_2_1_0 -) - void hide(); - void setHorizontalStretchable(bool); - void setVerticalStretchable(bool); - bool isHorizontalStretchable() const; - bool isVerticalStretchable() const; - void clear(); - TQSize minimumSize() const; - TQSize minimumSizeHint() const; -%End - -protected: - void paintEvent(TQPaintEvent *); -%If (TQt_2_1_0 -) - void resizeEvent(TQResizeEvent *); -%End -%If (TQt_2_3_0 -) - void styleChange(TQStyle &); -%End - -signals: -%If (TQt_2_1_0 -) - void orientationChanged(Orientation); -%End - -private: -%If (TQt_2_1_0 -) - TQToolBar(const TQToolBar &); -%End -}; - -%End diff --git a/sip/qt/qtoolbox.sip b/sip/qt/qtoolbox.sip index b896202..43486b5 100644 --- a/sip/qt/qtoolbox.sip +++ b/sip/qt/qtoolbox.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_2_0 -) - class TQToolBox : TQFrame { %TypeHeaderCode @@ -84,5 +82,3 @@ protected: void frameChanged(); void styleChange(TQStyle &); }; - -%End diff --git a/sip/qt/qtoolbutton.sip b/sip/qt/qtoolbutton.sip index 64c03a9..ab8d195 100644 --- a/sip/qt/qtoolbutton.sip +++ b/sip/qt/qtoolbutton.sip @@ -36,164 +36,70 @@ class TQToolButton : TQButton %End public: -%If (TQt_3_1_0 -) enum TextPosition { -%If (TQt_3_2_0 -) BesideIcon, BelowIcon, -%End Right, // Obsolete Under // Obsolete }; -%End -%If (- TQt_2_00) - TQToolButton(TQWidget * /TransferThis/ = 0,const char * = 0); - TQToolButton(const TQPixmap &,const char *,const char *,SIP_RXOBJ_CON, - SIP_SLOT_CON(),TQToolBar * /TransferThis/,const char * = 0); - TQToolButton(TQIconSet,const char *,const char *,SIP_RXOBJ_CON, - SIP_SLOT_CON(),TQToolBar * /TransferThis/,const char * = 0); -%End -%If (TQt_2_00 -) TQToolButton(TQWidget * /TransferThis/,const char * = 0); -%End -%If (TQt_2_00 - TQt_3_0_0) - TQToolButton(const TQPixmap &,const TQString &,const TQString &, - SIP_RXOBJ_CON,SIP_SLOT_CON(),TQToolBar * /TransferThis/, - const char * = 0); -%End -%If (TQt_2_00 -) TQToolButton(const TQIconSet &,const TQString &,const TQString &, SIP_RXOBJ_CON,SIP_SLOT_CON(),TQToolBar * /TransferThis/, const char * = 0); -%End -%If (TQt_2_1_0 -) TQToolButton(ArrowType,TQWidget * /TransferThis/,const char * = 0); -%End TQSize sizeHint() const; -%If (TQt_3_0_0 -) TQSize minimumSizeHint() const; -%End -%If (TQt_2_00 - TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End -%If (TQt_2_1_0 - TQt_3_0_0) - void setOnIconSet(const TQIconSet &); - void setOffIconSet(const TQIconSet &); -%End -%If (- TQt_2_00) - void setIconSet(const TQIconSet &); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setIconSet(const TQIconSet &,bool = 0); -%End -%If (TQt_2_1_0 - TQt_3_0_0) - TQIconSet onIconSet() const; - TQIconSet offIconSet() const; -%End -%If (- TQt_2_00) - TQIconSet iconSet() const; -%End -%If (TQt_2_00 - TQt_3_0_0) - TQIconSet iconSet(bool = 0) const; -%End -%If (TQt_3_0_0 -) virtual void setIconSet(const TQIconSet &); TQIconSet iconSet() const; -%End bool usesBigPixmap() const; bool usesTextLabel() const; -%If (- TQt_2_00) - const char *textLabel() const; -%End -%If (TQt_2_00 -) TQString textLabel() const; -%End -%If (TQt_2_1_0 -) void setPopup(TQPopupMenu *); TQPopupMenu* popup() const; void setPopupDelay(int); int popupDelay() const; -%End -%If (TQt_3_0_0 -) void openPopup(); -%End -%If (TQt_2_1_0 -) void setAutoRaise(bool); bool autoRaise() const; -%End -%If (TQt_3_1_0 -) TextPosition textPosition() const; -%End -%If (TQt_3_2_0 -) void setText(const TQString &); -%End public slots: virtual void setUsesBigPixmap(bool); virtual void setUsesTextLabel(bool); -%If (- TQt_2_00) - virtual void setTextLabel(const char *,bool = 1); -%End -%If (TQt_2_00 - TQt_3_0_0) - virtual void setTextLabel(const TQString &,bool = 1); -%End -%If (TQt_3_0_0 -) virtual void setTextLabel(const TQString &,bool); -%End -%If (- TQt_2_00) - void setToggleButton(bool); -%End -%If (TQt_2_00 -) virtual void setToggleButton(bool); -%End -%If (- TQt_2_00) - void setOn(bool); -%End -%If (TQt_2_00 -) virtual void setOn(bool); -%End void toggle(); -%If (TQt_3_0_0 -) // This was actually introduced in TQt v2.1.0 but gives signature // conflict until TQt v3.0.0. void setTextLabel(const TQString &); -%End -%If (TQt_3_1_0 -) void setTextPosition(TextPosition); -%End protected: -%If (TQt_3_0_0 -) void mousePressEvent(TQMouseEvent *); -%End void drawButton(TQPainter *); void drawButtonLabel(TQPainter *); void enterEvent(TQEvent *); void leaveEvent(TQEvent *); -%If (TQt_2_1_0 -) void moveEvent(TQMoveEvent *); -%End bool uses3D() const; -%If (TQt_3_0_0 -) bool eventFilter(TQObject *,TQEvent *); -%End private: -%If (TQt_2_1_0 -) TQToolButton(const TQToolButton &); -%End }; diff --git a/sip/qt/qtooltip.sip b/sip/qt/qtooltip.sip index 47694d4..1a24264 100644 --- a/sip/qt/qtooltip.sip +++ b/sip/qt/qtooltip.sip @@ -44,28 +44,15 @@ class TQToolTipGroup : TQObject public: TQToolTipGroup(TQObject * /TransferThis/,const char * = 0); -%If (TQt_2_00 -) bool delay() const; -%End -%If (TQt_2_1_0 -) bool enabled() const; -%End public slots: -%If (TQt_2_00 -) void setDelay(bool); -%End -%If (TQt_2_1_0 -) void setEnabled(bool); -%End signals: -%If (- TQt_2_00) - void showTip(const char *); -%End -%If (TQt_2_00 -) void showTip(const TQString &); -%End void removeTip(); private: @@ -73,41 +60,6 @@ private: }; -%If (- TQt_2_00) - -class TQToolTip -{ -%TypeHeaderCode -#include <tqtooltip.h> -%End - -public: - TQToolTip(TQWidget *,TQToolTipGroup * = 0); - - static void add(TQWidget *,const char *); - static void add(TQWidget *,const char *,TQToolTipGroup *,const char *); - static void remove(TQWidget *); - static void add(TQWidget *,const TQRect &,const char *); - static void add(TQWidget *,const TQRect &,const char *,TQToolTipGroup *,const char *); - static void remove(TQWidget *,const TQRect &); - static TQFont font(); - static void setFont(const TQFont &); - static TQPalette palette(); - static void setPalette(const TQPalette &); - TQWidget *parentWidget() const; - TQToolTipGroup *group() const; - -protected: - virtual void maybeTip(const TQPoint &) = 0; - void tip(const TQRect &,const char *); - void tip(const TQRect &,const char *,const char *); - void clear(); -}; - -%End - -%If (TQt_2_00 -) - class TQToolTip : TQt { %TypeHeaderCode @@ -127,30 +79,18 @@ public: TQToolTipGroup *,const TQString &); static void remove(TQWidget *,const TQRect &); -%If (TQt_3_0_0 -) static TQString textFor(TQWidget *,const TQPoint & = TQPoint()); -%End -%If (TQt_2_1_0 -) static void hide(); -%End static TQFont font(); static void setFont(const TQFont &); static TQPalette palette(); static void setPalette(const TQPalette &); -%If (TQt_3_0_0 -) static void setGloballyEnabled(bool); static bool isGloballyEnabled(); -%End -%If (TQt_2_1_0 - TQt_3_0_0) - static void setEnabled(bool); - static bool enabled(); -%End -%If (TQt_3_1_0 -) static void setWakeUpDelay(int); -%End TQWidget *parentWidget() const; TQToolTipGroup *group() const; @@ -159,11 +99,7 @@ protected: virtual void maybeTip(const TQPoint &) = 0; void tip(const TQRect &,const TQString &); void tip(const TQRect &,const TQString &,const TQString &); -%If (TQt_3_1_0 -) void tip(const TQRect &,const TQString &,const TQRect &); void tip(const TQRect &,const TQString &,const TQString &,const TQRect &); -%End void clear(); }; - -%End diff --git a/sip/qt/qtranslator.sip b/sip/qt/qtranslator.sip index 73f0bb6..1edee94 100644 --- a/sip/qt/qtranslator.sip +++ b/sip/qt/qtranslator.sip @@ -35,8 +35,6 @@ %End -%If (TQt_2_2_0 -) - class TQTranslatorMessage { %TypeHeaderCode @@ -66,22 +64,12 @@ public: HashContextSourceTextComment }; -%If (- TQt_3_0_0) - void write(TQDataStream &,bool, - Prefix = HashContextSourceTextComment) const /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) void write(TQDataStream &,bool = 0, Prefix = HashContextSourceTextComment) const /ReleaseGIL/; -%End Prefix commonPrefix(const TQTranslatorMessage &) const; }; -%End - - -%If (TQt_2_00 -) class TQTranslator : TQObject { @@ -90,39 +78,17 @@ class TQTranslator : TQObject %End public: -%If (TQt_3_2_0 -) TQTranslator(TQObject * /TransferThis/ = 0,const char * = 0); -%End -%If (- TQt_3_2_0) - TQTranslator(TQObject * /TransferThis/,const char * = 0); -%End -%If (TQt_2_2_0 -) TQString find(const char *,const char *,const char *) const; -%End -%If (- TQt_3_0_0) - virtual TQString find(const char *,const char *) const; -%End -%If (TQt_2_2_0 - TQt_3_0_0) - TQTranslatorMessage findMessage(const char *,const char *, - const char *) const; -%End -%If (TQt_3_0_0 - TQt_3_2_0) - virtual TQTranslatorMessage findMessage(const char *,const char *, - const char *) const; -%End -%If (TQt_3_2_0 -) virtual TQTranslatorMessage findMessage(const char *,const char *, const char * = 0) const; -%End bool load(const TQString &,const TQString & = TQString::null, const TQString & = TQString::null, const TQString & = TQString::null); -%If (TQt_3_1_0 -) bool load(const uchar *,int); -%End void clear(); @@ -133,45 +99,15 @@ public: bool save(const TQString &,SaveMode = Everything); -%If (TQt_2_2_0 -) void insert(const TQTranslatorMessage &); -%End -%If (- TQt_3_0_0) - void insert(const char *,const char *,const TQString &); -%End -%If (TQt_2_2_0 -) void remove(const TQTranslatorMessage &); -%End -%If (- TQt_3_0_0) - void remove(const char *,const char *); -%End -%If (- TQt_3_0_0) - bool contains(const char *,const char *) const; -%End -%If (TQt_2_2_0 - TQt_3_0_0) - bool contains(const char *,const char *,const char *) const; -%End -%If (TQt_3_0_0 -) bool contains(const char *,const char *,const char * = 0) const; -%End -%If (- TQt_3_0_0) - void squeeze(); -%End -%If (TQt_2_2_0 - TQt_3_0_0) - void squeeze(SaveMode); -%End -%If (TQt_3_0_0 -) void squeeze(SaveMode = Everything); -%End void unsqueeze(); -%If (TQt_2_2_0 -) TQValueList<TQTranslatorMessage> messages() const; -%End private: TQTranslator(const TQTranslator &); }; - -%End diff --git a/sip/qt/qurl.sip b/sip/qt/qurl.sip index aaad338..004b653 100644 --- a/sip/qt/qurl.sip +++ b/sip/qt/qurl.sip @@ -31,8 +31,6 @@ operators. %End -%If (TQt_2_1_0 -) - class TQUrl { %TypeHeaderCode @@ -62,9 +60,7 @@ public: int port() const; virtual void setPort(int); -%If (TQt_3_0_0 -) bool hasPort() const; -%End TQString path(bool = 1) const; virtual void setPath(const TQString &); @@ -112,5 +108,3 @@ protected: virtual void reset(); virtual bool parse(const TQString &); }; - -%End diff --git a/sip/qt/qurlinfo.sip b/sip/qt/qurlinfo.sip index 8a7573c..f2f0467 100644 --- a/sip/qt/qurlinfo.sip +++ b/sip/qt/qurlinfo.sip @@ -30,7 +30,6 @@ %If (TQt_NETWORKPROTOCOL) -%If (TQt_2_1_0 -) class TQUrlInfo { @@ -39,13 +38,11 @@ class TQUrlInfo %End public: -%If (TQt_3_2_0 -) enum PermissionSpec { ReadOwner, WriteOwner, ExeOwner, ReadGroup, WriteGroup, ExeGroup, ReadOther, WriteOther, ExeOther }; -%End TQUrlInfo(); TQUrlInfo(const TQUrlOperator &,const TQString &); @@ -69,9 +66,7 @@ public: virtual void setPermissions(int); virtual void setLastModified(const TQDateTime &); -%If (TQt_3_0_0 -) bool isValid() const; -%End TQString name() const; int permissions() const; @@ -93,4 +88,3 @@ public: }; %End -%End diff --git a/sip/qt/qurloperator.sip b/sip/qt/qurloperator.sip index 4dc3873..20e0d8d 100644 --- a/sip/qt/qurloperator.sip +++ b/sip/qt/qurloperator.sip @@ -35,7 +35,6 @@ This returns a tuple of the <Literal>bool</Literal> result and the %If (TQt_NETWORKPROTOCOL) -%If (TQt_2_1_0 -) class TQUrlOperator : TQObject, TQUrl { @@ -60,15 +59,9 @@ public: virtual const TQNetworkOperation *get(const TQString & = TQString::null); virtual const TQNetworkOperation *put(const TQByteArray &, const TQString & = TQString::null); -%If (- TQt_3_0_0) - virtual TQPtrList<TQNetworkOperation> copy(const TQString &,const TQString &, - bool = 0); -%End -%If (TQt_3_0_0 -) virtual TQPtrList<TQNetworkOperation> copy(const TQString &, const TQString &,bool = 0, bool = 1); -%End virtual void copy(const TQStringList &,const TQString &,bool = 0); virtual bool isDir(bool * = 0); @@ -88,23 +81,12 @@ signals: void itemChanged(TQNetworkOperation *); void data(const TQByteArray &,TQNetworkOperation *); void dataTransferProgress(int,int,TQNetworkOperation *); -%If (- TQt_3_0_0) - void startedNextCopy(const TQPtrList<TQNetworkOperation> &); -%End -%If (TQt_3_0_0 -) void startedNextCopy(const TQPtrList<TQNetworkOperation> &); -%End void connectionStateChanged(int,const TQString &); protected: -%If (- TQt_3_0_0) - virtual void reset(); - virtual bool parse(const TQString &); -%End -%If (TQt_3_0_0 -) void reset(); bool parse(const TQString &); -%End virtual bool checkValid(); virtual void clearEntries(); void getNetworkProtocol(); @@ -112,4 +94,3 @@ protected: }; %End -%End diff --git a/sip/qt/quuid.sip b/sip/qt/quuid.sip index 6d50e40..df334fa 100644 --- a/sip/qt/quuid.sip +++ b/sip/qt/quuid.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQUuid { %TypeHeaderCode @@ -38,7 +36,6 @@ class TQUuid %End public: -%If (TQt_3_3_0 -) enum Variant { VarUnknown, @@ -56,15 +53,9 @@ public: Name, Random }; -%End TQUuid(); -%If (TQt_3_0_1 -) TQUuid(uint,ushort,ushort,uchar,uchar,uchar,uchar,uchar,uchar,uchar,uchar); -%End -%If (- TQt_3_0_1) - TQUuid(ulong,ushort,ushort,uchar,uchar,uchar,uchar,uchar,uchar,uchar,uchar); -%End TQUuid(const TQUuid &); TQUuid(const TQString &); @@ -74,14 +65,10 @@ public: bool operator==(const TQUuid &) const; bool operator!=(const TQUuid &) const; -%If (TQt_3_3_0 -) bool operator<(const TQUuid &) const; bool operator>(const TQUuid &) const; static TQUuid createUuid(); TQUuid::Variant variant() const; TQUuid::Version version() const; -%End }; - -%End diff --git a/sip/qt/qvalidator.sip b/sip/qt/qvalidator.sip index dd90564..c400969 100644 --- a/sip/qt/qvalidator.sip +++ b/sip/qt/qvalidator.sip @@ -79,22 +79,8 @@ class TQValidator : TQObject %End public: -%If (- TQt_3_0_0) - TQValidator(TQWidget * /TransferThis/,const char * = 0); -%End -%If (TQt_3_0_0 -) TQValidator(TQObject * /TransferThis/,const char * = 0); -%End -%If (- TQt_2_1_0) - enum State - { - Invalid, - Valid, - Acceptable - }; -%End -%If (TQt_2_1_0 -) enum State { Invalid, @@ -102,21 +88,12 @@ public: Valid = Intermediate, Acceptable }; -%End -%If (TQt_2_00 -) virtual State validate(TQString &,int & /In,Out/) const = 0; virtual void fixup(TQString &) const; -%End -%If (- TQt_2_00) - virtual State validate(TQString &,int & /In,Out/) = 0; - virtual void fixup(TQString &); -%End private: -%If (TQt_2_1_0 -) TQValidator(const TQValidator &); -%End }; @@ -127,35 +104,20 @@ class TQIntValidator : TQValidator %End public: -%If (TQt_3_0_0 -) TQIntValidator(TQObject * /TransferThis/,const char * = 0); TQIntValidator(int,int,TQObject * /TransferThis/,const char * = 0); -%End -%If (- TQt_3_0_0) - TQIntValidator(TQWidget * /TransferThis/,const char * = 0); - TQIntValidator(int,int,TQWidget * /TransferThis/,const char * = 0); -%End -%If (TQt_2_00 -) TQValidator::State validate(TQString &,int & /In,Out/) const; -%End -%If (- TQt_2_00) - TQValidator::State validate(TQString &,int & /In,Out/); -%End -%If (TQt_2_1_0 -) void setBottom(int); void setTop(int); -%End virtual void setRange(int,int); int bottom() const; int top() const; private: -%If (TQt_2_1_0 -) TQIntValidator(const TQIntValidator &); -%End }; @@ -166,44 +128,26 @@ class TQDoubleValidator : TQValidator %End public: -%If (TQt_3_0_0 -) TQDoubleValidator(TQObject * /TransferThis/,const char * = 0); TQDoubleValidator(double,double,int,TQObject * /TransferThis/, const char * = 0); -%End -%If (- TQt_3_0_0) - TQDoubleValidator(TQWidget * /TransferThis/,const char * = 0); - TQDoubleValidator(double,double,int,TQWidget * /TransferThis/, - const char * = 0); -%End -%If (TQt_2_00 -) TQValidator::State validate(TQString &,int & /In,Out/) const; -%End -%If (- TQt_2_00) - TQValidator::State validate(TQString &,int & /In,Out/); -%End virtual void setRange(double,double,int = 0); -%If (TQt_2_1_0 -) void setBottom(double); void setTop(double); void setDecimals(int); -%End double bottom() const; double top() const; int decimals() const; private: -%If (TQt_2_1_0 -) TQDoubleValidator(const TQDoubleValidator &); -%End }; -%If (TQt_3_0_0 -) - class TQRegExpValidator : TQValidator { %TypeHeaderCode @@ -223,5 +167,3 @@ public: private: TQRegExpValidator(const TQRegExpValidator &); }; - -%End diff --git a/sip/qt/qvaluelist.sip b/sip/qt/qvaluelist.sip index e2a1d9b..d803861 100644 --- a/sip/qt/qvaluelist.sip +++ b/sip/qt/qvaluelist.sip @@ -31,8 +31,6 @@ converted to and from Python lists of the type. %End -%If (TQt_2_1_0 -) - template<Type> %MappedType TQValueList<Type> { @@ -115,10 +113,6 @@ template<Type> %End }; -%End - - -%If (TQt_2_00 -) %MappedType TQValueList<int> { @@ -177,5 +171,3 @@ template<Type> return 1; %End }; - -%End diff --git a/sip/qt/qvariant.sip b/sip/qt/qvariant.sip index 783418c..ea28fcf 100644 --- a/sip/qt/qvariant.sip +++ b/sip/qt/qvariant.sip @@ -193,8 +193,6 @@ Not yet implemented. %End -%If (TQt_2_1_0 -) - class TQVariant { %TypeHeaderCode @@ -228,24 +226,16 @@ public: Region, Bitmap, Cursor, -%If (TQt_2_2_0 -) SizePolicy, -%End -%If (TQt_3_0_0 -) Date, Time, DateTime, ByteArray, BitArray, KeySequence, -%End -%If (TQt_3_1_0 -) Pen, -%End -%If (TQt_3_2_0 -) LongLong, ULongLong, -%End }; TQVariant(); @@ -271,48 +261,34 @@ public: TQVariant(const TQRegion &); TQVariant(const TQBitmap &); TQVariant(const TQCursor &); -%If (TQt_3_0_0 -) TQVariant(const TQDate &); TQVariant(const TQTime &); TQVariant(const TQDateTime &); TQVariant(const TQByteArray &); // TQVariant(const TQBitArray &); -%End // TQVariant(const TQValueList<TQVariant> &); // TQVariant(const TQMap<TQString,TQVariant> &); TQVariant(int /Constrained/); // TQVariant(uint); -%If (TQt_3_2_0 -) // TQVariant(TQ_LLONG); // TQVariant(TQ_ULLONG); -%End TQVariant(bool /Constrained/); TQVariant(double); -%If (TQt_2_2_0 -) TQVariant(TQSizePolicy); -%End -%If (TQt_3_0_0 -) // This must appear after the TQString, int and double ctors because // each of those can be converted automatically to a TQKeySequence and // we want those to take precedence. TQVariant(const TQKeySequence &); -%End -%If (TQt_3_1_0 -) TQVariant(const TQPen &); -%End Type type() const; const char* typeName() const; bool canCast(Type) const; -%If (TQt_3_0_0 -) bool cast(Type); -%End bool isValid() const; -%If (TQt_3_1_0 -) bool isNull() const; -%End void clear(); @@ -334,30 +310,22 @@ public: const TQBitmap toBitmap() const; const TQRegion toRegion() const; const TQCursor toCursor() const; -%If (TQt_3_0_0 -) const TQDate toDate() const; const TQTime toTime() const; const TQDateTime toDateTime() const; const TQByteArray toByteArray() const; // const TQBitArray toBitArray() const; const TQKeySequence toKeySequence() const; -%End -%If (TQt_3_1_0 -) const TQPen toPen() const; -%End int toInt() const; uint toUInt() const; -%If (TQt_3_2_0 -) // TQ_LLONG toLongLong(bool * = 0) const; // TQ_ULLONG toULongLong( bool * = 0) const; -%End bool toBool() const; double toDouble() const; // const TQValueList<TQVariant> toList() const; // const TQMap<TQString,TQVariant> toMap() const; -%If (TQt_2_2_0 -) TQSizePolicy toSizePolicy() const; -%End // TQValueListConstIterator<TQVariant> listBegin() const; // TQValueListConstIterator<TQVariant> listEnd() const; @@ -385,30 +353,22 @@ public: TQBitmap & asBitmap(); TQRegion & asRegion(); TQCursor & asCursor(); -%If (TQt_3_0_0 -) TQDate & asDate(); TQTime & asTime(); TQDateTime & asDateTime(); TQByteArray & asByteArray(); // TQBitArray & asBitArray(); TQKeySequence & asKeySequence(); -%End -%If (TQt_3_1_0 -) TQPen & asPen(); -%End // int & asInt(); // uint & asUInt(); -%If (TQt_3_2_0 -) // TQ_LLONG & asLongLong(); // TQ_ULLONG & asULongLong(); -%End // bool & asBool(); // double & asDouble(); // TQValueList<TQVariant> & asList(); // TQMap<TQString,TQVariant> & asMap(); -%If (TQt_2_2_0 -) TQSizePolicy & asSizePolicy(); -%End void load(TQDataStream &); void save(TQDataStream &) const; @@ -416,5 +376,3 @@ public: static const char *typeToName(Type); static Type nameToType(const char *); }; - -%End diff --git a/sip/qt/qvbox.sip b/sip/qt/qvbox.sip index 1072b7e..d88d324 100644 --- a/sip/qt/qvbox.sip +++ b/sip/qt/qvbox.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQVBox : TQHBox { %TypeHeaderCode @@ -38,18 +36,8 @@ class TQVBox : TQHBox %End public: -%If (- TQt_3_0_0) - TQVBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0, - bool = 1); -%End -%If (TQt_3_0_0 -) TQVBox(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); -%End private: -%If (TQt_2_1_0 -) TQVBox(const TQVBox &); -%End }; - -%End diff --git a/sip/qt/qvbuttongroup.sip b/sip/qt/qvbuttongroup.sip index 83bff03..d024bfc 100644 --- a/sip/qt/qvbuttongroup.sip +++ b/sip/qt/qvbuttongroup.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQVButtonGroup : TQButtonGroup { %TypeHeaderCode @@ -44,5 +42,3 @@ public: private: TQVButtonGroup(const TQVButtonGroup &); }; - -%End diff --git a/sip/qt/qvgroupbox.sip b/sip/qt/qvgroupbox.sip index b52dd40..9714a08 100644 --- a/sip/qt/qvgroupbox.sip +++ b/sip/qt/qvgroupbox.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_00 -) - class TQVGroupBox : TQGroupBox { %TypeHeaderCode @@ -44,5 +42,3 @@ public: private: TQVGroupBox(const TQVGroupBox &); }; - -%End diff --git a/sip/qt/qwaitcondition.sip b/sip/qt/qwaitcondition.sip index 311ffb0..8f96561 100644 --- a/sip/qt/qwaitcondition.sip +++ b/sip/qt/qwaitcondition.sip @@ -31,8 +31,6 @@ %If (TQt_THREAD_SUPPORT) -%If (TQt_3_0_0 -) - class TQWaitCondition { %TypeHeaderCode @@ -53,29 +51,3 @@ private: }; %End - - -%If (TQt_2_2_0 - TQt_3_0_0) - -class TQWaitCondition : TQt -{ -%TypeHeaderCode -#include <tqthread.h> -%End - -public: - TQWaitCondition(); - - bool wait(unsigned long = ULONG_MAX) /ReleaseGIL/; - bool wait(TQMutex *,unsigned long = ULONG_MAX) /ReleaseGIL/; - - void wakeOne(); - void wakeAll(); - -private: - TQWaitCondition(const TQWaitCondition &); -}; - -%End - -%End diff --git a/sip/qt/qwhatsthis.sip b/sip/qt/qwhatsthis.sip index a517613..b6d5a3a 100644 --- a/sip/qt/qwhatsthis.sip +++ b/sip/qt/qwhatsthis.sip @@ -29,26 +29,6 @@ %End -%If (- TQt_2_00) - -class TQWhatsThis -{ -%TypeHeaderCode -#include <tqwhatsthis.h> -%End - -public: - static void add(TQWidget *,const char *,bool = 1); - static void add(TQWidget *,const TQPixmap &,const char *,const char *,bool = 1); - static void remove(TQWidget *); - static const char *textFor(TQWidget *); - static TQToolButton *whatsThisButton(TQWidget *); -}; - -%End - -%If (TQt_2_00 -) - class TQWhatsThis : TQt { %TypeHeaderCode @@ -59,39 +39,22 @@ public: TQWhatsThis(TQWidget *); virtual TQString text(const TQPoint &); -%If (TQt_3_0_0 -) virtual bool clicked(const TQString &); -%End -%If (TQt_3_1_0 -) static void setFont(const TQFont &); -%End static void add(TQWidget *,const TQString &); static void remove(TQWidget *); -%If (- TQt_3_0_0) - static TQString textFor(TQWidget *,const TQPoint & = TQPoint()); -%End -%If (TQt_3_0_0 -) static TQString textFor(TQWidget *,const TQPoint & = TQPoint(),bool = 0); -%End static TQToolButton *whatsThisButton(TQWidget *); static void enterWhatsThisMode(); static bool inWhatsThisMode(); -%If (- TQt_3_0_0) - static void leaveWhatsThisMode(const TQString & = TQString::null, - const TQPoint & = TQCursor::pos()); -%End -%If (TQt_3_0_0 -) static void leaveWhatsThisMode(const TQString & = TQString::null, const TQPoint & = TQCursor::pos(), TQWidget * = 0); static void display(const TQString &,const TQPoint & = TQCursor::pos(), TQWidget * = 0); -%End }; - -%End diff --git a/sip/qt/qwidget.sip b/sip/qt/qwidget.sip index 07ceda7..30c3af9 100644 --- a/sip/qt/qwidget.sip +++ b/sip/qt/qwidget.sip @@ -68,9 +68,7 @@ public: WId winId() const; bool isTopLevel() const; -%If (TQt_3_0_0 -) bool isDialog() const; -%End bool isPopup() const; bool isDesktop() const; bool isModal() const; @@ -104,42 +102,27 @@ public: TQPoint mapFromGlobal(const TQPoint &) const; TQPoint mapToParent(const TQPoint &) const; TQPoint mapFromParent(const TQPoint &) const; -%If (TQt_2_2_0 -) TQPoint mapTo(TQWidget *,const TQPoint &) const; TQPoint mapFrom(TQWidget *,const TQPoint &) const; -%End TQWidget *topLevelWidget() const; BackgroundMode backgroundMode() const; -%If (- TQt_3_0_0) - const TQColor &backgroundColor() const; - virtual void setBackgroundColor(const TQColor &); - const TQPixmap *backgroundPixmap(); - virtual void setBackgroundPixmap(const TQPixmap &); -%End const TQColor &foregroundColor() const; -%If (TQt_3_0_0 -) const TQColor &eraseColor() const; virtual void setEraseColor(const TQColor &); const TQPixmap *erasePixmap() const; virtual void setErasePixmap(const TQPixmap &); -%End const TQColorGroup &colorGroup() const; const TQPalette &palette() const; -%If (TQt_2_2_0 -) bool ownPalette() const; -%End virtual void setPalette(const TQPalette &); -%If (TQt_2_1_0 -) void unsetPalette(); -%End -%If (TQt_3_0_0 -) const TQColor &paletteForegroundColor() const; void setPaletteForegroundColor(const TQColor &); @@ -150,38 +133,18 @@ public: virtual void setPaletteBackgroundPixmap(const TQPixmap &); const TQBrush &backgroundBrush() const; -%End -%If (TQt_2_2_0 -) bool ownFont() const; -%End virtual void setFont(const TQFont &); TQFontMetrics fontMetrics() const; TQFontInfo fontInfo() const; -%If (- TQt_3_0_0) - enum PropagationMode - { - NoChildren, - AllChildren, - SameFont, - SamePalette = SameFont - }; - - PropagationMode fontPropagation() const; - PropagationMode palettePropagation() const; -%End - const TQCursor &cursor() const; -%If (TQt_2_2_0 -) bool ownCursor() const; -%End virtual void setCursor(const TQCursor &); const TQPixmap *icon() const; bool hasMouseTracking() const; -%If (TQt_3_0_0 -) bool hasMouse() const; -%End void clearMask(); bool isActiveWindow() const; @@ -191,10 +154,8 @@ public: static void setTabOrder(TQWidget *,TQWidget *); TQWidget *focusProxy() const; -%If (TQt_3_2_0 -) void setInputMethodEnabled(bool); bool isInputMethodEnabled() const; -%End void grabMouse(); void grabMouse(const TQCursor &); @@ -208,95 +169,27 @@ public: bool isVisibleTo(TQWidget *) const; bool isVisibleToTLW() const; virtual TQSize sizeHint() const; -%If (- TQt_3_1_0) - virtual void adjustSize(); -%End void erase(); void erase(int,int,int,int); void erase(const TQRect &); void scroll(int,int); TQWidget *focusWidget() const; bool acceptDrops() const; -%If (- TQt_3_0_0) - TQWidget *parentWidget() const; - bool testWFlags(WFlags) const; -%End -%If (TQt_3_0_0 -) TQWidget *parentWidget(bool = 0) const; WState testWState(WState) const; WFlags testWFlags(WFlags) const; -%End static TQWidget *find(WId); -%If (TQt_3_0_0 -) TQWidget *childAt(int,int,bool = 0) const; TQWidget *childAt(const TQPoint &,bool = 0) const; -%End -%If (TQt_3_3_0 -) void setWindowOpacity(double); double windowOpacity() const; -%End - -%If (- TQt_2_00) - GUIStyle style() const; - virtual void setStyle(GUIStyle); - const TQRect &frameGeometry() const; - void setMinimumSize(int,int); - void setMaximumSize(int,int); - void setSizeIncrement(int,int); - - enum BackgroundMode - { - FixedColor, - FixedPixmap, - NoBackground, - PaletteForeground, - PaletteBackground, - PaletteLight, - PaletteMidlight, - PaletteDark, - PaletteMid, - PaletteText, - PaletteBase - }; - - void setBackgroundMode(BackgroundMode); - const TQFont &font() const; - void setFontPropagation(PropagationMode); - void setPalettePropagation(PropagationMode); - const char *caption() const; - const char *iconText() const; - void setMask(TQBitmap); - void setMask(const TQRegion &); - enum FocusPolicy - { - NoFocus = 0, - TabFocus = 1, - ClickFocus = 2, - StrongFocus = 3 - }; - - void setActiveWindow(); - void setFocusPolicy(FocusPolicy); - void setFocus(); - void clearFocus(); - void setFocusProxy(TQWidget *); - virtual bool close(bool = 0); - void recreate(TQWidget *,WFlags,const TQPoint &,bool = 0); - void drawText(int,int,const char *); - void drawText(const TQPoint &,const char *); - void setAcceptDrops(bool); -%End - -%If (TQt_2_00 -) void setName(const char *); TQStyle &style() const; void setStyle(TQStyle *); -%If (TQt_3_0_0 -) TQStyle *setStyle(const TQString &); -%End TQRect frameGeometry() const; TQSize frameSize() const; TQRegion childrenRegion() const; @@ -311,62 +204,9 @@ public: void setBaseSize(const TQSize &); void setBaseSize(int,int); -%If (- TQt_2_2_0) - enum BackgroundMode - { - FixedColor, - FixedPixmap, - NoBackground, - PaletteForeground, - PaletteButton, - PaletteLight, - PaletteMidlight, - PaletteDark, - PaletteMid, - PaletteText, - PaletteBrightText, - PaletteBase, - PaletteBackground, - PaletteShadow, - PaletteHighlight, - PaletteHighlightedText - }; -%End -%If (TQt_2_2_0 - TQt_3_0_0) - enum BackgroundMode - { - FixedColor, - FixedPixmap, - NoBackground, - PaletteForeground, - PaletteButton, - PaletteLight, - PaletteMidlight, - PaletteDark, - PaletteMid, - PaletteText, - PaletteBrightText, - PaletteBase, - PaletteBackground, - PaletteShadow, - PaletteHighlight, - PaletteHighlightedText, - PaletteButtonText, - X11ParentRelative - }; -%End - virtual void setBackgroundMode(BackgroundMode); -%If (TQt_3_0_0 -) void setBackgroundMode(BackgroundMode,BackgroundMode); -%End TQFont font() const; -%If (- TQt_3_0_0) - void setPalette(const TQPalette &,bool); - void setFont(const TQFont &,bool); - virtual void setFontPropagation(PropagationMode); - virtual void setPalettePropagation(PropagationMode); -%End virtual void unsetCursor(); TQString caption() const; TQString iconText() const; @@ -391,35 +231,20 @@ public: bool isMinimized() const; virtual TQSize minimumSizeHint() const; virtual TQSizePolicy sizePolicy() const; -%If (TQt_2_2_0 -) bool isHidden() const; bool isMaximized() const; -%End -%If (TQt_3_1_0 -) bool isShown() const; bool isFullScreen() const; -%End -%If (TQt_3_3_0 -) uint windowState() const; void setWindowState(uint); -%End -%If (TQt_3_0_0 -) virtual void setSizePolicy(TQSizePolicy); -%End -%If (TQt_3_1_0 -) void setSizePolicy(TQSizePolicy::SizeType,TQSizePolicy::SizeType, bool = 0); -%End -%If (TQt_2_2_0 - TQt_3_0_0) - void setSizePolicy(TQSizePolicy); -%End virtual int heightForWidth(int) const; -%If (TQt_3_2_0 -) TQRegion clipRegion() const; -%End TQLayout *layout() const; void updateGeometry(); @@ -440,7 +265,6 @@ public: Py_END_ALLOW_THREADS %End -%If (TQt_2_1_0 -) void reparent(TQWidget * /GetWrapper/,const TQPoint &,bool = 0); %MethodCode if (sipCpp -> parent() != a0) @@ -455,7 +279,6 @@ public: sipCpp->reparent(a0, *a1, a2); Py_END_ALLOW_THREADS %End -%End void erase(const TQRegion &); void scroll(int,int,const TQRect &); @@ -465,51 +288,26 @@ public: virtual void setAutoMask(bool); bool autoMask() const; virtual bool customWhatsThis() const; -%If (- TQt_3_0_0) - bool testWState(uint) const; -%End -%End -%If (TQt_2_1_0 -) TQRect microFocusHint() const; void unsetFont(); -%End -%If (TQt_2_1_0 -) enum BackgroundOrigin { WidgetOrigin, ParentOrigin, -%If (TQt_3_0_0 -) WindowOrigin, -%End -%If (TQt_3_1_0 -) AncestorOrigin, -%End }; -%End -%If (TQt_2_1_0 - TQt_3_0_0) - void setBackgroundOrigin(BackgroundOrigin); -%End -%If (TQt_3_0_0 -) virtual void setBackgroundOrigin(BackgroundOrigin); -%End -%If (TQt_2_1_0 -) BackgroundOrigin backgroundOrigin() const; -%End -%If (TQt_3_1_0 -) TQPoint backgroundOffset() const; -%End public slots: -%If (TQt_3_1_0 -) virtual void adjustSize(); -%End virtual void setEnabled(bool); -%If (TQt_2_2_0 -) void setDisabled(bool); -%End void update(); void update(int,int,int,int); void update(const TQRect &); @@ -517,10 +315,8 @@ public slots: void repaint(const TQRect &,bool = 1); virtual void show(); virtual void hide(); -%If (TQt_3_1_0 -) void setShown(bool); void setHidden(bool); -%End void raise() /PyName=raiseW/; void lower() /PyName=lowerW/; virtual void move(int,int); @@ -529,18 +325,6 @@ public slots: void resize(const TQSize &); virtual void setGeometry(int,int,int,int); -%If (- TQt_2_00) - void setCaption(const char *); - void setIcon(const TQPixmap &); - void setIconText(const char *); - void setMouseTracking(bool); - void setUpdatesEnabled(bool); - void repaint(bool = 1); - void iconify(); - void setGeometry(const TQRect &); -%End - -%If (TQt_2_00 -) virtual void setCaption(const TQString &); virtual void setIcon(const TQPixmap &); virtual void setIconText(const TQString &); @@ -557,18 +341,13 @@ public slots: virtual void polish(); bool close(); virtual void setGeometry(const TQRect &); -%End -%If (TQt_2_1_0 -) void showFullScreen(); void constPolish() const; -%End -%If (TQt_3_0_0 -) // This was added before v3 but I can't be bothered to work out exactly // when. void stackUnder(TQWidget *); -%End protected: bool event(TQEvent *); @@ -586,42 +365,22 @@ protected: virtual void moveEvent(TQMoveEvent *); virtual void resizeEvent(TQResizeEvent *); virtual void closeEvent(TQCloseEvent *); -%If (TQt_3_0_0 -) virtual void contextMenuEvent(TQContextMenuEvent *); virtual void imStartEvent(TQIMEvent *); virtual void imComposeEvent(TQIMEvent *); virtual void imEndEvent(TQIMEvent *); virtual void tabletEvent(TQTabletEvent *); -%End virtual void enabledChange(bool); -%If (- TQt_3_0_0) - virtual void backgroundColorChange(const TQColor &); - virtual void backgroundPixmapChange(const TQPixmap &); -%End virtual void paletteChange(const TQPalette &); virtual void fontChange(const TQFont &); -%If (TQt_3_0_0 -) virtual void windowActivationChange(bool); void resetInputContext(); -%End WFlags getWFlags() const; void clearWFlags(WFlags); virtual bool focusNextPrevChild(bool); // TQWExtra *extraData(); // TQFocusData *focusData(); -%If (- TQt_2_00) - virtual void styleChange(GUIStyle); - void create(WId); - void create(WId,bool,bool); - void destroy(bool,bool); - void setWFlags(WFlags); - void setFRect(const TQRect &); - void setCRect(const TQRect &); - void setSizeGrip(bool); -%End - -%If (TQt_2_00 -) virtual void wheelEvent(TQWheelEvent *); %If (TQt_DRAGANDDROP) virtual void dragEnterEvent(TQDragEnterEvent *); @@ -631,10 +390,7 @@ protected: %End virtual void showEvent(TQShowEvent *); virtual void hideEvent(TQHideEvent *); -%If (- TQt_3_0_0) virtual void customEvent(TQCustomEvent *); -%End - virtual void updateMask(); @@ -646,18 +402,8 @@ protected: virtual void setWState(uint); void clearWState(uint); virtual void setWFlags(WFlags); -%If (- TQt_3_0_0) - virtual void setFRect(const TQRect &); - virtual void setCRect(const TQRect &); -%End virtual void setKeyCompression(bool); -%If (- TQt_3_0_0) - virtual void setMicroFocusHint(int,int,int,int,bool = 1); -%End -%If (TQt_3_0_0 -) virtual void setMicroFocusHint(int,int,int,int,bool = 1,TQFont * = 0); -%End -%End private: TQWidget(const TQWidget &); diff --git a/sip/qt/qwidgetstack.sip b/sip/qt/qwidgetstack.sip index 0f9ad7c..9451970 100644 --- a/sip/qt/qwidgetstack.sip +++ b/sip/qt/qwidgetstack.sip @@ -37,25 +37,16 @@ class TQWidgetStack : TQFrame public: TQWidgetStack(TQWidget * /TransferThis/ = 0,const char * = 0); -%If (TQt_3_1_0 -) TQWidgetStack(TQWidget * /TransferThis/,const char *,WFlags); -%End // The TQWidget has it's parent changed to be `this' so it will be // deleted automatically when `this' is deleted. It stays this way // even if removeWidget() is called, so it isn't transferred back. -%If (- TQt_3_0_0) - void addWidget(TQWidget * /Transfer/,int); -%End -%If (TQt_3_0_0 -) int addWidget(TQWidget * /Transfer/,int = -1); -%End void removeWidget(TQWidget *); -%If (TQt_2_00 -) TQSize sizeHint() const; TQSize minimumSizeHint() const; -%End void show(); TQWidget *widget(int) const; @@ -63,13 +54,7 @@ public: TQWidget *visibleWidget() const; -%If (TQt_2_00 -) void setFrameRect(const TQRect &); -%End - -%If (- TQt_2_00) - bool event(TQEvent *); -%End signals: void aboutToShow(int); @@ -81,18 +66,11 @@ public slots: protected: void frameChanged(); -%If (- TQt_2_00) - void setChildGeometries(); -%End -%If (TQt_2_00 -) void resizeEvent(TQResizeEvent *); virtual void setChildGeometries(); void childEvent(TQChildEvent *); -%End private: -%If (TQt_2_1_0 -) TQWidgetStack(const TQWidgetStack &); -%End }; diff --git a/sip/qt/qwindow.sip b/sip/qt/qwindow.sip deleted file mode 100644 index 7c34d16..0000000 --- a/sip/qt/qwindow.sip +++ /dev/null @@ -1,47 +0,0 @@ -// This is the SIP interface definition for TQWindow. -// -// Copyright (c) 2007 -// Riverbank Computing Limited <[email protected]> -// -// This file is part of PyTQt. -// -// This copy of PyTQt is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2, or (at your option) any later -// version. -// -// PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -// details. -// -// You should have received a copy of the GNU General Public License along with -// PyTQt; see the file LICENSE. If not, write to the Free Software Foundation, -// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -%ExportedDoc -<Sect2><Title>TQWindow</Title> -<Para> -<Literal>TQWindow</Literal> is fully implemented (TQt v1.x). -</Para> -</Sect2> -%End - - -%If (- TQt_2_00) - -class TQWindow : TQWidget -{ -%TypeHeaderCode -#include <tqwindow.h> -%End - -public: - TQWindow(TQWidget * = 0,const char * = 0,WFlags = 0); - -private: - TQWindow(const TQWindow &); -}; - -%End diff --git a/sip/qt/qwindowdefs.sip b/sip/qt/qwindowdefs.sip index d694279..5e709db 100644 --- a/sip/qt/qwindowdefs.sip +++ b/sip/qt/qwindowdefs.sip @@ -40,141 +40,12 @@ All constant values defined by TQt have equivalent constants defined to Python. %OptionalInclude qwindowdefs_x11.sip -%If (- TQt_2_00) -typedef short TQCOORD; - -const int TQCOORD_MIN; -const int TQCOORD_MAX; -%End - -%If (TQt_2_00 -) typedef TQ_INT32 TQCOORD; const TQCOORD TQCOORD_MIN; const TQCOORD TQCOORD_MAX; -%End typedef unsigned TQRgb; -%If (- TQt_3_0_0) -char *tqAppName(); -%End -%If (TQt_3_0_0 -) const char *tqAppName(); -%End - - -%If (- TQt_2_00) - -enum GUIStyle { - MacStyle, - WindowsStyle, - Win3Style, - PMStyle, - MotifStyle -}; - - -// Widget state flags. - -typedef uint WFlags; - -const uint WState_Created; -const uint WState_Disabled; -const uint WState_Visible; -const uint WState_DoHide; -const uint WState_ClickToFocus; -const uint WState_TrackMouse; -const uint WState_BlockUpdates; -const uint WState_PaintEvent; - -// Widget type flags. - -const uint WType_TopLevel; -const uint WType_Modal; -const uint WType_Popup; -const uint WType_Desktop; - -// Window style flags. - -const uint WStyle_Customize; -const uint WStyle_NormalBorder; -const uint WStyle_DialogBorder; -const uint WStyle_NoBorder; -const uint WStyle_Title; -const uint WStyle_SysMenu; -const uint WStyle_Minimize; -const uint WStyle_Maximize; -const uint WStyle_MinMax; -const uint WStyle_Tool; -const uint WStyle_Mask; - -// Miscellaneous widget flags. - -const uint WCursorSet; -const uint WDestructiveClose; -const uint WPaintDesktop; -const uint WPaintUnclipped; -const uint WPaintClever; -const uint WConfigPending; -const uint WResizeNoErase; -const uint WRecreated; -const uint WExportFontMetrics; -const uint WExportFontInfo; -const uint WFocusSet; -const uint WState_TabToFocus; - - -enum RasterOp { - CopyROP, - OrROP, - XorROP, - EraseROP, - NotCopyROP, - NotOrROP, - NotXorROP, - NotEraseROP, - NotROP -}; - - -// Text alignment flags. - -const int AlignLeft; -const int AlignRight; -const int AlignHCenter; -const int AlignTop; -const int AlignBottom; -const int AlignVCenter; -const int AlignCenter; - -// Miscellaneous text flags. - -const int SingleLine; -const int DontClip; -const int ExpandTabs; -const int ShowPrefix; -const int WordBreak; -const int GrayText; - -// Image conversion flags. - -const int ColorMode_Mask; -const int AutoColor; -const int ColorOnly; -const int MonoOnly; -const int AlphaDither_Mask; -const int ThresholdAlphaDither; -const int OrderedAlphaDither; -const int DiffuseAlphaDither; -const int Dither_Mask; -const int DiffuseDither; -const int OrderedDither; -const int ThresholdDither; -const int DitherMode_Mask; -const int AutoDither; -const int PreferDither; -const int AvoidDither; - -%End diff --git a/sip/qt/qwindowdefs_x11.sip b/sip/qt/qwindowdefs_x11.sip index 13ca459..db45346 100644 --- a/sip/qt/qwindowdefs_x11.sip +++ b/sip/qt/qwindowdefs_x11.sip @@ -23,26 +23,15 @@ %If (WS_X11) -%If (- TQt_3_0_0) -typedef unsigned HANDLE; -typedef unsigned WId; -%End - -%If (TQt_3_0_0 -) typedef unsigned long WId; -%End typedef void Display; Display *tqt_xdisplay(); int tqt_xscreen(); WId tqt_xrootwin(); -%If (TQt_3_1_0 -) WId tqt_xrootwin(int); -%End -%If (TQt_3_3_0 -) const char *tqAppClass(); -%End %End diff --git a/sip/qt/qwindowsstyle.sip b/sip/qt/qwindowsstyle.sip index 877d60d..72e5f83 100644 --- a/sip/qt/qwindowsstyle.sip +++ b/sip/qt/qwindowsstyle.sip @@ -64,7 +64,6 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the %If (TQt_STYLE_WINDOWS) -%If (TQt_2_00 -) class TQWindowsStyle : TQCommonStyle { @@ -75,7 +74,6 @@ class TQWindowsStyle : TQCommonStyle public: TQWindowsStyle(); -%If (TQt_3_3_0 -) void applicationPolish(const TQStyleControlElementData&, ControlElementFlags, void *); void applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *); @@ -85,64 +83,7 @@ public: void polish( TQPalette & ); virtual void polishPopupMenu( const TQStyleControlElementData&, ControlElementFlags, void * ); -%End - -%If (- TQt_3_0_0) - void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,const TQBrush * = 0); - void drawBevelButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,const TQBrush * = 0); - void drawFocusRect(TQPainter *,const TQRect &,const TQColorGroup &, - const TQColor * = 0,bool = 0); - void drawPushButton(TQPushButton *,TQPainter *); - - void getButtonShift(int &,int &); - - void drawPanel(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,int = 1,const TQBrush * = 0); - void drawPopupPanel(TQPainter *,int,int,int,int,const TQColorGroup &, - int = 2,const TQBrush * = 0); - void drawArrow(TQPainter *,ArrowType,bool,int,int,int,int, - const TQColorGroup &,bool,const TQBrush * = 0); - TQSize indicatorSize() const; - void drawIndicator(TQPainter *,int,int,int,int,const TQColorGroup &, - int,bool = 0,bool = 1); - TQSize exclusiveIndicatorSize() const; - void drawExclusiveIndicator(TQPainter *,int,int,int,int, - const TQColorGroup &,bool,bool = 0,bool = 1); - void drawExclusiveIndicatorMask(TQPainter *,int,int,int,int,bool); - void drawComboButton(TQPainter *,int,int,int,int,const TQColorGroup &, - bool = 0,bool = 0,bool = 1,const TQBrush * = 0); - TQRect comboButtonRect(int,int,int,int); - TQRect comboButtonFocusRect(int,int,int,int); - - void tabbarMetrics(const TQTabBar *,int &,int &,int &); - - void drawTab(TQPainter *,const TQTabBar *,TQTab *,bool); - void drawTabMask(TQPainter *,const TQTabBar *,TQTab *,bool); - - void scrollBarMetrics(const TQScrollBar *,int &,int &,int &,int &); - void drawScrollBarControls(TQPainter *,const TQScrollBar *,int,uint,uint); - int sliderLength() const; - void drawSlider(TQPainter *,int,int,int,int,const TQColorGroup &, - Orientation,bool,bool); - void drawSliderMask(TQPainter *,int,int,int,int,Orientation,bool,bool); - void drawSliderGroove(TQPainter *,int,int,int,int,const TQColorGroup &, - TQCOORD,Orientation); - int maximumSliderDragDistance() const; - int splitterWidth() const; - void drawSplitter(TQPainter *,int,int,int,int,const TQColorGroup &, - Orientation); - void drawCheckMark(TQPainter *,int,int,int,int,const TQColorGroup &,bool, - bool); - void polishPopupMenu(TQPopupMenu *); - int extraPopupMenuItemWidth(bool,int,TQMenuItem *,const TQFontMetrics &); - int popupMenuItemHeight(bool,TQMenuItem *,const TQFontMetrics &); - void drawPopupMenuItem(TQPainter *,bool,int,int,TQMenuItem *, - const TQPalette &,bool,bool,int,int,int,int); -%End -%If (TQt_3_0_0 -) void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &, const TQColorGroup &,SFlags = Style_Default, const TQStyleOption & = TQStyleOption()) const; @@ -169,24 +110,11 @@ public: TQPixmap stylePixmap(StylePixmap,const TQStyleControlElementData&,ControlElementFlags, const TQStyleOption & = TQStyleOption(), const TQWidget * = 0) const; -%End -%If (TQt_3_1_0 -) TQRect subRect(SubRect,const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const; -%End - -protected: -%If (- TQt_3_0_0) - void drawWinShades(TQPainter *,int,int,int,int,const TQColor &, - const TQColor &,const TQColor &,const TQColor &, - const TQBrush *); -%End private: -%If (TQt_3_0_0 -) TQWindowsStyle(const TQWindowsStyle &); -%End }; %End -%End diff --git a/sip/qt/qwizard.sip b/sip/qt/qwizard.sip index 9385df8..278be85 100644 --- a/sip/qt/qwizard.sip +++ b/sip/qt/qwizard.sip @@ -30,7 +30,6 @@ %If (TQt_WIZARD) -%If (TQt_2_00 -) class TQWizard : TQDialog { @@ -48,32 +47,22 @@ public: // The TQWidget is passed to TQWidgetStack::addWidget(). virtual void addPage(TQWidget * /Transfer/, const TQString &); -%If (TQt_3_0_0 -) // The TQWidget is passed to TQWidgetStack::addWidget(). virtual void insertPage(TQWidget * /Transfer/, const TQString &,int); -%End virtual void removePage(TQWidget *); TQString title(TQWidget *) const; -%If (TQt_2_2_0 -) void setTitle(TQWidget *,const TQString &); -%End -%If (TQt_3_0_0 -) TQFont titleFont() const; void setTitleFont(const TQFont &); -%End virtual void showPage(TQWidget *); TQWidget *currentPage() const; -%If (TQt_2_1_0 -) TQWidget *page(int) const; int pageCount() const; -%End -%If (TQt_3_0_0 -) int indexOf(TQWidget *) const; -%End virtual bool appropriate(TQWidget *) const; virtual void setAppropriate(TQWidget *,bool); @@ -93,10 +82,6 @@ public slots: virtual void setHelpEnabled(TQWidget *,bool); -%If (- TQt_3_0_0) - virtual void setFinish(TQWidget *,bool); -%End - protected slots: virtual void back(); virtual void next(); @@ -104,19 +89,14 @@ protected slots: signals: void helpClicked(); -%If (TQt_2_2_0 -) void selected(const TQString &); -%End protected: virtual void layOutButtonRow(TQHBoxLayout *); virtual void layOutTitleRow(TQHBoxLayout *,const TQString &); private: -%If (TQt_2_1_0 -) TQWizard(const TQWizard &); -%End }; %End -%End diff --git a/sip/qt/qwmatrix.sip b/sip/qt/qwmatrix.sip index a6a6828..965130e 100644 --- a/sip/qt/qwmatrix.sip +++ b/sip/qt/qwmatrix.sip @@ -86,37 +86,24 @@ class TQWMatrix public: TQWMatrix(); -%If (- TQt_2_00) - TQWMatrix(float,float,float,float,float,float); -%End -%If (TQt_2_00 -) TQWMatrix(double,double,double,double,double,double); -%End void map(int /Constrained/,int /Constrained/,int *,int *) const; -%If (TQt_3_0_0 -) TQRect mapRect(const TQRect &) const; -%End TQPoint map(const TQPoint &) const; TQRect map(const TQRect &); const TQPointArray map(const TQPointArray &) const; -%If (TQt_3_1_0 -) TQRegion map(const TQRegion &) const; TQRegion mapToRegion(const TQRect &) const; TQPointArray mapToPolygon(const TQRect &) const; -%End void reset(); -%If (TQt_3_0_0 -) bool isIdentity() const; bool isInvertible() const; -%End -%If (TQt_3_1_0 -) double det() const; -%End TQWMatrix invert(bool * = 0) const; @@ -124,15 +111,12 @@ public: bool operator!=(const TQWMatrix &) const; TQWMatrix &operator*=(const TQWMatrix &); -%If (TQt_3_0_0 -) // These aren't documented but are used in TQt examples. TQPoint operator*(const TQPoint &) const; TQRegion operator*(const TQRect &) const; TQRegion operator*(const TQRegion &) const; TQPointArray operator*(const TQPointArray &) const; -%End -%If (TQt_3_1_0 -) enum TransformationMode { Points, Areas @@ -140,26 +124,7 @@ public: static void setTransformationMode(TransformationMode); static TransformationMode transformationMode(); -%End -%If (- TQt_2_00) - void setMatrix(float,float,float,float,float,float); - float m11(); - float m12(); - float m21(); - float m22(); - float dx(); - float dy(); - - void map(float,float,float *,float *) const; - - TQWMatrix &translate(float,float); - TQWMatrix &scale(float,float); - TQWMatrix &shear(float,float); - TQWMatrix &rotate(float); -%End - -%If (TQt_2_00 -) void setMatrix(double,double,double,double,double,double); double m11(); double m12(); @@ -174,5 +139,4 @@ public: TQWMatrix &scale(double,double); TQWMatrix &shear(double,double); TQWMatrix &rotate(double); -%End }; diff --git a/sip/qt/qworkspace.sip b/sip/qt/qworkspace.sip index e38dcd3..06b85be 100644 --- a/sip/qt/qworkspace.sip +++ b/sip/qt/qworkspace.sip @@ -29,7 +29,6 @@ %End -%If (TQt_2_1_0 -) %If (TQt_WORKSPACE) class TQWorkspace : TQWidget @@ -41,31 +40,22 @@ class TQWorkspace : TQWidget public: TQWorkspace(TQWidget * /TransferThis/ = 0,const char * = 0); -%If (TQt_3_2_0 -) enum WindowOrder { CreationOrder, StackingOrder }; -%End TQWidget *activeWindow() const; TQWidgetList windowList() const; -%If (TQt_3_2_0 -) TQWidgetList windowList(WindowOrder) const; -%End -%If (- TQt_3_0_0) - TQSizePolicy sizePolicy() const; -%End TQSize sizeHint() const; -%If (TQt_3_0_0 -) bool scrollBarsEnabled() const; void setScrollBarsEnabled(bool); void setPaletteBackgroundColor(const TQColor &); void setPaletteBackgroundPixmap(const TQPixmap &); -%End signals: void windowActivated(TQWidget *); @@ -73,29 +63,22 @@ signals: public slots: void cascade(); void tile(); -%If (TQt_3_2_0 -) void closeActiveWindow(); void closeAllWindows(); void activateNextWindow(); void activatePrevWindow(); -%End protected: -%If (TQt_3_0_0 -) void styleChange(TQStyle &); -%End void childEvent(TQChildEvent *); void resizeEvent(TQResizeEvent *); bool eventFilter(TQObject *,TQEvent *); void showEvent(TQShowEvent *); -%If (TQt_3_0_0 -) void hideEvent(TQHideEvent *); void wheelEvent(TQWheelEvent *); -%End private: TQWorkspace(const TQWorkspace &); }; %End -%End diff --git a/sip/qtcanvas/qcanvas.sip b/sip/qtcanvas/qcanvas.sip index c005233..2fc5c0b 100644 --- a/sip/qtcanvas/qcanvas.sip +++ b/sip/qtcanvas/qcanvas.sip @@ -129,8 +129,6 @@ The <Literal>pixmaps</Literal> argument is a Python list of TQPixmap instances. %End -%If (TQt_2_2_0 -) - %MappedType TQCanvasItemList { %TypeHeaderCode @@ -229,11 +227,9 @@ public: sipClass = sipClass_TQCanvasLine; break; -#if TQT_VERSION >= 0x030000 case 8: sipClass = sipClass_TQCanvasSpline; break; -#endif default: sipClass = 0; @@ -286,35 +282,14 @@ public: void hide(); virtual void setVisible(bool); -%If (- TQt_3_0_0) - bool visible() const; -%End -%If (TQt_3_0_0 -) bool isVisible() const; -%End virtual void setSelected(bool); -%If (- TQt_3_0_0) - bool selected() const; -%End -%If (TQt_3_0_0 -) bool isSelected() const; -%End virtual void setEnabled(bool); -%If (- TQt_3_0_0) - bool enabled() const; -%End -%If (TQt_3_0_0 -) bool isEnabled() const; -%End virtual void setActive(bool); -%If (- TQt_3_0_0) - bool active() const; -%End -%If (TQt_3_0_0 -) bool isActive() const; -%End -%If (TQt_3_0_0 -) enum RttiValues { Rtti_Item, Rtti_Sprite, @@ -326,7 +301,6 @@ public: Rtti_Line, Rtti_Spline }; -%End virtual int rtti() const; @@ -336,9 +310,7 @@ public: TQCanvas *canvas() const; protected: -%If (TQt_3_0_0 -) void update(); -%End private: virtual bool collidesWith(const TQCanvasSprite *, @@ -409,9 +381,7 @@ public: int width() const; int height() const; TQSize size() const; -%If (TQt_3_0_0 -) TQRect rect() const; -%End bool onCanvas(int,int) const; bool onCanvas(const TQPoint &) const; bool validChunk(int,int) const; @@ -427,9 +397,7 @@ public: // virtual void setChangedChunkContaining(int,int); virtual void setAllChanged(); virtual void setChanged(const TQRect &); -%If (TQt_3_0_0 -) virtual void setUnchanged(const TQRect &); -%End TQCanvasItemList allItems(); TQCanvasItemList collisions(const TQPoint &) const; @@ -437,9 +405,7 @@ public: TQCanvasItemList collisions(const TQPointArray &,const TQCanvasItem *, bool) const; -%If (TQt_3_0_0 -) void drawArea(const TQRect &,TQPainter *,bool = 0); -%End virtual void setAdvancePeriod(int); virtual void setUpdatePeriod(int); @@ -458,9 +424,7 @@ protected: virtual void drawForeground(TQPainter &,const TQRect &); private: -%If (TQt_3_1_0 -) TQCanvas(const TQCanvas &); -%End }; @@ -471,33 +435,23 @@ class TQCanvasView : TQScrollView %End public: -%If (- TQt_3_0_0) - TQCanvasView(TQCanvas * = 0,TQWidget * /TransferThis/ = 0, - const char * = 0,WFlags = 0); -%End -%If (TQt_3_0_0 -) TQCanvasView(TQWidget * /TransferThis/ = 0,const char * = 0,WFlags = 0); TQCanvasView(TQCanvas *,TQWidget * /TransferThis/ = 0,const char * = 0, WFlags = 0); -%End TQCanvas* canvas() const; void setCanvas(TQCanvas *); -%If (TQt_3_0_0 -) const TQWMatrix &worldMatrix() const; const TQWMatrix &inverseWorldMatrix() const; bool setWorldMatrix(const TQWMatrix &); -%End protected: void drawContents(TQPainter *,int,int,int,int); TQSize sizeHint() const; private: -%If (TQt_3_1_0 -) TQCanvasView(const TQCanvasView &); -%End }; @@ -510,21 +464,14 @@ class TQCanvasPixmap : TQPixmap public: TQCanvasPixmap(const TQString &); TQCanvasPixmap(const TQImage &); -%If (- TQt_3_0_0) - TQCanvasPixmap(const TQPixmap &,TQPoint); -%End -%If (TQt_3_0_0 -) TQCanvasPixmap(const TQPixmap &,const TQPoint &); -%End int offsetX() const; int offsetY() const; void setOffset(int,int); private: -%If (TQt_3_1_0 -) TQCanvasPixmap(const TQCanvasPixmap &); -%End }; @@ -537,28 +484,19 @@ class TQCanvasPixmapArray public: TQCanvasPixmapArray(); TQCanvasPixmapArray(const TQString &,int = 0); -%If (- TQt_3_0_0) - TQCanvasPixmapArray(TQPtrList<TQPixmap>,TQPtrList<TQPoint>); -%End -%If (TQt_3_0_0 -) TQCanvasPixmapArray(TQValueList<TQPixmap>,TQPointArray = TQPointArray()); -%End bool readPixmaps(const TQString &,int = 0) /ReleaseGIL/; bool readCollisionMasks(const TQString &) /ReleaseGIL/; -%If (TQt_3_0_0 -) bool isValid() const; -%End TQCanvasPixmap *image(int) const; void setImage(int,TQCanvasPixmap * /Transfer/); uint count() const; private: -%If (TQt_3_1_0 -) TQCanvasPixmapArray(const TQCanvasPixmapArray &); -%End }; @@ -577,7 +515,6 @@ public: virtual void move(double,double,int); void setFrame(int); -%If (TQt_3_0_0 -) enum FrameAnimationType { Cycle, Oscillate @@ -585,22 +522,15 @@ public: virtual void setFrameAnimation(FrameAnimationType = Cycle,int = 1, int = 0); -%End int frame() const; int frameCount() const; -%If (- TQt_3_0_0) - virtual int rtti() const; -%End -%If (TQt_3_0_0 -) int rtti() const; -%End bool collidesWith(const TQCanvasItem *) const; TQRect boundingRect() const; -%If (TQt_3_0_0 -) int width() const; int height() const; @@ -621,30 +551,9 @@ public: void advance(int); void draw(TQPainter &); -%End - -protected: -%If (- TQt_3_0_0) - void draw(TQPainter &); - int width() const; - int height() const; - int absX() const; - int absY() const; - int absX2() const; - int absY2() const; - int absX(int) const; - int absY(int) const; - int absX2(int) const; - int absY2(int) const; - TQCanvasPixmap *image() const; - virtual TQCanvasPixmap *imageAdvanced() const; - TQCanvasPixmap *image(int) const; -%End private: -%If (TQt_3_1_0 -) TQCanvasSprite(const TQCanvasSprite &); -%End }; @@ -678,10 +587,8 @@ protected: bool winding() const; void setWinding(bool); -%If (TQt_3_1_0 -) void invalidate(); bool isValid() const; -%End }; @@ -735,8 +642,6 @@ protected: }; -%If (TQt_3_0_0 -) - class TQCanvasSpline : TQCanvasPolygon { %TypeHeaderCode @@ -753,8 +658,6 @@ public: int rtti() const; }; -%End - class TQCanvasLine : TQCanvasPolygonalItem { @@ -773,9 +676,7 @@ public: int rtti() const; void setPen(TQPen); -%If (TQt_3_3_0 -) void moveBy(double,double); -%End protected: void drawShape(TQPainter &); @@ -838,20 +739,11 @@ public: bool collidesWith(const TQCanvasItem *) const; -%If (- TQt_3_0_0) - virtual int rtti() const; -%End -%If (TQt_3_0_0 -) int rtti() const; -%End protected: virtual void draw(TQPainter &); private: -%If (TQt_3_1_0 -) TQCanvasText(const TQCanvasText &); -%End }; - -%End diff --git a/sip/qtgl/qgl.sip b/sip/qtgl/qgl.sip index b40e630..1d1b080 100644 --- a/sip/qtgl/qgl.sip +++ b/sip/qtgl/qgl.sip @@ -48,8 +48,6 @@ %End -%If (TQt_2_00 -) - const int TQGL_VERSION; const char *TQGL_VERSION_STR; @@ -140,9 +138,7 @@ class TQGLContext : TQGL public: TQGLContext(const TQGLFormat &,TQPaintDevice *); -%If (TQt_3_2_0 -) TQGLContext(const TQGLFormat &); -%End virtual bool create(const TQGLContext * = 0); bool isValid() const; @@ -150,9 +146,7 @@ public: virtual void reset(); TQGLFormat format() const; -%If (TQt_3_0_0 -) TQGLFormat requestedFormat() const; -%End virtual void setFormat(const TQGLFormat &); virtual void makeCurrent(); @@ -178,15 +172,11 @@ protected: void setWindowCreated(bool); bool initialized() const; void setInitialized(bool); -%If (TQt_3_1_0 -) void generateFontDisplayLists(const TQFont &,int); -%End uint colorIndex(const TQColor &) const; -%If (TQt_3_2_0 -) void setValid(bool); void setDevice(TQPaintDevice *); -%End private: TQGLContext(); @@ -203,10 +193,8 @@ class TQGLWidget : TQWidget, TQGL public: TQGLWidget(TQWidget * /TransferThis/ = 0,const char * = 0, const TQGLWidget * = 0,WFlags = 0); -%If (TQt_3_2_0 -) TQGLWidget(TQGLContext * /Transfer/,TQWidget * /TransferThis/ = 0,const char * = 0, const TQGLWidget * = 0,WFlags = 0); -%End TQGLWidget(const TQGLFormat &,TQWidget * /TransferThis/ = 0, const char * = 0,const TQGLWidget * = 0,WFlags = 0); @@ -220,9 +208,7 @@ public: bool isValid() const; bool isSharing() const; virtual void makeCurrent(); -%If (TQt_3_2_0 -) void doneCurrent(); -%End bool doubleBuffer() const; virtual void swapBuffers(); @@ -232,9 +218,7 @@ public: const TQGLContext *context() const; virtual TQPixmap renderPixmap(int = 0,int = 0,bool = 0); -%If (TQt_3_0_0 -) virtual TQImage grabFrameBuffer(bool = 0); -%End virtual void makeOverlayCurrent(); const TQGLContext *overlayContext() const; @@ -243,8 +227,7 @@ public: void setMouseTracking(bool); -%If (TQt_3_0_0 -) - virtual void reparent(TQWidget * /GetWrapper/,WFlags,const TQPoint &, + virtual void reparent(TQWidget * /GetWrapper/,WFlags,const TQPoint &, bool = 0); %MethodCode if (sipCpp -> parent() != a0) @@ -260,14 +243,11 @@ public: const TQGLColormap &colormap() const; void setColormap(const TQGLColormap &); -%End -%If (TQt_3_1_0 -) void renderText(int,int,const TQString &,const TQFont & = TQFont(), int = 2000); void renderText(double,double,double,const TQString &, const TQFont & = TQFont(),int = 2000); -%End public slots: virtual void updateGL(); @@ -294,5 +274,3 @@ protected: private: TQGLWidget(const TQGLWidget &); }; - -%End diff --git a/sip/qtgl/qglcolormap.sip b/sip/qtgl/qglcolormap.sip index 1e19527..4d621ae 100644 --- a/sip/qtgl/qglcolormap.sip +++ b/sip/qtgl/qglcolormap.sip @@ -35,8 +35,6 @@ Not yet implemented. %End -%If (TQt_3_0_0 -) - class TQGLColormap { %TypeHeaderCode @@ -59,5 +57,3 @@ public: int find(TQRgb) const; int findNearest(TQRgb) const; }; - -%End diff --git a/sip/qtnetwork/qdns.sip b/sip/qtnetwork/qdns.sip index 79d1d23..7d9c436 100644 --- a/sip/qtnetwork/qdns.sip +++ b/sip/qtnetwork/qdns.sip @@ -30,7 +30,6 @@ %If (TQt_DNS) -%If (TQt_2_2_0 -) class TQDns : TQObject { @@ -271,4 +270,3 @@ signals: }; %End -%End diff --git a/sip/qtnetwork/qftp.sip b/sip/qtnetwork/qftp.sip index 94aed30..9edb2c4 100644 --- a/sip/qtnetwork/qftp.sip +++ b/sip/qtnetwork/qftp.sip @@ -37,7 +37,6 @@ This takes a single <Literal>maxlen</Literal> parameter. The %If (TQt_NETWORKPROTOCOL_FTP) -%If (TQt_2_2_0 -) class TQFtp : TQNetworkProtocol { @@ -47,19 +46,11 @@ class TQFtp : TQNetworkProtocol public: TQFtp(); -%If (TQt_3_1_0 -) TQFtp(TQObject * /TransferThis/,const char * = 0); -%End virtual ~TQFtp(); -%If (TQt_3_0_0 -) int supportedOperations() const; -%End -%If (- TQt_3_0_0) - virtual int supportedOperations() const; -%End -%If (TQt_3_1_0 -) enum State { Unconnected, HostLookup, @@ -149,15 +140,11 @@ public: Error error() const; TQString errorString() const; -%End public slots: -%If (TQt_3_1_0 -) void abort(); -%End signals: -%If (TQt_3_1_0 -) void stateChanged(int); void listInfo(const TQUrlInfo &); void readyRead(); @@ -167,7 +154,6 @@ signals: void commandStarted(int); void commandFinished(int,bool); void done(bool); -%End protected: void parseDir(const TQString &,TQUrlInfo &); @@ -183,4 +169,3 @@ private: }; %End -%End diff --git a/sip/qtnetwork/qhostaddress.sip b/sip/qtnetwork/qhostaddress.sip index 0e825d6..6e1cc91 100644 --- a/sip/qtnetwork/qhostaddress.sip +++ b/sip/qtnetwork/qhostaddress.sip @@ -57,8 +57,6 @@ Not yet implemented. %End -%If (TQt_2_2_0 -) - class TQHostAddress { %TypeHeaderCode @@ -69,11 +67,9 @@ public: TQHostAddress(); TQHostAddress(TQ_UINT32); // TQHostAddress(TQ_UINT8 *); -%If (TQt_3_3_0 -) //TQHostAddress(const Q_IPV6ADDR &); // This isn't mentioned in the documentation. //TQHostAddress(const TQString &); -%End TQHostAddress(const TQHostAddress &); void setAddress(TQ_UINT32); @@ -82,18 +78,12 @@ public: bool isIp4Addr() const; TQ_UINT32 ip4Addr() const; -%If (TQt_3_3_0 -) bool isIPv4Address() const; TQ_UINT32 toIPv4Address() const; bool isIPv6Address() const; //Q_IPV6ADDR toIPv6Address() const; -%End TQString toString() const; -%If (TQt_3_2_0 -) bool isNull() const; -%End }; - -%End diff --git a/sip/qtnetwork/qhttp.sip b/sip/qtnetwork/qhttp.sip index 4762c30..9bb69b6 100644 --- a/sip/qtnetwork/qhttp.sip +++ b/sip/qtnetwork/qhttp.sip @@ -56,7 +56,6 @@ This takes a single <Literal>maxlen</Literal> parameter. The %If (TQt_NETWORKPROTOCOL_HTTP) -%If (TQt_3_1_0 -) class TQHttpHeader { @@ -147,10 +146,6 @@ protected: bool parseLine(const TQString &,int); }; -%End - - -%If (TQt_3_0_0 -) class TQHttp : TQNetworkProtocol { @@ -160,16 +155,13 @@ class TQHttp : TQNetworkProtocol public: TQHttp(); -%If (TQt_3_1_0 -) TQHttp(TQObject * /TransferThis/,const char * = 0); TQHttp(const TQString &,TQ_UINT16 = 80,TQObject * /TransferThis/ = 0, const char * = 0); virtual ~TQHttp(); -%End int supportedOperations() const; -%If (TQt_3_1_0 -) enum State { Unconnected, HostLookup, @@ -246,15 +238,11 @@ public: Error error() const; TQString errorString() const; -%End public slots: -%If (TQt_3_1_0 -) void abort(); -%End signals: -%If (TQt_3_1_0 -) void stateChanged(int); void responseHeaderReceived(const TQHttpResponseHeader &); void readyRead(const TQHttpResponseHeader &); @@ -264,16 +252,12 @@ signals: void requestStarted(int); void requestFinished(int,bool); void done(bool); -%End protected: void operationGet(TQNetworkOperation *); void operationPut(TQNetworkOperation *); -%If (TQt_3_1_0 -) void timerEvent(TQTimerEvent *); -%End }; %End -%End diff --git a/sip/qtnetwork/qlocalfs.sip b/sip/qtnetwork/qlocalfs.sip index 47f9e50..f33d6e0 100644 --- a/sip/qtnetwork/qlocalfs.sip +++ b/sip/qtnetwork/qlocalfs.sip @@ -30,7 +30,6 @@ %If (TQt_NETWORKPROTOCOL) -%If (TQt_2_1_0 -) class TQLocalFs : TQNetworkProtocol { @@ -53,4 +52,3 @@ protected: }; %End -%End diff --git a/sip/qtnetwork/qnetwork.sip b/sip/qtnetwork/qnetwork.sip index 62d067e..b0a6af3 100644 --- a/sip/qtnetwork/qnetwork.sip +++ b/sip/qtnetwork/qnetwork.sip @@ -21,7 +21,6 @@ %If (TQt_NETWORKPROTOCOL) -%If (TQt_2_2_0 -) %ModuleHeaderCode #include <tqglobal.h> @@ -31,4 +30,3 @@ void tqInitNetworkProtocols(); %End -%End diff --git a/sip/qtnetwork/qserversocket.sip b/sip/qtnetwork/qserversocket.sip index 403d424..4cbcdce 100644 --- a/sip/qtnetwork/qserversocket.sip +++ b/sip/qtnetwork/qserversocket.sip @@ -29,8 +29,6 @@ %End -%If (TQt_2_2_0 -) - class TQServerSocket : TQObject { %TypeHeaderCode @@ -38,18 +36,10 @@ class TQServerSocket : TQObject %End public: -%If (- TQt_3_0_0) - TQServerSocket(TQ_UINT16,int = 0,TQObject * /TransferThis/ = 0, - const char * = 0); - TQServerSocket(const TQHostAddress &,TQ_UINT16,int = 0, - TQObject * /TransferThis/ = 0,const char * = 0); -%End -%If (TQt_3_0_0 -) TQServerSocket(TQ_UINT16,int = 1,TQObject * /TransferThis/ = 0, const char * = 0); TQServerSocket(const TQHostAddress &,TQ_UINT16,int = 1, TQObject * /TransferThis/ = 0,const char * = 0); -%End TQServerSocket(TQObject * /TransferThis/ = 0,const char * = 0); bool ok() const; @@ -66,5 +56,3 @@ public: protected: TQSocketDevice *socketDevice(); }; - -%End diff --git a/sip/qtnetwork/qsocket.sip b/sip/qtnetwork/qsocket.sip index b97f243..a31fa73 100644 --- a/sip/qtnetwork/qsocket.sip +++ b/sip/qtnetwork/qsocket.sip @@ -57,8 +57,6 @@ as a parameter. %End -%If (TQt_2_2_0 -) - class TQSocket : TQObject, TQIODevice { %TypeHeaderCode @@ -78,12 +76,7 @@ public: Idle, HostLookup, Connecting, -%If (TQt_3_0_0 -) Connected, -%End -%If (- TQt_3_0_0) - Listening, -%End Closing, Connection }; @@ -98,11 +91,7 @@ public: {sipName_TQSocket, &sipClass_TQSocket, -1, 2}, {sipName_TQFtp, &sipClass_TQFtp, -1, 3}, {sipName_TQLocalFs, &sipClass_TQLocalFs, -1, 4}, -#if TQT_VERSION >= 0x030000 {sipName_TQHttp, &sipClass_TQHttp, -1, 5}, -#else - {NULL, NULL, -1, 5}, -#endif {sipName_TQDns, &sipClass_TQDns, -1, -1}, }; @@ -130,10 +119,8 @@ public: int socket() const; virtual void setSocket(int); -%If (TQt_3_0_0 -) TQSocketDevice *socketDevice(); virtual void setSocketDevice(TQSocketDevice *); -%End %If (TQt_DNS) virtual void connectToHost(const TQString &,TQ_UINT16) /ReleaseGIL/; @@ -143,103 +130,17 @@ public: bool open(int) /ReleaseGIL/; void close() /ReleaseGIL/; void flush() /ReleaseGIL/; -%If (TQt_3_0_0 -) Offset size() const; Offset at() const; bool at(Offset); -%End -%If (- TQt_3_0_0) - uint size() const; - int at() const; - bool at(int); -%End bool atEnd() const; -%If (TQt_3_0_0 -) TQ_ULONG bytesAvailable() const; TQ_ULONG waitForMore(int) const /ReleaseGIL/; //TQ_ULONG waitForMore(int,bool *) const /ReleaseGIL/; TQ_ULONG bytesToWrite() const; -%End -%If (- TQt_3_0_0) - int bytesAvailable() const; - int waitForMore(int) const /ReleaseGIL/; - int bytesToWrite() const; -%End -%If (TQt_3_1_0 -) void clearPendingData(); -%End - -%If (- TQt_3_0_0) - SIP_PYOBJECT readBlock(uint) /ReleaseGIL/ [int (char *,uint)]; -%MethodCode - char *buf; - - if ((buf = (char *)sipMalloc(a0)) == NULL) - sipIsErr = 1; - else - { - int actlen; - - Py_BEGIN_ALLOW_THREADS - actlen = sipSelfWasArg ? sipCpp->TQSocket::readBlock(buf, a0) : sipCpp->readBlock(buf, a0); - Py_END_ALLOW_THREADS - - if (actlen < 0) - { - sipFree((void *)buf); - - Py_INCREF(Py_None); - sipRes = Py_None; - } - else - { - sipRes = SIPBytes_FromStringAndSize(buf,actlen); - - sipFree((void *)buf); - - if (sipRes == NULL) - sipIsErr = 1; - } - } -%End - - int writeBlock(const char * /Array/,uint /ArraySize/) /ReleaseGIL/; - - SIP_PYOBJECT readLine(uint) /ReleaseGIL/ [int (char *,uint)]; -%MethodCode - char *buf; - - if ((buf = (char *)sipMalloc(a0)) == NULL) - sipIsErr = 1; - else - { - int actlen; - - Py_BEGIN_ALLOW_THREADS - actlen = sipCpp -> readLine(buf,a0); - Py_END_ALLOW_THREADS - if (actlen < 0) - { - sipFree((void *)buf); - - Py_INCREF(Py_None); - sipRes = Py_None; - } - else - { - sipRes = SIPBytes_FromStringAndSize(buf,actlen); - - sipFree((void *)buf); - - if (sipRes == NULL) - sipIsErr = 1; - } - } -%End -%End -%If (TQt_3_0_0 -) SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; %MethodCode char *buf; @@ -308,7 +209,6 @@ public: } } %End -%End int getch() /ReleaseGIL/; int putch(int) /ReleaseGIL/; @@ -322,10 +222,8 @@ public: TQHostAddress address() const; TQHostAddress peerAddress() const; -%If (TQt_3_2_0 -) void setReadBufferSize(TQ_ULONG); TQ_ULONG readBufferSize() const; -%End signals: void hostFound(); @@ -337,12 +235,7 @@ signals: void error(int); protected: -%If (- TQt_3_0_0) - TQSocketDevice *socketDevice(); -%End private: TQSocket(const TQSocket &); }; - -%End diff --git a/sip/qtnetwork/qsocketdevice.sip b/sip/qtnetwork/qsocketdevice.sip index bbaa008..12d6b67 100644 --- a/sip/qtnetwork/qsocketdevice.sip +++ b/sip/qtnetwork/qsocketdevice.sip @@ -46,8 +46,6 @@ as a parameter. %End -%If (TQt_2_2_0 -) - class TQSocketDevice : TQIODevice { %TypeHeaderCode @@ -60,25 +58,19 @@ public: Datagram }; -%If (TQt_3_3_0 -) enum Protocol { IPv4, IPv6, Unknown }; -%End TQSocketDevice(Type = Stream); -%If (TQt_3_3_0 -) TQSocketDevice(Type,Protocol,int); -%End TQSocketDevice(int,Type); bool isValid() const; Type type() const; -%If (TQt_3_3_0 -) Protocol protocol() const; -%End int socket() const; virtual void setSocket(int,Type); @@ -87,16 +79,9 @@ public: void close(); void flush() /ReleaseGIL/; -%If (- TQt_3_0_0) - uint size() const; - int at() const; - bool at(int); -%End -%If (TQt_3_0_0 -) Offset size() const; Offset at() const; bool at(Offset); -%End bool atEnd() const; bool blocking() const; @@ -116,47 +101,9 @@ public: virtual bool listen(int); virtual int accept(); -%If (- TQt_3_0_0) - int bytesAvailable() const; - int waitForMore(int) const /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) TQ_LONG bytesAvailable() const; TQ_LONG waitForMore(int) const /ReleaseGIL/; -%End - -%If (- TQt_3_0_0) - SIP_PYOBJECT readBlock(uint) /ReleaseGIL/ [int (char *,uint)]; -%MethodCode - char *buf; - - if ((buf = (char *)sipMalloc(a0)) == NULL) - sipIsErr = 1; - else - { - int actlen; - - Py_BEGIN_ALLOW_THREADS - actlen = sipSelfWasArg ? sipCpp->TQSocketDevice::readBlock(buf, a0) : sipCpp->readBlock(buf, a0); - Py_END_ALLOW_THREADS - - if (actlen < 0) - { - Py_INCREF(Py_None); - sipRes = Py_None; - } - else if ((sipRes = SIPBytes_FromStringAndSize(buf,actlen)) == NULL) - sipIsErr = 1; - - sipFree((void *)buf); - } -%End - int writeBlock(const char * /Array/,uint /ArraySize/) /ReleaseGIL/; - virtual int writeBlock(const char * /Array/,uint /ArraySize/, - const TQHostAddress &,TQ_UINT16) /ReleaseGIL/; -%End -%If (TQt_3_0_0 -) SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)]; %MethodCode char *buf; @@ -188,7 +135,6 @@ public: TQ_ULONG /ArraySize/) /ReleaseGIL/; virtual TQ_LONG writeBlock(const char * /Array/,TQ_ULONG /ArraySize/, const TQHostAddress &,TQ_UINT16) /ReleaseGIL/; -%End int getch(); int putch(int); @@ -220,5 +166,3 @@ protected: private: TQSocketDevice(const TQSocketDevice &); }; - -%End diff --git a/sip/qtsql/qdatabrowser.sip b/sip/qtsql/qdatabrowser.sip index 8730c5a..4aa7281 100644 --- a/sip/qtsql/qdatabrowser.sip +++ b/sip/qtsql/qdatabrowser.sip @@ -33,8 +33,6 @@ This has been renamed <Literal>delOnCursor</Literal> in Python. %End -%If (TQt_3_0_0 -) - class TQDataBrowser : TQWidget { %TypeHeaderCode @@ -142,9 +140,5 @@ protected: virtual void handleError(const TQSqlError &) /ReleaseGIL/; private: -%If (TQt_3_1_0 -) TQDataBrowser(const TQDataBrowser &); -%End }; - -%End diff --git a/sip/qtsql/qdatatable.sip b/sip/qtsql/qdatatable.sip index 267c980..5840f3e 100644 --- a/sip/qtsql/qdatatable.sip +++ b/sip/qtsql/qdatatable.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQDataTable : TQTable { %TypeHeaderCode @@ -113,10 +111,8 @@ public: void setNumRows(int); bool findBuffer(const TQSqlIndex &,int = 0); -%If (TQt_3_2_0 -) void hideColumn(int); void showColumn(int); -%End signals: void currentChanged(TQSqlRecord *); @@ -134,13 +130,9 @@ public slots: virtual void sortDescending(int); virtual void refresh(); void setColumnWidth(int,int); -%If (TQt_3_0_5 -) void adjustColumn(int); void setColumnStretchable(int,bool); -%End -%If (TQt_3_1_0 -) void swapColumns(int,int,bool = 0); -%End protected: virtual bool insertCurrent(); @@ -156,9 +148,7 @@ protected: virtual TQWidget *beginUpdate(int,int,bool); bool eventFilter(TQObject *,TQEvent *); -%If (TQt_3_2_0 -) void keyPressEvent(TQKeyEvent *); -%End void resizeEvent(TQResizeEvent *); void contentsMousePressEvent(TQMouseEvent *); void contentsContextMenuEvent(TQContextMenuEvent *); @@ -177,9 +167,7 @@ protected: const TQColorGroup &); virtual void paintField(TQPainter *,const TQSqlField *,const TQRect &, bool); -%If (TQt_3_1_0 -) void drawContents(TQPainter *,int,int,int,int); -%End virtual int fieldAlignment(const TQSqlField *); void columnClicked(int); void resizeData(int); @@ -193,9 +181,5 @@ protected: private: TQWidget *beginEdit(int,int,bool); -%If (TQt_3_1_0 -) TQDataTable(const TQDataTable &); -%End }; - -%End diff --git a/sip/qtsql/qdataview.sip b/sip/qtsql/qdataview.sip index 70d9cd6..cfa3c98 100644 --- a/sip/qtsql/qdataview.sip +++ b/sip/qtsql/qdataview.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQDataView : TQWidget { %TypeHeaderCode @@ -52,9 +50,5 @@ public slots: virtual void clearValues(); private: -%If (TQt_3_1_0 -) TQDataView(const TQDataView &); -%End }; - -%End diff --git a/sip/qtsql/qeditorfactory.sip b/sip/qtsql/qeditorfactory.sip index c343455..4208d90 100644 --- a/sip/qtsql/qeditorfactory.sip +++ b/sip/qtsql/qeditorfactory.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQEditorFactory : TQObject { %TypeHeaderCode @@ -47,9 +45,5 @@ public: static void installDefaultFactory(TQEditorFactory * /Transfer/); private: -%If (TQt_3_1_0 -) TQEditorFactory(const TQEditorFactory &); -%End }; - -%End diff --git a/sip/qtsql/qsql.sip b/sip/qtsql/qsql.sip index f27a18d..727134e 100644 --- a/sip/qtsql/qsql.sip +++ b/sip/qtsql/qsql.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQSql { %TypeHeaderCode @@ -58,7 +56,6 @@ public: Yes }; -%If (TQt_3_2_0 -) enum ParameterType { In, Out, @@ -71,10 +68,7 @@ public: Views, AllTables }; -%End private: TQSql(const TQSql &); }; - -%End diff --git a/sip/qtsql/qsqlcursor.sip b/sip/qtsql/qsqlcursor.sip index f667cad..76f258e 100644 --- a/sip/qtsql/qsqlcursor.sip +++ b/sip/qtsql/qsqlcursor.sip @@ -50,8 +50,6 @@ This has been renamed <Literal>execQuery</Literal> in Python. %End -%If (TQt_3_0_0 -) - class TQSqlCursor : TQSqlRecord, TQSqlQuery { %TypeHeaderCode @@ -72,10 +70,8 @@ public: TQVariant value(int) const; TQVariant value(const TQString &) const; -%If (TQt_3_1_0 -) void setValue(int,const TQVariant &); void setValue(const TQString &,const TQVariant &); -%End virtual TQSqlIndex primaryIndex(bool = 1) const; virtual TQSqlIndex index(const TQStringList &) const; TQSqlIndex index(const TQString &) const; @@ -123,10 +119,8 @@ public: TQString toString(const TQString & = TQString::null, const TQString & = ",") const; -%If (TQt_3_1_0 -) bool isNull(int) const; bool isNull(const TQString &) const; -%End protected: void afterSeek(); @@ -144,5 +138,3 @@ protected: const TQString &,const TQString &, const TQString &) const; }; - -%End diff --git a/sip/qtsql/qsqldatabase.sip b/sip/qtsql/qsqldatabase.sip index c3a11be..cab38d2 100644 --- a/sip/qtsql/qsqldatabase.sip +++ b/sip/qtsql/qsqldatabase.sip @@ -33,8 +33,6 @@ This has been renamed <Literal>execStatement</Literal> in Python. %End -%If (TQt_3_0_0 -) - class TQSqlDatabase : TQObject { %TypeHeaderCode @@ -84,9 +82,7 @@ public: bool isOpen() const; bool isOpenError() const; TQStringList tables() const; -%If (TQt_3_2_0 -) TQStringList tables(TQSql::TableType) const; -%End TQSqlIndex primaryIndex(const TQString &) const; TQSqlRecord record(const TQString &) const; TQSqlRecord record(const TQSqlQuery &) const; @@ -104,52 +100,36 @@ public: virtual void setPassword(const TQString &); virtual void setHostName(const TQString &); virtual void setPort(int); -%If (TQt_3_2_0 -) void setConnectOptions(const TQString & = TQString::null); -%End TQString databaseName() const; TQString userName() const; TQString password() const; TQString hostName() const; TQString driverName() const; int port() const; -%If (TQt_3_2_0 -) TQString connectOptions() const; -%End TQSqlDriver *driver() const; static TQSqlDatabase *addDatabase(const TQString &, const TQString & = TQString(TQSqlDatabase::defaultConnection)); -%If (TQt_3_2_0 -) static TQSqlDatabase *addDatabase(TQSqlDriver *, const TQString & = TQString(TQSqlDatabase::defaultConnection)); -%End static TQSqlDatabase *database(const TQString & = TQString(TQSqlDatabase::defaultConnection),bool = 1); static void removeDatabase(const TQString &); -%If (TQt_3_2_0 -) static void removeDatabase(TQSqlDatabase *); -%End static bool contains(const TQString & = TQString(TQSqlDatabase::defaultConnection)); static TQStringList drivers(); // static void registerSqlDriver(const TQString &, // const TQSqlDriverCreatorBase *); -%If (TQt_3_2_0 -) static bool isDriverAvailable(const TQString &); -%End protected: TQSqlDatabase(const TQString &,const TQString &, TQObject * /TransferThis/ = 0,const char * = 0); -%If (TQt_3_2_0 -) TQSqlDatabase(TQSqlDriver *,TQObject * /TransferThis/ = 0, const char * = 0); -%End private: -%If (TQt_3_1_0 -) TQSqlDatabase(const TQSqlDatabase &); -%End }; - -%End diff --git a/sip/qtsql/qsqldriver.sip b/sip/qtsql/qsqldriver.sip index cfde417..74aede8 100644 --- a/sip/qtsql/qsqldriver.sip +++ b/sip/qtsql/qsqldriver.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQSqlDriver : TQObject { %TypeHeaderCode @@ -42,12 +40,10 @@ public: Transactions, QuerySize, BLOB, -%If (TQt_3_1_0 -) Unicode, PreparedQueries, NamedPlaceholders, PositionalPlaceholders -%End }; TQSqlDriver(TQObject * /TransferThis/ = 0,const char * = 0); @@ -77,10 +73,8 @@ public: virtual bool ping() = 0; virtual TQSqlQuery createQuery() const = 0; -%If (TQt_3_2_0 -) bool open(const TQString &,const TQString &,const TQString &, const TQString &,int,const TQString &) /ReleaseGIL/; -%End protected: virtual void setOpen(bool); @@ -90,5 +84,3 @@ protected: private: TQSqlDriver(const TQSqlDriver &); }; - -%End diff --git a/sip/qtsql/qsqleditorfactory.sip b/sip/qtsql/qsqleditorfactory.sip index 3880938..cf0d361 100644 --- a/sip/qtsql/qsqleditorfactory.sip +++ b/sip/qtsql/qsqleditorfactory.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQSqlEditorFactory : TQEditorFactory { %TypeHeaderCode @@ -49,9 +47,5 @@ public: static void installDefaultFactory(TQSqlEditorFactory * /Transfer/); private: -%If (TQt_3_1_0 -) TQSqlEditorFactory(const TQSqlEditorFactory &); -%End }; - -%End diff --git a/sip/qtsql/qsqlerror.sip b/sip/qtsql/qsqlerror.sip index 5fd4bfb..ae9dd70 100644 --- a/sip/qtsql/qsqlerror.sip +++ b/sip/qtsql/qsqlerror.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQSqlError { %TypeHeaderCode @@ -59,10 +57,6 @@ public: virtual void setType(int); int number() const; virtual void setNumber(int); -%If (TQt_3_2_0 -) TQString text() const; void showMessage(const TQString & = TQString::null) const; -%End }; - -%End diff --git a/sip/qtsql/qsqlfield.sip b/sip/qtsql/qsqlfield.sip index d3bd2ba..c54e0f5 100644 --- a/sip/qtsql/qsqlfield.sip +++ b/sip/qtsql/qsqlfield.sip @@ -35,8 +35,6 @@ %End -%If (TQt_3_0_0 -) - class TQSqlField { %TypeHeaderCode @@ -91,5 +89,3 @@ public: virtual void setGenerated(bool); virtual void setCalculated(bool); }; - -%End diff --git a/sip/qtsql/qsqlform.sip b/sip/qtsql/qsqlform.sip index d21032a..9a03610 100644 --- a/sip/qtsql/qsqlform.sip +++ b/sip/qtsql/qsqlform.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQSqlForm : TQObject { %TypeHeaderCode @@ -66,9 +64,5 @@ protected: virtual void remove(TQWidget *); private: -%If (TQt_3_1_0 -) TQSqlForm(const TQSqlForm &); -%End }; - -%End diff --git a/sip/qtsql/qsqlindex.sip b/sip/qtsql/qsqlindex.sip index c839a44..5e6db25 100644 --- a/sip/qtsql/qsqlindex.sip +++ b/sip/qtsql/qsqlindex.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQSqlIndex : TQSqlRecord { %TypeHeaderCode @@ -60,5 +58,3 @@ public: static TQSqlIndex fromStringList(const TQStringList &,const TQSqlCursor *); }; - -%End diff --git a/sip/qtsql/qsqlpropertymap.sip b/sip/qtsql/qsqlpropertymap.sip index f40098d..9e7b9ea 100644 --- a/sip/qtsql/qsqlpropertymap.sip +++ b/sip/qtsql/qsqlpropertymap.sip @@ -36,8 +36,6 @@ This problem may be addressed in a future release of PyTQt. %End -%If (TQt_3_0_0 -) - class TQSqlPropertyMap { %TypeHeaderCode @@ -59,5 +57,3 @@ public: private: TQSqlPropertyMap(const TQSqlPropertyMap &); }; - -%End diff --git a/sip/qtsql/qsqlquery.sip b/sip/qtsql/qsqlquery.sip index a41eb57..8212391 100644 --- a/sip/qtsql/qsqlquery.sip +++ b/sip/qtsql/qsqlquery.sip @@ -49,8 +49,6 @@ This has been renamed <Literal>execQuery</Literal> in Python. (TQt v3.1+) %End -%If (TQt_3_0_0 -) - class TQSqlQuery { %TypeHeaderCode @@ -60,9 +58,7 @@ class TQSqlQuery public: TQSqlQuery(TQSqlResult *); TQSqlQuery(const TQString & = TQString::null,TQSqlDatabase * = 0); -%If (TQt_3_2_0 -) TQSqlQuery(TQSqlDatabase *); -%End TQSqlQuery(const TQSqlQuery &); bool isValid() const; @@ -76,10 +72,8 @@ public: int size() const; const TQSqlDriver *driver() const; const TQSqlResult *result() const; -%If (TQt_3_1_0 -) bool isForwardOnly() const; void setForwardOnly(bool); -%End virtual bool exec(const TQString &) /PyName=execQuery, ReleaseGIL/; virtual TQVariant value(int) const; @@ -90,14 +84,11 @@ public: virtual bool first() /ReleaseGIL/; virtual bool last() /ReleaseGIL/; -%If (TQt_3_1_0 -) bool exec() /PyName=execQuery, ReleaseGIL/; bool prepare(const TQString &); void bindValue(const TQString &,const TQVariant &); void bindValue(int,const TQVariant &); void addBindValue(const TQVariant &); -%End -%If (TQt_3_2_0 -) void bindValue(const TQString &,const TQVariant &,TQSql::ParameterType); void bindValue(int,const TQVariant &,TQSql::ParameterType); void addBindValue(const TQVariant &,TQSql::ParameterType); @@ -105,11 +96,8 @@ public: TQVariant boundValue(int) const; // TQMap<TQString,TQVariant> boundValues() const; TQString executedQuery() const; -%End protected: virtual void beforeSeek(); virtual void afterSeek(); }; - -%End diff --git a/sip/qtsql/qsqlrecord.sip b/sip/qtsql/qsqlrecord.sip index bfe08b8..4e79fac 100644 --- a/sip/qtsql/qsqlrecord.sip +++ b/sip/qtsql/qsqlrecord.sip @@ -36,8 +36,6 @@ %End -%If (TQt_3_0_0 -) - class TQSqlRecord { %TypeHeaderCode @@ -60,10 +58,8 @@ public: virtual void setNull(const TQString &); bool isNull(int); bool isNull(const TQString &); -%If (TQt_3_1_0 -) // bool isNull(int) const; // bool isNull(const TQString &) const; -%End int position(const TQString &) const; TQString fieldName(int) const; @@ -173,5 +169,3 @@ public: return sipGetState(sipTransferObj); %End }; - -%End diff --git a/sip/qtsql/qsqlresult.sip b/sip/qtsql/qsqlresult.sip index 25f1189..144f355 100644 --- a/sip/qtsql/qsqlresult.sip +++ b/sip/qtsql/qsqlresult.sip @@ -29,8 +29,6 @@ %End -%If (TQt_3_0_0 -) - class TQSqlResult { %TypeHeaderCode @@ -69,5 +67,3 @@ protected: private: TQSqlResult(const TQSqlResult &); }; - -%End diff --git a/sip/qtsql/qsqlselectcursor.sip b/sip/qtsql/qsqlselectcursor.sip index 595e7ae..a33fee3 100644 --- a/sip/qtsql/qsqlselectcursor.sip +++ b/sip/qtsql/qsqlselectcursor.sip @@ -41,8 +41,6 @@ This has been renamed <Literal>execQuery</Literal> in Python. %End -%If (TQt_3_2_0 -) - class TQSqlSelectCursor : TQSqlCursor { %TypeHeaderCode @@ -88,5 +86,3 @@ protected: const TQString & = ",") const; bool select(const TQString &,const TQSqlIndex & = TQSqlIndex()) /ReleaseGIL/; }; - -%End diff --git a/sip/qttable/qtable.sip b/sip/qttable/qtable.sip index da56d53..8b19fea 100644 --- a/sip/qttable/qtable.sip +++ b/sip/qttable/qtable.sip @@ -55,7 +55,6 @@ %If (TQt_TABLE) -%If (TQt_2_2_0 -) class TQTableSelection { @@ -65,9 +64,7 @@ class TQTableSelection public: TQTableSelection(); -%If (TQt_3_1_0 -) TQTableSelection(int,int,int,int); -%End void init(int,int); void expandTo(int,int); @@ -78,15 +75,11 @@ public: int rightCol() const; int anchorRow() const; int anchorCol() const; -%If (TQt_3_2_0 -) int numRows() const; int numCols() const; -%End bool isActive() const; -%If (TQt_3_2_0 -) bool isEmpty() const; -%End }; @@ -106,16 +99,13 @@ public: // Note that the TQt documentation is wrong. Ownership is only taken by // TQTable::setItem(). -%If (TQt_3_2_0 -) TQTableItem(TQTable *,EditType); -%End TQTableItem(TQTable *,EditType,const TQString &); TQTableItem(TQTable *,EditType,const TQString &,const TQPixmap &); %ConvertToSubClassCode Py_BEGIN_ALLOW_THREADS -#if TQT_VERSION >= 0x030000 int rtti = sipCpp -> rtti(); if (rtti == TQCheckTableItem::RTTI) @@ -124,9 +114,6 @@ public: sipClass = sipClass_TQComboTableItem; else sipClass = 0; -#else - sipClass = 0; -#endif Py_END_ALLOW_THREADS %End @@ -163,22 +150,13 @@ public: void updateEditor(int,int); -%If (TQt_3_0_0 -) virtual void setEnabled(bool); bool isEnabled() const; virtual int rtti() const; -%End - -protected: -%If (TQt_3_2_0 - TQt_3_3_0) - TQString content() const; -%End }; -%If (TQt_3_0_0 -) - class TQComboTableItem : TQTableItem { %TypeHeaderCode @@ -205,15 +183,9 @@ public: int rtti() const; -%If (TQt_3_0_6 -) TQSize sizeHint() const; -%End }; -%End - - -%If (TQt_3_0_0 -) class TQCheckTableItem : TQTableItem { @@ -226,9 +198,7 @@ public: // TQTable::setItem(). TQCheckTableItem(TQTable *,const TQString &); -%If (TQt_3_2_0 -) void setText(const TQString &); -%End virtual TQWidget *createEditor() const /Factory/; virtual void setContentFromEditor(TQWidget *); virtual void paint(TQPainter *,const TQColorGroup &,const TQRect &,bool); @@ -237,13 +207,9 @@ public: int rtti() const; -%If (TQt_3_0_6 -) TQSize sizeHint() const; -%End }; -%End - class TQTable : TQScrollView { @@ -262,14 +228,6 @@ public: TQHeader *horizontalHeader() const; TQHeader *verticalHeader() const; -%If (- TQt_3_0_0) - enum SelectionMode { - Single, - Multi, - NoSelection - }; -%End -%If (TQt_3_0_0 -) enum SelectionMode { Single, Multi, @@ -277,7 +235,6 @@ public: MultiRow, NoSelection }; -%End virtual void setSelectionMode(SelectionMode); SelectionMode selectionMode() const; @@ -298,14 +255,8 @@ public: virtual int columnAt(int) const; virtual int rowAt(int) const; -%If (- TQt_3_0_0) - int numRows() const; - int numCols() const; -%End -%If (TQt_3_0_0 -) virtual int numRows() const; virtual int numCols() const; -%End void updateCell(int,int); @@ -325,11 +276,9 @@ public: virtual void removeSelection(int); virtual int currentSelection() const; -%If (TQt_3_1_0 -) void selectCells(int,int,int,int); void selectRow(int); void selectColumn(int); -%End bool showGrid() const; @@ -346,19 +295,14 @@ public: virtual TQWidget *cellWidget(int,int) const; virtual void clearCellWidget(int,int); -%If (TQt_3_0_0 -) virtual TQRect cellRect(int,int) const; -%End virtual void paintCell(TQPainter *,int,int,const TQRect &,bool); -%If (TQt_3_0_0 -) virtual void paintCell(TQPainter *,int,int,const TQRect &,bool, const TQColorGroup &); -%End virtual void paintFocus(TQPainter *,const TQRect &); TQSize sizeHint() const; -%If (TQt_3_0_0 -) bool isReadOnly() const; bool isRowReadOnly(int) const; bool isColumnReadOnly(int) const; @@ -374,11 +318,8 @@ public: virtual void setFocusStyle(FocusStyle); FocusStyle focusStyle() const; -%End -%If (TQt_3_1_0 -) void updateHeaderStates(); -%End public slots: virtual void setNumRows(int); @@ -388,10 +329,8 @@ public slots: virtual void hideColumn(int); virtual void showRow(int); virtual void showColumn(int); -%If (TQt_3_3_0 -) bool isRowHidden(int) const; bool isColumnHidden(int) const; -%End virtual void setColumnWidth(int,int); virtual void setRowHeight(int,int); @@ -404,14 +343,8 @@ public slots: bool isColumnStretchable(int) const; bool isRowStretchable(int) const; virtual void setSorting(bool); -%If (- TQt_3_0_0) - virtual void swapRows(int,int); - virtual void swapColumns(int,int); -%End -%If (TQt_3_0_0 -) virtual void swapRows(int,int,bool = 0); virtual void swapColumns(int,int,bool = 0); -%End virtual void swapCells(int,int,int,int); virtual void setLeftMargin(int); @@ -421,7 +354,6 @@ public slots: virtual void setColumnMovingEnabled(bool); virtual void setRowMovingEnabled(bool); -%If (TQt_3_0_0 -) virtual void setReadOnly(bool); virtual void setRowReadOnly(int,bool); virtual void setColumnReadOnly(int,bool); @@ -437,44 +369,29 @@ public slots: virtual void removeColumns(const TQMemArray<int> &); virtual void editCell(int,int,bool = 0); -%End -%If (TQt_3_1_0 -) void setRowLabels(const TQStringList &); void setColumnLabels(const TQStringList &); -%End protected: -%If (TQt_3_0_0 -) enum EditMode { NotEditing, Editing, Replacing }; -%End void drawContents(TQPainter *,int,int,int,int); void contentsMousePressEvent(TQMouseEvent *); void contentsMouseMoveEvent(TQMouseEvent *); void contentsMouseDoubleClickEvent(TQMouseEvent *); void contentsMouseReleaseEvent(TQMouseEvent *); -%If (TQt_3_0_0 -) void contentsContextMenuEvent(TQContextMenuEvent *); -%End void keyPressEvent(TQKeyEvent *); void focusInEvent(TQFocusEvent *); void focusOutEvent(TQFocusEvent *); -%If (- TQt_3_0_0) - void resizeEvent(TQResizeEvent *); -%End -%If (TQt_3_0_0 -) void viewportResizeEvent(TQResizeEvent *); -%End void showEvent(TQShowEvent *); -%If (TQt_3_1_0 -) void paintEvent(TQPaintEvent *); -%End -%If (TQt_3_0_0 -) void setEditMode(EditMode,int,int); virtual void contentsDragEnterEvent(TQDragEnterEvent *); virtual void contentsDragMoveEvent(TQDragMoveEvent *); @@ -482,7 +399,6 @@ protected: virtual void contentsDropEvent(TQDropEvent *); virtual TQDragObject *dragObject(); virtual void startDrag(); -%End virtual void paintEmptyArea(TQPainter *,int,int,int,int); virtual void activateNextCell(); @@ -495,13 +411,11 @@ protected: virtual void insertWidget(int,int,TQWidget *); int indexOf(int,int) const; -%If (TQt_3_0_0 -) void windowActivationChange(bool); bool isEditing() const; EditMode editMode() const; int currEditRow() const; int currEditCol() const; -%End protected slots: virtual void columnWidthChanged(int); @@ -517,16 +431,11 @@ signals: void pressed(int,int,int,const TQPoint &); void selectionChanged(); void valueChanged(int,int); -%If (TQt_3_0_0 -) void contextMenuRequested(int,int,const TQPoint &); void dropped(TQDropEvent *); -%End private: -%If (TQt_3_1_0 -) TQTable(const TQTable &); -%End }; %End -%End diff --git a/sip/qtui/qwidgetfactory.sip b/sip/qtui/qwidgetfactory.sip index e3b9c78..c58c477 100644 --- a/sip/qtui/qwidgetfactory.sip +++ b/sip/qtui/qwidgetfactory.sip @@ -30,8 +30,6 @@ %End -%If (TQt_3_0_0 -) - class TQWidgetFactory { %TypeHeaderCode @@ -54,10 +52,6 @@ public: virtual TQWidget *createWidget(const TQString &,TQWidget * /TransferThis/, const char *) const /Factory/; -%If (TQt_3_1_0 -) static TQStringList widgets(); static bool supportsWidget(const TQString &); -%End }; - -%End diff --git a/sip/qtxml/qdom.sip b/sip/qtxml/qdom.sip index 40b9150..2dc3a9d 100644 --- a/sip/qtxml/qdom.sip +++ b/sip/qtxml/qdom.sip @@ -255,7 +255,6 @@ Not yet implemented. (TQt v3.2.0+) %If (TQt_DOM) -%If (TQt_2_2_0 -) class TQDomImplementation { @@ -268,13 +267,11 @@ public: TQDomImplementation(const TQDomImplementation &); virtual bool hasFeature(const TQString &,const TQString &); -%If (TQt_3_0_0 -) virtual TQDomDocumentType createDocumentType(const TQString &, const TQString &, const TQString &); virtual TQDomDocument createDocument(const TQString &,const TQString &, const TQDomDocumentType &); -%End bool isNull(); }; @@ -314,14 +311,10 @@ public: virtual TQDomNode replaceChild(const TQDomNode &,const TQDomNode &); virtual TQDomNode removeChild(const TQDomNode &); virtual TQDomNode appendChild(const TQDomNode &); -%If (TQt_3_0_0 -) virtual bool hasChildNodes() const; -%End virtual TQDomNode cloneNode(bool = 1) const; -%If (TQt_3_0_0 -) virtual void normalize(); virtual bool isSupported(const TQString &,const TQString &) const; -%End virtual TQString nodeName() const; virtual NodeType nodeType() const; @@ -333,18 +326,14 @@ public: virtual TQDomNode nextSibling() const; virtual TQDomNamedNodeMap attributes() const; virtual TQDomDocument ownerDocument() const; -%If (TQt_3_0_0 -) virtual TQString namespaceURI() const; virtual TQString localName() const; virtual bool hasAttributes() const; -%End virtual TQString nodeValue() const; virtual void setNodeValue(const TQString &); -%If (TQt_3_0_0 -) virtual TQString prefix() const; virtual void setPrefix(const TQString &); -%End virtual bool isAttr() const; virtual bool isCDATASection() const; @@ -413,11 +402,9 @@ public: virtual TQString name() const; virtual TQDomNamedNodeMap entities() const; virtual TQDomNamedNodeMap notations() const; -%If (TQt_3_0_0 -) virtual TQString publicId() const; virtual TQString systemId() const; virtual TQString internalSubset() const; -%End TQDomNode::NodeType nodeType() const; bool isDocumentType() const; @@ -433,9 +420,7 @@ class TQDomDocument : TQDomNode public: TQDomDocument(); TQDomDocument(const TQString &); -%If (TQt_3_0_0 -) TQDomDocument(const TQDomDocumentType &); -%End TQDomDocument(const TQDomDocument &); TQDomElement createElement(const TQString &); @@ -448,21 +433,12 @@ public: TQDomAttr createAttribute(const TQString &); TQDomEntityReference createEntityReference(const TQString &); TQDomNodeList elementsByTagName(const TQString &) const; -%If (TQt_3_0_0 -) TQDomElement elementById(const TQString &); -%End TQDomDocumentType doctype() const; TQDomImplementation implementation() const; TQDomElement documentElement() const; -%If (- TQt_3_0_0) - bool setContent(const TQCString &); - bool setContent(const TQByteArray &); - bool setContent(const TQString &); - bool setContent(TQIODevice *); -%End -%If (TQt_3_0_0 -) // Note that we need handwritten code for these because of the need to // allocate storage for the error string. SIP_PYTUPLE setContent(const TQCString &,bool); @@ -577,24 +553,16 @@ public: sipType_TQString, (PyObject *)0, eline, ecol); %End -%End - -%If (TQt_3_2_0 -) // bool setContent(TQXmlInputSource *,TQXmlReader *,TQString * = 0,int * = 0, // int * = 0); -%End TQDomNode::NodeType nodeType() const; bool isDocument() const; TQString toString() const; -%If (TQt_3_1_0 -) TQString toString(int) const; -%End TQCString toCString() const; -%If (TQt_3_1_0 -) TQCString toCString(int) const; -%End }; @@ -612,16 +580,12 @@ public: TQDomNode setNamedItem(const TQDomNode &); TQDomNode removeNamedItem(const TQString &); TQDomNode item(int) const; -%If (TQt_3_0_0 -) TQDomNode namedItemNS(const TQString &,const TQString &) const; TQDomNode setNamedItemNS(const TQDomNode &); TQDomNode removeNamedItemNS(const TQString &,const TQString &); -%End uint length() const; -%If (TQt_3_0_0 -) uint count() const; -%End bool contains(const TQString &) const; }; @@ -680,9 +644,7 @@ public: virtual TQString name() const; virtual bool specified() const; -%If (TQt_3_0_0 -) virtual TQDomElement ownerElement() const; -%End virtual TQString value() const; virtual void setValue(const TQString &); @@ -707,10 +669,8 @@ public: void setAttribute(const TQString &,const TQString &); void setAttribute(const TQString &,int /Constrained/); // void setAttribute(const TQString &,uint); -%If (TQt_3_2_0 -) // void setAttribute(const TQString &,long); // void setAttribute(const TQString &,ulong); -%End void setAttribute(const TQString &,double); void removeAttribute(const TQString &); TQDomAttr attributeNode(const TQString &); @@ -718,20 +678,14 @@ public: TQDomAttr removeAttributeNode(const TQDomAttr &); virtual TQDomNodeList elementsByTagName(const TQString &) const; bool hasAttribute(const TQString &) const; -%If (- TQt_3_0_0) - void normalize(); -%End -%If (TQt_3_0_0 -) TQString attributeNS(const TQString,const TQString &, const TQString &) const; void setAttributeNS(const TQString,const TQString &,const TQString &); void setAttributeNS(const TQString,const TQString &,int /Constrained/); // void setAttributeNS(const TQString,const TQString &,uint); -%If (TQt_3_2_0 -) // void setAttributeNS(const TQString &,const TQString &,long); // void setAttributeNS(const TQString &,const TQString &,ulong); -%End void setAttributeNS(const TQString,const TQString &,double); void removeAttributeNS(const TQString &,const TQString &); TQDomAttr attributeNodeNS(const TQString &,const TQString &); @@ -739,7 +693,6 @@ public: virtual TQDomNodeList elementsByTagNameNS(const TQString &, const TQString &) const; bool hasAttributeNS(const TQString &,const TQString &) const; -%End TQString tagName() const; void setTagName(const TQString &); @@ -871,4 +824,3 @@ public: }; %End -%End |