Fix FTBFS on TQt3

pull/1/head
Darrell Anderson 12 years ago
parent d2b03dad3d
commit aa0e597d69

@ -47,7 +47,7 @@ class KDGanttMinimizeSplitter : public TQFrame
Q_OBJECT Q_OBJECT
TQ_ENUMS( Direction ) 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 ) TQ_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
public: public:
@ -55,11 +55,11 @@ public:
enum Direction { Left, Right, Up, Down }; enum Direction { Left, Right, Up, Down };
KDGanttMinimizeSplitter( TQWidget* parent=0, const char* name=0 ); 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(); ~KDGanttMinimizeSplitter();
virtual void setOrientation( Qt::Orientation ); virtual void setOrientation( Orientation );
Qt::Orientation orientation() const { return orient; } Orientation orientation() const { return orient; }
void setMinimizeDirection( Direction ); void setMinimizeDirection( Direction );
Direction minimizeDirection() const; Direction minimizeDirection() const;
@ -120,7 +120,7 @@ private:
TQSplitterData *data; TQSplitterData *data;
private: private:
Qt::Orientation orient; Orientation orient;
Direction _direction; Direction _direction;
#ifndef DOXYGEN_SKIP_INTERNAL #ifndef DOXYGEN_SKIP_INTERNAL
friend class KDGanttSplitterHandle; friend class KDGanttSplitterHandle;
@ -142,10 +142,10 @@ class KDGanttSplitterHandle : public TQWidget
Q_OBJECT Q_OBJECT
public: public:
KDGanttSplitterHandle( Qt::Orientation o, KDGanttSplitterHandle( Orientation o,
KDGanttMinimizeSplitter *parent, const char* name=0 ); KDGanttMinimizeSplitter *parent, const char* name=0 );
void setOrientation( Qt::Orientation o ); void setOrientation( Orientation o );
Qt::Orientation orientation() const { return orient; } Orientation orientation() const { return orient; }
bool opaque() const { return s->opaqueResize(); } bool opaque() const { return s->opaqueResize(); }
@ -164,7 +164,7 @@ protected:
void updateCursor( const TQPoint& p ); void updateCursor( const TQPoint& p );
private: private:
Qt::Orientation orient; Orientation orient;
bool opaq; bool opaq;
int myId; int myId;

@ -41,14 +41,14 @@ class KFORMEDITOR_EXPORT Line : public TQFrame
{ {
Q_OBJECT Q_OBJECT
TQ_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation) TQ_PROPERTY(Orientation orientation READ orientation WRITE setOrientation)
public: public:
Line(Qt::Orientation orient, TQWidget *parent, const char *name); Line(Orientation orient, TQWidget *parent, const char *name);
~Line(){;} ~Line(){;}
void setOrientation(Qt::Orientation orient); void setOrientation(Orientation orient);
Qt::Orientation orientation() const; Orientation orientation() const;
}; };
//! Factory for all basic widgets, including Spring (not containers) //! Factory for all basic widgets, including Spring (not containers)

@ -38,7 +38,7 @@ class KFORMEDITOR_EXPORT Spring : public TQWidget
Q_OBJECT Q_OBJECT
TQ_ENUMS(SizeType) 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) TQ_PROPERTY(SizeType sizeType READ sizeType WRITE setSizeType)
private: private:
@ -54,8 +54,8 @@ class KFORMEDITOR_EXPORT Spring : public TQWidget
static bool isPropertyVisible(const TQCString &name); static bool isPropertyVisible(const TQCString &name);
static void saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &domDoc, bool insideGridLayout); static void saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &domDoc, bool insideGridLayout);
void setOrientation(Qt::Orientation orient); void setOrientation(Orientation orient);
Qt::Orientation orientation() const { return m_orient;} Orientation orientation() const { return m_orient;}
void setSizeType(SizeType size); void setSizeType(SizeType size);
SizeType sizeType() const; SizeType sizeType() const;
@ -65,7 +65,7 @@ class KFORMEDITOR_EXPORT Spring : public TQWidget
void paintEvent(TQPaintEvent *ev); void paintEvent(TQPaintEvent *ev);
private: private:
Qt::Orientation m_orient; Orientation m_orient;
bool m_edit; bool m_edit;
}; };

Loading…
Cancel
Save