From 2440b621ccc596299855abed364df856be8afe3a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 30 Oct 2012 15:25:42 -0500 Subject: Fix FTBFS with TQt3 --- kdevdesigner/designer/layout.h | 8 ++++---- kdevdesigner/designer/widgetfactory.h | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index de302e08..d1ea776e 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -122,7 +122,7 @@ class Spacer : public TQWidget TQ_OVERRIDE( TQCString name ) - TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) + TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) TQ_ENUMS( SizeType ) TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) @@ -147,8 +147,8 @@ public: void setSizeType( SizeType t ); SizeType sizeType() const; int alignment() const; - Qt::Orientation orientation() const; - void setOrientation( Qt::Orientation o ); + Orientation orientation() const; + void setOrientation( Orientation o ); void setInteraciveMode( bool b ) { interactive = b; }; void setSizeHint( const TQSize &s ); @@ -156,7 +156,7 @@ protected: void paintEvent( TQPaintEvent *e ); void resizeEvent( TQResizeEvent* e ); void updateMask(); - Qt::Orientation orient; + Orientation orient; bool interactive; TQSize sh; }; diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h index 8a568122..feebe9c7 100644 --- a/kdevdesigner/designer/widgetfactory.h +++ b/kdevdesigner/designer/widgetfactory.h @@ -77,7 +77,7 @@ public: }; static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE, - const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal ); + const TQRect *rect = 0, Orientation orient = TQt::Horizontal ); static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type ); static void deleteLayout( TQWidget *widget ); @@ -111,7 +111,7 @@ public: private: static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, - const TQRect *r = 0, Qt::Orientation orient = Qt::Horizontal ); + const TQRect *r = 0, Orientation orient = TQt::Horizontal ); static TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w ); static TQGuardedPtr *lastPassiveInteractor; @@ -293,7 +293,7 @@ class Line : public TQFrame Q_OBJECT - TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) + TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) TQ_OVERRIDE( int frameWidth DESIGNABLE false ) TQ_OVERRIDE( Shape frameShape DESIGNABLE false ) TQ_OVERRIDE( TQRect frameRect DESIGNABLE false ) @@ -304,14 +304,14 @@ public: setFrameStyle( HLine | Sunken ); } - void setOrientation( Qt::Orientation orient ) { - if ( orient ==Qt::Horizontal ) + void setOrientation( Orientation orient ) { + if ( orient ==TQt::Horizontal ) setFrameShape( HLine ); else setFrameShape( VLine ); } - Qt::Orientation orientation() const { - return frameShape() == HLine ?Qt::Horizontal :Qt::Vertical; + Orientation orientation() const { + return frameShape() == HLine ?TQt::Horizontal :TQt::Vertical; } }; -- cgit v1.2.1