diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-13 13:18:58 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-13 13:18:58 +0900 |
| commit | 1ba13366a7a377d50b9e8df9044ce11d8209f98c (patch) | |
| tree | 40765573bcccd42239475344141eb98d2ac5d45e /src/kernel | |
| parent | 926102a455014e6ab308aaced19e32eed7ed4414 (diff) | |
| download | tqt3-1ba13366a7a377d50b9e8df9044ce11d8209f98c.tar.gz tqt3-1ba13366a7a377d50b9e8df9044ce11d8209f98c.zip | |
Replace Q_EXPORT_*/Q_EXTERN defines with TQ_EXPORT_*/TQ_EXTERN
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/kernel')
104 files changed, 397 insertions, 397 deletions
diff --git a/src/kernel/ntqaccel.h b/src/kernel/ntqaccel.h index 42ee4f77..ef578242 100644 --- a/src/kernel/ntqaccel.h +++ b/src/kernel/ntqaccel.h @@ -50,7 +50,7 @@ class TQAccelPrivate; -class Q_EXPORT TQAccel : public TQObject // accelerator class +class TQ_EXPORT TQAccel : public TQObject // accelerator class { TQ_OBJECT public: diff --git a/src/kernel/ntqaccessible.h b/src/kernel/ntqaccessible.h index 7df830ff..fb826d4f 100644 --- a/src/kernel/ntqaccessible.h +++ b/src/kernel/ntqaccessible.h @@ -51,7 +51,7 @@ struct TQAccessibleInterface; -class Q_EXPORT TQAccessible +class TQ_EXPORT TQAccessible { private: #ifdef Q_WS_MAC @@ -231,7 +231,7 @@ public: // {EC86CB9C-5DA0-4c43-A739-13EBDF1C6B14} #define IID_QAccessible TQUuid( 0xec86cb9c, 0x5da0, 0x4c43, 0xa7, 0x39, 0x13, 0xeb, 0xdf, 0x1c, 0x6b, 0x14 ) -struct Q_EXPORT TQAccessibleInterface : public TQAccessible, public TQUnknownInterface +struct TQ_EXPORT TQAccessibleInterface : public TQAccessible, public TQUnknownInterface { // check for valid pointers virtual bool isValid() const = 0; @@ -265,12 +265,12 @@ struct Q_EXPORT TQAccessibleInterface : public TQAccessible, public TQUnknownInt #define IID_QAccessibleFactory TQUuid( 0x49f4c6a7, 0x412f, 0x41de, 0x9e, 0x24, 0x64, 0x88, 0x43, 0x42, 0x1f, 0xd3 ) #endif -struct Q_EXPORT TQAccessibleFactoryInterface : public TQAccessible, public TQFeatureListInterface +struct TQ_EXPORT TQAccessibleFactoryInterface : public TQAccessible, public TQFeatureListInterface { virtual TQRESULT createAccessibleInterface( const TQString &, TQObject *, TQAccessibleInterface** ) = 0; }; -class Q_EXPORT TQAccessibleObject : public TQObject, public TQAccessibleInterface +class TQ_EXPORT TQAccessibleObject : public TQObject, public TQAccessibleInterface { public: TQAccessibleObject( TQObject *object ); diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h index e00289ab..d657e264 100644 --- a/src/kernel/ntqapplication.h +++ b/src/kernel/ntqapplication.h @@ -68,10 +68,10 @@ class TQThread; class TQApplication; -extern Q_EXPORT TQApplication *tqApp; // global application object +extern TQ_EXPORT TQApplication *tqApp; // global application object -class Q_EXPORT TQApplication : public TQObject +class TQ_EXPORT TQApplication : public TQObject { TQ_OBJECT public: @@ -441,7 +441,7 @@ private: #endif // TQT_THREAD_SUPPORT friend class TQTranslator; friend class TQEventLoop; - friend Q_EXPORT void tqt_ucm_initialize( TQApplication * ); + friend TQ_EXPORT void tqt_ucm_initialize( TQApplication * ); #if defined(Q_WS_WIN) friend bool qt_sendSpontaneousEvent( TQObject*, TQEvent* ); #endif diff --git a/src/kernel/ntqasyncimageio.h b/src/kernel/ntqasyncimageio.h index b307490e..54255978 100644 --- a/src/kernel/ntqasyncimageio.h +++ b/src/kernel/ntqasyncimageio.h @@ -51,7 +51,7 @@ #pragma GCC system_header #endif -class Q_EXPORT TQImageConsumer { +class TQ_EXPORT TQImageConsumer { public: virtual void end()=0; @@ -67,14 +67,14 @@ public: virtual void setSize( int, int ) = 0; }; -class Q_EXPORT TQImageFormat { +class TQ_EXPORT TQImageFormat { public: virtual ~TQImageFormat(); virtual int decode( TQImage& img, TQImageConsumer* consumer, const uchar* buffer, int length ) = 0; }; -class Q_EXPORT TQImageFormatType { +class TQ_EXPORT TQImageFormatType { public: virtual ~TQImageFormatType(); virtual TQImageFormat* decoderFor( const uchar* buffer, int length ) = 0; @@ -84,7 +84,7 @@ protected: }; class TQImageDecoderPrivate; -class Q_EXPORT TQImageDecoder { +class TQ_EXPORT TQImageDecoder { public: TQImageDecoder( TQImageConsumer* c ); ~TQImageDecoder(); diff --git a/src/kernel/ntqasyncio.h b/src/kernel/ntqasyncio.h index b585032f..1fea830b 100644 --- a/src/kernel/ntqasyncio.h +++ b/src/kernel/ntqasyncio.h @@ -51,7 +51,7 @@ class TQIODevice; -class Q_EXPORT TQAsyncIO { +class TQ_EXPORT TQAsyncIO { public: virtual ~TQAsyncIO(); void connect(TQObject*, const char *member); @@ -63,7 +63,7 @@ private: TQSignal signal; }; -class Q_EXPORT TQDataSink : public TQAsyncIO { +class TQ_EXPORT TQDataSink : public TQAsyncIO { public: // Call this to know how much I can take. virtual int readyToReceive()=0; @@ -72,7 +72,7 @@ public: void maybeReady(); }; -class Q_EXPORT TQDataSource : public TQAsyncIO { +class TQ_EXPORT TQDataSource : public TQAsyncIO { public: virtual int readyToSend()=0; // returns -1 when never any more ready virtual void sendTo(TQDataSink*, int count)=0; @@ -83,7 +83,7 @@ public: virtual void rewind(); }; -class Q_EXPORT TQIODeviceSource : public TQDataSource { +class TQ_EXPORT TQIODeviceSource : public TQDataSource { const int buf_size; uchar *buffer; TQIODevice* iod; @@ -100,7 +100,7 @@ public: void rewind(); }; -class Q_EXPORT TQDataPump : public TQObject { +class TQ_EXPORT TQDataPump : public TQObject { TQ_OBJECT int interval; TQTimer timer; diff --git a/src/kernel/ntqbitmap.h b/src/kernel/ntqbitmap.h index a4e49a36..22307b55 100644 --- a/src/kernel/ntqbitmap.h +++ b/src/kernel/ntqbitmap.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQBitmap : public TQPixmap +class TQ_EXPORT TQBitmap : public TQPixmap { public: TQBitmap(); diff --git a/src/kernel/ntqbrush.h b/src/kernel/ntqbrush.h index 6c13f230..93b375a6 100644 --- a/src/kernel/ntqbrush.h +++ b/src/kernel/ntqbrush.h @@ -47,7 +47,7 @@ #endif // QT_H -class Q_EXPORT TQBrush: public TQt +class TQ_EXPORT TQBrush: public TQt { friend class TQPainter; public: @@ -87,8 +87,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/src/kernel/ntqclipboard.h b/src/kernel/ntqclipboard.h index 34e9ed50..39050888 100644 --- a/src/kernel/ntqclipboard.h +++ b/src/kernel/ntqclipboard.h @@ -50,7 +50,7 @@ class TQMimeSource; -class Q_EXPORT TQClipboard : public TQObject +class TQ_EXPORT TQClipboard : public TQObject { TQ_OBJECT private: diff --git a/src/kernel/ntqcolor.h b/src/kernel/ntqcolor.h index 30acc281..d45dd4f5 100644 --- a/src/kernel/ntqcolor.h +++ b/src/kernel/ntqcolor.h @@ -48,32 +48,32 @@ const TQRgb TQT_RGB_MASK = 0x00ffffff; // masks RGB values -Q_EXPORT inline int tqRed( TQRgb rgb ) // get red part of RGB +TQ_EXPORT inline int tqRed( TQRgb rgb ) // get red part of RGB { return (int)((rgb >> 16) & 0xff); } -Q_EXPORT inline int tqGreen( TQRgb rgb ) // get green part of RGB +TQ_EXPORT inline int tqGreen( TQRgb rgb ) // get green part of RGB { return (int)((rgb >> 8) & 0xff); } -Q_EXPORT inline int tqBlue( TQRgb rgb ) // get blue part of RGB +TQ_EXPORT inline int tqBlue( TQRgb rgb ) // get blue part of RGB { return (int)(rgb & 0xff); } -Q_EXPORT inline int tqAlpha( TQRgb rgb ) // get alpha part of RGBA +TQ_EXPORT inline int tqAlpha( TQRgb rgb ) // get alpha part of RGBA { return (int)((rgb >> 24) & 0xff); } -Q_EXPORT inline TQRgb tqRgb( int r, int g, int b )// set RGB value +TQ_EXPORT inline TQRgb tqRgb( int r, int g, int b )// set RGB value { return (0xff << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); } -Q_EXPORT inline TQRgb tqRgba( int r, int g, int b, int a )// set RGBA value +TQ_EXPORT inline TQRgb tqRgba( int r, int g, int b, int a )// set RGBA value { return ((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); } -Q_EXPORT inline int tqGray( int r, int g, int b )// convert R,G,B to gray 0..255 +TQ_EXPORT inline int tqGray( int r, int g, int b )// convert R,G,B to gray 0..255 { return (r*11+g*16+b*5)/32; } -Q_EXPORT inline int tqGray( TQRgb rgb ) // convert RGB to gray 0..255 +TQ_EXPORT inline int tqGray( TQRgb rgb ) // convert RGB to gray 0..255 { return tqGray( tqRed(rgb), tqGreen(rgb), tqBlue(rgb) ); } -class Q_EXPORT TQColor +class TQ_EXPORT TQColor { public: enum Spec { Rgb, Hsv }; @@ -222,8 +222,8 @@ inline bool TQColor::operator!=( const TQColor &c ) const *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColor & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQColor & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColor & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQColor & ); #endif #endif // TQCOLOR_H diff --git a/src/kernel/ntqconnection.h b/src/kernel/ntqconnection.h index e505fcd7..b259d986 100644 --- a/src/kernel/ntqconnection.h +++ b/src/kernel/ntqconnection.h @@ -45,7 +45,7 @@ #include "ntqobject.h" #endif // QT_H -class Q_EXPORT TQConnection +class TQ_EXPORT TQConnection { public: TQConnection( const TQObject *, int, const char *memberName, int memberType ); diff --git a/src/kernel/ntqcursor.h b/src/kernel/ntqcursor.h index 38f55c48..8e7b10ce 100644 --- a/src/kernel/ntqcursor.h +++ b/src/kernel/ntqcursor.h @@ -51,7 +51,7 @@ */ #ifdef TQT_NO_CURSOR -class Q_EXPORT TQCursor : public TQt +class TQ_EXPORT TQCursor : public TQt { public: static TQPoint pos(); @@ -68,7 +68,7 @@ private: struct TQCursorData; -class Q_EXPORT TQCursor : public TQt +class TQ_EXPORT TQCursor : public TQt { public: TQCursor(); // create default arrow cursor @@ -126,8 +126,8 @@ private: TQCursor stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCursor & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCursor & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCursor & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQCursor & ); #endif #endif // TQT_NO_CURSOR diff --git a/src/kernel/ntqdesktopwidget.h b/src/kernel/ntqdesktopwidget.h index 9fd40045..51fbc823 100644 --- a/src/kernel/ntqdesktopwidget.h +++ b/src/kernel/ntqdesktopwidget.h @@ -46,7 +46,7 @@ class TQApplication; class TQDesktopWidgetPrivate; /* Don't touch! */ -class Q_EXPORT TQDesktopWidget : public TQWidget +class TQ_EXPORT TQDesktopWidget : public TQWidget { TQ_OBJECT public: diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h index a255d0fe..bc63a07d 100644 --- a/src/kernel/ntqdragobject.h +++ b/src/kernel/ntqdragobject.h @@ -54,7 +54,7 @@ class TQImageDragData; #ifndef TQT_NO_MIME -class Q_EXPORT TQDragObject: public TQObject, public TQMimeSource { +class TQ_EXPORT TQDragObject: public TQObject, public TQMimeSource { TQ_OBJECT public: TQDragObject( TQWidget * dragSource = 0, const char * name = 0 ); @@ -92,7 +92,7 @@ private: #endif }; -class Q_EXPORT TQStoredDrag: public TQDragObject { +class TQ_EXPORT TQStoredDrag: public TQDragObject { TQ_OBJECT TQStoredDragData * d; @@ -113,7 +113,7 @@ private: #endif }; -class Q_EXPORT TQTextDrag: public TQDragObject { +class TQ_EXPORT TQTextDrag: public TQDragObject { TQ_OBJECT TQTextDragPrivate* d; public: @@ -139,7 +139,7 @@ private: #endif }; -class Q_EXPORT TQImageDrag: public TQDragObject { +class TQ_EXPORT TQImageDrag: public TQDragObject { TQ_OBJECT TQImage img; TQStrList ofmts; @@ -167,7 +167,7 @@ private: }; -class Q_EXPORT TQUriDrag: public TQStoredDrag { +class TQ_EXPORT TQUriDrag: public TQStoredDrag { TQ_OBJECT public: @@ -196,7 +196,7 @@ private: #endif }; -class Q_EXPORT TQColorDrag : public TQStoredDrag +class TQ_EXPORT TQColorDrag : public TQStoredDrag { TQ_OBJECT TQColor color; @@ -227,7 +227,7 @@ typedef TQUriDrag TQUrlDrag; // member functions. // -class Q_EXPORT TQDragManager: public TQObject { +class TQ_EXPORT TQDragManager: public TQObject { TQ_OBJECT private: diff --git a/src/kernel/ntqdrawutil.h b/src/kernel/ntqdrawutil.h index c315cb5b..fb6f7025 100644 --- a/src/kernel/ntqdrawutil.h +++ b/src/kernel/ntqdrawutil.h @@ -58,52 +58,52 @@ class TQPixmap; // Standard shade drawing // -Q_EXPORT void qDrawShadeLine( TQPainter *p, int x1, int y1, int x2, int y2, +TQ_EXPORT void qDrawShadeLine( TQPainter *p, int x1, int y1, int x2, int y2, const TQColorGroup &g, bool sunken = TRUE, int lineWidth = 1, int midLineWidth = 0 ); -Q_EXPORT void qDrawShadeLine( TQPainter *p, const TQPoint &p1, const TQPoint &p2, +TQ_EXPORT void qDrawShadeLine( TQPainter *p, const TQPoint &p1, const TQPoint &p2, const TQColorGroup &g, bool sunken = TRUE, int lineWidth = 1, int midLineWidth = 0 ); -Q_EXPORT void qDrawShadeRect( TQPainter *p, int x, int y, int w, int h, +TQ_EXPORT void qDrawShadeRect( TQPainter *p, int x, int y, int w, int h, const TQColorGroup &, bool sunken=FALSE, int lineWidth = 1, int midLineWidth = 0, const TQBrush *fill = 0 ); -Q_EXPORT void qDrawShadeRect( TQPainter *p, const TQRect &r, +TQ_EXPORT void qDrawShadeRect( TQPainter *p, const TQRect &r, const TQColorGroup &, bool sunken=FALSE, int lineWidth = 1, int midLineWidth = 0, const TQBrush *fill = 0 ); -Q_EXPORT void qDrawShadePanel( TQPainter *p, int x, int y, int w, int h, +TQ_EXPORT void qDrawShadePanel( TQPainter *p, int x, int y, int w, int h, const TQColorGroup &, bool sunken=FALSE, int lineWidth = 1, const TQBrush *fill = 0 ); -Q_EXPORT void qDrawShadePanel( TQPainter *p, const TQRect &r, +TQ_EXPORT void qDrawShadePanel( TQPainter *p, const TQRect &r, const TQColorGroup &, bool sunken=FALSE, int lineWidth = 1, const TQBrush *fill = 0 ); -Q_EXPORT void qDrawWinButton( TQPainter *p, int x, int y, int w, int h, +TQ_EXPORT void qDrawWinButton( TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, bool sunken = FALSE, const TQBrush *fill = 0 ); -Q_EXPORT void qDrawWinButton( TQPainter *p, const TQRect &r, +TQ_EXPORT void qDrawWinButton( TQPainter *p, const TQRect &r, const TQColorGroup &g, bool sunken = FALSE, const TQBrush *fill = 0 ); -Q_EXPORT void qDrawWinPanel( TQPainter *p, int x, int y, int w, int h, +TQ_EXPORT void qDrawWinPanel( TQPainter *p, int x, int y, int w, int h, const TQColorGroup &, bool sunken=FALSE, const TQBrush *fill = 0 ); -Q_EXPORT void qDrawWinPanel( TQPainter *p, const TQRect &r, +TQ_EXPORT void qDrawWinPanel( TQPainter *p, const TQRect &r, const TQColorGroup &, bool sunken=FALSE, const TQBrush *fill = 0 ); -Q_EXPORT void qDrawPlainRect( TQPainter *p, int x, int y, int w, int h, const TQColor &, +TQ_EXPORT void qDrawPlainRect( TQPainter *p, int x, int y, int w, int h, const TQColor &, int lineWidth = 1, const TQBrush *fill = 0 ); -Q_EXPORT void qDrawPlainRect( TQPainter *p, const TQRect &r, const TQColor &, +TQ_EXPORT void qDrawPlainRect( TQPainter *p, const TQRect &r, const TQColor &, int lineWidth = 1, const TQBrush *fill = 0 ); @@ -111,16 +111,16 @@ Q_EXPORT void qDrawPlainRect( TQPainter *p, const TQRect &r, const TQColor &, // Other obsolete drawing functions. // Use TQStyle::itemRect(), TQStyle::drawItem() and TQStyle::drawArrow() instead. // -Q_EXPORT TQRect qItemRect( TQPainter *p, TQt::GUIStyle gs, int x, int y, int w, int h, +TQ_EXPORT TQRect qItemRect( TQPainter *p, TQt::GUIStyle gs, int x, int y, int w, int h, int flags, bool enabled, const TQPixmap *pixmap, const TQString& text, int len=-1 ); -Q_EXPORT void qDrawItem( TQPainter *p, TQt::GUIStyle gs, int x, int y, int w, int h, +TQ_EXPORT void qDrawItem( TQPainter *p, TQt::GUIStyle gs, int x, int y, int w, int h, int flags, const TQColorGroup &g, bool enabled, const TQPixmap *pixmap, const TQString& text, int len=-1, const TQColor* penColor = 0 ); -Q_EXPORT void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style, bool down, +TQ_EXPORT void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style, bool down, int x, int y, int w, int h, const TQColorGroup &g, bool enabled ); diff --git a/src/kernel/ntqdropsite.h b/src/kernel/ntqdropsite.h index 952be802..3e95cdc3 100644 --- a/src/kernel/ntqdropsite.h +++ b/src/kernel/ntqdropsite.h @@ -49,7 +49,7 @@ class TQWidget; -class Q_EXPORT TQDropSite { +class TQ_EXPORT TQDropSite { public: TQDropSite( TQWidget* parent ); virtual ~TQDropSite(); diff --git a/src/kernel/ntqevent.h b/src/kernel/ntqevent.h index d5db5ce8..ae344371 100644 --- a/src/kernel/ntqevent.h +++ b/src/kernel/ntqevent.h @@ -49,7 +49,7 @@ #include "ntqpair.h" #endif // QT_H -class Q_EXPORT TQEvent: public TQt // event base class +class TQ_EXPORT TQEvent: public TQt // event base class { public: enum Type { @@ -162,7 +162,7 @@ private: }; -class Q_EXPORT TQTimerEvent : public TQEvent +class TQ_EXPORT TQTimerEvent : public TQEvent { public: TQTimerEvent( int timerId ) @@ -173,7 +173,7 @@ protected: }; -class Q_EXPORT TQMouseEvent : public TQEvent +class TQ_EXPORT TQMouseEvent : public TQEvent { public: TQMouseEvent( Type type, const TQPoint &pos, int button, int state ); @@ -204,7 +204,7 @@ protected: #ifndef TQT_NO_WHEELEVENT -class Q_EXPORT TQWheelEvent : public TQEvent +class TQ_EXPORT TQWheelEvent : public TQEvent { public: TQWheelEvent( const TQPoint &pos, int delta, int state, Orientation orient = Vertical ); @@ -233,7 +233,7 @@ protected: }; #endif -class Q_EXPORT TQTabletEvent : public TQEvent +class TQ_EXPORT TQTabletEvent : public TQEvent { public: enum TabletDevice { NoDevice = -1, Puck, Stylus, Eraser }; @@ -272,7 +272,7 @@ protected: }; -class Q_EXPORT TQKeyEvent : public TQEvent +class TQ_EXPORT TQKeyEvent : public TQEvent { public: TQKeyEvent( Type type, int key, int ascii, int state, @@ -304,7 +304,7 @@ protected: }; -class Q_EXPORT TQFocusEvent : public TQEvent +class TQ_EXPORT TQFocusEvent : public TQEvent { public: @@ -325,7 +325,7 @@ private: }; -class Q_EXPORT TQPaintEvent : public TQEvent +class TQ_EXPORT TQPaintEvent : public TQEvent { public: TQPaintEvent( const TQRegion& paintRegion, bool erased = TRUE) @@ -356,7 +356,7 @@ protected: }; -class Q_EXPORT TQMoveEvent : public TQEvent +class TQ_EXPORT TQMoveEvent : public TQEvent { public: TQMoveEvent( const TQPoint &pos, const TQPoint &oldPos ) @@ -370,7 +370,7 @@ protected: }; -class Q_EXPORT TQResizeEvent : public TQEvent +class TQ_EXPORT TQResizeEvent : public TQEvent { public: TQResizeEvent( const TQSize &size, const TQSize &oldSize ) @@ -384,7 +384,7 @@ protected: }; -class Q_EXPORT TQCloseEvent : public TQEvent +class TQ_EXPORT TQCloseEvent : public TQEvent { public: TQCloseEvent() @@ -397,7 +397,7 @@ protected: }; -class Q_EXPORT TQIconDragEvent : public TQEvent +class TQ_EXPORT TQIconDragEvent : public TQEvent { public: TQIconDragEvent() @@ -410,7 +410,7 @@ protected: bool accpt; }; -class Q_EXPORT TQShowEvent : public TQEvent +class TQ_EXPORT TQShowEvent : public TQEvent { public: TQShowEvent() @@ -418,14 +418,14 @@ public: }; -class Q_EXPORT TQHideEvent : public TQEvent +class TQ_EXPORT TQHideEvent : public TQEvent { public: TQHideEvent() : TQEvent(Hide) {} }; -class Q_EXPORT TQContextMenuEvent : public TQEvent +class TQ_EXPORT TQContextMenuEvent : public TQEvent { public: enum Reason { Mouse, Keyboard, Other }; @@ -461,7 +461,7 @@ protected: }; -class Q_EXPORT TQIMEvent : public TQEvent +class TQ_EXPORT TQIMEvent : public TQEvent { public: TQIMEvent( Type type, const TQString &text, int cursorPosition ) @@ -479,7 +479,7 @@ private: bool a; }; -class Q_EXPORT TQIMComposeEvent : public TQIMEvent +class TQ_EXPORT TQIMComposeEvent : public TQIMEvent { public: TQIMComposeEvent( Type type, const TQString &text, int cursorPosition, @@ -506,7 +506,7 @@ inline int TQIMEvent::selectionLength() const // own DND event objects, write to qt-bugs@trolltech.com and we'll try to // find a way to extend it so it covers your needs. -class Q_EXPORT TQDropEvent : public TQEvent, public TQMimeSource +class TQ_EXPORT TQDropEvent : public TQEvent, public TQMimeSource { public: TQDropEvent( const TQPoint& pos, Type typ=Drop ) @@ -545,7 +545,7 @@ protected: -class Q_EXPORT TQDragMoveEvent : public TQDropEvent +class TQ_EXPORT TQDragMoveEvent : public TQDropEvent { public: TQDragMoveEvent( const TQPoint& pos, Type typ=DragMove ) @@ -562,7 +562,7 @@ protected: }; -class Q_EXPORT TQDragEnterEvent : public TQDragMoveEvent +class TQ_EXPORT TQDragEnterEvent : public TQDragMoveEvent { public: TQDragEnterEvent( const TQPoint& pos ) : @@ -571,7 +571,7 @@ public: /* An internal class */ -class Q_EXPORT TQDragResponseEvent : public TQEvent +class TQ_EXPORT TQDragResponseEvent : public TQEvent { public: TQDragResponseEvent( bool accepted ) @@ -582,7 +582,7 @@ protected: }; -class Q_EXPORT TQDragLeaveEvent : public TQEvent +class TQ_EXPORT TQDragLeaveEvent : public TQEvent { public: TQDragLeaveEvent() @@ -591,7 +591,7 @@ public: #endif // TQT_NO_DRAGANDDROP -class Q_EXPORT TQChildEvent : public TQEvent +class TQ_EXPORT TQChildEvent : public TQEvent { public: TQChildEvent( Type type, TQObject *child ) @@ -604,7 +604,7 @@ protected: }; -class Q_EXPORT TQCustomEvent : public TQEvent +class TQ_EXPORT TQCustomEvent : public TQEvent { public: TQCustomEvent( int type ); diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h index cc76fb75..9f802dbd 100644 --- a/src/kernel/ntqeventloop.h +++ b/src/kernel/ntqeventloop.h @@ -64,7 +64,7 @@ class TQMutex; #endif // TQT_THREAD_SUPPORT -class Q_EXPORT TQEventLoop : public TQObject +class TQ_EXPORT TQEventLoop : public TQObject { TQ_OBJECT diff --git a/src/kernel/ntqfocusdata.h b/src/kernel/ntqfocusdata.h index 8a44a503..29c804c2 100644 --- a/src/kernel/ntqfocusdata.h +++ b/src/kernel/ntqfocusdata.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQFocusData { +class TQ_EXPORT TQFocusData { public: TQWidget* focusWidget() const { return it.current(); } diff --git a/src/kernel/ntqfont.h b/src/kernel/ntqfont.h index cdbd069d..6f347e41 100644 --- a/src/kernel/ntqfont.h +++ b/src/kernel/ntqfont.h @@ -51,7 +51,7 @@ class TQFontPrivate; /* don't touch */ class TQStringList; class TQTextFormatCollection; -class Q_EXPORT TQFont +class TQ_EXPORT TQFont { public: enum StyleHint { @@ -341,8 +341,8 @@ private: friend TQt::HANDLE qt_xft_handle(const TQFont &font); #endif #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & ); #endif TQFontPrivate *d; @@ -364,8 +364,8 @@ inline void TQFont::setBold( bool enable ) *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & ); #endif diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h index 7ea42515..fd19761c 100644 --- a/src/kernel/ntqfontdatabase.h +++ b/src/kernel/ntqfontdatabase.h @@ -64,7 +64,7 @@ class TQDiskFont; class TQFontDatabasePrivate; -class Q_EXPORT TQFontDatabase +class TQ_EXPORT TQFontDatabase { public: static TQValueList<int> standardSizes(); diff --git a/src/kernel/ntqfontinfo.h b/src/kernel/ntqfontinfo.h index 175aaa32..25c269ff 100644 --- a/src/kernel/ntqfontinfo.h +++ b/src/kernel/ntqfontinfo.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQFontInfo +class TQ_EXPORT TQFontInfo { public: TQFontInfo( const TQFont & ); diff --git a/src/kernel/ntqfontmetrics.h b/src/kernel/ntqfontmetrics.h index 99bdbe0d..e5a64975 100644 --- a/src/kernel/ntqfontmetrics.h +++ b/src/kernel/ntqfontmetrics.h @@ -53,7 +53,7 @@ class TQFontEngine; class TQTextCodec; class TQTextParag; -class Q_EXPORT TQFontMetrics +class TQ_EXPORT TQFontMetrics { public: TQFontMetrics( const TQFont & ); diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h index 3b645ab2..71f3e00d 100644 --- a/src/kernel/ntqgplugin.h +++ b/src/kernel/ntqgplugin.h @@ -57,15 +57,15 @@ #ifndef TQT_NO_COMPONENT -#ifndef Q_EXTERN_C +#ifndef TQ_EXTERN_C #ifdef __cplusplus -#define Q_EXTERN_C extern "C" +#define TQ_EXTERN_C extern "C" #else -#define Q_EXTERN_C extern +#define TQ_EXTERN_C extern #endif #endif -#ifndef Q_EXPORT_PLUGIN +#ifndef TQ_EXPORT_PLUGIN #if defined(TQT_THREAD_SUPPORT) #define QT_THREADED_BUILD 1 #define Q_PLUGIN_FLAGS_STRING "11" @@ -99,18 +99,18 @@ # define Q_STDCALL #endif -#define Q_EXPORT_PLUGIN(PLUGIN) \ +#define TQ_EXPORT_PLUGIN(PLUGIN) \ Q_PLUGIN_VERIFICATION_DATA \ - Q_EXTERN_C Q_EXPORT \ + TQ_EXTERN_C TQ_EXPORT \ const char * Q_STDCALL qt_ucm_query_verification_data() \ { return qt_ucm_verification_data; } \ - Q_EXTERN_C Q_EXPORT TQUnknownInterface* Q_STDCALL ucm_instantiate() \ + TQ_EXTERN_C TQ_EXPORT TQUnknownInterface* Q_STDCALL ucm_instantiate() \ Q_PLUGIN_INSTANTIATE( PLUGIN ) #endif struct TQUnknownInterface; -class Q_EXPORT TQGPlugin : public TQObject +class TQ_EXPORT TQGPlugin : public TQObject { TQ_OBJECT public: diff --git a/src/kernel/ntqguardedptr.h b/src/kernel/ntqguardedptr.h index 3d1fe481..c0b7084a 100644 --- a/src/kernel/ntqguardedptr.h +++ b/src/kernel/ntqguardedptr.h @@ -46,7 +46,7 @@ #endif // QT_H // ### 4.0: rename to something without Private in it. Not really internal. -class Q_EXPORT TQGuardedPtrPrivate : public TQObject, public TQShared +class TQ_EXPORT TQGuardedPtrPrivate : public TQObject, public TQShared { TQ_OBJECT public: diff --git a/src/kernel/ntqiconset.h b/src/kernel/ntqiconset.h index 3276f321..d9a90460 100644 --- a/src/kernel/ntqiconset.h +++ b/src/kernel/ntqiconset.h @@ -52,7 +52,7 @@ class TQIconFactory; class TQIconSetPrivate; // ### Remove all 'virtual' functions in TQIconSet (but not TQIconFactory) in TQt 4.0 -class Q_EXPORT TQIconSet +class TQ_EXPORT TQIconSet { public: // the implementation makes assumptions about the value of these @@ -101,7 +101,7 @@ private: TQIconSetPrivate *d; }; -class Q_EXPORT TQIconFactory : private TQShared +class TQ_EXPORT TQIconFactory : private TQShared { public: TQIconFactory(); diff --git a/src/kernel/ntqimage.h b/src/kernel/ntqimage.h index 214af452..d571aae0 100644 --- a/src/kernel/ntqimage.h +++ b/src/kernel/ntqimage.h @@ -49,7 +49,7 @@ class TQImageDataMisc; // internal #ifndef TQT_NO_IMAGE_TEXT -class Q_EXPORT TQImageTextKeyLang { +class TQ_EXPORT TQImageTextKeyLang { public: TQImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { } TQImageTextKeyLang() { } @@ -65,7 +65,7 @@ public: #endif //TQT_NO_IMAGE_TEXT -class Q_EXPORT TQImage +class TQ_EXPORT TQImage { public: enum Endian { IgnoreEndian, BigEndian, LittleEndian }; @@ -249,7 +249,7 @@ private: #ifndef TQT_NO_IMAGEIO bool doImageIO( TQImageIO* io, int quality ) const; #endif - friend Q_EXPORT void bitBlt( TQImage* dst, int dx, int dy, + friend TQ_EXPORT void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, int sx, int sy, int sw, int sh, int conversion_flags ); }; @@ -258,8 +258,8 @@ private: // TQImage stream functions #if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO) -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQImage & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQImage & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQImage & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQImage & ); #endif #ifndef TQT_NO_IMAGEIO @@ -270,7 +270,7 @@ typedef void (*image_io_handler)( TQImageIO * ); // image IO handler struct TQImageIOData; -class Q_EXPORT TQImageIO +class TQ_EXPORT TQImageIO { public: TQImageIO(); @@ -334,7 +334,7 @@ private: // Disabled copy constructor and operator= #endif //TQT_NO_IMAGEIO -Q_EXPORT void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, +TQ_EXPORT void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, int sx=0, int sy=0, int sw=-1, int sh=-1, int conversion_flags=0 ); diff --git a/src/kernel/ntqimageformatplugin.h b/src/kernel/ntqimageformatplugin.h index d595881c..237817e9 100644 --- a/src/kernel/ntqimageformatplugin.h +++ b/src/kernel/ntqimageformatplugin.h @@ -48,7 +48,7 @@ class TQImageFormat; class TQImageFormatPluginPrivate; -class Q_EXPORT TQImageFormatPlugin : public TQGPlugin +class TQ_EXPORT TQImageFormatPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h index d45657af..0b1dfe90 100644 --- a/src/kernel/ntqinputcontext.h +++ b/src/kernel/ntqinputcontext.h @@ -62,7 +62,7 @@ struct TQInputContextMenu { }; -class Q_EXPORT TQInputContext : public TQObject +class TQ_EXPORT TQInputContext : public TQObject { TQ_OBJECT public: diff --git a/src/kernel/ntqkeysequence.h b/src/kernel/ntqkeysequence.h index 84475a17..5036e69d 100644 --- a/src/kernel/ntqkeysequence.h +++ b/src/kernel/ntqkeysequence.h @@ -55,13 +55,13 @@ *****************************************************************************/ #ifndef TQT_NO_DATASTREAM class TQKeySequence; -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQKeySequence & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQKeySequence & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQKeySequence & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQKeySequence & ); #endif class TQKeySequencePrivate; -class Q_EXPORT TQKeySequence : public TQt +class TQ_EXPORT TQKeySequence : public TQt { public: TQKeySequence(); @@ -90,14 +90,14 @@ private: TQKeySequencePrivate* d; - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQKeySequence & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQKeySequence & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQKeySequence & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQKeySequence & ); friend class TQAccelManager; }; #else -class Q_EXPORT TQKeySequence : public TQt +class TQ_EXPORT TQKeySequence : public TQt { public: TQKeySequence() {} diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h index a9962e47..6e074909 100644 --- a/src/kernel/ntqlayout.h +++ b/src/kernel/ntqlayout.h @@ -66,7 +66,7 @@ class TQMenuBar; class TQSpacerItem; class TQWidget; -class Q_EXPORT TQGLayoutIterator : public TQShared +class TQ_EXPORT TQGLayoutIterator : public TQShared { public: virtual ~TQGLayoutIterator(); @@ -75,7 +75,7 @@ public: virtual TQLayoutItem *takeCurrent() = 0; }; -class Q_EXPORT TQLayoutIterator +class TQ_EXPORT TQLayoutIterator { public: TQLayoutIterator( TQGLayoutIterator *i ) : it( i ) { } @@ -101,7 +101,7 @@ private: TQGLayoutIterator *it; }; -class Q_EXPORT TQLayoutItem +class TQ_EXPORT TQLayoutItem { public: TQLayoutItem( int alignment = 0 ) : align( alignment ) { } @@ -130,7 +130,7 @@ protected: int align; }; -class Q_EXPORT TQSpacerItem : public TQLayoutItem +class TQ_EXPORT TQSpacerItem : public TQLayoutItem { public: TQSpacerItem( int w, int h, @@ -156,7 +156,7 @@ private: TQRect rect; }; -class Q_EXPORT TQWidgetItem : public TQLayoutItem +class TQ_EXPORT TQWidgetItem : public TQLayoutItem { public: TQWidgetItem( TQWidget *w ) : wid( w ) { } @@ -176,7 +176,7 @@ private: TQWidget *wid; }; -class Q_EXPORT TQLayout : public TQObject, public TQLayoutItem +class TQ_EXPORT TQLayout : public TQObject, public TQLayoutItem { TQ_OBJECT TQ_ENUMS( ResizeMode ) @@ -288,7 +288,7 @@ inline void TQLayoutIterator::deleteCurrent() delete takeCurrent(); } -class Q_EXPORT TQGridLayout : public TQLayout +class TQ_EXPORT TQGridLayout : public TQLayout { TQ_OBJECT public: @@ -365,7 +365,7 @@ private: class TQBoxLayoutData; class TQDockWindow; -class Q_EXPORT TQBoxLayout : public TQLayout +class TQ_EXPORT TQBoxLayout : public TQLayout { TQ_OBJECT public: @@ -431,7 +431,7 @@ private: TQBoxLayout *createTmpCopy(); }; -class Q_EXPORT TQHBoxLayout : public TQBoxLayout +class TQ_EXPORT TQHBoxLayout : public TQBoxLayout { TQ_OBJECT public: @@ -450,7 +450,7 @@ private: // Disabled copy constructor and operator= #endif }; -class Q_EXPORT TQVBoxLayout : public TQBoxLayout +class TQ_EXPORT TQVBoxLayout : public TQBoxLayout { TQ_OBJECT public: diff --git a/src/kernel/ntqlocalfs.h b/src/kernel/ntqlocalfs.h index 7676cec4..2ee4fad0 100644 --- a/src/kernel/ntqlocalfs.h +++ b/src/kernel/ntqlocalfs.h @@ -48,7 +48,7 @@ #ifndef TQT_NO_NETWORKPROTOCOL -class Q_EXPORT TQLocalFs : public TQNetworkProtocol +class TQ_EXPORT TQLocalFs : public TQNetworkProtocol { TQ_OBJECT diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/ntqmetaobject.h index 55d3962e..d4ed34e1 100644 --- a/src/kernel/ntqmetaobject.h +++ b/src/kernel/ntqmetaobject.h @@ -79,7 +79,7 @@ struct TQMetaEnum // enumerator meta data #ifndef TQT_NO_PROPERTIES -class Q_EXPORT TQMetaProperty // property meta data +class TQ_EXPORT TQMetaProperty // property meta data { public: const char* type() const { return t; } // type of the property @@ -139,7 +139,7 @@ struct TQClassInfo // class info meta data const char* value; // - value of the info }; -class Q_EXPORT TQMetaObject // meta object class +class TQ_EXPORT TQMetaObject // meta object class { public: TQMetaObject( const char * const class_name, TQMetaObject *superclass, @@ -270,7 +270,7 @@ inline int TQMetaObject::propertyOffset() const typedef TQMetaObject *(*TQtStaticMetaObjectFunction)(); -class Q_EXPORT TQMetaObjectCleanUp +class TQ_EXPORT TQMetaObjectCleanUp { public: TQMetaObjectCleanUp( const char *mo_name, TQtStaticMetaObjectFunction ); diff --git a/src/kernel/ntqmime.h b/src/kernel/ntqmime.h index 08b5334b..719f83b0 100644 --- a/src/kernel/ntqmime.h +++ b/src/kernel/ntqmime.h @@ -51,7 +51,7 @@ class TQImageDrag; class TQTextDrag; -class Q_EXPORT TQMimeSource +class TQ_EXPORT TQMimeSource { friend class TQClipboardData; @@ -93,7 +93,7 @@ inline int TQMimeSource::serialNumber() const class TQStringList; class TQMimeSourceFactoryData; -class Q_EXPORT TQMimeSourceFactory { +class TQ_EXPORT TQMimeSourceFactory { public: TQMimeSourceFactory(); virtual ~TQMimeSourceFactory(); @@ -134,7 +134,7 @@ private: directly. */ -class Q_EXPORT TQWindowsMime { +class TQ_EXPORT TQWindowsMime { public: TQWindowsMime(); virtual ~TQWindowsMime(); @@ -170,7 +170,7 @@ public: directly. */ -class Q_EXPORT TQMacMime { +class TQ_EXPORT TQMacMime { char type; public: enum TQMacMimeType { MIME_DND=0x01, MIME_CLIP=0x02, MIME_QT_CONVERTOR=0x04, MIME_ALL=MIME_DND|MIME_CLIP }; diff --git a/src/kernel/ntqmovie.h b/src/kernel/ntqmovie.h index 5c1b5f74..939f10c9 100644 --- a/src/kernel/ntqmovie.h +++ b/src/kernel/ntqmovie.h @@ -51,7 +51,7 @@ class TQDataSource; class TQObject; class TQMoviePrivate; -class Q_EXPORT TQMovie { +class TQ_EXPORT TQMovie { public: TQMovie(); TQMovie(int bufsize); diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h index ef772989..b044494b 100644 --- a/src/kernel/ntqnamespace.h +++ b/src/kernel/ntqnamespace.h @@ -50,7 +50,7 @@ class TQColor; class TQCursor; -class Q_EXPORT TQt { +class TQ_EXPORT TQt { public: QT_STATIC_CONST TQColor & color0; QT_STATIC_CONST TQColor & color1; @@ -1017,7 +1017,7 @@ public: }; -class Q_EXPORT TQInternal { +class TQ_EXPORT TQInternal { public: enum PaintDeviceFlags { UndefinedDevice = 0x00, diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h index 1877d168..fa245f9c 100644 --- a/src/kernel/ntqnetworkprotocol.h +++ b/src/kernel/ntqnetworkprotocol.h @@ -61,7 +61,7 @@ class TQUrlOperator; class TQNetworkProtocolPrivate; template <class T> class TQValueList; -class Q_EXPORT TQNetworkProtocolFactoryBase +class TQ_EXPORT TQNetworkProtocolFactoryBase { public: TQNetworkProtocolFactoryBase(); @@ -84,7 +84,7 @@ public: typedef TQDict< TQNetworkProtocolFactoryBase > TQNetworkProtocolDict; -class Q_EXPORT TQNetworkProtocol : public TQObject +class TQ_EXPORT TQNetworkProtocol : public TQObject { TQ_OBJECT @@ -200,7 +200,7 @@ private: // Disabled copy constructor and operator= class TQNetworkOperationPrivate; -class Q_EXPORT TQNetworkOperation : public TQObject +class TQ_EXPORT TQNetworkOperation : public TQObject { TQ_OBJECT friend class TQUrlOperator; diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h index c1760dfa..fc16c50b 100644 --- a/src/kernel/ntqobject.h +++ b/src/kernel/ntqobject.h @@ -71,7 +71,7 @@ class TQThread; class TQStyleControlElementData; class TQStyleControlElementDataPrivate; -class Q_EXPORT TQObject: public TQt +class TQ_EXPORT TQObject: public TQt { TQ_OBJECT TQ_PROPERTY( TQCString name READ name WRITE setName ) @@ -245,7 +245,7 @@ private: #ifndef TQT_NO_USERDATA -class Q_EXPORT TQObjectUserData { +class TQ_EXPORT TQObjectUserData { public: virtual ~TQObjectUserData(); }; diff --git a/src/kernel/ntqobjectcleanuphandler.h b/src/kernel/ntqobjectcleanuphandler.h index 74f4dae8..82fe6d9b 100644 --- a/src/kernel/ntqobjectcleanuphandler.h +++ b/src/kernel/ntqobjectcleanuphandler.h @@ -45,7 +45,7 @@ class TQObjectList; -class Q_EXPORT TQObjectCleanupHandler : public TQObject +class TQ_EXPORT TQObjectCleanupHandler : public TQObject { TQ_OBJECT diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index e274ee43..fac233ce 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -162,11 +162,11 @@ class TQMemberDict; extern TQMutex *tqt_sharedMetaObjectMutex; -Q_EXPORT void *tqt_find_obj_child( TQObject *, const char *, const char * ); +TQ_EXPORT void *tqt_find_obj_child( TQObject *, const char *, const char * ); #define Q_CHILD(parent,type,name) \ ((type*)tqt_find_obj_child(parent,#type,name)) -Q_EXPORT void *tqt_inheritedBy( TQMetaObject *super, const TQObject *cls ); +TQ_EXPORT void *tqt_inheritedBy( TQMetaObject *super, const TQObject *cls ); template <typename T> TQ_INLINE_TEMPLATES T tqt_cast(const TQObject *object) diff --git a/src/kernel/ntqobjectdict.h b/src/kernel/ntqobjectdict.h index b3fcd282..4ee49faf 100644 --- a/src/kernel/ntqobjectdict.h +++ b/src/kernel/ntqobjectdict.h @@ -51,7 +51,7 @@ // The object dictionary is a collection of TQMetaObjects // -class Q_EXPORT TQObjectDictionary : public TQAsciiDict<TQMetaObject> +class TQ_EXPORT TQObjectDictionary : public TQAsciiDict<TQMetaObject> { public: TQObjectDictionary(int size=17,bool cs=TRUE,bool ck=TRUE) diff --git a/src/kernel/ntqobjectlist.h b/src/kernel/ntqobjectlist.h index 1cb73a55..80c353f0 100644 --- a/src/kernel/ntqobjectlist.h +++ b/src/kernel/ntqobjectlist.h @@ -48,12 +48,12 @@ #if defined(Q_TEMPLATEDLL) -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQObject>; -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<TQObject>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQObject>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQObject>; #endif -class Q_EXPORT TQObjectList : public TQPtrList<TQObject> +class TQ_EXPORT TQObjectList : public TQPtrList<TQObject> { public: TQObjectList() : TQPtrList<TQObject>() {} @@ -63,7 +63,7 @@ public: { return (TQObjectList&)TQPtrList<TQObject>::operator=(list); } }; -class Q_EXPORT TQObjectListIterator : public TQPtrListIterator<TQObject> +class TQ_EXPORT TQObjectListIterator : public TQPtrListIterator<TQObject> { public: TQObjectListIterator( const TQObjectList &l ) @@ -73,7 +73,7 @@ public: TQPtrListIterator<TQObject>::operator=( i ); } }; -class Q_EXPORT TQObjectListIt : public TQPtrListIterator<TQObject> +class TQ_EXPORT TQObjectListIt : public TQPtrListIterator<TQObject> { public: TQObjectListIt( const TQObjectList &l ) : TQPtrListIterator<TQObject>(l) {} diff --git a/src/kernel/ntqpaintdevice.h b/src/kernel/ntqpaintdevice.h index 68014152..114cf8b1 100644 --- a/src/kernel/ntqpaintdevice.h +++ b/src/kernel/ntqpaintdevice.h @@ -81,7 +81,7 @@ union TQPDevCmdParam { -class Q_EXPORT TQPaintDevice // device for TQPainter +class TQ_EXPORT TQPaintDevice // device for TQPainter { public: virtual ~TQPaintDevice(); @@ -248,10 +248,10 @@ protected: #ifndef TQMAC_NO_QUARTZ virtual CGContextRef macCGContext(bool clipped=TRUE) const; #endif - friend Q_EXPORT void unclippedScaledBitBlt( TQPaintDevice *, int, int, int, int, + friend TQ_EXPORT void unclippedScaledBitBlt( TQPaintDevice *, int, int, int, int, const TQPaintDevice *, int, int, int, int, TQt::RasterOp, bool, bool ); #else - friend Q_EXPORT void bitBlt( TQPaintDevice *, int, int, + friend TQ_EXPORT void bitBlt( TQPaintDevice *, int, int, const TQPaintDevice *, int, int, int, int, TQt::RasterOp, bool ); #endif @@ -293,12 +293,12 @@ private: // Disabled copy constructor and operator= }; -Q_EXPORT +TQ_EXPORT void bitBlt( TQPaintDevice *dst, int dx, int dy, const TQPaintDevice *src, int sx=0, int sy=0, int sw=-1, int sh=-1, TQt::RasterOp = TQt::CopyROP, bool ignoreMask=FALSE ); -Q_EXPORT +TQ_EXPORT void bitBlt( TQPaintDevice *dst, int dx, int dy, const TQImage *src, int sx=0, int sy=0, int sw=-1, int sh=-1, int conversion_flags=0 ); @@ -306,7 +306,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, #if defined(Q_WS_X11) -struct Q_EXPORT TQPaintDeviceX11Data : public TQShared { +struct TQ_EXPORT TQPaintDeviceX11Data : public TQShared { Display* x_display; int x_screen; int x_depth; @@ -408,7 +408,7 @@ inline bool TQPaintDevice::x11AppDefaultVisual() #endif // Q_WS_X11 -Q_EXPORT +TQ_EXPORT inline void bitBlt( TQPaintDevice *dst, const TQPoint &dp, const TQPaintDevice *src, const TQRect &sr =TQRect(0,0,-1,-1), TQt::RasterOp rop=TQt::CopyROP, bool ignoreMask=FALSE ) diff --git a/src/kernel/ntqpaintdevicemetrics.h b/src/kernel/ntqpaintdevicemetrics.h index e618a1d2..1db8ad7d 100644 --- a/src/kernel/ntqpaintdevicemetrics.h +++ b/src/kernel/ntqpaintdevicemetrics.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQPaintDeviceMetrics // paint device metrics +class TQ_EXPORT TQPaintDeviceMetrics // paint device metrics { public: TQPaintDeviceMetrics( const TQPaintDevice * ); diff --git a/src/kernel/ntqpainter.h b/src/kernel/ntqpainter.h index 2f95272f..96b5c13c 100644 --- a/src/kernel/ntqpainter.h +++ b/src/kernel/ntqpainter.h @@ -67,7 +67,7 @@ class TQPainterPrivate; class TQScreen; #endif -class Q_EXPORT TQPainter : public TQt +class TQ_EXPORT TQPainter : public TQt { public: enum CoordinateMode { CoordDevice, CoordPainter }; diff --git a/src/kernel/ntqpalette.h b/src/kernel/ntqpalette.h index 7b0d6f0a..ba673085 100644 --- a/src/kernel/ntqpalette.h +++ b/src/kernel/ntqpalette.h @@ -52,7 +52,7 @@ class TQColorGroupPrivate; -class Q_EXPORT TQColorGroup +class TQ_EXPORT TQColorGroup { public: TQColorGroup(); @@ -110,7 +110,7 @@ private: }; -class Q_EXPORT TQPalette +class TQ_EXPORT TQPalette { public: TQPalette(); @@ -172,11 +172,11 @@ private: *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColorGroup & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQColorGroup & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColorGroup & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQColorGroup & ); -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPalette & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPalette & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPalette & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPalette & ); #endif // TQT_NO_DATASTREAM #endif // TQT_NO_PALETTE diff --git a/src/kernel/ntqpen.h b/src/kernel/ntqpen.h index b3e471f1..248fdc6c 100644 --- a/src/kernel/ntqpen.h +++ b/src/kernel/ntqpen.h @@ -47,7 +47,7 @@ #endif // QT_H -class Q_EXPORT TQPen: public TQt +class TQ_EXPORT TQPen: public TQt { public: TQPen(); @@ -95,8 +95,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/src/kernel/ntqpicture.h b/src/kernel/ntqpicture.h index 4acbdc33..e6b5bc91 100644 --- a/src/kernel/ntqpicture.h +++ b/src/kernel/ntqpicture.h @@ -48,7 +48,7 @@ #ifndef TQT_NO_PICTURE -class Q_EXPORT TQPicture : public TQPaintDevice // picture class +class TQ_EXPORT TQPicture : public TQPaintDevice // picture class { public: TQPicture( int formatVersion = -1 ); @@ -73,8 +73,8 @@ public: TQPicture& operator= (const TQPicture&); - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPicture & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPicture & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPicture & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPicture & ); protected: bool cmd( int, TQPainter *, TQPDevCmdParam * ); @@ -119,8 +119,8 @@ inline const char* TQPicture::data() const TQPicture stream functions *****************************************************************************/ -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPicture & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPicture & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPicture & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPicture & ); #endif // TQT_NO_PICTURE diff --git a/src/kernel/ntqpixmap.h b/src/kernel/ntqpixmap.h index 5c23c751..94d92362 100644 --- a/src/kernel/ntqpixmap.h +++ b/src/kernel/ntqpixmap.h @@ -57,7 +57,7 @@ class TQMultiCellPixmap; #endif -class Q_EXPORT TQPixmap : public TQPaintDevice, public TQt +class TQ_EXPORT TQPixmap : public TQPaintDevice, public TQt { public: enum ColorMode { Auto, Color, Mono }; @@ -247,13 +247,13 @@ private: int sw, int sh, bool useDstAlpha ); #endif static Optimization defOptim; - friend Q_EXPORT void bitBlt( TQPaintDevice *, int, int, + friend TQ_EXPORT void bitBlt( TQPaintDevice *, int, int, const TQPaintDevice *, int, int, int, int, RasterOp, bool ); - friend Q_EXPORT void bitBlt( TQPaintDevice *, int, int, + friend TQ_EXPORT void bitBlt( TQPaintDevice *, int, int, const TQImage* src, int, int, int, int, int conversion_flags ); - friend Q_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, + friend TQ_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, const TQPixmap *src, int sx, int sy, int sw, int sh ); @@ -330,8 +330,8 @@ inline bool TQPixmap::isMultiCellPixmap() const *****************************************************************************/ #if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO) -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPixmap & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPixmap & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & ); #endif /***************************************************************************** @@ -347,7 +347,7 @@ Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & ); bool qt_xForm_helper( const TQWMatrix&, int, int, int, uchar*, int, int, int, uchar*, int, int, int ); #endif -Q_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, +TQ_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, const TQPixmap *src, int sx = 0, int sy = 0, int sw = -1, int sh = -1 ); diff --git a/src/kernel/ntqpixmapcache.h b/src/kernel/ntqpixmapcache.h index 29bcb82e..2f2d1372 100644 --- a/src/kernel/ntqpixmapcache.h +++ b/src/kernel/ntqpixmapcache.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQPixmapCache // global pixmap cache +class TQ_EXPORT TQPixmapCache // global pixmap cache { public: static int cacheLimit(); diff --git a/src/kernel/ntqpngio.h b/src/kernel/ntqpngio.h index f0a3819a..ebb817d6 100644 --- a/src/kernel/ntqpngio.h +++ b/src/kernel/ntqpngio.h @@ -53,7 +53,7 @@ class TQIODevice; #ifndef Q_PNGEXPORT #if !defined(QT_PLUGIN) -#define Q_PNGEXPORT Q_EXPORT +#define Q_PNGEXPORT TQ_EXPORT #else #define Q_PNGEXPORT #endif diff --git a/src/kernel/ntqpoint.h b/src/kernel/ntqpoint.h index 62b60f3a..c38e379b 100644 --- a/src/kernel/ntqpoint.h +++ b/src/kernel/ntqpoint.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQPoint +class TQ_EXPORT TQPoint { public: TQPoint(); @@ -100,8 +100,8 @@ private: TQPoint stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPoint & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPoint & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPoint & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPoint & ); #endif /***************************************************************************** diff --git a/src/kernel/ntqpointarray.h b/src/kernel/ntqpointarray.h index 85c05e53..bd7b50fb 100644 --- a/src/kernel/ntqpointarray.h +++ b/src/kernel/ntqpointarray.h @@ -48,10 +48,10 @@ #if defined(Q_TEMPLATEDLL) -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<TQPoint>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<TQPoint>; #endif -class Q_EXPORT TQPointArray : public TQMemArray<TQPoint> +class TQ_EXPORT TQPointArray : public TQMemArray<TQPoint> { public: TQPointArray() {} @@ -101,8 +101,8 @@ protected: TQPointArray stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPointArray & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPointArray & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPointArray & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPointArray & ); #endif /***************************************************************************** diff --git a/src/kernel/ntqpolygonscanner.h b/src/kernel/ntqpolygonscanner.h index 276f9afc..3d281da7 100644 --- a/src/kernel/ntqpolygonscanner.h +++ b/src/kernel/ntqpolygonscanner.h @@ -48,7 +48,7 @@ class TQPointArray; class TQPoint; -class Q_EXPORT TQPolygonScanner { +class TQ_EXPORT TQPolygonScanner { public: // BIC: fix for 3.0 void scan( const TQPointArray& pa, bool winding, int index=0, int npoints=-1 ); diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h index bb854be2..1e57c330 100644 --- a/src/kernel/ntqprinter.h +++ b/src/kernel/ntqprinter.h @@ -55,7 +55,7 @@ class TQPrinterPrivate; -class Q_EXPORT TQPrinter : public TQPaintDevice +class TQ_EXPORT TQPrinter : public TQPaintDevice { public: enum PrinterMode { ScreenResolution, PrinterResolution, HighResolution, Compatible }; diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h index 7b243c7a..b03ffe64 100644 --- a/src/kernel/ntqprocess.h +++ b/src/kernel/ntqprocess.h @@ -53,7 +53,7 @@ class TQProcessPrivate; class TQMembuf; -class Q_EXPORT TQProcess : public TQObject +class TQ_EXPORT TQProcess : public TQObject { TQ_OBJECT public: diff --git a/src/kernel/ntqrect.h b/src/kernel/ntqrect.h index 97cc62e8..c56d637d 100644 --- a/src/kernel/ntqrect.h +++ b/src/kernel/ntqrect.h @@ -50,7 +50,7 @@ // don't just silently undo people's defines: #undef topLeft #endif -class Q_EXPORT TQRect // rectangle class +class TQ_EXPORT TQRect // rectangle class { public: TQRect() { x1 = y1 = 0; x2 = y2 = -1; } @@ -131,8 +131,8 @@ public: TQRect intersect( const TQRect &r ) const; bool intersects( const TQRect &r ) const; - friend Q_EXPORT bool operator==( const TQRect &, const TQRect & ); - friend Q_EXPORT bool operator!=( const TQRect &, const TQRect & ); + friend TQ_EXPORT bool operator==( const TQRect &, const TQRect & ); + friend TQ_EXPORT bool operator!=( const TQRect &, const TQRect & ); private: #if defined(Q_WS_X11) || defined(Q_OS_TEMP) @@ -151,16 +151,16 @@ private: #endif }; -Q_EXPORT bool operator==( const TQRect &, const TQRect & ); -Q_EXPORT bool operator!=( const TQRect &, const TQRect & ); +TQ_EXPORT bool operator==( const TQRect &, const TQRect & ); +TQ_EXPORT bool operator!=( const TQRect &, const TQRect & ); /***************************************************************************** TQRect stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRect & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRect & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRect & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQRect & ); #endif /***************************************************************************** diff --git a/src/kernel/ntqregion.h b/src/kernel/ntqregion.h index 911f085c..934dd981 100644 --- a/src/kernel/ntqregion.h +++ b/src/kernel/ntqregion.h @@ -50,7 +50,7 @@ struct TQRegionPrivate; #endif -class Q_EXPORT TQRegion +class TQ_EXPORT TQRegion { public: enum RegionType { Rectangle, Ellipse }; @@ -108,8 +108,8 @@ public: #endif #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & ); #endif private: TQRegion( bool ); @@ -169,8 +169,8 @@ private: *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & ); #endif diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h index e39cd762..b70559ee 100644 --- a/src/kernel/ntqsessionmanager.h +++ b/src/kernel/ntqsessionmanager.h @@ -51,7 +51,7 @@ class TQSessionManagerData; -class Q_EXPORT TQSessionManager : public TQObject +class TQ_EXPORT TQSessionManager : public TQObject { TQ_OBJECT TQSessionManager( TQApplication *app, TQString &id, TQString &key ); diff --git a/src/kernel/ntqsignal.h b/src/kernel/ntqsignal.h index 3d482e5b..942eaaeb 100644 --- a/src/kernel/ntqsignal.h +++ b/src/kernel/ntqsignal.h @@ -47,7 +47,7 @@ #endif // QT_H -class Q_EXPORT TQSignal : public TQObject +class TQ_EXPORT TQSignal : public TQObject { TQ_OBJECT diff --git a/src/kernel/ntqsignalmapper.h b/src/kernel/ntqsignalmapper.h index 50cbb29b..b8125e57 100644 --- a/src/kernel/ntqsignalmapper.h +++ b/src/kernel/ntqsignalmapper.h @@ -49,7 +49,7 @@ class TQSignalMapperData; struct TQSignalMapperRec; -class Q_EXPORT TQSignalMapper : public TQObject { +class TQ_EXPORT TQSignalMapper : public TQObject { TQ_OBJECT public: TQSignalMapper( TQObject* parent, const char* name=0 ); diff --git a/src/kernel/ntqsignalslotimp.h b/src/kernel/ntqsignalslotimp.h index e1c3bf0f..375f8eaa 100644 --- a/src/kernel/ntqsignalslotimp.h +++ b/src/kernel/ntqsignalslotimp.h @@ -47,7 +47,7 @@ #include "ntqptrvector.h" #endif // QT_H -class Q_EXPORT TQConnectionList : public TQPtrList<TQConnection> +class TQ_EXPORT TQConnectionList : public TQPtrList<TQConnection> { public: TQConnectionList() : TQPtrList<TQConnection>() {} @@ -57,7 +57,7 @@ public: { return (TQConnectionList&)TQPtrList<TQConnection>::operator=(list); } }; -class Q_EXPORT TQConnectionListIt : public TQPtrListIterator<TQConnection> +class TQ_EXPORT TQConnectionListIt : public TQPtrListIterator<TQConnection> { public: TQConnectionListIt( const TQConnectionList &l ) : TQPtrListIterator<TQConnection>(l) {} @@ -67,12 +67,12 @@ public: #if defined(Q_TEMPLATEDLL) && defined(Q_CC_INTEL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQConnectionList>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQConnectionList>; #define Q_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES // MOC_SKIP_END #endif -class Q_EXPORT TQSignalVec : public TQPtrVector<TQConnectionList> +class TQ_EXPORT TQSignalVec : public TQPtrVector<TQConnectionList> { public: TQSignalVec(int size=17 ) diff --git a/src/kernel/ntqsimplerichtext.h b/src/kernel/ntqsimplerichtext.h index 8b0a28fe..f4b11e65 100644 --- a/src/kernel/ntqsimplerichtext.h +++ b/src/kernel/ntqsimplerichtext.h @@ -56,7 +56,7 @@ class TQBrush; class TQMimeSourceFactory; class TQSimpleRichTextData; -class Q_EXPORT TQSimpleRichText +class TQ_EXPORT TQSimpleRichText { public: TQSimpleRichText( const TQString& text, const TQFont& fnt, diff --git a/src/kernel/ntqsize.h b/src/kernel/ntqsize.h index 01905dfd..5ac36482 100644 --- a/src/kernel/ntqsize.h +++ b/src/kernel/ntqsize.h @@ -45,7 +45,7 @@ #include "ntqpoint.h" // ### change to ntqwindowdefs.h? #endif // QT_H -class Q_EXPORT TQSize +class TQ_EXPORT TQSize // ### Make TQSize inherit TQt in TQt 4.0 { public: @@ -108,8 +108,8 @@ private: TQSize stream functions *****************************************************************************/ -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQSize & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQSize & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQSize & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQSize & ); /***************************************************************************** diff --git a/src/kernel/ntqsizegrip.h b/src/kernel/ntqsizegrip.h index 37a5a337..93e95aad 100644 --- a/src/kernel/ntqsizegrip.h +++ b/src/kernel/ntqsizegrip.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_SIZEGRIP -class Q_EXPORT TQSizeGrip: public TQWidget +class TQ_EXPORT TQSizeGrip: public TQWidget { TQ_OBJECT public: diff --git a/src/kernel/ntqsizepolicy.h b/src/kernel/ntqsizepolicy.h index 3fc4dd2f..2c764d33 100644 --- a/src/kernel/ntqsizepolicy.h +++ b/src/kernel/ntqsizepolicy.h @@ -47,7 +47,7 @@ // Documentation is in qabstractlayout.cpp. -class Q_EXPORT TQSizePolicy +class TQ_EXPORT TQSizePolicy { private: enum SizePolicy_Internal { HSize = 6, HMask = 0x3f, VMask = HMask << HSize, diff --git a/src/kernel/ntqsocketnotifier.h b/src/kernel/ntqsocketnotifier.h index ec42bd19..7a9c56fb 100644 --- a/src/kernel/ntqsocketnotifier.h +++ b/src/kernel/ntqsocketnotifier.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQSocketNotifier : public TQObject +class TQ_EXPORT TQSocketNotifier : public TQObject { TQ_OBJECT public: diff --git a/src/kernel/ntqsound.h b/src/kernel/ntqsound.h index 02b2e881..19f1ba4e 100644 --- a/src/kernel/ntqsound.h +++ b/src/kernel/ntqsound.h @@ -48,7 +48,7 @@ class TQSoundData; -class Q_EXPORT TQSound : public TQObject { +class TQ_EXPORT TQSound : public TQObject { TQ_OBJECT public: static bool isAvailable(); @@ -96,12 +96,12 @@ private: TQAuBucket is whatever you want. */ -class Q_EXPORT TQAuBucket { +class TQ_EXPORT TQAuBucket { public: virtual ~TQAuBucket(); }; -class Q_EXPORT TQAuServer : public TQObject { +class TQ_EXPORT TQAuServer : public TQObject { TQ_OBJECT public: diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index b79901fc..5ebbb2c5 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -59,7 +59,7 @@ class TQTab; class TQListViewItem; class TQCheckListItem; -class Q_EXPORT TQStyleOption { +class TQ_EXPORT TQStyleOption { public: enum StyleOptionDefault { Default }; @@ -220,7 +220,7 @@ class TQStyleControlElementTabBarData { }; }; -class Q_EXPORT TQStyleControlElementData { +class TQ_EXPORT TQStyleControlElementData { public: TQStyleControlElementData(); ~TQStyleControlElementData(); @@ -298,7 +298,7 @@ class Q_EXPORT TQStyleControlElementData { }; -class Q_EXPORT TQStyleWidgetActionRequestData { +class TQ_EXPORT TQStyleWidgetActionRequestData { public: TQStyleWidgetActionRequestData(); TQStyleWidgetActionRequestData(int metric1, int metric2=0); @@ -322,7 +322,7 @@ class Q_EXPORT TQStyleWidgetActionRequestData { typedef TQStyleWidgetActionRequestData TQStyleApplicationActionRequestData; -class Q_EXPORT TQStyle: public TQObject +class TQ_EXPORT TQStyle: public TQObject { TQ_OBJECT @@ -1233,11 +1233,11 @@ private: inline TQStyle::ControlElementFlags operator|(const TQStyle::ControlElementFlags a, const TQStyle::ControlElementFlags b) { return static_cast<TQStyle::ControlElementFlags>(static_cast<int>(a) | static_cast<int>(b)); } // inline TQStyle::ControlElementFlags operator|=(TQStyle::ControlElementFlags &a, const TQStyle::ControlElementFlags b) { a = static_cast<TQStyle::ControlElementFlags>(static_cast<int>(a) | static_cast<int>(b)); return a; } -Q_EXPORT const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields=true); -Q_EXPORT const TQStyleControlElementData &populateControlElementDataFromApplication(const TQApplication* app, const TQStyleOption& opt, bool populateReliantFields=true); -Q_EXPORT TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQObject* object, const TQStyleOption& opt, bool populateReliantFields=true); -Q_EXPORT TQStringList getObjectTypeListForObject(const TQObject* object); -Q_EXPORT const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields); +TQ_EXPORT const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields=true); +TQ_EXPORT const TQStyleControlElementData &populateControlElementDataFromApplication(const TQApplication* app, const TQStyleOption& opt, bool populateReliantFields=true); +TQ_EXPORT TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQObject* object, const TQStyleOption& opt, bool populateReliantFields=true); +TQ_EXPORT TQStringList getObjectTypeListForObject(const TQObject* object); +TQ_EXPORT const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields); #endif // TQT_NO_STYLE #endif // TQSTYLE_H diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h index 2e91b36c..17f13a25 100644 --- a/src/kernel/ntqstylesheet.h +++ b/src/kernel/ntqstylesheet.h @@ -56,7 +56,7 @@ class TQTextDocument; template<class Key, class T> class TQMap; class TQStyleSheetItemData; -class Q_EXPORT TQStyleSheetItem : public TQt +class TQ_EXPORT TQStyleSheetItem : public TQt { public: TQStyleSheetItem( TQStyleSheet* parent, const TQString& name ); @@ -194,10 +194,10 @@ private: #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQDict<TQStyleSheetItem>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList< TQPtrVector<TQStyleSheetItem> >; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQStyleSheetItem>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQStyleSheetItem::ListStyle>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQStyleSheetItem>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList< TQPtrVector<TQStyleSheetItem> >; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQStyleSheetItem>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQStyleSheetItem::ListStyle>; // MOC_SKIP_END #endif @@ -205,7 +205,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQStyleSheetItem::ListStyl class TQTextCustomItem; #endif -class Q_EXPORT TQStyleSheet : public TQObject +class TQ_EXPORT TQStyleSheet : public TQObject { TQ_OBJECT public: diff --git a/src/kernel/ntqthread.h b/src/kernel/ntqthread.h index dc0df082..695a61fb 100644 --- a/src/kernel/ntqthread.h +++ b/src/kernel/ntqthread.h @@ -51,7 +51,7 @@ class TQThreadInstance; -class Q_EXPORT TQThread : public TQt +class TQ_EXPORT TQThread : public TQt { public: static TQt::HANDLE currentThread(); @@ -133,7 +133,7 @@ public: static TQThread* currentThreadObject(); }; -class Q_EXPORT TQEventLoopThread : public TQThread +class TQ_EXPORT TQEventLoopThread : public TQThread { public: TQEventLoopThread(); diff --git a/src/kernel/ntqtimer.h b/src/kernel/ntqtimer.h index 7496a22c..1b3045ca 100644 --- a/src/kernel/ntqtimer.h +++ b/src/kernel/ntqtimer.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQTimer : public TQObject +class TQ_EXPORT TQTimer : public TQObject { TQ_OBJECT public: diff --git a/src/kernel/ntqtranslator.h b/src/kernel/ntqtranslator.h index 5d6709db..beb6f552 100644 --- a/src/kernel/ntqtranslator.h +++ b/src/kernel/ntqtranslator.h @@ -51,7 +51,7 @@ class TQTranslatorPrivate; -class Q_EXPORT TQTranslatorMessage +class TQ_EXPORT TQTranslatorMessage { public: TQTranslatorMessage(); @@ -102,7 +102,7 @@ private: }; -class Q_EXPORT TQTranslator: public TQObject +class TQ_EXPORT TQTranslator: public TQObject { TQ_OBJECT public: diff --git a/src/kernel/ntqurl.h b/src/kernel/ntqurl.h index 7286648f..c984788f 100644 --- a/src/kernel/ntqurl.h +++ b/src/kernel/ntqurl.h @@ -49,7 +49,7 @@ class TQUrlPrivate; -class Q_EXPORT TQUrl +class TQ_EXPORT TQUrl { public: TQUrl(); diff --git a/src/kernel/ntqurlinfo.h b/src/kernel/ntqurlinfo.h index f726aa32..9a2f35a8 100644 --- a/src/kernel/ntqurlinfo.h +++ b/src/kernel/ntqurlinfo.h @@ -50,7 +50,7 @@ class TQUrlOperator; class TQUrl; class TQUrlInfoPrivate; -class Q_EXPORT TQUrlInfo +class TQ_EXPORT TQUrlInfo { public: enum PermissionSpec { diff --git a/src/kernel/ntqurloperator.h b/src/kernel/ntqurloperator.h index d7ab440f..1644922a 100644 --- a/src/kernel/ntqurloperator.h +++ b/src/kernel/ntqurloperator.h @@ -54,7 +54,7 @@ class TQUrlInfo; class TQUrlOperatorPrivate; -class Q_EXPORT TQUrlOperator : public TQObject, public TQUrl +class TQ_EXPORT TQUrlOperator : public TQObject, public TQUrl { friend class TQNetworkProtocol; diff --git a/src/kernel/ntqvariant.h b/src/kernel/ntqvariant.h index 42a39804..f0657b49 100644 --- a/src/kernel/ntqvariant.h +++ b/src/kernel/ntqvariant.h @@ -89,7 +89,7 @@ typedef TQMapIterator<TQString, TQVariant> TQStringVariantMapIterator; typedef TQMapConstIterator<TQString, TQVariant> TQStringVariantMapConstIterator; #endif -class Q_EXPORT TQVariant +class TQ_EXPORT TQVariant { public: enum Type { @@ -385,10 +385,10 @@ inline TQMapConstIterator<TQString,TQVariant> TQVariant::mapFind( const TQString #endif #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant& p ); -Q_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant& p ); -Q_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant::Type& p ); -Q_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant::Type p ); +TQ_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant& p ); +TQ_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant& p ); +TQ_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant::Type& p ); +TQ_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant::Type p ); #endif #endif //TQT_NO_VARIANT diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h index b6c261cc..3a9f32eb 100644 --- a/src/kernel/ntqwidget.h +++ b/src/kernel/ntqwidget.h @@ -65,7 +65,7 @@ class TQWSRegionManager; class TQStyle; class TQStyleControlElementData; -class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice +class TQ_EXPORT TQWidget : public TQObject, public TQPaintDevice { TQ_OBJECT TQ_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin ) @@ -991,7 +991,7 @@ class TQOleDropTarget; class TQMacDndExtra; #endif -struct Q_EXPORT TQTLWExtra { +struct TQ_EXPORT TQTLWExtra { #ifndef TQT_NO_WIDGET_TOPEXTRA TQString caption; // widget caption TQString iconText; // widget icon text @@ -1046,7 +1046,7 @@ struct Q_EXPORT TQTLWExtra { // dear user: you can see this struct, but it is internal. do not touch. -struct Q_EXPORT TQWExtra { +struct TQ_EXPORT TQWExtra { TQ_INT16 minw, minh; // minimum size TQ_INT16 maxw, maxh; // maximum size TQPixmap *bg_pix; // background pixmap diff --git a/src/kernel/ntqwidgetintdict.h b/src/kernel/ntqwidgetintdict.h index 512f7830..f5c924b2 100644 --- a/src/kernel/ntqwidgetintdict.h +++ b/src/kernel/ntqwidgetintdict.h @@ -48,12 +48,12 @@ #if defined(Q_TEMPLATEDLL) -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQIntDict<TQWidget>; -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQIntDictIterator<TQWidget>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDict<TQWidget>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDictIterator<TQWidget>; #endif -class Q_EXPORT TQWidgetIntDict : public TQIntDict<TQWidget> +class TQ_EXPORT TQWidgetIntDict : public TQIntDict<TQWidget> { public: TQWidgetIntDict(int size=17) : TQIntDict<TQWidget>(size) {} @@ -63,7 +63,7 @@ public: { return (TQWidgetIntDict&)TQIntDict<TQWidget>::operator=(dict); } }; -class Q_EXPORT TQWidgetIntDictIt : public TQIntDictIterator<TQWidget> +class TQ_EXPORT TQWidgetIntDictIt : public TQIntDictIterator<TQWidget> { public: TQWidgetIntDictIt( const TQWidgetIntDict &d ) : TQIntDictIterator<TQWidget>(d) {} diff --git a/src/kernel/ntqwidgetlist.h b/src/kernel/ntqwidgetlist.h index 03e40b7c..af912f81 100644 --- a/src/kernel/ntqwidgetlist.h +++ b/src/kernel/ntqwidgetlist.h @@ -46,7 +46,7 @@ #include "ntqptrlist.h" #endif // QT_H -class Q_EXPORT TQWidgetList : public TQPtrList<TQWidget> +class TQ_EXPORT TQWidgetList : public TQPtrList<TQWidget> { public: TQWidgetList() : TQPtrList<TQWidget>() {} @@ -56,7 +56,7 @@ public: { return (TQWidgetList&)TQPtrList<TQWidget>::operator=(list); } }; -class Q_EXPORT TQWidgetListIt : public TQPtrListIterator<TQWidget> +class TQ_EXPORT TQWidgetListIt : public TQPtrListIterator<TQWidget> { public: TQWidgetListIt( const TQWidgetList &l ) : TQPtrListIterator<TQWidget>(l) {} diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h index 6d57f214..6ec8f779 100644 --- a/src/kernel/ntqwindowdefs.h +++ b/src/kernel/ntqwindowdefs.h @@ -147,14 +147,14 @@ typedef struct _XGC *GC; typedef struct _XRegion *Region; typedef unsigned long WId; -Q_EXPORT Display *tqt_xdisplay(); -Q_EXPORT int tqt_xscreen(); -Q_EXPORT WId tqt_xrootwin(); // ### REMOVE 4.0 -Q_EXPORT WId tqt_xrootwin( int scrn ); // ### 4.0 add default arg of -1 -Q_EXPORT GC tqt_xget_readonly_gc( int scrn, bool monochrome ); -Q_EXPORT GC tqt_xget_temp_gc( int scrn, bool monochrome ); +TQ_EXPORT Display *tqt_xdisplay(); +TQ_EXPORT int tqt_xscreen(); +TQ_EXPORT WId tqt_xrootwin(); // ### REMOVE 4.0 +TQ_EXPORT WId tqt_xrootwin( int scrn ); // ### 4.0 add default arg of -1 +TQ_EXPORT GC tqt_xget_readonly_gc( int scrn, bool monochrome ); +TQ_EXPORT GC tqt_xget_temp_gc( int scrn, bool monochrome ); -Q_EXPORT const char *tqAppClass(); // get application class +TQ_EXPORT const char *tqAppClass(); // get application class #endif // Q_WS_X11 @@ -180,12 +180,12 @@ const TQCOORD TQCOORD_MIN = -TQCOORD_MAX - 1; typedef unsigned int TQRgb; // RGB triplet -Q_EXPORT const char *tqAppName(); // get application name +TQ_EXPORT const char *tqAppName(); // get application name // Misc functions typedef void (*TQtCleanUpFunction)(); -Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction ); -Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction ); +TQ_EXPORT void tqAddPostRoutine( TQtCleanUpFunction ); +TQ_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction ); #endif // TQWINDOWDEFS_H diff --git a/src/kernel/ntqwmatrix.h b/src/kernel/ntqwmatrix.h index f4e6c9bf..1a7153b7 100644 --- a/src/kernel/ntqwmatrix.h +++ b/src/kernel/ntqwmatrix.h @@ -51,7 +51,7 @@ #ifndef TQT_NO_WMATRIX -class Q_EXPORT TQWMatrix // 2D transform matrix +class TQ_EXPORT TQWMatrix // 2D transform matrix { public: TQWMatrix(); @@ -113,15 +113,15 @@ private: double _dx, _dy; }; -Q_EXPORT TQWMatrix operator*( const TQWMatrix &, const TQWMatrix & ); +TQ_EXPORT TQWMatrix operator*( const TQWMatrix &, const TQWMatrix & ); /***************************************************************************** TQWMatrix stream functions *****************************************************************************/ -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQWMatrix & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQWMatrix & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQWMatrix & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQWMatrix & ); #endif // TQT_NO_WMATRIX diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp index db717f7b..ffd25393 100644 --- a/src/kernel/qaccel.cpp +++ b/src/kernel/qaccel.cpp @@ -193,15 +193,15 @@ private: }; TQAccelManager* TQAccelManager::self_ptr = 0; -bool Q_EXPORT tqt_tryAccelEvent( TQWidget* w, TQKeyEvent* e){ +bool TQ_EXPORT tqt_tryAccelEvent( TQWidget* w, TQKeyEvent* e){ return TQAccelManager::self()->tryAccelEvent( w, e ); } -bool Q_EXPORT tqt_dispatchAccelEvent( TQWidget* w, TQKeyEvent* e){ +bool TQ_EXPORT tqt_dispatchAccelEvent( TQWidget* w, TQKeyEvent* e){ return TQAccelManager::self()->dispatchAccelEvent( w, e ); } -bool Q_EXPORT tqt_tryComposeUnicode( TQWidget* w, TQKeyEvent* e){ +bool TQ_EXPORT tqt_tryComposeUnicode( TQWidget* w, TQKeyEvent* e){ return TQAccelManager::self()->tryComposeUnicode( w, e ); } @@ -210,7 +210,7 @@ static bool qt_accel_no_shortcuts = TRUE; #else static bool qt_accel_no_shortcuts = FALSE; #endif -void Q_EXPORT tqt_setAccelAutoShortcuts(bool b) { qt_accel_no_shortcuts = b; } +void TQ_EXPORT tqt_setAccelAutoShortcuts(bool b) { qt_accel_no_shortcuts = b; } /* \internal diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 9b04e1d2..d67b34dd 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -323,7 +323,7 @@ void tqt_cleanup(); void tqt_init( Display* dpy, TQt::HANDLE, TQt::HANDLE ); void tqt_init( int *, char **, Display* dpy, TQt::HANDLE, TQt::HANDLE ); #endif -Q_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ); +TQ_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ); TQApplication *tqApp = 0; // global application object @@ -353,8 +353,8 @@ int TQApplication::mouse_double_click_time = 400; // mouse dbl click limit int TQApplication::wheel_scroll_lines = 3; // number of lines to scroll #endif bool tqt_is_gui_used; -bool Q_EXPORT tqt_resolve_symlinks = TRUE; -bool Q_EXPORT tqt_tab_all_widgets = TRUE; +bool TQ_EXPORT tqt_resolve_symlinks = TRUE; +bool TQ_EXPORT tqt_tab_all_widgets = TRUE; TQRect tqt_maxWindowRect; static int drag_time = 500; static int drag_distance = 4; @@ -378,13 +378,13 @@ int TQApplication::composedUnicode = 0; #ifdef TQT_THREAD_SUPPORT TQMutex *TQApplication::tqt_mutex = 0; TQMutex *tqt_sharedStringMutex = 0; -Q_EXPORT TQMutex * tqt_sharedMetaObjectMutex = 0; +TQ_EXPORT TQMutex * tqt_sharedMetaObjectMutex = 0; #ifdef QT_USE_GLIBMAINLOOP TQMutex *tqt_timerListMutex = 0; #endif // QT_USE_GLIBMAINLOOP static TQMutex *postevent_mutex = 0; static TQt::HANDLE tqt_application_thread_id = 0; -Q_EXPORT TQt::HANDLE tqt_get_application_thread_id() +TQ_EXPORT TQt::HANDLE tqt_get_application_thread_id() { return tqt_application_thread_id; } @@ -502,7 +502,7 @@ static TQVFuncList *postRList = 0; // list of post routines to clean up the module's data at the exact right moment. */ -Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction p) +TQ_EXPORT void tqAddPostRoutine( TQtCleanUpFunction p) { if ( !postRList ) { postRList = new TQVFuncList; @@ -512,7 +512,7 @@ Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction p) } -Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction p ) +TQ_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction p ) { if ( !postRList ) return; TQVFuncList::Iterator it = postRList->begin(); @@ -584,7 +584,7 @@ struct TQPostEvent { TQEvent *event; }; -class Q_EXPORT TQPostEventList : public TQPtrList<TQPostEvent> +class TQ_EXPORT TQPostEventList : public TQPtrList<TQPostEvent> { public: TQPostEventList() : TQPtrList<TQPostEvent>() {} @@ -593,7 +593,7 @@ public: TQPostEventList &operator=(const TQPostEventList &list) { return (TQPostEventList&)TQPtrList<TQPostEvent>::operator=(list); } }; -class Q_EXPORT TQPostEventListIt : public TQPtrListIterator<TQPostEvent> +class TQ_EXPORT TQPostEventListIt : public TQPtrListIterator<TQPostEvent> { public: TQPostEventListIt( const TQPostEventList &l ) : TQPtrListIterator<TQPostEvent>(l) {} @@ -901,7 +901,7 @@ TQApplication::TQApplication( int &argc, char **argv, Type type ) construct( argc, argv, type, true ); } -Q_EXPORT void tqt_ucm_initialize( TQApplication *theApp ) +TQ_EXPORT void tqt_ucm_initialize( TQApplication *theApp ) { if ( tqApp ) return; @@ -3930,7 +3930,7 @@ void TQApplication::setActiveWindow( TQWidget* act ) Creates the proper Enter/Leave event when widget \a enter is entered and widget \a leave is left. */ -Q_EXPORT void tqt_dispatchEnterLeave( TQWidget* enter, TQWidget* leave ) { +TQ_EXPORT void tqt_dispatchEnterLeave( TQWidget* enter, TQWidget* leave ) { #if 0 if ( leave ) { TQEvent e( TQEvent::Leave ); @@ -4021,7 +4021,7 @@ extern TQWidget *tqt_tryModalHelperMac( TQWidget * top ); //qapplication_mac.cpp Called from qapplication_<platform>.cpp, returns TRUE if the widget should accept the event. */ -Q_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) { +TQ_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) { TQWidget *modal=0, *top=TQApplication::activeModalWidget(); if ( rettop ) *rettop = top; diff --git a/src/kernel/qapplication_p.h b/src/kernel/qapplication_p.h index c0c59d59..abeceee6 100644 --- a/src/kernel/qapplication_p.h +++ b/src/kernel/qapplication_p.h @@ -65,9 +65,9 @@ class TQKeyEvent; class TQMouseEvent; class TQWheelEvent; -extern Q_EXPORT bool tqt_modal_state(); -extern Q_EXPORT void tqt_enter_modal( TQWidget* ); -extern Q_EXPORT void tqt_leave_modal( TQWidget* ); +extern TQ_EXPORT bool tqt_modal_state(); +extern TQ_EXPORT void tqt_enter_modal( TQWidget* ); +extern TQ_EXPORT void tqt_leave_modal( TQWidget* ); extern bool tqt_is_gui_used; #ifndef TQT_NO_CLIPBOARD diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index c53ef91a..de2c62d2 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -// ### 4.0: examine Q_EXPORT's below. The respective symbols had all +// ### 4.0: examine TQ_EXPORT's below. The respective symbols had all // been in use (e.g. in the KDE wm ) before the introduction of a version // map. One might want to turn some of them into propert public API and // provide a proper alternative for others. See also the exports in @@ -192,7 +192,7 @@ static const char *appBTNCol = 0; // application btn color static const char *mwGeometry = 0; // main widget geometry static const char *mwTitle = 0; // main widget title //Ming-Che 10/10 -Q_EXPORT char *qt_ximServer = 0; // XIM Server will connect to +TQ_EXPORT char *qt_ximServer = 0; // XIM Server will connect to static bool mwIconic = FALSE; // main widget iconified //Ming-Che 10/10 static Display *appDpy = 0; // X11 application display @@ -214,9 +214,9 @@ static GC* app_gc_tmp = 0; // temporary GC static GC* app_gc_ro_m = 0; // read-only GC (monochrome) static GC* app_gc_tmp_m = 0; // temporary GC (monochrome) // symbols needed by extern TQXEmbed class -Q_EXPORT Atom tqt_wm_protocols = 0; // window manager protocols -Q_EXPORT Atom tqt_wm_delete_window = 0; // delete window protocol -Q_EXPORT Atom tqt_wm_take_focus = 0; // take focus window protocol +TQ_EXPORT Atom tqt_wm_protocols = 0; // window manager protocols +TQ_EXPORT Atom tqt_wm_delete_window = 0; // delete window protocol +TQ_EXPORT Atom tqt_wm_take_focus = 0; // take focus window protocol Atom qt_qt_scrolldone = 0; // scroll synchronization Atom qt_net_wm_context_help = 0; // context help @@ -227,15 +227,15 @@ Atom qt_xa_clipboard = 0; Atom qt_selection_property = 0; Atom tqt_clipboard_sentinel = 0; Atom qt_selection_sentinel = 0; -Q_EXPORT Atom tqt_wm_state = 0; +TQ_EXPORT Atom tqt_wm_state = 0; Atom qt_wm_change_state = 0; static Atom qt_settings_timestamp = 0; // TQt >=3 settings timestamp static Atom qt_input_encoding = 0; // TQt desktop properties static Atom qt_resource_manager = 0; // X11 Resource manager Atom qt_sizegrip = 0; // sizegrip Atom qt_wm_client_leader = 0; -Q_EXPORT Atom tqt_window_role = 0; -Q_EXPORT Atom tqt_sm_client_id = 0; +TQ_EXPORT Atom tqt_window_role = 0; +TQ_EXPORT Atom tqt_sm_client_id = 0; Atom qt_xa_motif_wm_hints = 0; Atom qt_cde_running = 0; Atom qt_twin_running = 0; @@ -328,7 +328,7 @@ static int xrandr_eventbase; // TRUE if TQt is compiled w/ XRender support and XRender exists on the connected // Display -Q_EXPORT bool tqt_use_xrender = FALSE; +TQ_EXPORT bool tqt_use_xrender = FALSE; #ifndef TQT_NO_XSYNC // True if SYNC extension exists on the connected display @@ -347,7 +347,7 @@ static long qt_mode_switch_remove_mask = 0; // flags for extensions for special Languages, currently only for RTL languages static bool qt_use_rtl_extensions = FALSE; -Q_EXPORT bool tqt_hebrew_keyboard_hack = FALSE; +TQ_EXPORT bool tqt_hebrew_keyboard_hack = FALSE; static Window mouseActWindow = 0; // window where mouse is static int mouseButtonPressed = 0; // last mouse button pressed @@ -406,7 +406,7 @@ typedef int (*QX11EventFilter) (XEvent*); QX11EventFilter tqt_set_x11_event_filter(QX11EventFilter filter); static QX11EventFilter qt_x11_event_filter = 0; -Q_EXPORT QX11EventFilter tqt_set_x11_event_filter(QX11EventFilter filter) +TQ_EXPORT QX11EventFilter tqt_set_x11_event_filter(QX11EventFilter filter) { QX11EventFilter old_filter = qt_x11_event_filter; qt_x11_event_filter = filter; @@ -425,16 +425,16 @@ static bool qt_x11EventFilter( XEvent* ev ) #if !defined(TQT_NO_XIM) //XIM qt_xim = 0; -Q_EXPORT XIMStyle qt_xim_style = 0; -Q_EXPORT XIMStyle qt_xim_preferred_style = 0; +TQ_EXPORT XIMStyle qt_xim_style = 0; +TQ_EXPORT XIMStyle qt_xim_preferred_style = 0; static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing; #endif -Q_EXPORT int qt_ximComposingKeycode=0; -Q_EXPORT TQTextCodec * qt_input_mapper = 0; +TQ_EXPORT int qt_ximComposingKeycode=0; +TQ_EXPORT TQTextCodec * qt_input_mapper = 0; -Q_EXPORT Time tqt_x_time = CurrentTime; -Q_EXPORT Time tqt_x_user_time = CurrentTime; +TQ_EXPORT Time tqt_x_time = CurrentTime; +TQ_EXPORT Time tqt_x_user_time = CurrentTime; extern bool qt_check_clipboard_sentinel(); //def in qclipboard_x11.cpp extern bool qt_check_selection_sentinel(); //def in qclipboard_x11.cpp @@ -3908,7 +3908,7 @@ void tqt_leave_modal( TQWidget *widget ) } -Q_EXPORT bool tqt_try_modal( TQWidget *widget, XEvent *event ) +TQ_EXPORT bool tqt_try_modal( TQWidget *widget, XEvent *event ) { if (qt_xdnd_dragging) { // allow mouse events while DnD is active diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp index 468eff81..d0571fc5 100644 --- a/src/kernel/qclipboard_x11.cpp +++ b/src/kernel/qclipboard_x11.cpp @@ -112,7 +112,7 @@ static int pending_timer_id = 0; static bool pending_clipboard_changed = FALSE; static bool pending_selection_changed = FALSE; -Q_EXPORT bool tqt_qclipboard_bailout_hack = false; +TQ_EXPORT bool tqt_qclipboard_bailout_hack = false; // event capture mechanism for qt_xclb_wait_for_event static bool waiting_for_data = FALSE; diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp index eed239eb..9f86734a 100644 --- a/src/kernel/qfont_x11.cpp +++ b/src/kernel/qfont_x11.cpp @@ -69,7 +69,7 @@ #define TQFONTLOADER_DEBUG #define TQFONTLOADER_DEBUG_VERBOSE -Q_EXPORT bool tqt_has_xft = FALSE; +TQ_EXPORT bool tqt_has_xft = FALSE; #ifndef TQT_NO_XFTFREETYPE TQt::HANDLE qt_xft_handle(const TQFont &font) diff --git a/src/kernel/qimageformatinterface_p.h b/src/kernel/qimageformatinterface_p.h index 6d184ecf..8abe49c2 100644 --- a/src/kernel/qimageformatinterface_p.h +++ b/src/kernel/qimageformatinterface_p.h @@ -68,7 +68,7 @@ class TQImage; -struct Q_EXPORT TQImageFormatInterface : public TQFeatureListInterface +struct TQ_EXPORT TQImageFormatInterface : public TQFeatureListInterface { virtual TQRESULT loadImage( const TQString &format, const TQString &filename, TQImage * ) = 0; virtual TQRESULT saveImage( const TQString &format, const TQString &filename, const TQImage & ) = 0; diff --git a/src/kernel/qimageformatplugin.cpp b/src/kernel/qimageformatplugin.cpp index 89d04960..3982053e 100644 --- a/src/kernel/qimageformatplugin.cpp +++ b/src/kernel/qimageformatplugin.cpp @@ -54,7 +54,7 @@ Writing an image format plugin is achieved by subclassing this base class, reimplementing the pure virtual functions keys() and installIOHandler(), and exporting the class with the - Q_EXPORT_PLUGIN macro. See the \link plugins-howto.html Plugins + TQ_EXPORT_PLUGIN macro. See the \link plugins-howto.html Plugins documentation\endlink for details. */ @@ -143,7 +143,7 @@ TQRESULT TQImageFormatPluginPrivate::installIOHandler( const TQString &format ) /*! Constructs an image format plugin. This is invoked automatically - by the Q_EXPORT_PLUGIN macro. + by the TQ_EXPORT_PLUGIN macro. */ TQImageFormatPlugin::TQImageFormatPlugin() : TQGPlugin( d = new TQImageFormatPluginPrivate( this ) ) diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h index 57c5dcd1..e8142c8f 100644 --- a/src/kernel/qinternal_p.h +++ b/src/kernel/qinternal_p.h @@ -64,7 +64,7 @@ class TQWidget; class TQPainter; class TQPixmap; -class Q_EXPORT TQSharedDoubleBuffer +class TQ_EXPORT TQSharedDoubleBuffer { public: enum DoubleBufferFlags { @@ -170,7 +170,7 @@ TQAutoDeleter<T>* qAutoDeleter( T* p ) return new TQAutoDeleter<T>( p ); } -class Q_EXPORT TQMembuf +class TQ_EXPORT TQMembuf { public: TQMembuf(); diff --git a/src/kernel/qlayoutengine.cpp b/src/kernel/qlayoutengine.cpp index c37811c3..149e04fd 100644 --- a/src/kernel/qlayoutengine.cpp +++ b/src/kernel/qlayoutengine.cpp @@ -63,7 +63,7 @@ static inline int fRound( int i ) { count is the count of items in the chain; pos and space give the interval (relative to parentWidget topLeft). */ -Q_EXPORT void qGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, +TQ_EXPORT void qGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, int pos, int space, int spacer ) { typedef int fixed; @@ -242,7 +242,7 @@ Q_EXPORT void qGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count } } -Q_EXPORT TQSize qSmartMinSize( const TQWidgetItem *i ) +TQ_EXPORT TQSize qSmartMinSize( const TQWidgetItem *i ) { TQWidget *w = ((TQWidgetItem *)i)->widget(); @@ -284,13 +284,13 @@ Q_EXPORT TQSize qSmartMinSize( const TQWidgetItem *i ) return s; } -Q_EXPORT TQSize qSmartMinSize( TQWidget *w ) +TQ_EXPORT TQSize qSmartMinSize( TQWidget *w ) { TQWidgetItem item( w ); return qSmartMinSize( &item ); } -Q_EXPORT TQSize qSmartMaxSize( const TQWidgetItem *i, int align ) +TQ_EXPORT TQSize qSmartMaxSize( const TQWidgetItem *i, int align ) { TQWidget *w = ( (TQWidgetItem*)i )->widget(); if ( align & TQt::AlignHorizontal_Mask && align & TQt::AlignVertical_Mask ) @@ -313,7 +313,7 @@ Q_EXPORT TQSize qSmartMaxSize( const TQWidgetItem *i, int align ) return s; } -Q_EXPORT TQSize qSmartMaxSize( TQWidget *w, int align ) +TQ_EXPORT TQSize qSmartMaxSize( TQWidget *w, int align ) { TQWidgetItem item( w ); return qSmartMaxSize( &item, align ); diff --git a/src/kernel/qlayoutengine_p.h b/src/kernel/qlayoutengine_p.h index ddff6cd2..560c0a9e 100644 --- a/src/kernel/qlayoutengine_p.h +++ b/src/kernel/qlayoutengine_p.h @@ -96,12 +96,12 @@ struct TQLayoutStruct }; -Q_EXPORT void qGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, +TQ_EXPORT void qGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, int pos, int space, int spacer ); -Q_EXPORT TQSize qSmartMinSize( const TQWidgetItem *i ); -Q_EXPORT TQSize qSmartMinSize( TQWidget *w ); -Q_EXPORT TQSize qSmartMaxSize( const TQWidgetItem *i, int align = 0 ); -Q_EXPORT TQSize qSmartMaxSize( TQWidget *w, int align = 0 ); +TQ_EXPORT TQSize qSmartMinSize( const TQWidgetItem *i ); +TQ_EXPORT TQSize qSmartMinSize( TQWidget *w ); +TQ_EXPORT TQSize qSmartMaxSize( const TQWidgetItem *i, int align = 0 ); +TQ_EXPORT TQSize qSmartMaxSize( TQWidget *w, int align = 0 ); /* diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp index 0165f700..70ed6b5d 100644 --- a/src/kernel/qmetaobject.cpp +++ b/src/kernel/qmetaobject.cpp @@ -170,7 +170,7 @@ typedef TQMetaData TQConstMetaData; typedef const TQMetaData TQConstMetaData; #endif -class Q_EXPORT TQMemberDict : public TQAsciiDict<TQConstMetaData> +class TQ_EXPORT TQMemberDict : public TQAsciiDict<TQConstMetaData> { public: TQMemberDict( int size = 17, bool cs = TRUE, bool ck = TRUE ) : diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp index 53cb6916..1adfa945 100644 --- a/src/kernel/qnetworkprotocol.cpp +++ b/src/kernel/qnetworkprotocol.cpp @@ -51,7 +51,7 @@ //#define TQNETWORKPROTOCOL_DEBUG #define NETWORK_OP_DELAY 1000 -extern Q_EXPORT TQNetworkProtocolDict *tqNetworkProtocolRegister; +extern TQ_EXPORT TQNetworkProtocolDict *tqNetworkProtocolRegister; TQNetworkProtocolDict *tqNetworkProtocolRegister = 0; diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 4f04d37d..28a82027 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -261,7 +261,7 @@ TQSenderObjectList::~TQSenderObjectList() { delete listMutex; } -class Q_EXPORT TQMetaCallEvent : public TQEvent +class TQ_EXPORT TQMetaCallEvent : public TQEvent { public: enum MetaCallType { @@ -511,7 +511,7 @@ TQThread* TQObject::contextThreadObject() const /* Preliminary signal spy */ -Q_EXPORT TQObject* tqt_preliminary_signal_spy = 0; +TQ_EXPORT TQObject* tqt_preliminary_signal_spy = 0; static TQObject* qt_spy_signal_sender = 0; static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o ) diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index 0eb1cf04..d0bfa97a 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -2392,7 +2392,7 @@ bool TQPixmap::hasAlphaChannel() const copyBlt() does nothing if \a src and \a dst have different depths. */ -Q_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, +TQ_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, const TQPixmap *src, int sx, int sy, int sw, int sh ) { if ( ! dst || ! src || sw == 0 || sh == 0 || dst->depth() != src->depth() ) { diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index 42c1b8bc..d8bb1d46 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -106,7 +106,7 @@ extern bool tqt_has_xft; static bool qt_gen_epsf = FALSE; static bool embedFonts = TRUE; -Q_EXPORT void tqt_generate_epsf( bool b ) +TQ_EXPORT void tqt_generate_epsf( bool b ) { qt_gen_epsf = b; } diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/qpsprinter_p.h index 35513e12..6b96a965 100644 --- a/src/kernel/qpsprinter_p.h +++ b/src/kernel/qpsprinter_p.h @@ -66,7 +66,7 @@ class TQPSPrinterPrivate; -class Q_EXPORT TQPSPrinter : public TQPaintDevice +class TQ_EXPORT TQPSPrinter : public TQPaintDevice { private: // TQPrinter uses these diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index 3f1e4828..43935513 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -1518,7 +1518,7 @@ void TQTextDocument::setPlainText( const TQString &text ) lParag = fParag = createParagraph( this, 0, 0 ); } -struct Q_EXPORT TQTextDocumentTag { +struct TQ_EXPORT TQTextDocumentTag { TQTextDocumentTag(){} TQTextDocumentTag( const TQString&n, const TQStyleSheetItem* s, const TQTextFormat& f ) :name(n),style(s), format(f), alignment(TQt::AlignAuto), direction(TQChar::DirON),liststyle(TQStyleSheetItem::ListDisc) { diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h index 4d88323a..df6b0a27 100644 --- a/src/kernel/qrichtext_p.h +++ b/src/kernel/qrichtext_p.h @@ -97,7 +97,7 @@ struct TQBidiContext; // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -class Q_EXPORT TQTextStringChar +class TQ_EXPORT TQTextStringChar { friend class TQTextString; @@ -173,11 +173,11 @@ private: #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<TQTextStringChar>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<TQTextStringChar>; // MOC_SKIP_END #endif -class Q_EXPORT TQTextString +class TQ_EXPORT TQTextString { public: @@ -300,13 +300,13 @@ inline bool TQTextString::validCursorPosition( int idx ) #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueStack<int>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueStack<TQTextParagraph*>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueStack<bool>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueStack<int>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueStack<TQTextParagraph*>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueStack<bool>; // MOC_SKIP_END #endif -class Q_EXPORT TQTextCursor +class TQ_EXPORT TQTextCursor { public: TQTextCursor( TQTextDocument *d = 0 ); @@ -398,7 +398,7 @@ private: // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -class Q_EXPORT TQTextCommand +class TQ_EXPORT TQTextCommand { public: enum Commands { Invalid, Insert, Delete, Format, Style }; @@ -419,11 +419,11 @@ protected: #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQTextCommand>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQTextCommand>; // MOC_SKIP_END #endif -class Q_EXPORT TQTextCommandHistory +class TQ_EXPORT TQTextCommandHistory { public: TQTextCommandHistory( int s ) : current( -1 ), steps( s ) { history.setAutoDelete( TRUE ); } @@ -458,7 +458,7 @@ inline TQTextCommandHistory::~TQTextCommandHistory() // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ #ifndef TQT_NO_TEXTCUSTOMITEM -class Q_EXPORT TQTextCustomItem +class TQ_EXPORT TQTextCustomItem { public: TQTextCustomItem( TQTextDocument *p ) @@ -509,12 +509,12 @@ public: #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<TQString, TQString>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<TQString, TQString>; // MOC_SKIP_END #endif #ifndef TQT_NO_TEXTCUSTOMITEM -class Q_EXPORT TQTextImage : public TQTextCustomItem +class TQ_EXPORT TQTextImage : public TQTextCustomItem { public: TQTextImage( TQTextDocument *p, const TQMap<TQString, TQString> &attr, const TQString& context, @@ -541,7 +541,7 @@ private: #endif #ifndef TQT_NO_TEXTCUSTOMITEM -class Q_EXPORT TQTextHorizontalLine : public TQTextCustomItem +class TQ_EXPORT TQTextHorizontalLine : public TQTextCustomItem { public: TQTextHorizontalLine( TQTextDocument *p, const TQMap<TQString, TQString> &attr, const TQString& context, @@ -565,12 +565,12 @@ private: #ifndef TQT_NO_TEXTCUSTOMITEM #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQTextCustomItem>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQTextCustomItem>; // MOC_SKIP_END #endif #endif -class Q_EXPORT TQTextFlow +class TQ_EXPORT TQTextFlow { friend class TQTextDocument; #ifndef TQT_NO_TEXTCUSTOMITEM @@ -618,7 +618,7 @@ inline int TQTextFlow::width() const { return w; } #ifndef TQT_NO_TEXTCUSTOMITEM class TQTextTable; -class Q_EXPORT TQTextTableCell : public TQLayoutItem +class TQ_EXPORT TQTextTableCell : public TQLayoutItem { friend class TQTextTable; @@ -683,13 +683,13 @@ private: #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQTextTableCell>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<TQTextCursor*, int>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQTextTableCell>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<TQTextCursor*, int>; // MOC_SKIP_END #endif #ifndef TQT_NO_TEXTCUSTOMITEM -class Q_EXPORT TQTextTable: public TQTextCustomItem +class TQ_EXPORT TQTextTable: public TQTextCustomItem { friend class TQTextTableCell; @@ -756,7 +756,7 @@ class TQTextTableCell; class TQTextParagraph; #endif -struct Q_EXPORT TQTextDocumentSelection +struct TQ_EXPORT TQTextDocumentSelection { TQTextCursor startCursor, endCursor; bool swapped; @@ -765,14 +765,14 @@ struct Q_EXPORT TQTextDocumentSelection #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, TQColor>; -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, bool>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, TQTextDocumentSelection>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQTextDocument>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, TQColor>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, bool>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, TQTextDocumentSelection>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQTextDocument>; // MOC_SKIP_END #endif -class Q_EXPORT TQTextDocument : public TQObject +class TQ_EXPORT TQTextDocument : public TQObject { TQ_OBJECT @@ -983,7 +983,7 @@ private: void setRichTextMarginsInternal( TQPtrList< TQPtrVector<TQStyleSheetItem> >& styles, TQTextParagraph* stylesPar ); private: - struct Q_EXPORT Focus { + struct TQ_EXPORT Focus { TQTextParagraph *parag; int start, len; TQString href; @@ -1049,7 +1049,7 @@ private: // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -class Q_EXPORT TQTextDeleteCommand : public TQTextCommand +class TQ_EXPORT TQTextDeleteCommand : public TQTextCommand { public: TQTextDeleteCommand( TQTextDocument *d, int i, int idx, const TQMemArray<TQTextStringChar> &str, @@ -1069,7 +1069,7 @@ protected: }; -class Q_EXPORT TQTextInsertCommand : public TQTextDeleteCommand +class TQ_EXPORT TQTextInsertCommand : public TQTextDeleteCommand { public: TQTextInsertCommand( TQTextDocument *d, int i, int idx, const TQMemArray<TQTextStringChar> &str, @@ -1085,7 +1085,7 @@ public: }; -class Q_EXPORT TQTextFormatCommand : public TQTextCommand +class TQ_EXPORT TQTextFormatCommand : public TQTextCommand { public: TQTextFormatCommand( TQTextDocument *d, int sid, int sidx, int eid, int eidx, const TQMemArray<TQTextStringChar> &old, TQTextFormat *f, int fl ); @@ -1103,7 +1103,7 @@ protected: }; -class Q_EXPORT TQTextStyleCommand : public TQTextCommand +class TQ_EXPORT TQTextStyleCommand : public TQTextCommand { public: TQTextStyleCommand( TQTextDocument *d, int fParag, int lParag, const TQByteArray& beforeChange ); @@ -1124,14 +1124,14 @@ private: // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -struct Q_EXPORT TQTextParagraphSelection +struct TQ_EXPORT TQTextParagraphSelection { TQTextParagraphSelection() : start(0), end(0) { } int start, end; TQ_DUMMY_COMPARISON_OPERATOR(TQTextParagraphSelection) }; -struct Q_EXPORT TQTextLineStart +struct TQ_EXPORT TQTextLineStart { TQTextLineStart() : y( 0 ), baseLine( 0 ), h( 0 ) { } @@ -1146,12 +1146,12 @@ public: #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, TQTextParagraphSelection>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, TQTextLineStart*>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, TQTextParagraphSelection>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, TQTextLineStart*>; // MOC_SKIP_END #endif -class Q_EXPORT TQTextParagraphData +class TQ_EXPORT TQTextParagraphData { public: TQTextParagraphData() {} @@ -1163,7 +1163,7 @@ class TQTextParagraphPseudoDocument; class TQSyntaxHighlighter; -class Q_EXPORT TQTextParagraph +class TQ_EXPORT TQTextParagraph { friend class TQTextDocument; friend class TQTextCursor; @@ -1383,7 +1383,7 @@ private: // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -class Q_EXPORT TQTextFormatter +class TQ_EXPORT TQTextFormatter { public: TQTextFormatter(); @@ -1428,7 +1428,7 @@ private: // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -class Q_EXPORT TQTextFormatterBreakInWords : public TQTextFormatter +class TQ_EXPORT TQTextFormatterBreakInWords : public TQTextFormatter { public: TQTextFormatterBreakInWords(); @@ -1440,7 +1440,7 @@ public: // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -class Q_EXPORT TQTextFormatterBreakWords : public TQTextFormatter +class TQ_EXPORT TQTextFormatterBreakWords : public TQTextFormatter { public: TQTextFormatterBreakWords(); @@ -1452,7 +1452,7 @@ public: // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -class Q_EXPORT TQTextIndent +class TQ_EXPORT TQTextIndent { public: TQTextIndent(); @@ -1464,7 +1464,7 @@ public: // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -class Q_EXPORT TQTextPreProcessor +class TQ_EXPORT TQTextPreProcessor { public: enum Ids { @@ -1481,7 +1481,7 @@ public: // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -class Q_EXPORT TQTextFormat +class TQ_EXPORT TQTextFormat { friend class TQTextFormatCollection; friend class TQTextDocument; @@ -1591,11 +1591,11 @@ private: #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQDict<TQTextFormat>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQTextFormat>; // MOC_SKIP_END #endif -class Q_EXPORT TQTextFormatCollection +class TQ_EXPORT TQTextFormatCollection { friend class TQTextDocument; friend class TQTextFormat; @@ -1633,7 +1633,7 @@ private: TQPaintDevice *paintdevice; }; -class Q_EXPORT TQTextParagraphPseudoDocument +class TQ_EXPORT TQTextParagraphPseudoDocument { public: TQTextParagraphPseudoDocument(); diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h index 701db02c..04faa33b 100644 --- a/src/kernel/qtextengine_p.h +++ b/src/kernel/qtextengine_p.h @@ -292,7 +292,7 @@ private: class TQFontPrivate; -class Q_EXPORT TQTextEngine { +class TQ_EXPORT TQTextEngine { public: TQTextEngine( const TQString &str, TQFontPrivate *f ); ~TQTextEngine(); diff --git a/src/kernel/qtextlayout_p.h b/src/kernel/qtextlayout_p.h index b4763c8e..b2430e05 100644 --- a/src/kernel/qtextlayout_p.h +++ b/src/kernel/qtextlayout_p.h @@ -46,7 +46,7 @@ class TQTextEngine; class TQFont; -class Q_EXPORT TQTextItem +class TQ_EXPORT TQTextItem { public: inline TQTextItem() : item(0), engine(0) {} @@ -97,7 +97,7 @@ private: class TQPainter; -class Q_EXPORT TQTextLayout +class TQ_EXPORT TQTextLayout { public: // does itemization diff --git a/src/kernel/qucomextra_p.h b/src/kernel/qucomextra_p.h index f183fd62..ad4dacb5 100644 --- a/src/kernel/qucomextra_p.h +++ b/src/kernel/qucomextra_p.h @@ -67,7 +67,7 @@ class TQVariant; // 6dc75d58-a1d9-4417-b591-d45c63a3a4ea extern const TQUuid TID_QUType_TQVariant; -struct Q_EXPORT TQUType_TQVariant : public TQUType +struct TQ_EXPORT TQUType_TQVariant : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -83,13 +83,13 @@ struct Q_EXPORT TQUType_TQVariant : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_TQVariant static_QUType_TQVariant; +extern TQ_EXPORT TQUType_TQVariant static_QUType_TQVariant; #endif //TQT_NO_VARIANT // {0x8d48b3a8, 0xbd7f, 0x11d5, 0x8d, 0x74, 0x00, 0xc0, 0xf0, 0x3b, 0xc0, 0xf3 } -extern Q_EXPORT const TQUuid TID_QUType_varptr; -struct Q_EXPORT TQUType_varptr : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_varptr; +struct TQ_EXPORT TQUType_varptr : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -104,7 +104,7 @@ struct Q_EXPORT TQUType_varptr : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_varptr static_QUType_varptr; +extern TQ_EXPORT TQUType_varptr static_QUType_varptr; #endif // TQUCOMEXTRA_P_H diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 31185921..3d64b6fe 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -208,7 +208,7 @@ Window qt_XCreateSimpleWindow( const TQWidget *creator, void qt_XDestroyWindow( const TQWidget *destroyer, Display *display, Window window ); -Q_EXPORT void tqt_x11_enforce_cursor( TQWidget * w ) +TQ_EXPORT void tqt_x11_enforce_cursor( TQWidget * w ) { if ( w->testWState( TQt::WState_OwnCursor ) ) { TQCursor * oc = TQApplication::overrideCursor(); @@ -226,7 +226,7 @@ Q_EXPORT void tqt_x11_enforce_cursor( TQWidget * w ) } } -Q_EXPORT void tqt_wait_for_window_manager( TQWidget* w ) +TQ_EXPORT void tqt_wait_for_window_manager( TQWidget* w ) { TQApplication::flushX(); XEvent ev; |