diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-10-30 16:48:40 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-10-30 16:48:40 -0500 |
commit | 27ccd2aacf0aa799d4adca6b3bf1457ce24e2592 (patch) | |
tree | 572c15b4a2825860243ebb75dd8379323bd60a9e | |
parent | 8a511b5ac9055821d5eba49a6706dd9065d0769a (diff) | |
download | tdewebdev-27ccd2aacf0aa799d4adca6b3bf1457ce24e2592.tar.gz tdewebdev-27ccd2aacf0aa799d4adca6b3bf1457ce24e2592.zip |
Fix FTBFS on TQt3
-rw-r--r-- | kommander/editor/actiondnd.h | 8 | ||||
-rw-r--r-- | kommander/editor/layout.h | 8 | ||||
-rw-r--r-- | kommander/editor/resource.h | 2 | ||||
-rw-r--r-- | kommander/editor/widgetfactory.h | 14 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kdockwidget.h | 2 | ||||
-rw-r--r-- | lib/compatibility/kmdi/qextmdi/kdockwidget_private.h | 6 |
6 files changed, 20 insertions, 20 deletions
diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h index b15d47ff..b71d2c2c 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -106,17 +106,17 @@ class QDesignerToolBarSeparator : public TQWidget public: - QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); + QDesignerToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 ); TQSize sizeHint() const; - Qt::Orientation orientation() const { return orient; } + Orientation orientation() const { return orient; } public slots: - void setOrientation( Qt::Orientation ); + void setOrientation( Orientation ); protected: void styleChange( TQStyle& ); void paintEvent( TQPaintEvent * ); private: - Qt::Orientation orient; + Orientation orient; }; diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h index e42759cb..ee266127 100644 --- a/kommander/editor/layout.h +++ b/kommander/editor/layout.h @@ -115,7 +115,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 ) @@ -140,8 +140,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 ); @@ -149,7 +149,7 @@ protected: void paintEvent( TQPaintEvent *e ); void resizeEvent( TQResizeEvent* e ); void updateMask(); - Qt::Orientation orient; + Orientation orient; bool interactive; TQSize sh; }; diff --git a/kommander/editor/resource.h b/kommander/editor/resource.h index c3304acc..511d5273 100644 --- a/kommander/editor/resource.h +++ b/kommander/editor/resource.h @@ -104,7 +104,7 @@ private: #endif TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 ); - TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, TQt::Orientation o ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createColumn( const TQDomElement &e, TQWidget *widget ); void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index 913e855c..2341b676 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -71,7 +71,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 ); @@ -102,7 +102,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 ); }; @@ -281,7 +281,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 ) @@ -292,14 +292,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; } }; diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h index f861a236..c4b4b97b 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h @@ -888,7 +888,7 @@ private: // GROUP data TQString firstName; TQString lastName; - Qt::Orientation splitterOrientation; + Orientation splitterOrientation; bool isGroup; bool isTabGroup; protected: diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h index 4f93a4f2..1a4d021f 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h @@ -45,7 +45,7 @@ class TDEUI_EXPORT KDockSplitter : public TQWidget Q_OBJECT public: - KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false); + KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient=TQt::Vertical, int pos= 50, bool highResolution=false); virtual ~KDockSplitter(){}; void activate(TQWidget *c0, TQWidget *c1 = 0L); @@ -85,7 +85,7 @@ public: void setForcedFixedHeight(KDockWidget *dw,int h); void restoreFromForcedFixedSize(KDockWidget *dw); - Qt::Orientation orientation(){return m_orientation;} + Orientation orientation(){return m_orientation;} protected: friend class KDockContainer; @@ -99,7 +99,7 @@ protected slots: private: void setupMinMaxSize(); TQWidget *child0, *child1; - Qt::Orientation m_orientation; + Orientation m_orientation; bool initialised; TQFrame* divider; int xpos, savedXPos; |