diff options
Diffstat (limited to 'kjsembed/tools/headers/qcanvas.h')
| -rw-r--r-- | kjsembed/tools/headers/qcanvas.h | 24 |
1 files changed, 7 insertions, 17 deletions
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; |