diff options
Diffstat (limited to 'kdevdesigner/designer/layout.h')
| -rw-r--r-- | kdevdesigner/designer/layout.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index c42fb373..d71368ab 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -31,7 +31,7 @@ #include <tqmap.h> #include <tqguardedptr.h> #include <tqobject.h> -#include <layout.h> +#include <tqlayout.h> #include <tqmap.h> #include <tqwidgetlist.h> @@ -51,7 +51,7 @@ public: virtual void undoLayout(); virtual void breakLayout(); virtual bool prepareLayout( bool &needMove, bool &needReparent ); - virtual void finishLayout( bool needMove, TQLayout *layout ); + virtual void finishLayout( bool needMove, TQLayout *tqlayout ); protected: TQWidgetList widgets; @@ -125,8 +125,8 @@ class Spacer : public TQWidget TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) Q_ENUMS( SizeType ) TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) - TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) - TQ_OVERRIDE( TQRect geometry DESIGNABLE false ) + TQ_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true ) + TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false ) private: enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize, @@ -142,11 +142,11 @@ public: Spacer( TQWidget *parent, const char *name ); - TQSize minimumSize() const; - TQSize sizeHint() const; + TQSize tqminimumSize() const; + TQSize tqsizeHint() const; void setSizeType( SizeType t ); SizeType sizeType() const; - int alignment() const; + int tqalignment() const; Qt::Orientation orientation() const; void setOrientation( Qt::Orientation o ); void setInteraciveMode( bool b ) { interactive = b; }; |