Fix FTBFS on TQt3

pull/1/head
Timothy Pearson 12 years ago
parent 8a511b5ac9
commit 27ccd2aacf

@ -106,17 +106,17 @@ class QDesignerToolBarSeparator : public TQWidget
public: public:
QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); QDesignerToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 );
TQSize sizeHint() const; TQSize sizeHint() const;
Qt::Orientation orientation() const { return orient; } Orientation orientation() const { return orient; }
public slots: public slots:
void setOrientation( Qt::Orientation ); void setOrientation( Orientation );
protected: protected:
void styleChange( TQStyle& ); void styleChange( TQStyle& );
void paintEvent( TQPaintEvent * ); void paintEvent( TQPaintEvent * );
private: private:
Qt::Orientation orient; Orientation orient;
}; };

@ -115,7 +115,7 @@ class Spacer : public TQWidget
TQ_OVERRIDE( TQCString name ) 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_ENUMS( SizeType )
TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
@ -140,8 +140,8 @@ public:
void setSizeType( SizeType t ); void setSizeType( SizeType t );
SizeType sizeType() const; SizeType sizeType() const;
int alignment() const; int alignment() const;
Qt::Orientation orientation() const; Orientation orientation() const;
void setOrientation( Qt::Orientation o ); void setOrientation( Orientation o );
void setInteraciveMode( bool b ) { interactive = b; }; void setInteraciveMode( bool b ) { interactive = b; };
void setSizeHint( const TQSize &s ); void setSizeHint( const TQSize &s );
@ -149,7 +149,7 @@ protected:
void paintEvent( TQPaintEvent *e ); void paintEvent( TQPaintEvent *e );
void resizeEvent( TQResizeEvent* e ); void resizeEvent( TQResizeEvent* e );
void updateMask(); void updateMask();
Qt::Orientation orient; Orientation orient;
bool interactive; bool interactive;
TQSize sh; TQSize sh;
}; };

@ -104,7 +104,7 @@ private:
#endif #endif
TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 ); 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 createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
void createColumn( const TQDomElement &e, TQWidget *widget ); void createColumn( const TQDomElement &e, TQWidget *widget );
void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e);

@ -71,7 +71,7 @@ public:
}; };
static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE, 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 TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type );
static void deleteLayout( TQWidget *widget ); static void deleteLayout( TQWidget *widget );
@ -102,7 +102,7 @@ public:
private: private:
static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, 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 TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w );
}; };
@ -281,7 +281,7 @@ class Line : public TQFrame
Q_OBJECT 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( int frameWidth DESIGNABLE false )
TQ_OVERRIDE( Shape frameShape DESIGNABLE false ) TQ_OVERRIDE( Shape frameShape DESIGNABLE false )
TQ_OVERRIDE( TQRect frameRect DESIGNABLE false ) TQ_OVERRIDE( TQRect frameRect DESIGNABLE false )
@ -292,14 +292,14 @@ public:
setFrameStyle( HLine | Sunken ); setFrameStyle( HLine | Sunken );
} }
void setOrientation( Qt::Orientation orient ) { void setOrientation( Orientation orient ) {
if ( orient ==Qt::Horizontal ) if ( orient ==TQt::Horizontal )
setFrameShape( HLine ); setFrameShape( HLine );
else else
setFrameShape( VLine ); setFrameShape( VLine );
} }
Qt::Orientation orientation() const { Orientation orientation() const {
return frameShape() == HLine ?Qt::Horizontal :Qt::Vertical; return frameShape() == HLine ?TQt::Horizontal :TQt::Vertical;
} }
}; };

@ -888,7 +888,7 @@ private:
// GROUP data // GROUP data
TQString firstName; TQString firstName;
TQString lastName; TQString lastName;
Qt::Orientation splitterOrientation; Orientation splitterOrientation;
bool isGroup; bool isGroup;
bool isTabGroup; bool isTabGroup;
protected: protected:

@ -45,7 +45,7 @@ class TDEUI_EXPORT KDockSplitter : public TQWidget
Q_OBJECT Q_OBJECT
public: 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(){}; virtual ~KDockSplitter(){};
void activate(TQWidget *c0, TQWidget *c1 = 0L); void activate(TQWidget *c0, TQWidget *c1 = 0L);
@ -85,7 +85,7 @@ public:
void setForcedFixedHeight(KDockWidget *dw,int h); void setForcedFixedHeight(KDockWidget *dw,int h);
void restoreFromForcedFixedSize(KDockWidget *dw); void restoreFromForcedFixedSize(KDockWidget *dw);
Qt::Orientation orientation(){return m_orientation;} Orientation orientation(){return m_orientation;}
protected: protected:
friend class KDockContainer; friend class KDockContainer;
@ -99,7 +99,7 @@ protected slots:
private: private:
void setupMinMaxSize(); void setupMinMaxSize();
TQWidget *child0, *child1; TQWidget *child0, *child1;
Qt::Orientation m_orientation; Orientation m_orientation;
bool initialised; bool initialised;
TQFrame* divider; TQFrame* divider;
int xpos, savedXPos; int xpos, savedXPos;

Loading…
Cancel
Save