diff options
Diffstat (limited to 'kjsembed/tools/headers')
-rw-r--r-- | kjsembed/tools/headers/qbrush.h | 6 | ||||
-rw-r--r-- | kjsembed/tools/headers/qcanvas.h | 24 | ||||
-rw-r--r-- | kjsembed/tools/headers/qdir.h | 18 | ||||
-rw-r--r-- | kjsembed/tools/headers/qpen.h | 8 | ||||
-rw-r--r-- | kjsembed/tools/headers/qtimer.h | 6 |
5 files changed, 26 insertions, 36 deletions
diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h index 6fc18ccf..60f7f638 100644 --- a/kjsembed/tools/headers/qbrush.h +++ b/kjsembed/tools/headers/qbrush.h @@ -44,7 +44,7 @@ #endif // QT_H -class Q_EXPORT TQBrush: public Qt +class TQ_EXPORT TQBrush: public TQt { friend class TQPainter; public: @@ -84,8 +84,8 @@ private: *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); #endif #endif // TQBRUSH_H diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h index bbd97489..fade5e2c 100644 --- a/kjsembed/tools/headers/qcanvas.h +++ b/kjsembed/tools/headers/qcanvas.h @@ -52,7 +52,7 @@ #define TQM_EXPORT_CANVAS #define TQM_TEMPLATE_EXTERN_CANVAS #else -#define TQM_EXPORT_CANVAS Q_EXPORT +#define TQM_EXPORT_CANVAS TQ_EXPORT #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN #endif @@ -82,7 +82,7 @@ public: class TQCanvasItemExtra; -class TQM_EXPORT_CANVAS TQCanvasItem : public Qt +class TQM_EXPORT_CANVAS TQCanvasItem : public TQt { public: TQCanvasItem(TQCanvas* canvas); @@ -133,16 +133,6 @@ public: virtual void setActive(bool yes); bool isActive() const { return (bool)act; } -#ifndef TQT_NO_COMPAT - bool visible() const - { return (bool)vis; } - bool selected() const - { return (bool)sel; } - bool enabled() const - { return (bool)ena; } - bool active() const - { return (bool)act; } -#endif enum RttiValues { Rtti_Item = 0, @@ -208,7 +198,7 @@ class TQCanvasData; class TQM_EXPORT_CANVAS TQCanvas : public TQObject { - Q_OBJECT + TQ_OBJECT public: TQCanvas( TQObject* parent = 0, const char* name = 0 ); TQCanvas(int w, int h); @@ -280,12 +270,12 @@ public: TQCanvasItemList collisions( const TQPointArray& pa, const TQCanvasItem* item, bool exact) const; - void drawArea(const TQRect&, TQPainter* p, bool double_buffer=FALSE); + void drawArea(const TQRect&, TQPainter* p, bool double_buffer=false); // These are for TQCanvasView to call virtual void addView(TQCanvasView*); virtual void removeView(TQCanvasView*); - void drawCanvasArea(const TQRect&, TQPainter* p=0, bool double_buffer=TRUE); + void drawCanvasArea(const TQRect&, TQPainter* p=0, bool double_buffer=true); void drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& r, bool dbuf ); // These are for TQCanvasItem to call @@ -354,7 +344,7 @@ class TQCanvasViewData; class TQM_EXPORT_CANVAS TQCanvasView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0); @@ -661,7 +651,7 @@ public: TQCanvasSpline(TQCanvas* canvas); ~TQCanvasSpline(); - void setControlPoints(TQPointArray, bool closed=TRUE); + void setControlPoints(TQPointArray, bool closed=true); TQPointArray controlPoints() const; bool closed() const; diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h index 7fda3222..5542fd0e 100644 --- a/kjsembed/tools/headers/qdir.h +++ b/kjsembed/tools/headers/qdir.h @@ -52,7 +52,7 @@ class TQStringList; template <class T> class TQDeepCopy; -class Q_EXPORT TQDir +class TQ_EXPORT TQDir { public: enum FilterSpec { Dirs = 0x001, @@ -102,13 +102,13 @@ public: virtual TQString dirName() const; virtual TQString filePath( const TQString &fileName, - bool acceptAbsPath = TRUE ) const; + bool acceptAbsPath = true ) const; virtual TQString absFilePath( const TQString &fileName, - bool acceptAbsPath = TRUE ) const; + bool acceptAbsPath = true ) const; static TQString convertSeparators( const TQString &pathName ); - virtual bool cd( const TQString &dirName, bool acceptAbsPath = TRUE ); + virtual bool cd( const TQString &dirName, bool acceptAbsPath = true ); virtual bool cdUp(); TQString nameFilter() const; @@ -144,9 +144,9 @@ public: static const TQFileInfoList *drives(); virtual bool mkdir( const TQString &dirName, - bool acceptAbsPath = TRUE ) const; + bool acceptAbsPath = true ) const; virtual bool rmdir( const TQString &dirName, - bool acceptAbsPath = TRUE ) const; + bool acceptAbsPath = true ) const; virtual bool isReadable() const; virtual bool exists() const; @@ -159,11 +159,11 @@ public: virtual bool operator!=( const TQDir & ) const; virtual bool remove( const TQString &fileName, - bool acceptAbsPath = TRUE ); + bool acceptAbsPath = true ); virtual bool rename( const TQString &name, const TQString &newName, - bool acceptAbsPaths = TRUE ); + bool acceptAbsPaths = true ); virtual bool exists( const TQString &name, - bool acceptAbsPath = TRUE ); + bool acceptAbsPath = true ); static char separator(); diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h index 40e9767e..7532f50b 100644 --- a/kjsembed/tools/headers/qpen.h +++ b/kjsembed/tools/headers/qpen.h @@ -44,7 +44,7 @@ #endif // QT_H -class Q_EXPORT TQPen: public Qt +class TQ_EXPORT TQPen: public TQt { public: TQPen(); @@ -72,7 +72,7 @@ public: private: friend class TQPainter; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN friend class TQFontEngineWin; #endif @@ -92,8 +92,8 @@ private: TQPen stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); #endif #endif // TQPEN_H diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h index 1f7115f2..35fd16b5 100644 --- a/kjsembed/tools/headers/qtimer.h +++ b/kjsembed/tools/headers/qtimer.h @@ -43,16 +43,16 @@ #endif // QT_H -class Q_EXPORT TQTimer : public TQObject +class TQ_EXPORT TQTimer : public TQObject { - Q_OBJECT + TQ_OBJECT public: TQTimer( TQObject *parent=0, const char *name=0 ); ~TQTimer(); bool isActive() const; - int start( int msec, bool sshot = FALSE ); + int start( int msec, bool sshot = false ); void changeInterval( int msec ); void stop(); |