From aa0e597d69c5fee77817b37b89407137893b3baf Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Wed, 31 Oct 2012 10:46:45 -0500 Subject: [PATCH] Fix FTBFS on TQt3 --- kdgantt/KDGanttMinimizeSplitter.h | 18 +++++++++--------- kexi/formeditor/factories/stdwidgetfactory.h | 8 ++++---- kexi/formeditor/spring.h | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index a99b84c7..839a7aa8 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -47,7 +47,7 @@ class KDGanttMinimizeSplitter : public TQFrame Q_OBJECT TQ_ENUMS( Direction ) - TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) + TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) TQ_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection ) public: @@ -55,11 +55,11 @@ public: enum Direction { Left, Right, Up, Down }; KDGanttMinimizeSplitter( TQWidget* parent=0, const char* name=0 ); - KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* parent=0, const char* name=0 ); + KDGanttMinimizeSplitter( Orientation, TQWidget* parent=0, const char* name=0 ); ~KDGanttMinimizeSplitter(); - virtual void setOrientation( Qt::Orientation ); - Qt::Orientation orientation() const { return orient; } + virtual void setOrientation( Orientation ); + Orientation orientation() const { return orient; } void setMinimizeDirection( Direction ); Direction minimizeDirection() const; @@ -120,7 +120,7 @@ private: TQSplitterData *data; private: - Qt::Orientation orient; + Orientation orient; Direction _direction; #ifndef DOXYGEN_SKIP_INTERNAL friend class KDGanttSplitterHandle; @@ -142,10 +142,10 @@ class KDGanttSplitterHandle : public TQWidget Q_OBJECT public: - KDGanttSplitterHandle( Qt::Orientation o, + KDGanttSplitterHandle( Orientation o, KDGanttMinimizeSplitter *parent, const char* name=0 ); - void setOrientation( Qt::Orientation o ); - Qt::Orientation orientation() const { return orient; } + void setOrientation( Orientation o ); + Orientation orientation() const { return orient; } bool opaque() const { return s->opaqueResize(); } @@ -164,7 +164,7 @@ protected: void updateCursor( const TQPoint& p ); private: - Qt::Orientation orient; + Orientation orient; bool opaq; int myId; diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h index 087ffdc8..a99bf6a8 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.h +++ b/kexi/formeditor/factories/stdwidgetfactory.h @@ -41,14 +41,14 @@ class KFORMEDITOR_EXPORT Line : public TQFrame { Q_OBJECT - TQ_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation) + TQ_PROPERTY(Orientation orientation READ orientation WRITE setOrientation) public: - Line(Qt::Orientation orient, TQWidget *parent, const char *name); + Line(Orientation orient, TQWidget *parent, const char *name); ~Line(){;} - void setOrientation(Qt::Orientation orient); - Qt::Orientation orientation() const; + void setOrientation(Orientation orient); + Orientation orientation() const; }; //! Factory for all basic widgets, including Spring (not containers) diff --git a/kexi/formeditor/spring.h b/kexi/formeditor/spring.h index 09f9cccb..dac4a2fb 100644 --- a/kexi/formeditor/spring.h +++ b/kexi/formeditor/spring.h @@ -38,7 +38,7 @@ class KFORMEDITOR_EXPORT Spring : public TQWidget Q_OBJECT TQ_ENUMS(SizeType) - TQ_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation) + TQ_PROPERTY(Orientation orientation READ orientation WRITE setOrientation) TQ_PROPERTY(SizeType sizeType READ sizeType WRITE setSizeType) private: @@ -54,8 +54,8 @@ class KFORMEDITOR_EXPORT Spring : public TQWidget static bool isPropertyVisible(const TQCString &name); static void saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &domDoc, bool insideGridLayout); - void setOrientation(Qt::Orientation orient); - Qt::Orientation orientation() const { return m_orient;} + void setOrientation(Orientation orient); + Orientation orientation() const { return m_orient;} void setSizeType(SizeType size); SizeType sizeType() const; @@ -65,7 +65,7 @@ class KFORMEDITOR_EXPORT Spring : public TQWidget void paintEvent(TQPaintEvent *ev); private: - Qt::Orientation m_orient; + Orientation m_orient; bool m_edit; };