diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel/tqlayout.h')
| -rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqlayout.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqlayout.h b/experimental/tqtinterface/qt4/src/kernel/tqlayout.h index d96483815..5423cad5b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqlayout.h @@ -52,7 +52,7 @@ #ifndef TQT_H #include "tqobject.h" -#include "sizepolicy.h" +#include "tqsizepolicy.h" #include "tqwidget.h" #endif // TQT_H @@ -170,7 +170,7 @@ public: virtual inline void tqinvalidate() { QLayoutItem::invalidate(); } virtual inline void invalidate() { tqinvalidate(); } -// inline virtual TQSize sizeHint() const { return QLayoutItem::sizeHint(); } +// inline virtual TQSize tqsizeHint() const { return QLayoutItem::sizeHint(); } // inline virtual TQSize tqminimumSize() const { return QLayoutItem::minimumSize(); } // inline virtual TQSize tqmaximumSize() const { return QLayoutItem::maximumSize(); } // inline virtual void setGeometry( const TQRect&r ) { QLayoutItem::setGeometry(r); } @@ -178,7 +178,7 @@ public: // inline virtual TQ_SPExpandData expandingDirections() const { return QLayoutItem::expandingDirections(); } // These functions are pure virtual in Qt4 - inline TQSize sizeHint() const { return sizeHint(); } + inline TQSize tqsizeHint() const { return sizeHint(); } inline TQSize tqminimumSize() const { return minimumSize(); } inline TQSize tqmaximumSize() const { return maximumSize(); } // inline void setGeometry( const TQRect&r ) { TQ_UNUSED(r); } @@ -189,7 +189,7 @@ public: // This requires that the base virtual Qt functions be reimplemented so as to point to the TQt virtual functions instead as shown below. // This way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead. #define QLAYOUTITEM_REQUIRED_FUNCTIONS \ - virtual inline QSize sizeHint() const { return sizeHint(); } \ + virtual inline QSize sizeHint() const { return tqsizeHint(); } \ virtual inline QSize minimumSize() const { return tqminimumSize(); } \ virtual inline QSize maximumSize() const { return tqmaximumSize(); } \ virtual inline void setGeometry( const QRect &r ) { return setGeometry( TQT_TQRECT_OBJECT(r) ); } \ @@ -211,7 +211,7 @@ public: // virtual int heightForWidth( int ) const; // virtual TQLayoutIterator iterator(); // -// virtual TQSize sizeHint() const = 0; +// virtual TQSize tqsizeHint() const = 0; // virtual TQSize tqminimumSize() const = 0; // virtual TQSize tqmaximumSize() const = 0; // virtual void setGeometry( const TQRect& ) = 0; @@ -223,7 +223,7 @@ public: // // Use the TQt virtual functions, not the built in Qt ones... // // This requires that the base virtual Qt functions be reimplemented so as to point to the TQt virtual functions instead as shown below. // // This way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead. -// inline QSize sizeHint() const { return sizeHint(); } +// inline QSize sizeHint() const { return tqsizeHint(); } // inline QSize minimumSize() const { return tqminimumSize(); } // inline QSize maximumSize() const { return tqmaximumSize(); } // inline void setGeometry( const QRect &r ) { return TQLayoutItem::setGeometry( r ); } @@ -240,7 +240,7 @@ class TQ_EXPORT TQLayoutItem public: TQLayoutItem( int tqalignment = 0 ) : align( tqalignment ) { } virtual ~TQLayoutItem(); - virtual TQSize sizeHint() const = 0; + virtual TQSize tqsizeHint() const = 0; virtual TQSize tqminimumSize() const = 0; virtual TQSize tqmaximumSize() const = 0; virtual TQ_SPExpandData expandingDirections() const = 0; @@ -278,7 +278,7 @@ public: TQ_SPExpandData expandingDirections() const; // Used by tqabstractlayout.cpp bool isEmpty() const; // Used by tqabstractlayout.cpp - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; void setGeometry( const TQRect &qr ); @@ -287,7 +287,7 @@ public: // Use the TQt virtual functions, not the built in Qt ones... // This requires that the base virtual Qt functions be reimplemented so as to point to the TQt virtual functions instead as shown below. // This way, when Trinity overrides a TQt virtual function, the calling Qt code will blithely use the overriden TQt function instead. - inline QSize sizeHint() const { return sizeHint(); } + inline QSize sizeHint() const { return tqsizeHint(); } inline QSize minimumSize() const { return tqminimumSize(); } inline QSize maximumSize() const { return tqmaximumSize(); } inline void setGeometry( const QRect &r ) { return TQSpacerItem::setGeometry( TQT_TQRECT_OBJECT(r) ); } @@ -306,7 +306,7 @@ public: void changeSize( int w, int h, TQSizePolicy::SizeType hData = TQSizePolicy::Minimum, TQSizePolicy::SizeType vData = TQSizePolicy::Minimum ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; TQ_SPExpandData expandingDirections() const; @@ -328,7 +328,7 @@ class TQ_EXPORT TQWidgetItem : public TQLayoutItem { public: TQWidgetItem( TQWidget *w ) : wid( w ) { } - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; TQ_SPExpandData expandingDirections() const; @@ -369,7 +369,7 @@ public: virtual TQ_SPExpandData expandingDirections() const; TQLayout *tqlayout(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual TQSize tqminimumSize() const; virtual TQSize tqmaximumSize() const; @@ -652,7 +652,7 @@ inline void TQLayoutIterator::deleteCurrent() int count() const; \ TQLayoutItem* itemAt(int index) const; \ TQLayoutItem* takeAt(int index); \ - virtual inline QSize sizeHint() const { return sizeHint(); } \ + virtual inline QSize sizeHint() const { return tqsizeHint(); } \ virtual inline QSize minimumSize() const { return tqminimumSize(); } \ virtual inline QSize maximumSize() const { return tqmaximumSize(); } \ virtual inline void setGeometry( const QRect &r ) { return setGeometry( TQT_TQRECT_OBJECT(r) ); } \ @@ -720,7 +720,7 @@ public: delete hack; } - inline TQSize sizeHint() const { return sizeHint(); } + inline TQSize tqsizeHint() const { return sizeHint(); } inline TQSize tqminimumSize() const { return minimumSize(); } inline TQSize tqmaximumSize() const { return maximumSize(); } inline void tqinvalidate() { invalidate(); } @@ -956,7 +956,7 @@ public: int spacing = -1, const char *name = 0 ); ~TQGridLayout(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; @@ -1064,7 +1064,7 @@ public: bool setStretchFactor( TQWidget*, int stretch ); bool setStretchFactor( TQLayout *l, int stretch ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSize() const; TQSize tqmaximumSize() const; |