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 | |
| 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>
577 files changed, 1582 insertions, 1582 deletions
diff --git a/doc/html/designer-manual-16.html b/doc/html/designer-manual-16.html index 39513c565..b156e25c8 100644 --- a/doc/html/designer-manual-16.html +++ b/doc/html/designer-manual-16.html @@ -182,7 +182,7 @@ body { background: #ffffff; color: black; } </pre> <a name="exportmacro"></a><h4><a name="1-7"></a>exportmacro</h4> <p>This tag is only relevant to Windows users.</p> -<p>If you have a class that requires some Windows-specific export macro, e.g. for classes in a DLL that need to be declared like this: <tt>class win_specific_declaration_goes_here Class</tt>, you can use the <tt><exportmacro></tt> tag. (In standard TQt we use the <tt>Q_EXPORT</tt> macro, e.g. <tt>class Q_EXPORT TQWidget</tt>.) If you use this tag you must also:</p> +<p>If you have a class that requires some Windows-specific export macro, e.g. for classes in a DLL that need to be declared like this: <tt>class win_specific_declaration_goes_here Class</tt>, you can use the <tt><exportmacro></tt> tag. (In standard TQt we use the <tt>TQ_EXPORT</tt> macro, e.g. <tt>class TQ_EXPORT TQWidget</tt>.) If you use this tag you must also:</p> <ol type=1><li><p><a href="designer-manual-16.html#1-11">include</a> the file which contains the macro definition;</p> <li><p>add the export macro to the form -- this is achieved by entering the macro's name in the 'export macro' sub-property of the form's name property.</p> </ol><p>Following these steps will ensure that <a href="uic.html">uic</a> will create the correct <tt>class YOUR_MACRO Form</tt> declarations.</p> diff --git a/doc/html/designer-manual-7.html b/doc/html/designer-manual-7.html index ac49f1c55..725812bb1 100644 --- a/doc/html/designer-manual-7.html +++ b/doc/html/designer-manual-7.html @@ -349,8 +349,8 @@ DEFINES += FILECHOOSER_IS_WIDGET } </pre> <p>Copy this function changing the class name to suit your widget plugin implementation. It should return <tt>TRUE</tt> if your custom widget can contain other widgets, e.g. like <a href="ntqframe.html">TQFrame</a>, or <tt>FALSE</tt> if it must not contain other widgets, e.g. like <a href="ntqpushbutton.html">TQPushButton</a>.</p> -<!-- index Macros!Q_EXPORT_PLUGIN --><!-- index Q_EXPORT_PLUGIN --><p>The <tt>Q_EXPORT_PLUGIN</tt> macro.</p> -<pre> Q_EXPORT_PLUGIN( CustomWidgetPlugin ) +<!-- index Macros!TQ_EXPORT_PLUGIN --><!-- index TQ_EXPORT_PLUGIN --><p>The <tt>TQ_EXPORT_PLUGIN</tt> macro.</p> +<pre> TQ_EXPORT_PLUGIN( CustomWidgetPlugin ) </pre> <p>This macro identifies the module as a plugin -- all the other code simply implements the relevant interface, i.e. wraps the classes you wish to make available.</p> <p>This macro must appear once in your plugin. It should be copied with the class name changed to the name of your plugin's class. (See the <a href="http://doc.trolltech.com/plugins.html">TQt Plugin documentation</a> for more information on the plugin entry point.)</p> diff --git a/doc/html/ntqimageformatplugin.html b/doc/html/ntqimageformatplugin.html index 6389e67de..ebc4e0745 100644 --- a/doc/html/ntqimageformatplugin.html +++ b/doc/html/ntqimageformatplugin.html @@ -53,7 +53,7 @@ transparently by applications. <p> Writing an image format plugin is achieved by subclassing this base class, reimplementing the pure virtual functions <a href="#keys">keys</a>() and <a href="#installIOHandler">installIOHandler</a>(), and exporting the class with the -Q_EXPORT_PLUGIN macro. See the <a href="plugins-howto.html">Plugins +TQ_EXPORT_PLUGIN macro. See the <a href="plugins-howto.html">Plugins documentation</a> for details. <p>See also <a href="plugins.html">Plugins</a>. @@ -61,7 +61,7 @@ Q_EXPORT_PLUGIN macro. See the <a href="plugins-howto.html">Plugins <h3 class=fn><a name="TQImageFormatPlugin"></a>TQImageFormatPlugin::TQImageFormatPlugin () </h3> Constructs an image format plugin. This is invoked automatically -by the Q_EXPORT_PLUGIN macro. +by the TQ_EXPORT_PLUGIN macro. <h3 class=fn><a name="~TQImageFormatPlugin"></a>TQImageFormatPlugin::~TQImageFormatPlugin () </h3> diff --git a/doc/html/ntqsqldriverplugin.html b/doc/html/ntqsqldriverplugin.html index ae1ed41b5..4a948e20e 100644 --- a/doc/html/ntqsqldriverplugin.html +++ b/doc/html/ntqsqldriverplugin.html @@ -53,7 +53,7 @@ easy to create your own SQL driver plugins that can be loaded dynamically by TQt. <p> Writing a SQL plugin is achieved by subclassing this base class, reimplementing the pure virtual functions <a href="#keys">keys</a>() and <a href="#create">create</a>(), and -exporting the class with the <tt>Q_EXPORT_PLUGIN</tt> macro. See the SQL +exporting the class with the <tt>TQ_EXPORT_PLUGIN</tt> macro. See the SQL plugins that come with TQt for example implementations (in the <tt>plugins/src/sqldrivers</tt> subdirectory of the source distribution). Read the <a href="plugins-howto.html">plugins @@ -64,7 +64,7 @@ distribution). Read the <a href="plugins-howto.html">plugins <h3 class=fn><a name="TQSqlDriverPlugin"></a>TQSqlDriverPlugin::TQSqlDriverPlugin () </h3> Constructs a SQL driver plugin. This is invoked automatically by -the <tt>Q_EXPORT_PLUGIN</tt> macro. +the <tt>TQ_EXPORT_PLUGIN</tt> macro. <h3 class=fn><a name="~TQSqlDriverPlugin"></a>TQSqlDriverPlugin::~TQSqlDriverPlugin () </h3> diff --git a/doc/html/ntqstyleplugin.html b/doc/html/ntqstyleplugin.html index df73c8771..9397d01f3 100644 --- a/doc/html/ntqstyleplugin.html +++ b/doc/html/ntqstyleplugin.html @@ -52,7 +52,7 @@ to create custom styles that can be loaded dynamically into applications with a <a href="ntqstylefactory.html">TQStyleFactory</a>. <p> Writing a style plugin is achieved by subclassing this base class, reimplementing the pure virtual functions <a href="#keys">keys</a>() and <a href="#create">create</a>(), and -exporting the class with the <tt>Q_EXPORT_PLUGIN</tt> macro. See the +exporting the class with the <tt>TQ_EXPORT_PLUGIN</tt> macro. See the <a href="plugins-howto.html">plugins documentation</a> for an example. <p>See also <a href="plugins.html">Plugins</a>. @@ -61,7 +61,7 @@ example. <h3 class=fn><a name="TQStylePlugin"></a>TQStylePlugin::TQStylePlugin () </h3> Constructs a style plugin. This is invoked automatically by the -<tt>Q_EXPORT_PLUGIN</tt> macro. +<tt>TQ_EXPORT_PLUGIN</tt> macro. <h3 class=fn><a name="~TQStylePlugin"></a>TQStylePlugin::~TQStylePlugin () </h3> diff --git a/doc/html/ntqtextcodecplugin.html b/doc/html/ntqtextcodecplugin.html index f6670614a..b6ec3e115 100644 --- a/doc/html/ntqtextcodecplugin.html +++ b/doc/html/ntqtextcodecplugin.html @@ -57,7 +57,7 @@ into applications. <p> Writing a text codec plugin is achieved by subclassing this base class, reimplementing the pure virtual functions <a href="#names">names</a>(), <a href="#createForName">createForName</a>(), <a href="#mibEnums">mibEnums</a>() and <a href="#createForMib">createForMib</a>(), and exporting the -class with the <tt>Q_EXPORT_PLUGIN</tt> macro. See the <a href="plugins-howto.html">TQt Plugins documentation</a> for details. +class with the <tt>TQ_EXPORT_PLUGIN</tt> macro. See the <a href="plugins-howto.html">TQt Plugins documentation</a> for details. <p> See the <a href="http://www.iana.org/assignments/character-sets">IANA character-sets encoding file</a> for more information on mime names and mib enums. @@ -67,7 +67,7 @@ names and mib enums. <h3 class=fn><a name="TQTextCodecPlugin"></a>TQTextCodecPlugin::TQTextCodecPlugin () </h3> Constructs a text codec plugin. This is invoked automatically by -the <tt>Q_EXPORT_PLUGIN</tt> macro. +the <tt>TQ_EXPORT_PLUGIN</tt> macro. <h3 class=fn><a name="~TQTextCodecPlugin"></a>TQTextCodecPlugin::~TQTextCodecPlugin () </h3> diff --git a/doc/html/ntqwidgetplugin.html b/doc/html/ntqwidgetplugin.html index 83735618f..dbd1e5489 100644 --- a/doc/html/ntqwidgetplugin.html +++ b/doc/html/ntqwidgetplugin.html @@ -58,7 +58,7 @@ to create custom widgets that can be included in forms using <a href="designer-m <p> Writing a widget plugin is achieved by subclassing this base class, reimplementing the pure virtual functions <a href="#keys">keys</a>(), <a href="#create">create</a>(), <a href="#group">group</a>(), <a href="#iconSet">iconSet</a>(), <a href="#includeFile">includeFile</a>(), <a href="#toolTip">toolTip</a>(), <a href="#whatsThis">whatsThis</a>() and -<a href="#isContainer">isContainer</a>(), and exporting the class with the <tt>Q_EXPORT_PLUGIN</tt> +<a href="#isContainer">isContainer</a>(), and exporting the class with the <tt>TQ_EXPORT_PLUGIN</tt> macro. <p> See the <a href="designer-manual.html">TQt Designer manual's</a>, 'Creating Custom Widgets' section in the 'Creating Custom Widgets' @@ -72,7 +72,7 @@ supplied with <a href="designer-manual.html">TQt Designer</a>. <h3 class=fn><a name="TQWidgetPlugin"></a>TQWidgetPlugin::TQWidgetPlugin () </h3> Constructs a widget plugin. This is invoked automatically by the -<tt>Q_EXPORT_PLUGIN</tt> macro. +<tt>TQ_EXPORT_PLUGIN</tt> macro. <h3 class=fn><a name="~TQWidgetPlugin"></a>TQWidgetPlugin::~TQWidgetPlugin () </h3> diff --git a/doc/html/plugins-howto.html b/doc/html/plugins-howto.html index 7bb3a2dcd..8ae14f2a7 100644 --- a/doc/html/plugins-howto.html +++ b/doc/html/plugins-howto.html @@ -90,7 +90,7 @@ to make available as a plugin. The required code is straightforward: } }; - Q_EXPORT_PLUGIN( MyStylePlugin ) + TQ_EXPORT_PLUGIN( MyStylePlugin ) </pre> <p> (Note that <a href="ntqstylefactory.html">TQStyleFactory</a> is case-insensitive, and the lower case diff --git a/doc/html/qaccel-h.html b/doc/html/qaccel-h.html index 04df7eed4..866d8d71d 100644 --- a/doc/html/qaccel-h.html +++ b/doc/html/qaccel-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } class TQAccelPrivate; -class Q_EXPORT TQAccel : public TQObject // accelerator class +class TQ_EXPORT TQAccel : public TQObject // accelerator class { TQ_OBJECT public: diff --git a/doc/html/qaccessible-h.html b/doc/html/qaccessible-h.html index 0a382c040..c23b44aff 100644 --- a/doc/html/qaccessible-h.html +++ b/doc/html/qaccessible-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } struct TQAccessibleInterface; -class Q_EXPORT TQAccessible +class TQ_EXPORT TQAccessible { private: #ifdef Q_WS_MAC @@ -267,7 +267,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; @@ -301,12 +301,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/doc/html/qaction-h.html b/doc/html/qaction-h.html index 11a06f9e4..a04a26234 100644 --- a/doc/html/qaction-h.html +++ b/doc/html/qaction-h.html @@ -92,7 +92,7 @@ class TQStatusBar; class TQPopupMenu; class TQToolTipGroup; -class Q_EXPORT TQAction : public TQObject +class TQ_EXPORT TQAction : public TQObject { TQ_OBJECT TQ_PROPERTY( bool toggleAction READ isToggleAction WRITE setToggleAction) @@ -187,7 +187,7 @@ private: #endif }; -class Q_EXPORT TQActionGroup : public TQAction +class TQ_EXPORT TQActionGroup : public TQAction { TQ_OBJECT TQ_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive ) diff --git a/doc/html/qapplication-h.html b/doc/html/qapplication-h.html index 0b0844967..813a6693f 100644 --- a/doc/html/qapplication-h.html +++ b/doc/html/qapplication-h.html @@ -100,10 +100,10 @@ class TQMutex; 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: @@ -443,7 +443,7 @@ private: friend class TQEvent; 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/doc/html/qasyncimageio-h.html b/doc/html/qasyncimageio-h.html index 9c76aa4e4..b8f7bea47 100644 --- a/doc/html/qasyncimageio-h.html +++ b/doc/html/qasyncimageio-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #pragma GCC system_header #endif -class Q_EXPORT TQImageConsumer { +class TQ_EXPORT TQImageConsumer { public: virtual void end()=0; @@ -103,14 +103,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; @@ -120,7 +120,7 @@ protected: }; class TQImageDecoderPrivate; -class Q_EXPORT TQImageDecoder { +class TQ_EXPORT TQImageDecoder { public: TQImageDecoder( TQImageConsumer* c ); ~TQImageDecoder(); diff --git a/doc/html/qasyncio-h.html b/doc/html/qasyncio-h.html index 845733896..dbe68585e 100644 --- a/doc/html/qasyncio-h.html +++ b/doc/html/qasyncio-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQIODevice; -class Q_EXPORT TQAsyncIO { +class TQ_EXPORT TQAsyncIO { public: virtual ~TQAsyncIO(); void connect(TQObject*, const char *member); @@ -99,7 +99,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; @@ -108,7 +108,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; @@ -119,7 +119,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; @@ -136,7 +136,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/doc/html/qbitarray-h.html b/doc/html/qbitarray-h.html index 2b4af25b1..7644a5acb 100644 --- a/doc/html/qbitarray-h.html +++ b/doc/html/qbitarray-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } class TQBitArray; -class Q_EXPORT TQBitVal +class TQ_EXPORT TQBitVal { private: TQBitArray *array; @@ -105,7 +105,7 @@ public: TQBitArray class *****************************************************************************/ -class Q_EXPORT TQBitArray : public TQByteArray +class TQ_EXPORT TQBitArray : public TQByteArray { public: TQBitArray(); @@ -171,9 +171,9 @@ inline bool TQBitArray::operator[]( int index ) const Misc. TQBitArray operator functions *****************************************************************************/ -Q_EXPORT TQBitArray operator&( const TQBitArray &, const TQBitArray & ); -Q_EXPORT TQBitArray operator|( const TQBitArray &, const TQBitArray & ); -Q_EXPORT TQBitArray operator^( const TQBitArray &, const TQBitArray & ); +TQ_EXPORT TQBitArray operator&( const TQBitArray &, const TQBitArray & ); +TQ_EXPORT TQBitArray operator|( const TQBitArray &, const TQBitArray & ); +TQ_EXPORT TQBitArray operator^( const TQBitArray &, const TQBitArray & ); inline TQBitVal::operator int() @@ -198,8 +198,8 @@ inline TQBitVal &TQBitVal::operator=( bool v ) TQBitArray stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBitArray & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBitArray & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBitArray & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQBitArray & ); #endif #endif // TQBITARRAY_H diff --git a/doc/html/qbitmap-h.html b/doc/html/qbitmap-h.html index 5aa3054ae..51799ef76 100644 --- a/doc/html/qbitmap-h.html +++ b/doc/html/qbitmap-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQBitmap : public TQPixmap +class TQ_EXPORT TQBitmap : public TQPixmap { public: TQBitmap(); diff --git a/doc/html/qbrush-h.html b/doc/html/qbrush-h.html index a960503bc..59ab87f4b 100644 --- a/doc/html/qbrush-h.html +++ b/doc/html/qbrush-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQBrush: public TQt +class TQ_EXPORT TQBrush: public TQt { friend class TQPainter; public: @@ -123,8 +123,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/doc/html/qbuffer-h.html b/doc/html/qbuffer-h.html index fd7a0814a..04c8c821c 100644 --- a/doc/html/qbuffer-h.html +++ b/doc/html/qbuffer-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQBuffer : public TQIODevice +class TQ_EXPORT TQBuffer : public TQIODevice { public: TQBuffer(); diff --git a/doc/html/qbutton-h.html b/doc/html/qbutton-h.html index ccd2bc5bd..90e28c72c 100644 --- a/doc/html/qbutton-h.html +++ b/doc/html/qbutton-h.html @@ -89,7 +89,7 @@ class TQButtonGroup; class TQToolBar; class TQButtonData; -class Q_EXPORT TQButton : public TQWidget +class TQ_EXPORT TQButton : public TQWidget { TQ_OBJECT TQ_ENUMS( ToggleType ToggleState ) diff --git a/doc/html/qbuttongroup-h.html b/doc/html/qbuttongroup-h.html index 0c5e2c913..6dbf6dc74 100644 --- a/doc/html/qbuttongroup-h.html +++ b/doc/html/qbuttongroup-h.html @@ -88,7 +88,7 @@ class TQButton; class TQButtonList; -class Q_EXPORT TQButtonGroup : public TQGroupBox +class TQ_EXPORT TQButtonGroup : public TQGroupBox { TQ_OBJECT TQ_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive ) diff --git a/doc/html/qcanvas-h.html b/doc/html/qcanvas-h.html index 61a641b1d..7790f434b 100644 --- a/doc/html/qcanvas-h.html +++ b/doc/html/qcanvas-h.html @@ -91,7 +91,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_CANVAS #define TQM_TEMPLATE_EXTERN_CANVAS #else -#define TQM_EXPORT_CANVAS Q_EXPORT +#define TQM_EXPORT_CANVAS TQ_EXPORT #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN #endif diff --git a/doc/html/qcdestyle-h.html b/doc/html/qcdestyle-h.html index fe453f3ee..5bb262696 100644 --- a/doc/html/qcdestyle-h.html +++ b/doc/html/qcdestyle-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_CDE #else -#define Q_EXPORT_STYLE_CDE Q_EXPORT +#define Q_EXPORT_STYLE_CDE TQ_EXPORT #endif class Q_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle diff --git a/doc/html/qcheckbox-h.html b/doc/html/qcheckbox-h.html index 81697bb9d..c50ccad62 100644 --- a/doc/html/qcheckbox-h.html +++ b/doc/html/qcheckbox-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_CHECKBOX -class Q_EXPORT TQCheckBox : public TQButton +class TQ_EXPORT TQCheckBox : public TQButton { TQ_OBJECT TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) diff --git a/doc/html/qclipboard-h.html b/doc/html/qclipboard-h.html index af842b501..188c110b1 100644 --- a/doc/html/qclipboard-h.html +++ b/doc/html/qclipboard-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } class TQMimeSource; -class Q_EXPORT TQClipboard : public TQObject +class TQ_EXPORT TQClipboard : public TQObject { TQ_OBJECT private: diff --git a/doc/html/qcolor-h.html b/doc/html/qcolor-h.html index ad23b063f..d96b1e190 100644 --- a/doc/html/qcolor-h.html +++ b/doc/html/qcolor-h.html @@ -84,32 +84,32 @@ body { background: #ffffff; color: black; } 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 }; @@ -258,8 +258,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/doc/html/qcolordialog-h.html b/doc/html/qcolordialog-h.html index 281efdaad..ea646e991 100644 --- a/doc/html/qcolordialog-h.html +++ b/doc/html/qcolordialog-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQColorDialogPrivate; -class Q_EXPORT TQColorDialog : public TQDialog +class TQ_EXPORT TQColorDialog : public TQDialog { TQ_OBJECT diff --git a/doc/html/qcombobox-h.html b/doc/html/qcombobox-h.html index 411a8da15..9d06d198d 100644 --- a/doc/html/qcombobox-h.html +++ b/doc/html/qcombobox-h.html @@ -92,7 +92,7 @@ class TQListBox; class TQComboBoxData; class TQWheelEvent; -class Q_EXPORT TQComboBox : public TQWidget +class TQ_EXPORT TQComboBox : public TQWidget { TQ_OBJECT TQ_ENUMS( Policy ) diff --git a/doc/html/qcommonstyle-h.html b/doc/html/qcommonstyle-h.html index e09eba727..a3d019e9f 100644 --- a/doc/html/qcommonstyle-h.html +++ b/doc/html/qcommonstyle-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_STYLE -class Q_EXPORT TQCommonStyle: public TQStyle +class TQ_EXPORT TQCommonStyle: public TQStyle { TQ_OBJECT diff --git a/doc/html/qcstring-h.html b/doc/html/qcstring-h.html index 18c29b776..533aa0f68 100644 --- a/doc/html/qcstring-h.html +++ b/doc/html/qcstring-h.html @@ -89,38 +89,38 @@ body { background: #ffffff; color: black; } Safe and portable C string functions; extensions to standard string.h *****************************************************************************/ -Q_EXPORT void *tqmemmove( void *dst, const void *src, uint len ); +TQ_EXPORT void *tqmemmove( void *dst, const void *src, uint len ); -Q_EXPORT char *tqstrdup( const char * ); +TQ_EXPORT char *tqstrdup( const char * ); -Q_EXPORT inline uint tqstrlen( const char *str ) +TQ_EXPORT inline uint tqstrlen( const char *str ) { return str ? (uint)strlen(str) : 0u; } -Q_EXPORT inline char *qstrcpy( char *dst, const char *src ) +TQ_EXPORT inline char *qstrcpy( char *dst, const char *src ) { return src ? strcpy(dst, src) : 0; } -Q_EXPORT char *tqstrncpy( char *dst, const char *src, uint len ); +TQ_EXPORT char *tqstrncpy( char *dst, const char *src, uint len ); -Q_EXPORT inline int qstrcmp( const char *str1, const char *str2 ) +TQ_EXPORT inline int qstrcmp( const char *str1, const char *str2 ) { return ( str1 && str2 ) ? strcmp( str1, str2 ) : ( str1 ? 1 : ( str2 ? -1 : 0 ) ); } -Q_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len ) +TQ_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len ) { return ( str1 && str2 ) ? strncmp( str1, str2, len ) : ( str1 ? 1 : ( str2 ? -1 : 0 ) ); } -Q_EXPORT int tqstricmp( const char *, const char * ); +TQ_EXPORT int tqstricmp( const char *, const char * ); -Q_EXPORT int tqstrnicmp( const char *, const char *, uint len ); +TQ_EXPORT int tqstrnicmp( const char *, const char *, uint len ); // tqChecksum: Internet checksum -Q_EXPORT TQ_UINT16 tqChecksum( const char *s, uint len ); +TQ_EXPORT TQ_UINT16 tqChecksum( const char *s, uint len ); /***************************************************************************** TQByteArray class @@ -142,11 +142,11 @@ typedef TQMemArray<char> TQByteArray; #endif #ifndef TQT_NO_COMPRESS -Q_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes ); -Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes ); -Q_EXPORT inline TQByteArray tqCompress( const TQByteArray& data) +TQ_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes ); +TQ_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes ); +TQ_EXPORT inline TQByteArray tqCompress( const TQByteArray& data) { return tqCompress( (const uchar*)data.data(), data.size() ); } -Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) +TQ_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) { return tqUncompress( (const uchar*)data.data(), data.size() ); } #endif @@ -154,8 +154,8 @@ Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) TQByteArray stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQByteArray & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQByteArray & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & ); #endif /***************************************************************************** @@ -164,7 +164,7 @@ Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray &am class TQRegExp; -class Q_EXPORT TQCString : public TQByteArray // C string class +class TQ_EXPORT TQCString : public TQByteArray // C string class { public: TQCString() {} // make null string @@ -262,8 +262,8 @@ private: TQCString stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCString & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCString & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCString & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQCString & ); #endif /***************************************************************************** @@ -320,61 +320,61 @@ inline TQCString::operator const char *() const TQCString non-member operators *****************************************************************************/ -Q_EXPORT inline bool operator==( const TQCString &s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator==( const TQCString &s1, const TQCString &s2 ) { return qstrcmp( s1.data(), s2.data() ) == 0; } -Q_EXPORT inline bool operator==( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator==( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) == 0; } -Q_EXPORT inline bool operator==( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator==( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) == 0; } -Q_EXPORT inline bool operator!=( const TQCString &s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator!=( const TQCString &s1, const TQCString &s2 ) { return qstrcmp( s1.data(), s2.data() ) != 0; } -Q_EXPORT inline bool operator!=( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator!=( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) != 0; } -Q_EXPORT inline bool operator!=( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator!=( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) != 0; } -Q_EXPORT inline bool operator<( const TQCString &s1, const TQCString& s2 ) +TQ_EXPORT inline bool operator<( const TQCString &s1, const TQCString& s2 ) { return qstrcmp( s1.data(), s2.data() ) < 0; } -Q_EXPORT inline bool operator<( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator<( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) < 0; } -Q_EXPORT inline bool operator<( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator<( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) < 0; } -Q_EXPORT inline bool operator<=( const TQCString &s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator<=( const TQCString &s1, const TQCString &s2 ) { return qstrcmp( s1.data(), s2.data() ) <= 0; } -Q_EXPORT inline bool operator<=( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator<=( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) <= 0; } -Q_EXPORT inline bool operator<=( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator<=( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) <= 0; } -Q_EXPORT inline bool operator>( const TQCString &s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator>( const TQCString &s1, const TQCString &s2 ) { return qstrcmp( s1.data(), s2.data() ) > 0; } -Q_EXPORT inline bool operator>( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator>( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) > 0; } -Q_EXPORT inline bool operator>( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator>( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) > 0; } -Q_EXPORT inline bool operator>=( const TQCString &s1, const TQCString& s2 ) +TQ_EXPORT inline bool operator>=( const TQCString &s1, const TQCString& s2 ) { return qstrcmp( s1.data(), s2.data() ) >= 0; } -Q_EXPORT inline bool operator>=( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator>=( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) >= 0; } -Q_EXPORT inline bool operator>=( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator>=( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) >= 0; } -Q_EXPORT inline const TQCString operator+( const TQCString &s1, +TQ_EXPORT inline const TQCString operator+( const TQCString &s1, const TQCString &s2 ) { TQCString tmp( s1.data() ); @@ -382,28 +382,28 @@ Q_EXPORT inline const TQCString operator+( const TQCString &s1, return tmp; } -Q_EXPORT inline const TQCString operator+( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline const TQCString operator+( const TQCString &s1, const char *s2 ) { TQCString tmp( s1.data() ); tmp += s2; return tmp; } -Q_EXPORT inline const TQCString operator+( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline const TQCString operator+( const char *s1, const TQCString &s2 ) { TQCString tmp( s1 ); tmp += s2; return tmp; } -Q_EXPORT inline const TQCString operator+( const TQCString &s1, char c2 ) +TQ_EXPORT inline const TQCString operator+( const TQCString &s1, char c2 ) { TQCString tmp( s1.data() ); tmp += c2; return tmp; } -Q_EXPORT inline const TQCString operator+( char c1, const TQCString &s2 ) +TQ_EXPORT inline const TQCString operator+( char c1, const TQCString &s2 ) { TQCString tmp; tmp += c1; diff --git a/doc/html/qcursor-h.html b/doc/html/qcursor-h.html index 05263a1da..866dd140c 100644 --- a/doc/html/qcursor-h.html +++ b/doc/html/qcursor-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } */ #ifdef TQT_NO_CURSOR -class Q_EXPORT TQCursor : public TQt +class TQ_EXPORT TQCursor : public TQt { public: static TQPoint pos(); @@ -104,7 +104,7 @@ private: struct TQCursorData; -class Q_EXPORT TQCursor : public TQt +class TQ_EXPORT TQCursor : public TQt { public: TQCursor(); // create default arrow cursor @@ -162,8 +162,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/doc/html/qdatabrowser-h.html b/doc/html/qdatabrowser-h.html index 779b2cda6..e0028d74a 100644 --- a/doc/html/qdatabrowser-h.html +++ b/doc/html/qdatabrowser-h.html @@ -91,7 +91,7 @@ body { background: #ffffff; color: black; } class TQSqlForm; class TQDataBrowserPrivate; -class Q_EXPORT TQDataBrowser : public TQWidget +class TQ_EXPORT TQDataBrowser : public TQWidget { TQ_OBJECT TQ_PROPERTY( bool boundaryChecking READ boundaryChecking WRITE setBoundaryChecking ) diff --git a/doc/html/qdatastream-h.html b/doc/html/qdatastream-h.html index f8f5f20c2..e9f8331a1 100644 --- a/doc/html/qdatastream-h.html +++ b/doc/html/qdatastream-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #endif // QT_H #ifndef TQT_NO_DATASTREAM -class Q_EXPORT TQDataStream // data stream class +class TQ_EXPORT TQDataStream // data stream class { public: TQDataStream(); diff --git a/doc/html/qdatatable-h.html b/doc/html/qdatatable-h.html index d53e4f3e0..36fca8a47 100644 --- a/doc/html/qdatatable-h.html +++ b/doc/html/qdatatable-h.html @@ -90,7 +90,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_VIEW_WIDGETS diff --git a/doc/html/qdataview-h.html b/doc/html/qdataview-h.html index 1ac5c535e..9f9710812 100644 --- a/doc/html/qdataview-h.html +++ b/doc/html/qdataview-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_VIEW_WIDGETS diff --git a/doc/html/qdatetime-h.html b/doc/html/qdatetime-h.html index 3a91305da..23195e7ef 100644 --- a/doc/html/qdatetime-h.html +++ b/doc/html/qdatetime-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } TQDate class *****************************************************************************/ -class Q_EXPORT TQDate +class TQ_EXPORT TQDate { public: TQDate() { jd = 0; } @@ -149,8 +149,8 @@ private: uint jd; friend class TQDateTime; #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); #endif }; @@ -159,7 +159,7 @@ private: TQTime class *****************************************************************************/ -class Q_EXPORT TQTime +class TQ_EXPORT TQTime { public: TQTime() { ds=0; } // set null time @@ -210,8 +210,8 @@ private: uint ds; friend class TQDateTime; #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); #endif }; @@ -220,7 +220,7 @@ private: TQDateTime class *****************************************************************************/ -class Q_EXPORT TQDateTime +class TQ_EXPORT TQDateTime { public: TQDateTime() {} // set null date and null time @@ -266,8 +266,8 @@ private: TQDate d; TQTime t; #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime &); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime &); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); #endif }; @@ -277,12 +277,12 @@ private: *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); #endif // TQT_NO_DATASTREAM #endif // TQDATETIME_H diff --git a/doc/html/qdatetimeedit-h.html b/doc/html/qdatetimeedit-h.html index 25799f4ec..1d710ba5e 100644 --- a/doc/html/qdatetimeedit-h.html +++ b/doc/html/qdatetimeedit-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_DATETIMEEDIT -class Q_EXPORT TQDateTimeEditBase : public TQWidget +class TQ_EXPORT TQDateTimeEditBase : public TQWidget { TQ_OBJECT public: @@ -110,7 +110,7 @@ private: class TQDateEditPrivate; -class Q_EXPORT TQDateEdit : public TQDateTimeEditBase +class TQ_EXPORT TQDateEdit : public TQDateTimeEditBase { TQ_OBJECT TQ_ENUMS( Order ) @@ -190,7 +190,7 @@ private: class TQTimeEditPrivate; -class Q_EXPORT TQTimeEdit : public TQDateTimeEditBase +class TQ_EXPORT TQTimeEdit : public TQDateTimeEditBase { TQ_OBJECT TQ_SETS( Display ) @@ -274,7 +274,7 @@ private: class TQDateTimeEditPrivate; -class Q_EXPORT TQDateTimeEdit : public TQWidget +class TQ_EXPORT TQDateTimeEdit : public TQWidget { TQ_OBJECT TQ_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime ) diff --git a/doc/html/qdesktopwidget-h.html b/doc/html/qdesktopwidget-h.html index e2c43d5f1..ab63f2878 100644 --- a/doc/html/qdesktopwidget-h.html +++ b/doc/html/qdesktopwidget-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } 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/doc/html/qdial-h.html b/doc/html/qdial-h.html index 584a11277..1765a68e5 100644 --- a/doc/html/qdial-h.html +++ b/doc/html/qdial-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQDialPrivate; -class Q_EXPORT TQDial: public TQWidget, public TQRangeControl +class TQ_EXPORT TQDial: public TQWidget, public TQRangeControl { TQ_OBJECT TQ_PROPERTY( bool tracking READ tracking WRITE setTracking ) diff --git a/doc/html/qdialog-h.html b/doc/html/qdialog-h.html index 185b3d0f9..3abf629fc 100644 --- a/doc/html/qdialog-h.html +++ b/doc/html/qdialog-h.html @@ -88,7 +88,7 @@ TQ_OBJECT class TQPushButton; class TQDialogPrivate; -class Q_EXPORT TQDialog : public TQWidget +class TQ_EXPORT TQDialog : public TQWidget { friend class TQPushButton; TQ_OBJECT diff --git a/doc/html/qdir-h.html b/doc/html/qdir-h.html index f497d7558..935aa96d1 100644 --- a/doc/html/qdir-h.html +++ b/doc/html/qdir-h.html @@ -91,7 +91,7 @@ class TQStringList; template <class T> class TQDeepCopy; -class Q_EXPORT TQDir +class TQ_EXPORT TQDir { public: enum FilterSpec { Dirs = 0x001, diff --git a/doc/html/qdirectpainter_qws-h.html b/doc/html/qdirectpainter_qws-h.html index 78ac7bdf9..809773524 100644 --- a/doc/html/qdirectpainter_qws-h.html +++ b/doc/html/qdirectpainter_qws-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #ifdef Q_WS_QWS #ifndef TQT_NO_DIRECTPAINTER -class Q_EXPORT TQDirectPainter : public TQPainter { +class TQ_EXPORT TQDirectPainter : public TQPainter { public: TQDirectPainter( const TQWidget* ); ~TQDirectPainter(); diff --git a/doc/html/qdns-h.html b/doc/html/qdns-h.html index 93eef9cb1..6bc631f1e 100644 --- a/doc/html/qdns-h.html +++ b/doc/html/qdns-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_DNS #else -#define TQM_EXPORT_DNS Q_EXPORT +#define TQM_EXPORT_DNS TQ_EXPORT #endif #ifndef TQT_NO_DNS diff --git a/doc/html/qdockarea-h.html b/doc/html/qdockarea-h.html index 45e5622e3..b7b3badb7 100644 --- a/doc/html/qdockarea-h.html +++ b/doc/html/qdockarea-h.html @@ -96,7 +96,7 @@ class TQMouseEvent; class TQDockWindowResizeHandle; class TQDockAreaPrivate; -class Q_EXPORT TQDockAreaLayout : public TQLayout +class TQ_EXPORT TQDockAreaLayout : public TQLayout { TQ_OBJECT friend class TQDockArea; @@ -139,7 +139,7 @@ private: #endif }; -class Q_EXPORT TQDockArea : public TQWidget +class TQ_EXPORT TQDockArea : public TQWidget { TQ_OBJECT TQ_ENUMS( HandlePosition ) @@ -216,8 +216,8 @@ private: // Disabled copy constructor and operator= }; #ifndef TQT_NO_TEXTSTREAM -Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQDockArea & ); -Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & ); +TQ_EXPORT TQTextStream &operator<<( TQTextStream &, const TQDockArea & ); +TQ_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & ); #endif #define Q_DEFINED_QDOCKAREA diff --git a/doc/html/qdockwindow-h.html b/doc/html/qdockwindow-h.html index 601799854..a94d730c7 100644 --- a/doc/html/qdockwindow-h.html +++ b/doc/html/qdockwindow-h.html @@ -98,7 +98,7 @@ class TQDockWindowPrivate; class TQToolBar; class TQWindowsXPStyle; -class Q_EXPORT TQDockWindow : public TQFrame +class TQ_EXPORT TQDockWindow : public TQFrame { TQ_OBJECT TQ_ENUMS( CloseMode Place ) diff --git a/doc/html/qdom-h.html b/doc/html/qdom-h.html index 65167c05e..0151a1d52 100644 --- a/doc/html/qdom-h.html +++ b/doc/html/qdom-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML ) #define TQM_EXPORT_DOM #else -#define TQM_EXPORT_DOM Q_EXPORT +#define TQM_EXPORT_DOM TQ_EXPORT #endif #ifndef TQT_NO_DOM diff --git a/doc/html/qdragobject-h.html b/doc/html/qdragobject-h.html index 7be03edad..ecfdc9c9e 100644 --- a/doc/html/qdragobject-h.html +++ b/doc/html/qdragobject-h.html @@ -90,7 +90,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 ); @@ -128,7 +128,7 @@ private: #endif }; -class Q_EXPORT TQStoredDrag: public TQDragObject { +class TQ_EXPORT TQStoredDrag: public TQDragObject { TQ_OBJECT TQStoredDragData * d; @@ -149,7 +149,7 @@ private: #endif }; -class Q_EXPORT TQTextDrag: public TQDragObject { +class TQ_EXPORT TQTextDrag: public TQDragObject { TQ_OBJECT TQTextDragPrivate* d; public: @@ -175,7 +175,7 @@ private: #endif }; -class Q_EXPORT TQImageDrag: public TQDragObject { +class TQ_EXPORT TQImageDrag: public TQDragObject { TQ_OBJECT TQImage img; TQStrList ofmts; @@ -203,7 +203,7 @@ private: }; -class Q_EXPORT TQUriDrag: public TQStoredDrag { +class TQ_EXPORT TQUriDrag: public TQStoredDrag { TQ_OBJECT public: @@ -232,7 +232,7 @@ private: #endif }; -class Q_EXPORT TQColorDrag : public TQStoredDrag +class TQ_EXPORT TQColorDrag : public TQStoredDrag { TQ_OBJECT TQColor color; @@ -263,7 +263,7 @@ typedef TQUriDrag TQUrlDrag; // member functions. // -class Q_EXPORT TQDragManager: public TQObject { +class TQ_EXPORT TQDragManager: public TQObject { TQ_OBJECT private: diff --git a/doc/html/qdrawutil-h.html b/doc/html/qdrawutil-h.html index f5e4d4487..ab3170dbd 100644 --- a/doc/html/qdrawutil-h.html +++ b/doc/html/qdrawutil-h.html @@ -94,52 +94,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 ); @@ -147,16 +147,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/doc/html/qdropsite-h.html b/doc/html/qdropsite-h.html index 349b6fc44..050645d72 100644 --- a/doc/html/qdropsite-h.html +++ b/doc/html/qdropsite-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQWidget; -class Q_EXPORT TQDropSite { +class TQ_EXPORT TQDropSite { public: TQDropSite( TQWidget* parent ); virtual ~TQDropSite(); diff --git a/doc/html/qeditorfactory-h.html b/doc/html/qeditorfactory-h.html index 5492f2303..d1789af3d 100644 --- a/doc/html/qeditorfactory-h.html +++ b/doc/html/qeditorfactory-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_EDIT_WIDGETS diff --git a/doc/html/qerrormessage-h.html b/doc/html/qerrormessage-h.html index 3905a72f9..6b363eaf1 100644 --- a/doc/html/qerrormessage-h.html +++ b/doc/html/qerrormessage-h.html @@ -90,7 +90,7 @@ class TQStringList; template<class type> class TQDict; -class Q_EXPORT TQErrorMessage: public TQDialog { +class TQ_EXPORT TQErrorMessage: public TQDialog { TQ_OBJECT public: TQErrorMessage( TQWidget* parent, const char* name=0 ); diff --git a/doc/html/qeucjpcodec-h.html b/doc/html/qeucjpcodec-h.html index 3363fb071..8c28e8982 100644 --- a/doc/html/qeucjpcodec-h.html +++ b/doc/html/qeucjpcodec-h.html @@ -116,7 +116,7 @@ body { background: #ffffff; color: black; } #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP Q_EXPORT +#define Q_EXPORT_CODECS_JP TQ_EXPORT #endif class Q_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { diff --git a/doc/html/qeuckrcodec-h.html b/doc/html/qeuckrcodec-h.html index 7b6d947c8..0446d1a58 100644 --- a/doc/html/qeuckrcodec-h.html +++ b/doc/html/qeuckrcodec-h.html @@ -111,7 +111,7 @@ body { background: #ffffff; color: black; } #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_KR #else -#define Q_EXPORT_CODECS_KR Q_EXPORT +#define Q_EXPORT_CODECS_KR TQ_EXPORT #endif class Q_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { diff --git a/doc/html/qevent-h.html b/doc/html/qevent-h.html index 49f05c9ff..ca644045e 100644 --- a/doc/html/qevent-h.html +++ b/doc/html/qevent-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #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 { @@ -196,7 +196,7 @@ private: }; -class Q_EXPORT TQTimerEvent : public TQEvent +class TQ_EXPORT TQTimerEvent : public TQEvent { public: TQTimerEvent( int timerId ) @@ -207,7 +207,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 ); @@ -238,7 +238,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 ); @@ -267,7 +267,7 @@ protected: }; #endif -class Q_EXPORT TQTabletEvent : public TQEvent +class TQ_EXPORT TQTabletEvent : public TQEvent { public: enum TabletDevice { NoDevice = -1, Puck, Stylus, Eraser }; @@ -306,7 +306,7 @@ protected: }; -class Q_EXPORT TQKeyEvent : public TQEvent +class TQ_EXPORT TQKeyEvent : public TQEvent { public: TQKeyEvent( Type type, int key, int ascii, int state, @@ -338,7 +338,7 @@ protected: }; -class Q_EXPORT TQFocusEvent : public TQEvent +class TQ_EXPORT TQFocusEvent : public TQEvent { public: @@ -359,7 +359,7 @@ private: }; -class Q_EXPORT TQPaintEvent : public TQEvent +class TQ_EXPORT TQPaintEvent : public TQEvent { public: TQPaintEvent( const TQRegion& paintRegion, bool erased = TRUE) @@ -390,7 +390,7 @@ protected: }; -class Q_EXPORT TQMoveEvent : public TQEvent +class TQ_EXPORT TQMoveEvent : public TQEvent { public: TQMoveEvent( const TQPoint &pos, const TQPoint &oldPos ) @@ -404,7 +404,7 @@ protected: }; -class Q_EXPORT TQResizeEvent : public TQEvent +class TQ_EXPORT TQResizeEvent : public TQEvent { public: TQResizeEvent( const TQSize &size, const TQSize &oldSize ) @@ -418,7 +418,7 @@ protected: }; -class Q_EXPORT TQCloseEvent : public TQEvent +class TQ_EXPORT TQCloseEvent : public TQEvent { public: TQCloseEvent() @@ -431,7 +431,7 @@ protected: }; -class Q_EXPORT TQIconDragEvent : public TQEvent +class TQ_EXPORT TQIconDragEvent : public TQEvent { public: TQIconDragEvent() @@ -444,7 +444,7 @@ protected: bool accpt; }; -class Q_EXPORT TQShowEvent : public TQEvent +class TQ_EXPORT TQShowEvent : public TQEvent { public: TQShowEvent() @@ -452,14 +452,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 }; @@ -495,7 +495,7 @@ protected: }; -class Q_EXPORT TQIMEvent : public TQEvent +class TQ_EXPORT TQIMEvent : public TQEvent { public: TQIMEvent( Type type, const TQString &text, int cursorPosition ) @@ -513,7 +513,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, @@ -540,7 +540,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 ) @@ -579,7 +579,7 @@ protected: -class Q_EXPORT TQDragMoveEvent : public TQDropEvent +class TQ_EXPORT TQDragMoveEvent : public TQDropEvent { public: TQDragMoveEvent( const TQPoint& pos, Type typ=DragMove ) @@ -596,7 +596,7 @@ protected: }; -class Q_EXPORT TQDragEnterEvent : public TQDragMoveEvent +class TQ_EXPORT TQDragEnterEvent : public TQDragMoveEvent { public: TQDragEnterEvent( const TQPoint& pos ) : @@ -605,7 +605,7 @@ public: /* An internal class */ -class Q_EXPORT TQDragResponseEvent : public TQEvent +class TQ_EXPORT TQDragResponseEvent : public TQEvent { public: TQDragResponseEvent( bool accepted ) @@ -616,7 +616,7 @@ protected: }; -class Q_EXPORT TQDragLeaveEvent : public TQEvent +class TQ_EXPORT TQDragLeaveEvent : public TQEvent { public: TQDragLeaveEvent() @@ -625,7 +625,7 @@ public: #endif // TQT_NO_DRAGANDDROP -class Q_EXPORT TQChildEvent : public TQEvent +class TQ_EXPORT TQChildEvent : public TQEvent { public: TQChildEvent( Type type, TQObject *child ) @@ -638,7 +638,7 @@ protected: }; -class Q_EXPORT TQCustomEvent : public TQEvent +class TQ_EXPORT TQCustomEvent : public TQEvent { public: TQCustomEvent( int type ); diff --git a/doc/html/qeventloop-h.html b/doc/html/qeventloop-h.html index 2221f85b3..c766fecee 100644 --- a/doc/html/qeventloop-h.html +++ b/doc/html/qeventloop-h.html @@ -93,7 +93,7 @@ class TQMutex; #endif // TQT_THREAD_SUPPORT -class Q_EXPORT TQEventLoop : public TQObject +class TQ_EXPORT TQEventLoop : public TQObject { TQ_OBJECT diff --git a/doc/html/qfile-h.html b/doc/html/qfile-h.html index 763c4c5ea..67716de0a 100644 --- a/doc/html/qfile-h.html +++ b/doc/html/qfile-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } class TQDir; class TQFilePrivate; -class Q_EXPORT TQFile : public TQIODevice // file I/O device class +class TQ_EXPORT TQFile : public TQIODevice // file I/O device class { public: TQFile(); diff --git a/doc/html/qfiledialog-h.html b/doc/html/qfiledialog-h.html index ac25a627d..e0698e3db 100644 --- a/doc/html/qfiledialog-h.html +++ b/doc/html/qfiledialog-h.html @@ -103,7 +103,7 @@ class TQFileDialogTQFileListView; #ifndef TQT_NO_FILEDIALOG -class Q_EXPORT TQFileIconProvider : public TQObject +class TQ_EXPORT TQFileIconProvider : public TQObject { TQ_OBJECT public: @@ -117,7 +117,7 @@ private: // Disabled copy constructor and operator= #endif }; -class Q_EXPORT TQFilePreview +class TQ_EXPORT TQFilePreview { public: TQFilePreview(); @@ -125,7 +125,7 @@ public: }; -class Q_EXPORT TQFileDialog : public TQDialog +class TQ_EXPORT TQFileDialog : public TQDialog { TQ_OBJECT TQ_ENUMS( Mode ViewMode PreviewMode ) diff --git a/doc/html/qfileinfo-h.html b/doc/html/qfileinfo-h.html index 4b82fc655..c37b125b0 100644 --- a/doc/html/qfileinfo-h.html +++ b/doc/html/qfileinfo-h.html @@ -88,7 +88,7 @@ struct TQFileInfoCache; template <class T> class TQDeepCopy; -class Q_EXPORT TQFileInfo +class TQ_EXPORT TQFileInfo { public: enum PermissionSpec { diff --git a/doc/html/qfocusdata-h.html b/doc/html/qfocusdata-h.html index da9901911..57cc6ca47 100644 --- a/doc/html/qfocusdata-h.html +++ b/doc/html/qfocusdata-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQFocusData { +class TQ_EXPORT TQFocusData { public: TQWidget* focusWidget() const { return it.current(); } diff --git a/doc/html/qfont-h.html b/doc/html/qfont-h.html index 76f0b23c8..9bf038c80 100644 --- a/doc/html/qfont-h.html +++ b/doc/html/qfont-h.html @@ -87,7 +87,7 @@ class TQFontPrivate; /* don't touch */ class TQStringList; class TQTextFormatCollection; -class Q_EXPORT TQFont +class TQ_EXPORT TQFont { public: enum StyleHint { @@ -377,8 +377,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; @@ -400,8 +400,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/doc/html/qfontdatabase-h.html b/doc/html/qfontdatabase-h.html index 565b48b2e..9fc00a254 100644 --- a/doc/html/qfontdatabase-h.html +++ b/doc/html/qfontdatabase-h.html @@ -100,7 +100,7 @@ class TQDiskFont; class TQFontDatabasePrivate; -class Q_EXPORT TQFontDatabase +class TQ_EXPORT TQFontDatabase { public: static TQValueList<int> standardSizes(); diff --git a/doc/html/qfontdialog-h.html b/doc/html/qfontdialog-h.html index e0dbac877..4a0042290 100644 --- a/doc/html/qfontdialog-h.html +++ b/doc/html/qfontdialog-h.html @@ -98,7 +98,7 @@ body { background: #ffffff; color: black; } class TQFontDialogPrivate; -class Q_EXPORT TQFontDialog: public TQDialog +class TQ_EXPORT TQFontDialog: public TQDialog { TQ_OBJECT diff --git a/doc/html/qfontinfo-h.html b/doc/html/qfontinfo-h.html index 6630344fc..fc91abf11 100644 --- a/doc/html/qfontinfo-h.html +++ b/doc/html/qfontinfo-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQFontInfo +class TQ_EXPORT TQFontInfo { public: TQFontInfo( const TQFont & ); diff --git a/doc/html/qfontmetrics-h.html b/doc/html/qfontmetrics-h.html index ced78f9cc..9aaf526dc 100644 --- a/doc/html/qfontmetrics-h.html +++ b/doc/html/qfontmetrics-h.html @@ -89,7 +89,7 @@ class TQFontEngine; class TQTextCodec; class TQTextParag; -class Q_EXPORT TQFontMetrics +class TQ_EXPORT TQFontMetrics { public: TQFontMetrics( const TQFont & ); diff --git a/doc/html/qframe-h.html b/doc/html/qframe-h.html index 8d1943fe5..7046f55a8 100644 --- a/doc/html/qframe-h.html +++ b/doc/html/qframe-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_FRAME -class Q_EXPORT TQFrame : public TQWidget +class TQ_EXPORT TQFrame : public TQWidget { TQ_OBJECT TQ_ENUMS( Shape Shadow ) diff --git a/doc/html/qftp-h.html b/doc/html/qftp-h.html index b81ee5c2c..220b56666 100644 --- a/doc/html/qftp-h.html +++ b/doc/html/qftp-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_FTP #else -#define TQM_EXPORT_FTP Q_EXPORT +#define TQM_EXPORT_FTP TQ_EXPORT #endif #ifndef TQT_NO_NETWORKPROTOCOL_FTP diff --git a/doc/html/qgb18030codec-h.html b/doc/html/qgb18030codec-h.html index c6cf889e4..663055631 100644 --- a/doc/html/qgb18030codec-h.html +++ b/doc/html/qgb18030codec-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_CN #else -#define Q_EXPORT_CODECS_CN Q_EXPORT +#define Q_EXPORT_CODECS_CN TQ_EXPORT #endif class Q_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { diff --git a/doc/html/qgfx_qws-h.html b/doc/html/qgfx_qws-h.html index c3e3009ea..7772fecae 100644 --- a/doc/html/qgfx_qws-h.html +++ b/doc/html/qgfx_qws-h.html @@ -354,7 +354,7 @@ protected: extern TQScreen * qt_screen; -class Q_EXPORT TQGfx : public TQt { +class TQ_EXPORT TQGfx : public TQt { public: // With loadable drivers, do probe here static TQGfx *createGfx( int depth, unsigned char *buffer, diff --git a/doc/html/qgfxdriverfactory_qws-h.html b/doc/html/qgfxdriverfactory_qws-h.html index e3e741b98..beb31b0b7 100644 --- a/doc/html/qgfxdriverfactory_qws-h.html +++ b/doc/html/qgfxdriverfactory_qws-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } class TQString; class TQScreen; -class Q_EXPORT TQGfxDriverFactory +class TQ_EXPORT TQGfxDriverFactory { public: #ifndef TQT_NO_STRINGLIST diff --git a/doc/html/qgfxdriverplugin.html b/doc/html/qgfxdriverplugin.html index 34c8336d9..787688e92 100644 --- a/doc/html/qgfxdriverplugin.html +++ b/doc/html/qgfxdriverplugin.html @@ -53,7 +53,7 @@ TQt/Embedded graphics driver plugins. it easy to create custom graphics drivers. <p> Writing a graphics driver plugin is achieved by subclassing this base class, reimplementing the pure virtual functions <a href="#keys">keys</a>() and -<a href="#create">create</a>(), and exporting the class with the <tt>Q_EXPORT_PLUGIN</tt> +<a href="#create">create</a>(), and exporting the class with the <tt>TQ_EXPORT_PLUGIN</tt> macro. See the <a href="plugins-howto.html">Plugins documentation</a> for details. <p> This class is only available in TQt/Embedded. @@ -63,7 +63,7 @@ macro. See the <a href="plugins-howto.html">Plugins <h3 class=fn><a name="TQGfxDriverPlugin"></a>TQGfxDriverPlugin::TQGfxDriverPlugin () </h3> Constructs a graphics driver plugin. This is invoked automatically -by the <tt>Q_EXPORT_PLUGIN</tt> macro. +by the <tt>TQ_EXPORT_PLUGIN</tt> macro. <h3 class=fn><a name="~TQGfxDriverPlugin"></a>TQGfxDriverPlugin::~TQGfxDriverPlugin () </h3> diff --git a/doc/html/qgfxdriverplugin_qws-h.html b/doc/html/qgfxdriverplugin_qws-h.html index 76022fa1e..c8934835b 100644 --- a/doc/html/qgfxdriverplugin_qws-h.html +++ b/doc/html/qgfxdriverplugin_qws-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQScreen; class TQGfxDriverPluginPrivate; -class Q_EXPORT TQGfxDriverPlugin : public TQGPlugin +class TQ_EXPORT TQGfxDriverPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/doc/html/qgl-h.html b/doc/html/qgl-h.html index 341b5f02e..5476f63f4 100644 --- a/doc/html/qgl-h.html +++ b/doc/html/qgl-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_OPENGL #else -#define TQM_EXPORT_OPENGL Q_EXPORT +#define TQM_EXPORT_OPENGL TQ_EXPORT #endif #ifndef TQT_NO_COMPAT diff --git a/doc/html/qglcolormap-h.html b/doc/html/qglcolormap-h.html index 5c866f49f..a0aa8ff4c 100644 --- a/doc/html/qglcolormap-h.html +++ b/doc/html/qglcolormap-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_OPENGL #else -#define TQM_EXPORT_OPENGL Q_EXPORT +#define TQM_EXPORT_OPENGL TQ_EXPORT #endif class TQWidget; diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 7716167c3..0432bdf6a 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -879,12 +879,12 @@ class TQDataStream; # if defined(QT_DLL) # undef QT_DLL # endif -# define Q_EXPORT __declspec(dllexport) +# define TQ_EXPORT __declspec(dllexport) # define Q_TEMPLATEDLL # define Q_TEMPLATE_EXTERN # undef TQ_DISABLE_COPY /* avoid unresolved externals */ # elif defined(QT_DLL) /* use a TQt DLL library */ -# define Q_EXPORT __declspec(dllimport) +# define TQ_EXPORT __declspec(dllimport) # define Q_TEMPLATEDLL # ifndef Q_TEMPLATE_EXTERN # if defined(Q_CC_MSVC_NET) @@ -897,7 +897,7 @@ class TQDataStream; # endif #elif defined(Q_OS_LINUX) && defined(Q_CC_BOR) # if defined(QT_SHARED) /* create a TQt shared library */ -# define Q_EXPORT __declspec(dllexport) +# define TQ_EXPORT __declspec(dllexport) # define Q_TEMPLATEDLL # define Q_TEMPLATE_EXTERN # undef TQ_DISABLE_COPY /* avoid unresolved externals */ @@ -911,8 +911,8 @@ class TQDataStream; # undef QT_DLL #endif -#ifndef Q_EXPORT -# define Q_EXPORT +#ifndef TQ_EXPORT +# define TQ_EXPORT #endif @@ -921,7 +921,7 @@ class TQDataStream; // #if defined(Q_WS_WIN) -extern Q_EXPORT bool qt_winunicode; +extern TQ_EXPORT bool qt_winunicode; #endif @@ -929,13 +929,13 @@ extern Q_EXPORT bool qt_winunicode; // System information // -Q_EXPORT const char *tqVersion(); -Q_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian ); -Q_EXPORT bool tqSharedBuild(); +TQ_EXPORT const char *tqVersion(); +TQ_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian ); +TQ_EXPORT bool tqSharedBuild(); #if defined(Q_OS_MAC) int qMacVersion(); #elif defined(Q_WS_WIN) -Q_EXPORT int qWinVersion(); +TQ_EXPORT int qWinVersion(); #if defined(UNICODE) #define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi } #define QT_WA_INLINE( uni, ansi ) ( qt_winunicode ? uni : ansi ) @@ -990,25 +990,25 @@ Q_EXPORT int qWinVersion(); #endif -Q_EXPORT void tqDebug( const char *, ... ) // print debug message +TQ_EXPORT void tqDebug( const char *, ... ) // print debug message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqWarning( const char *, ... ) // print warning message +TQ_EXPORT void tqWarning( const char *, ... ) // print warning message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit +TQ_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit #if defined(Q_CC_GNU) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); +TQ_EXPORT void tqSystemWarning( const char *, int code = -1 ); #if !defined(Q_ASSERT) @@ -1032,7 +1032,7 @@ Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); #endif // TQT_NO_COMPAT -Q_EXPORT bool tqt_check_pointer( bool c, const char *, int ); +TQ_EXPORT bool tqt_check_pointer( bool c, const char *, int ); #if defined(QT_CHECK_NULL) # define TQ_CHECK_PTR(p) (tqt_check_pointer((p)==0,__FILE__,__LINE__)) @@ -1043,33 +1043,33 @@ Q_EXPORT bool tqt_check_pointer( bool c, const char *, int ); enum TQtMsgType { TQtDebugMsg, TQtWarningMsg, TQtFatalMsg }; typedef void (*TQtMsgHandler)(TQtMsgType, const char *); -Q_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler ); +TQ_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler ); #if !defined(TQT_NO_COMPAT) // compatibility with TQt 2 typedef TQtMsgHandler msg_handler; #endif // TQT_NO_COMPAT -Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE ); +TQ_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE ); -Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc, +TQ_EXPORT void tqObsolete( const char *obj, const char *oldfunc, const char *newfunc ); -Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc ); -Q_EXPORT void tqObsolete( const char *message ); +TQ_EXPORT void tqObsolete( const char *obj, const char *oldfunc ); +TQ_EXPORT void tqObsolete( const char *message ); // // Install paths from configure // -Q_EXPORT const char *tqInstallPath(); -Q_EXPORT const char *tqInstallPathDocs(); -Q_EXPORT const char *tqInstallPathHeaders(); -Q_EXPORT const char *tqInstallPathLibs(); -Q_EXPORT const char *tqInstallPathBins(); -Q_EXPORT const char *tqInstallPathPlugins(); -Q_EXPORT const char *tqInstallPathData(); -Q_EXPORT const char *tqInstallPathTranslations(); -Q_EXPORT const char *tqInstallPathSysconf(); +TQ_EXPORT const char *tqInstallPath(); +TQ_EXPORT const char *tqInstallPathDocs(); +TQ_EXPORT const char *tqInstallPathHeaders(); +TQ_EXPORT const char *tqInstallPathLibs(); +TQ_EXPORT const char *tqInstallPathBins(); +TQ_EXPORT const char *tqInstallPathPlugins(); +TQ_EXPORT const char *tqInstallPathData(); +TQ_EXPORT const char *tqInstallPathTranslations(); +TQ_EXPORT const char *tqInstallPathSysconf(); #endif /* __cplusplus */ diff --git a/doc/html/qgrid-h.html b/doc/html/qgrid-h.html index 2336a3595..e4d9b8815 100644 --- a/doc/html/qgrid-h.html +++ b/doc/html/qgrid-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } class TQGridLayout; -class Q_EXPORT TQGrid : public TQFrame +class TQ_EXPORT TQGrid : public TQFrame { TQ_OBJECT public: diff --git a/doc/html/qgridview-h.html b/doc/html/qgridview-h.html index d9a15c7e8..441c1ff54 100644 --- a/doc/html/qgridview-h.html +++ b/doc/html/qgridview-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQGridViewPrivate; -class Q_EXPORT TQGridView : public TQScrollView +class TQ_EXPORT TQGridView : public TQScrollView { TQ_OBJECT TQ_PROPERTY( int numRows READ numRows WRITE setNumRows ) diff --git a/doc/html/qgroupbox-h.html b/doc/html/qgroupbox-h.html index 4fcbefa4f..8e0a8b9da 100644 --- a/doc/html/qgroupbox-h.html +++ b/doc/html/qgroupbox-h.html @@ -90,7 +90,7 @@ class TQVBoxLayout; class TQGridLayout; class TQSpacerItem; -class Q_EXPORT TQGroupBox : public TQFrame +class TQ_EXPORT TQGroupBox : public TQFrame { TQ_OBJECT TQ_PROPERTY( TQString title READ title WRITE setTitle ) diff --git a/doc/html/qguardedptr-h.html b/doc/html/qguardedptr-h.html index 6040b7f2f..4c7f91145 100644 --- a/doc/html/qguardedptr-h.html +++ b/doc/html/qguardedptr-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #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/doc/html/qhbox-h.html b/doc/html/qhbox-h.html index 0693f024b..7f411638c 100644 --- a/doc/html/qhbox-h.html +++ b/doc/html/qhbox-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } class TQBoxLayout; -class Q_EXPORT TQHBox : public TQFrame +class TQ_EXPORT TQHBox : public TQFrame { TQ_OBJECT public: diff --git a/doc/html/qhbuttongroup-h.html b/doc/html/qhbuttongroup-h.html index 01b6a600a..6ba89ebc7 100644 --- a/doc/html/qhbuttongroup-h.html +++ b/doc/html/qhbuttongroup-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_HBUTTONGROUP -class Q_EXPORT TQHButtonGroup : public TQButtonGroup +class TQ_EXPORT TQHButtonGroup : public TQButtonGroup { TQ_OBJECT public: diff --git a/doc/html/qheader-h.html b/doc/html/qheader-h.html index f9a1e31ad..482fd337b 100644 --- a/doc/html/qheader-h.html +++ b/doc/html/qheader-h.html @@ -89,7 +89,7 @@ class TQShowEvent; class TQHeaderData; class TQTable; -class Q_EXPORT TQHeader : public TQWidget +class TQ_EXPORT TQHeader : public TQWidget { friend class TQTable; friend class TQTableHeader; @@ -248,7 +248,7 @@ inline TQHeader::Orientation TQHeader::orientation() const inline void TQHeader::setTracking( bool enable ) { trackingIsOn = enable; } inline bool TQHeader::tracking() const { return trackingIsOn; } -extern Q_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition +extern TQ_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition #endif // TQT_NO_HEADER diff --git a/doc/html/qhgroupbox-h.html b/doc/html/qhgroupbox-h.html index 14a1adeb5..5e18344a4 100644 --- a/doc/html/qhgroupbox-h.html +++ b/doc/html/qhgroupbox-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_HGROUPBOX -class Q_EXPORT TQHGroupBox : public TQGroupBox +class TQ_EXPORT TQHGroupBox : public TQGroupBox { TQ_OBJECT public: diff --git a/doc/html/qhostaddress-h.html b/doc/html/qhostaddress-h.html index cae9d608c..b0c2cce00 100644 --- a/doc/html/qhostaddress-h.html +++ b/doc/html/qhostaddress-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK #else -#define TQM_EXPORT_NETWORK Q_EXPORT +#define TQM_EXPORT_NETWORK TQ_EXPORT #endif #ifndef TQT_NO_NETWORK diff --git a/doc/html/qhttp-h.html b/doc/html/qhttp-h.html index b27a2345c..2a814c552 100644 --- a/doc/html/qhttp-h.html +++ b/doc/html/qhttp-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_HTTP #define TQM_TEMPLATE_EXTERN_HTTP #else -#define TQM_EXPORT_HTTP Q_EXPORT +#define TQM_EXPORT_HTTP TQ_EXPORT #define TQM_TEMPLATE_EXTERN_HTTP Q_TEMPLATE_EXTERN #endif diff --git a/doc/html/qiconset-h.html b/doc/html/qiconset-h.html index 1b736da5e..53944617c 100644 --- a/doc/html/qiconset-h.html +++ b/doc/html/qiconset-h.html @@ -88,7 +88,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 @@ -137,7 +137,7 @@ private: TQIconSetPrivate *d; }; -class Q_EXPORT TQIconFactory : private TQShared +class TQ_EXPORT TQIconFactory : private TQShared { public: TQIconFactory(); diff --git a/doc/html/qiconview-h.html b/doc/html/qiconview-h.html index e03f1b077..153d7b7ac 100644 --- a/doc/html/qiconview-h.html +++ b/doc/html/qiconview-h.html @@ -108,7 +108,7 @@ class TQIconDragPrivate; #ifndef TQT_NO_DRAGANDDROP -class Q_EXPORT TQIconDragItem +class TQ_EXPORT TQIconDragItem { public: TQIconDragItem(); @@ -122,7 +122,7 @@ private: }; -class Q_EXPORT TQIconDrag : public TQDragObject +class TQ_EXPORT TQIconDrag : public TQDragObject { TQ_OBJECT public: @@ -152,7 +152,7 @@ private: class TQIconViewToolTip; class TQIconViewItemPrivate; -class Q_EXPORT TQIconViewItem : public TQt +class TQ_EXPORT TQIconViewItem : public TQt { friend class TQIconView; friend class TQIconViewToolTip; @@ -295,7 +295,7 @@ private: class TQIconViewPrivate; /* don't touch */ -class Q_EXPORT TQIconView : public TQScrollView +class TQ_EXPORT TQIconView : public TQScrollView { friend class TQIconViewItem; friend class TQIconViewPrivate; diff --git a/doc/html/qimage-h.html b/doc/html/qimage-h.html index 27e0f3f68..b6b952c15 100644 --- a/doc/html/qimage-h.html +++ b/doc/html/qimage-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } 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() { } @@ -101,7 +101,7 @@ public: #endif //TQT_NO_IMAGE_TEXT -class Q_EXPORT TQImage +class TQ_EXPORT TQImage { public: enum Endian { IgnoreEndian, BigEndian, LittleEndian }; @@ -285,7 +285,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 ); }; @@ -294,8 +294,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 @@ -306,7 +306,7 @@ typedef void (*image_io_handler)( TQImageIO * ); // image IO handler struct TQImageIOData; -class Q_EXPORT TQImageIO +class TQ_EXPORT TQImageIO { public: TQImageIO(); @@ -370,7 +370,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/doc/html/qimageformatplugin-h.html b/doc/html/qimageformatplugin-h.html index d5e6ebf65..312a633e5 100644 --- a/doc/html/qimageformatplugin-h.html +++ b/doc/html/qimageformatplugin-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } class TQImageFormat; class TQImageFormatPluginPrivate; -class Q_EXPORT TQImageFormatPlugin : public TQGPlugin +class TQ_EXPORT TQImageFormatPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/doc/html/qinputdialog-h.html b/doc/html/qinputdialog-h.html index 3989529ac..07db64afe 100644 --- a/doc/html/qinputdialog-h.html +++ b/doc/html/qinputdialog-h.html @@ -89,7 +89,7 @@ class TQSpinBox; class TQComboBox; class TQInputDialogPrivate; -class Q_EXPORT TQInputDialog : public TQDialog +class TQ_EXPORT TQInputDialog : public TQDialog { TQ_OBJECT diff --git a/doc/html/qiodevice-h.html b/doc/html/qiodevice-h.html index 4b505356c..60b0a78ba 100644 --- a/doc/html/qiodevice-h.html +++ b/doc/html/qiodevice-h.html @@ -124,7 +124,7 @@ body { background: #ffffff; color: black; } #define IO_UnspecifiedError 8 // unspecified error -class Q_EXPORT TQIODevice +class TQ_EXPORT TQIODevice { public: typedef TQ_ULONG Offset; diff --git a/doc/html/qjiscodec-h.html b/doc/html/qjiscodec-h.html index 319b1ae95..afe800535 100644 --- a/doc/html/qjiscodec-h.html +++ b/doc/html/qjiscodec-h.html @@ -116,7 +116,7 @@ body { background: #ffffff; color: black; } #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP Q_EXPORT +#define Q_EXPORT_CODECS_JP TQ_EXPORT #endif class Q_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { diff --git a/doc/html/qkbddriverfactory_qws-h.html b/doc/html/qkbddriverfactory_qws-h.html index 88fdfede0..eaa5c69a7 100644 --- a/doc/html/qkbddriverfactory_qws-h.html +++ b/doc/html/qkbddriverfactory_qws-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } class TQString; class TQWSKeyboardHandler; -class Q_EXPORT TQKbdDriverFactory +class TQ_EXPORT TQKbdDriverFactory { public: #ifndef TQT_NO_STRINGLIST diff --git a/doc/html/qkbddriverplugin.html b/doc/html/qkbddriverplugin.html index e72719337..4eed2475a 100644 --- a/doc/html/qkbddriverplugin.html +++ b/doc/html/qkbddriverplugin.html @@ -53,7 +53,7 @@ TQt/Embedded keyboard driver plugins. it easy to create custom keyboard drivers. <p> Writing a keyboard driver plugin is achieved by subclassing this base class, reimplementing the pure virtual functions <a href="#keys">keys</a>() and -<a href="#create">create</a>(), and exporting the class with the <tt>Q_EXPORT_PLUGIN</tt> +<a href="#create">create</a>(), and exporting the class with the <tt>TQ_EXPORT_PLUGIN</tt> macro. See the <a href="plugins-howto.html">Plugins documentation</a> for details. <p> This class is only available in TQt/Embedded. @@ -63,7 +63,7 @@ macro. See the <a href="plugins-howto.html">Plugins <h3 class=fn><a name="TQKbdDriverPlugin"></a>TQKbdDriverPlugin::TQKbdDriverPlugin () </h3> Constructs a keyboard driver plugin. This is invoked automatically -by the <tt>Q_EXPORT_PLUGIN</tt> macro. +by the <tt>TQ_EXPORT_PLUGIN</tt> macro. <h3 class=fn><a name="~TQKbdDriverPlugin"></a>TQKbdDriverPlugin::~TQKbdDriverPlugin () </h3> diff --git a/doc/html/qkbddriverplugin_qws-h.html b/doc/html/qkbddriverplugin_qws-h.html index fa2ab5621..7631bff06 100644 --- a/doc/html/qkbddriverplugin_qws-h.html +++ b/doc/html/qkbddriverplugin_qws-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQWSKeyboardHandler; class TQKbdDriverPluginPrivate; -class Q_EXPORT TQKbdDriverPlugin : public TQGPlugin +class TQ_EXPORT TQKbdDriverPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/doc/html/qkeysequence-h.html b/doc/html/qkeysequence-h.html index e0aeeb31b..eef29883f 100644 --- a/doc/html/qkeysequence-h.html +++ b/doc/html/qkeysequence-h.html @@ -91,13 +91,13 @@ body { background: #ffffff; color: black; } *****************************************************************************/ #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(); @@ -126,14 +126,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/doc/html/qlabel-h.html b/doc/html/qlabel-h.html index a82c4ebfe..e5ef73951 100644 --- a/doc/html/qlabel-h.html +++ b/doc/html/qlabel-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } class TQSimpleRichText; class TQLabelPrivate; -class Q_EXPORT TQLabel : public TQFrame +class TQ_EXPORT TQLabel : public TQFrame { TQ_OBJECT TQ_PROPERTY( TQString text READ text WRITE setText ) diff --git a/doc/html/qlayout-h.html b/doc/html/qlayout-h.html index 3df55a9b3..859d563cb 100644 --- a/doc/html/qlayout-h.html +++ b/doc/html/qlayout-h.html @@ -102,7 +102,7 @@ class TQMenuBar; class TQSpacerItem; class TQWidget; -class Q_EXPORT TQGLayoutIterator : public TQShared +class TQ_EXPORT TQGLayoutIterator : public TQShared { public: virtual ~TQGLayoutIterator(); @@ -111,7 +111,7 @@ public: virtual TQLayoutItem *takeCurrent() = 0; }; -class Q_EXPORT TQLayoutIterator +class TQ_EXPORT TQLayoutIterator { public: TQLayoutIterator( TQGLayoutIterator *i ) : it( i ) { } @@ -137,7 +137,7 @@ private: TQGLayoutIterator *it; }; -class Q_EXPORT TQLayoutItem +class TQ_EXPORT TQLayoutItem { public: TQLayoutItem( int alignment = 0 ) : align( alignment ) { } @@ -166,7 +166,7 @@ protected: int align; }; -class Q_EXPORT TQSpacerItem : public TQLayoutItem +class TQ_EXPORT TQSpacerItem : public TQLayoutItem { public: TQSpacerItem( int w, int h, @@ -192,7 +192,7 @@ private: TQRect rect; }; -class Q_EXPORT TQWidgetItem : public TQLayoutItem +class TQ_EXPORT TQWidgetItem : public TQLayoutItem { public: TQWidgetItem( TQWidget *w ) : wid( w ) { } @@ -212,7 +212,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 ) @@ -324,7 +324,7 @@ inline void TQLayoutIterator::deleteCurrent() delete takeCurrent(); } -class Q_EXPORT TQGridLayout : public TQLayout +class TQ_EXPORT TQGridLayout : public TQLayout { TQ_OBJECT public: @@ -401,7 +401,7 @@ private: class TQBoxLayoutData; class TQDockWindow; -class Q_EXPORT TQBoxLayout : public TQLayout +class TQ_EXPORT TQBoxLayout : public TQLayout { TQ_OBJECT public: @@ -467,7 +467,7 @@ private: TQBoxLayout *createTmpCopy(); }; -class Q_EXPORT TQHBoxLayout : public TQBoxLayout +class TQ_EXPORT TQHBoxLayout : public TQBoxLayout { TQ_OBJECT public: @@ -486,7 +486,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/doc/html/qlcdnumber-h.html b/doc/html/qlcdnumber-h.html index 9d9f541c7..8bb0d2c48 100644 --- a/doc/html/qlcdnumber-h.html +++ b/doc/html/qlcdnumber-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQLCDNumberPrivate; -class Q_EXPORT TQLCDNumber : public TQFrame // LCD number widget +class TQ_EXPORT TQLCDNumber : public TQFrame // LCD number widget { TQ_OBJECT TQ_ENUMS( Mode SegmentStyle ) diff --git a/doc/html/qlibrary-h.html b/doc/html/qlibrary-h.html index 4c480fe9e..5a34f35bd 100644 --- a/doc/html/qlibrary-h.html +++ b/doc/html/qlibrary-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQLibraryPrivate; -class Q_EXPORT TQLibrary +class TQ_EXPORT TQLibrary { public: TQLibrary( const TQString& filename ); diff --git a/doc/html/qlineedit-h.html b/doc/html/qlineedit-h.html index 996e4f299..7ca2e1451 100644 --- a/doc/html/qlineedit-h.html +++ b/doc/html/qlineedit-h.html @@ -92,7 +92,7 @@ class TQPopupMenu; class TQTextParagraph; class TQTextCursor; -class Q_EXPORT TQLineEdit : public TQFrame +class TQ_EXPORT TQLineEdit : public TQFrame { TQ_OBJECT TQ_ENUMS( EchoMode ) diff --git a/doc/html/qlistbox-h.html b/doc/html/qlistbox-h.html index 4401f72ec..edb186fa9 100644 --- a/doc/html/qlistbox-h.html +++ b/doc/html/qlistbox-h.html @@ -92,7 +92,7 @@ class TQStrList; class TQStringList; -class Q_EXPORT TQListBox : public TQScrollView +class TQ_EXPORT TQListBox : public TQScrollView { friend class TQListBoxItem; friend class TQListBoxPrivate; @@ -351,7 +351,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQListBoxItem +class TQ_EXPORT TQListBoxItem { public: TQListBoxItem( TQListBox* listbox = 0 ); @@ -409,7 +409,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQListBoxText : public TQListBoxItem +class TQ_EXPORT TQListBoxText : public TQListBoxItem { public: TQListBoxText( TQListBox* listbox, const TQString & text=TQString::null ); @@ -434,7 +434,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQListBoxPixmap : public TQListBoxItem +class TQ_EXPORT TQListBoxPixmap : public TQListBoxItem { public: TQListBoxPixmap( TQListBox* listbox, const TQPixmap & ); diff --git a/doc/html/qlistview-h.html b/doc/html/qlistview-h.html index 650325241..a5594975b 100644 --- a/doc/html/qlistview-h.html +++ b/doc/html/qlistview-h.html @@ -99,7 +99,7 @@ class TQMimeSource; class TQLineEdit; class TQListViewToolTip; -class Q_EXPORT TQListViewItem : public TQt +class TQ_EXPORT TQListViewItem : public TQt { friend class TQListViewItemIterator; friend class TQListViewToolTip; @@ -269,7 +269,7 @@ private: class TQCheckListItem; -class Q_EXPORT TQListView: public TQScrollView +class TQ_EXPORT TQListView: public TQScrollView { friend class TQListViewItemIterator; friend class TQListViewItem; @@ -503,7 +503,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQCheckListItem : public TQListViewItem +class TQ_EXPORT TQCheckListItem : public TQListViewItem { public: enum Type { RadioButton, @@ -575,7 +575,7 @@ private: TQCheckListItemPrivate *d; }; -class Q_EXPORT TQListViewItemIterator +class TQ_EXPORT TQListViewItemIterator { friend struct TQListViewPrivate; friend class TQListView; diff --git a/doc/html/qlocale-h.html b/doc/html/qlocale-h.html index 1df5e3a22..c200aec11 100644 --- a/doc/html/qlocale-h.html +++ b/doc/html/qlocale-h.html @@ -79,7 +79,7 @@ body { background: #ffffff; color: black; } struct TQLocalePrivate; -class Q_EXPORT TQLocale +class TQ_EXPORT TQLocale { friend class TQString; diff --git a/doc/html/qlocalfs-h.html b/doc/html/qlocalfs-h.html index b142b8c45..b03c3beed 100644 --- a/doc/html/qlocalfs-h.html +++ b/doc/html/qlocalfs-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_NETWORKPROTOCOL -class Q_EXPORT TQLocalFs : public TQNetworkProtocol +class TQ_EXPORT TQLocalFs : public TQNetworkProtocol { TQ_OBJECT diff --git a/doc/html/qmacstyle_mac-h.html b/doc/html/qmacstyle_mac-h.html index 1d156223d..9b6bd5d98 100644 --- a/doc/html/qmacstyle_mac-h.html +++ b/doc/html/qmacstyle_mac-h.html @@ -88,7 +88,7 @@ class TQPalette; #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_MAC #else -#define Q_EXPORT_STYLE_MAC Q_EXPORT +#define Q_EXPORT_STYLE_MAC TQ_EXPORT #endif class TQMacStylePrivate; diff --git a/doc/html/qmainwindow-h.html b/doc/html/qmainwindow-h.html index 1cf481488..91648e74e 100644 --- a/doc/html/qmainwindow-h.html +++ b/doc/html/qmainwindow-h.html @@ -93,7 +93,7 @@ class TQMainWindowPrivate; class TQMainWindowLayout; class TQPopupMenu; -class Q_EXPORT TQMainWindow: public TQWidget +class TQ_EXPORT TQMainWindow: public TQWidget { TQ_OBJECT TQ_PROPERTY( bool rightJustification READ rightJustification WRITE setRightJustification DESIGNABLE false ) @@ -288,8 +288,8 @@ inline void TQMainWindow::setToolBarsMovable( bool b ) #endif #ifndef TQT_NO_TEXTSTREAM -Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQMainWindow & ); -Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQMainWindow & ); +TQ_EXPORT TQTextStream &operator<<( TQTextStream &, const TQMainWindow & ); +TQ_EXPORT TQTextStream &operator>>( TQTextStream &, TQMainWindow & ); #endif #endif // TQT_NO_MAINWINDOW diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html index 805efb03f..044433441 100644 --- a/doc/html/qmap-h.html +++ b/doc/html/qmap-h.html @@ -92,7 +92,7 @@ body { background: #ffffff; color: black; } //#define QT_CHECK_MAP_RANGE -struct Q_EXPORT TQMapNodeBase +struct TQ_EXPORT TQMapNodeBase { enum Color { Red, Black }; @@ -363,7 +363,7 @@ TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec() } // ### 4.0: rename to something without Private in it. Not really internal. -class Q_EXPORT TQMapPrivateBase : public TQShared +class TQ_EXPORT TQMapPrivateBase : public TQShared { public: TQMapPrivateBase() { diff --git a/doc/html/qmenubar-h.html b/doc/html/qmenubar-h.html index 7a877f35f..c94555238 100644 --- a/doc/html/qmenubar-h.html +++ b/doc/html/qmenubar-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQPopupMenu; -class Q_EXPORT TQMenuBar : public TQFrame, public TQMenuData +class TQ_EXPORT TQMenuBar : public TQFrame, public TQMenuData { TQ_OBJECT TQ_ENUMS( Separator ) diff --git a/doc/html/qmenudata-h.html b/doc/html/qmenudata-h.html index 306b78599..fb6dfa4de 100644 --- a/doc/html/qmenudata-h.html +++ b/doc/html/qmenudata-h.html @@ -95,7 +95,7 @@ class TQObject; class TQCustomMenuItem; class TQMenuItemData; -class Q_EXPORT TQMenuItem // internal menu item class +class TQ_EXPORT TQMenuItem // internal menu item class { friend class TQMenuData; public: @@ -159,7 +159,7 @@ typedef TQPtrList<TQMenuItem> TQMenuItemList; typedef TQPtrListIterator<TQMenuItem> TQMenuItemListIt; -class Q_EXPORT TQCustomMenuItem : public TQt +class TQ_EXPORT TQCustomMenuItem : public TQt { public: TQCustomMenuItem(); @@ -173,7 +173,7 @@ public: }; -class Q_EXPORT TQMenuData // menu data class +class TQ_EXPORT TQMenuData // menu data class { friend class TQMenuBar; friend class TQPopupMenu; diff --git a/doc/html/qmessagebox-h.html b/doc/html/qmessagebox-h.html index c04813b64..5b7f298e6 100644 --- a/doc/html/qmessagebox-h.html +++ b/doc/html/qmessagebox-h.html @@ -87,7 +87,7 @@ class TQLabel; class TQPushButton; struct TQMessageBoxData; -class Q_EXPORT TQMessageBox : public TQDialog +class TQ_EXPORT TQMessageBox : public TQDialog { TQ_OBJECT TQ_ENUMS( Icon ) diff --git a/doc/html/qmetaobject-h.html b/doc/html/qmetaobject-h.html index cebbf68c1..712cc82e3 100644 --- a/doc/html/qmetaobject-h.html +++ b/doc/html/qmetaobject-h.html @@ -115,7 +115,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 @@ -175,7 +175,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, @@ -306,7 +306,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/doc/html/qmime-h.html b/doc/html/qmime-h.html index 2cf765a57..a00d9aa40 100644 --- a/doc/html/qmime-h.html +++ b/doc/html/qmime-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQImageDrag; class TQTextDrag; -class Q_EXPORT TQMimeSource +class TQ_EXPORT TQMimeSource { friend class TQClipboardData; @@ -129,7 +129,7 @@ inline int TQMimeSource::serialNumber() const class TQStringList; class TQMimeSourceFactoryData; -class Q_EXPORT TQMimeSourceFactory { +class TQ_EXPORT TQMimeSourceFactory { public: TQMimeSourceFactory(); virtual ~TQMimeSourceFactory(); @@ -170,7 +170,7 @@ private: directly. */ -class Q_EXPORT TQWindowsMime { +class TQ_EXPORT TQWindowsMime { public: TQWindowsMime(); virtual ~TQWindowsMime(); @@ -206,7 +206,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/doc/html/qmotifplusstyle-h.html b/doc/html/qmotifplusstyle-h.html index f7ec03a7e..ed53cdebe 100644 --- a/doc/html/qmotifplusstyle-h.html +++ b/doc/html/qmotifplusstyle-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_MOTIFPLUS #else -#define Q_EXPORT_STYLE_MOTIFPLUS Q_EXPORT +#define Q_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT #endif class Q_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle diff --git a/doc/html/qmotifstyle-h.html b/doc/html/qmotifstyle-h.html index 1f2cea8af..91df3fa15 100644 --- a/doc/html/qmotifstyle-h.html +++ b/doc/html/qmotifstyle-h.html @@ -88,7 +88,7 @@ class TQPalette; #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_MOTIF #else -#define Q_EXPORT_STYLE_MOTIF Q_EXPORT +#define Q_EXPORT_STYLE_MOTIF TQ_EXPORT #endif diff --git a/doc/html/qmousedriverfactory_qws-h.html b/doc/html/qmousedriverfactory_qws-h.html index 9695846a0..3ccc3da32 100644 --- a/doc/html/qmousedriverfactory_qws-h.html +++ b/doc/html/qmousedriverfactory_qws-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } class TQString; class TQWSMouseHandler; -class Q_EXPORT TQMouseDriverFactory +class TQ_EXPORT TQMouseDriverFactory { public: #ifndef TQT_NO_STRINGLIST diff --git a/doc/html/qmousedriverplugin.html b/doc/html/qmousedriverplugin.html index 70fc956b9..84d2d0518 100644 --- a/doc/html/qmousedriverplugin.html +++ b/doc/html/qmousedriverplugin.html @@ -53,7 +53,7 @@ TQt/Embedded mouse driver plugins. easy to create custom mouse drivers. <p> Writing a mouse driver plugin is achieved by subclassing this base class, reimplementing the pure virtual functions <a href="#keys">keys</a>() and -<a href="#create">create</a>(), and exporting the class with the <tt>Q_EXPORT_PLUGIN</tt> +<a href="#create">create</a>(), and exporting the class with the <tt>TQ_EXPORT_PLUGIN</tt> macro. See the <a href="plugins-howto.html">Plugins documentation</a> for details. <p> This class is only available in TQt/Embedded. @@ -63,7 +63,7 @@ macro. See the <a href="plugins-howto.html">Plugins <h3 class=fn><a name="TQMouseDriverPlugin"></a>TQMouseDriverPlugin::TQMouseDriverPlugin () </h3> Constructs a mouse driver plugin. This is invoked automatically by -the <tt>Q_EXPORT_PLUGIN</tt> macro. +the <tt>TQ_EXPORT_PLUGIN</tt> macro. <h3 class=fn><a name="~TQMouseDriverPlugin"></a>TQMouseDriverPlugin::~TQMouseDriverPlugin () </h3> diff --git a/doc/html/qmousedriverplugin_qws-h.html b/doc/html/qmousedriverplugin_qws-h.html index e2e54f53e..f9ab8fac8 100644 --- a/doc/html/qmousedriverplugin_qws-h.html +++ b/doc/html/qmousedriverplugin_qws-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQWSMouseHandler; class TQMouseDriverPluginPrivate; -class Q_EXPORT TQMouseDriverPlugin : public TQGPlugin +class TQ_EXPORT TQMouseDriverPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/doc/html/qmovie-h.html b/doc/html/qmovie-h.html index c40495763..e4634adce 100644 --- a/doc/html/qmovie-h.html +++ b/doc/html/qmovie-h.html @@ -87,7 +87,7 @@ class TQDataSource; class TQObject; class TQMoviePrivate; -class Q_EXPORT TQMovie { +class TQ_EXPORT TQMovie { public: TQMovie(); TQMovie(int bufsize); diff --git a/doc/html/qmultilineedit-h.html b/doc/html/qmultilineedit-h.html index 74a310115..63eae7b6c 100644 --- a/doc/html/qmultilineedit-h.html +++ b/doc/html/qmultilineedit-h.html @@ -87,7 +87,7 @@ class TQMultiLineEditCommand; class TQValidator; class TQMultiLineEditData; -class Q_EXPORT TQMultiLineEdit : public TQTextEdit +class TQ_EXPORT TQMultiLineEdit : public TQTextEdit { TQ_OBJECT TQ_PROPERTY( int numLines READ numLines ) diff --git a/doc/html/qmutex-h.html b/doc/html/qmutex-h.html index c811e5a3a..8f9eba58e 100644 --- a/doc/html/qmutex-h.html +++ b/doc/html/qmutex-h.html @@ -88,7 +88,7 @@ class TQMutexPrivate; const int Q_MUTEX_NORMAL = 0; const int Q_MUTEX_RECURSIVE = 1; -class Q_EXPORT TQMutex +class TQ_EXPORT TQMutex { friend class TQThread; friend class TQWaitCondition; @@ -112,7 +112,7 @@ private: #endif }; -class Q_EXPORT TQMutexLocker +class TQ_EXPORT TQMutexLocker { public: TQMutexLocker( TQMutex * ); diff --git a/doc/html/qnamespace-h.html b/doc/html/qnamespace-h.html index 716aa236e..8205a989c 100644 --- a/doc/html/qnamespace-h.html +++ b/doc/html/qnamespace-h.html @@ -86,7 +86,7 @@ class TQColor; class TQCursor; -class Q_EXPORT TQt { +class TQ_EXPORT TQt { public: QT_STATIC_CONST TQColor & color0; QT_STATIC_CONST TQColor & color1; @@ -942,7 +942,7 @@ public: }; -class Q_EXPORT TQInternal { +class TQ_EXPORT TQInternal { public: enum PaintDeviceFlags { UndefinedDevice = 0x00, diff --git a/doc/html/qnetworkprotocol-h.html b/doc/html/qnetworkprotocol-h.html index 060a24447..4f6ee9960 100644 --- a/doc/html/qnetworkprotocol-h.html +++ b/doc/html/qnetworkprotocol-h.html @@ -97,7 +97,7 @@ class TQUrlOperator; class TQNetworkProtocolPrivate; template <class T> class TQValueList; -class Q_EXPORT TQNetworkProtocolFactoryBase +class TQ_EXPORT TQNetworkProtocolFactoryBase { public: virtual TQNetworkProtocol *createObject() = 0; @@ -116,7 +116,7 @@ public: typedef TQDict< TQNetworkProtocolFactoryBase > TQNetworkProtocolDict; -class Q_EXPORT TQNetworkProtocol : public TQObject +class TQ_EXPORT TQNetworkProtocol : public TQObject { TQ_OBJECT @@ -232,7 +232,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/doc/html/qobject-h.html b/doc/html/qobject-h.html index e53fb992d..2fd448345 100644 --- a/doc/html/qobject-h.html +++ b/doc/html/qobject-h.html @@ -99,7 +99,7 @@ class TQObjectUserData; #endif struct TQUObject; -class Q_EXPORT TQObject: public TQt +class TQ_EXPORT TQObject: public TQt { TQ_OBJECT TQ_PROPERTY( TQCString name READ name WRITE setName ) @@ -254,7 +254,7 @@ private: // Disabled copy constructor and operator= #ifndef TQT_NO_USERDATA -class Q_EXPORT TQObjectUserData { +class TQ_EXPORT TQObjectUserData { public: virtual ~TQObjectUserData(); }; diff --git a/doc/html/qobjectcleanuphandler-h.html b/doc/html/qobjectcleanuphandler-h.html index 1deec7de6..577916574 100644 --- a/doc/html/qobjectcleanuphandler-h.html +++ b/doc/html/qobjectcleanuphandler-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } class TQObjectList; -class Q_EXPORT TQObjectCleanupHandler : public TQObject +class TQ_EXPORT TQObjectCleanupHandler : public TQObject { TQ_OBJECT diff --git a/doc/html/qobjectlist-h.html b/doc/html/qobjectlist-h.html index 64d83da62..38917d656 100644 --- a/doc/html/qobjectlist-h.html +++ b/doc/html/qobjectlist-h.html @@ -84,12 +84,12 @@ body { background: #ffffff; color: black; } #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>() {} @@ -99,7 +99,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 ) @@ -109,7 +109,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/doc/html/qpaintdevice-h.html b/doc/html/qpaintdevice-h.html index b25d9f77a..9fff8419c 100644 --- a/doc/html/qpaintdevice-h.html +++ b/doc/html/qpaintdevice-h.html @@ -117,7 +117,7 @@ union TQPDevCmdParam { -class Q_EXPORT TQPaintDevice // device for TQPainter +class TQ_EXPORT TQPaintDevice // device for TQPainter { public: virtual ~TQPaintDevice(); @@ -282,10 +282,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 @@ -327,12 +327,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 ); @@ -340,7 +340,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; @@ -442,7 +442,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/doc/html/qpaintdevicemetrics-h.html b/doc/html/qpaintdevicemetrics-h.html index 10039d5da..f58e87de3 100644 --- a/doc/html/qpaintdevicemetrics-h.html +++ b/doc/html/qpaintdevicemetrics-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQPaintDeviceMetrics // paint device metrics +class TQ_EXPORT TQPaintDeviceMetrics // paint device metrics { public: TQPaintDeviceMetrics( const TQPaintDevice * ); diff --git a/doc/html/qpainter-h.html b/doc/html/qpainter-h.html index b3ec77851..830386e08 100644 --- a/doc/html/qpainter-h.html +++ b/doc/html/qpainter-h.html @@ -103,7 +103,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/doc/html/qpalette-h.html b/doc/html/qpalette-h.html index 5ae3ef1d1..ccedcc6b5 100644 --- a/doc/html/qpalette-h.html +++ b/doc/html/qpalette-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } class TQColorGroupPrivate; -class Q_EXPORT TQColorGroup +class TQ_EXPORT TQColorGroup { public: TQColorGroup(); @@ -146,7 +146,7 @@ private: }; -class Q_EXPORT TQPalette +class TQ_EXPORT TQPalette { public: TQPalette(); @@ -208,11 +208,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/doc/html/qpen-h.html b/doc/html/qpen-h.html index f7b0cf46b..5d538994d 100644 --- a/doc/html/qpen-h.html +++ b/doc/html/qpen-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQPen: public TQt +class TQ_EXPORT TQPen: public TQt { public: TQPen(); @@ -131,8 +131,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/doc/html/qpicture-h.html b/doc/html/qpicture-h.html index d357c5321..aad815cc3 100644 --- a/doc/html/qpicture-h.html +++ b/doc/html/qpicture-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #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 ); @@ -109,8 +109,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 * ); @@ -155,8 +155,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/doc/html/qpixmap-h.html b/doc/html/qpixmap-h.html index 8a6a6618b..b8f8654d9 100644 --- a/doc/html/qpixmap-h.html +++ b/doc/html/qpixmap-h.html @@ -93,7 +93,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 }; @@ -283,13 +283,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 ); @@ -366,8 +366,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 /***************************************************************************** @@ -383,7 +383,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/doc/html/qpixmapcache-h.html b/doc/html/qpixmapcache-h.html index 9a349f64a..5459bb67d 100644 --- a/doc/html/qpixmapcache-h.html +++ b/doc/html/qpixmapcache-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQPixmapCache // global pixmap cache +class TQ_EXPORT TQPixmapCache // global pixmap cache { public: static int cacheLimit(); diff --git a/doc/html/qplatinumstyle-h.html b/doc/html/qplatinumstyle-h.html index 420dc72a1..012aeb73e 100644 --- a/doc/html/qplatinumstyle-h.html +++ b/doc/html/qplatinumstyle-h.html @@ -88,7 +88,7 @@ class TQPalette; #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_PLATINUM #else -#define Q_EXPORT_STYLE_PLATINUM Q_EXPORT +#define Q_EXPORT_STYLE_PLATINUM TQ_EXPORT #endif class Q_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle diff --git a/doc/html/qpngio-h.html b/doc/html/qpngio-h.html index 912d1c5a5..c57f94e3c 100644 --- a/doc/html/qpngio-h.html +++ b/doc/html/qpngio-h.html @@ -89,7 +89,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/doc/html/qpoint-h.html b/doc/html/qpoint-h.html index f1e7d8442..64283b127 100644 --- a/doc/html/qpoint-h.html +++ b/doc/html/qpoint-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQPoint +class TQ_EXPORT TQPoint { public: TQPoint(); @@ -136,8 +136,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/doc/html/qpointarray-h.html b/doc/html/qpointarray-h.html index fa7642845..a0a919a61 100644 --- a/doc/html/qpointarray-h.html +++ b/doc/html/qpointarray-h.html @@ -84,10 +84,10 @@ body { background: #ffffff; color: black; } #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() {} @@ -137,8 +137,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/doc/html/qpopupmenu-h.html b/doc/html/qpopupmenu-h.html index 796e3dcf3..cd6be761d 100644 --- a/doc/html/qpopupmenu-h.html +++ b/doc/html/qpopupmenu-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_POPUPMENU class TQPopupMenuPrivate; -class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData +class TQ_EXPORT TQPopupMenu : public TQFrame, public TQMenuData { TQ_OBJECT TQ_PROPERTY( bool checkable READ isCheckable WRITE setCheckable ) diff --git a/doc/html/qprinter-h.html b/doc/html/qprinter-h.html index f5ecfcb07..986c90f4c 100644 --- a/doc/html/qprinter-h.html +++ b/doc/html/qprinter-h.html @@ -91,7 +91,7 @@ body { background: #ffffff; color: black; } class TQPrinterPrivate; -class Q_EXPORT TQPrinter : public TQPaintDevice +class TQ_EXPORT TQPrinter : public TQPaintDevice { public: enum PrinterMode { ScreenResolution, PrinterResolution, HighResolution, Compatible }; diff --git a/doc/html/qprocess-h.html b/doc/html/qprocess-h.html index 67a39f400..08956f927 100644 --- a/doc/html/qprocess-h.html +++ b/doc/html/qprocess-h.html @@ -89,7 +89,7 @@ class TQProcessPrivate; class TQMembuf; -class Q_EXPORT TQProcess : public TQObject +class TQ_EXPORT TQProcess : public TQObject { TQ_OBJECT public: diff --git a/doc/html/qprogressbar-h.html b/doc/html/qprogressbar-h.html index d7facb641..e243515c2 100644 --- a/doc/html/qprogressbar-h.html +++ b/doc/html/qprogressbar-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQProgressBarPrivate; -class Q_EXPORT TQProgressBar : public TQFrame +class TQ_EXPORT TQProgressBar : public TQFrame { TQ_OBJECT TQ_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps ) diff --git a/doc/html/qprogressdialog-h.html b/doc/html/qprogressdialog-h.html index b86a9c247..6c849f0eb 100644 --- a/doc/html/qprogressdialog-h.html +++ b/doc/html/qprogressdialog-h.html @@ -88,7 +88,7 @@ class TQPushButton; class TQTimer; class TQProgressDialogData; -class Q_EXPORT TQProgressDialog : public TQDialog +class TQ_EXPORT TQProgressDialog : public TQDialog { TQ_OBJECT TQ_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0 diff --git a/doc/html/qptrcollection-h.html b/doc/html/qptrcollection-h.html index e3cc0519a..de63bc4f5 100644 --- a/doc/html/qptrcollection-h.html +++ b/doc/html/qptrcollection-h.html @@ -85,7 +85,7 @@ class TQGList; class TQGDict; -class Q_EXPORT TQPtrCollection // inherited by all collections +class TQ_EXPORT TQPtrCollection // inherited by all collections { public: bool autoDelete() const { return del_item; } diff --git a/doc/html/qpushbutton-h.html b/doc/html/qpushbutton-h.html index d3c85b509..386246c91 100644 --- a/doc/html/qpushbutton-h.html +++ b/doc/html/qpushbutton-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } class TQPushButtonPrivate; class TQPopupMenu; -class Q_EXPORT TQPushButton : public TQButton +class TQ_EXPORT TQPushButton : public TQButton { TQ_OBJECT diff --git a/doc/html/qradiobutton-h.html b/doc/html/qradiobutton-h.html index dcd55c0f9..9a8880fb8 100644 --- a/doc/html/qradiobutton-h.html +++ b/doc/html/qradiobutton-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_RADIOBUTTON -class Q_EXPORT TQRadioButton : public TQButton +class TQ_EXPORT TQRadioButton : public TQButton { TQ_OBJECT TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) diff --git a/doc/html/qrangecontrol-h.html b/doc/html/qrangecontrol-h.html index 6d4ea8b21..04702a5d2 100644 --- a/doc/html/qrangecontrol-h.html +++ b/doc/html/qrangecontrol-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } class TQRangeControlPrivate; -class Q_EXPORT TQRangeControl +class TQ_EXPORT TQRangeControl { public: TQRangeControl(); @@ -163,7 +163,7 @@ inline int TQRangeControl::pageStep() const #ifndef TQT_NO_SPINWIDGET class TQSpinWidgetPrivate; -class Q_EXPORT TQSpinWidget : public TQWidget +class TQ_EXPORT TQSpinWidget : public TQWidget { TQ_OBJECT public: diff --git a/doc/html/qrect-h.html b/doc/html/qrect-h.html index 80cd610c2..3aabb89de 100644 --- a/doc/html/qrect-h.html +++ b/doc/html/qrect-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } // 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; } @@ -167,8 +167,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) @@ -187,16 +187,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/doc/html/qregexp-h.html b/doc/html/qregexp-h.html index 3df950356..5112c2b0e 100644 --- a/doc/html/qregexp-h.html +++ b/doc/html/qregexp-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQRegExpEngine; struct TQRegExpPrivate; -class Q_EXPORT TQRegExp +class TQ_EXPORT TQRegExp { public: enum CaretMode { CaretAtZero, CaretAtOffset, CaretWontMatch }; diff --git a/doc/html/qregion-h.html b/doc/html/qregion-h.html index f17432a4d..a1e565420 100644 --- a/doc/html/qregion-h.html +++ b/doc/html/qregion-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } struct TQRegionPrivate; #endif -class Q_EXPORT TQRegion +class TQ_EXPORT TQRegion { public: enum RegionType { Rectangle, Ellipse }; @@ -144,8 +144,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 ); @@ -205,8 +205,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/doc/html/qrtlcodec-h.html b/doc/html/qrtlcodec-h.html index 9b99ec993..bdfc830ca 100644 --- a/doc/html/qrtlcodec-h.html +++ b/doc/html/qrtlcodec-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_CODEC_HEBREW -class Q_EXPORT TQHebrewCodec : public TQTextCodec { +class TQ_EXPORT TQHebrewCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/qscrollbar-h.html b/doc/html/qscrollbar-h.html index bb6fa8431..02d1bff7b 100644 --- a/doc/html/qscrollbar-h.html +++ b/doc/html/qscrollbar-h.html @@ -86,7 +86,7 @@ class TQTimer; #ifndef TQT_NO_SCROLLBAR -class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl +class TQ_EXPORT TQScrollBar : public TQWidget, public TQRangeControl { TQ_OBJECT TQ_PROPERTY( int minValue READ minValue WRITE setMinValue ) diff --git a/doc/html/qscrollview-h.html b/doc/html/qscrollview-h.html index 967f37e7d..3bd7016d0 100644 --- a/doc/html/qscrollview-h.html +++ b/doc/html/qscrollview-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQScrollViewData; -class Q_EXPORT TQScrollView : public TQFrame +class TQ_EXPORT TQScrollView : public TQFrame { TQ_OBJECT TQ_ENUMS( ResizePolicy ScrollBarMode ) diff --git a/doc/html/qsemaphore-h.html b/doc/html/qsemaphore-h.html index 25bb2dd92..a80c1de15 100644 --- a/doc/html/qsemaphore-h.html +++ b/doc/html/qsemaphore-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQSemaphorePrivate; -class Q_EXPORT TQSemaphore +class TQ_EXPORT TQSemaphore { public: TQSemaphore( int ); diff --git a/doc/html/qserversocket-h.html b/doc/html/qserversocket-h.html index 36ce1f7b6..84e414c37 100644 --- a/doc/html/qserversocket-h.html +++ b/doc/html/qserversocket-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK #else -#define TQM_EXPORT_NETWORK Q_EXPORT +#define TQM_EXPORT_NETWORK TQ_EXPORT #endif class TQServerSocketPrivate; diff --git a/doc/html/qsessionmanager-h.html b/doc/html/qsessionmanager-h.html index 6a5921861..0722c9533 100644 --- a/doc/html/qsessionmanager-h.html +++ b/doc/html/qsessionmanager-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } 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/doc/html/qsettings-h.html b/doc/html/qsettings-h.html index 9c77f7ef5..676a9f821 100644 --- a/doc/html/qsettings-h.html +++ b/doc/html/qsettings-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQSettingsPrivate; -class Q_EXPORT TQSettings +class TQ_EXPORT TQSettings { public: enum Format { diff --git a/doc/html/qsgistyle-h.html b/doc/html/qsgistyle-h.html index d7c063f5f..73a6b98d1 100644 --- a/doc/html/qsgistyle-h.html +++ b/doc/html/qsgistyle-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_SGI #else -#define Q_EXPORT_STYLE_SGI Q_EXPORT +#define Q_EXPORT_STYLE_SGI TQ_EXPORT #endif class TQSGIStylePrivate; diff --git a/doc/html/qsignal-h.html b/doc/html/qsignal-h.html index 82e664d5c..d35b946bc 100644 --- a/doc/html/qsignal-h.html +++ b/doc/html/qsignal-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQSignal : public TQObject +class TQ_EXPORT TQSignal : public TQObject { TQ_OBJECT diff --git a/doc/html/qsignalmapper-h.html b/doc/html/qsignalmapper-h.html index f0e574ddd..b2398b11e 100644 --- a/doc/html/qsignalmapper-h.html +++ b/doc/html/qsignalmapper-h.html @@ -85,7 +85,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/doc/html/qsimplerichtext-h.html b/doc/html/qsimplerichtext-h.html index 3db84db39..5fec9cf84 100644 --- a/doc/html/qsimplerichtext-h.html +++ b/doc/html/qsimplerichtext-h.html @@ -92,7 +92,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/doc/html/qsize-h.html b/doc/html/qsize-h.html index 2484d3abd..bb58605ae 100644 --- a/doc/html/qsize-h.html +++ b/doc/html/qsize-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #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: @@ -144,8 +144,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/doc/html/qsizegrip-h.html b/doc/html/qsizegrip-h.html index fa1f1234e..0aa973d66 100644 --- a/doc/html/qsizegrip-h.html +++ b/doc/html/qsizegrip-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_SIZEGRIP -class Q_EXPORT TQSizeGrip: public TQWidget +class TQ_EXPORT TQSizeGrip: public TQWidget { TQ_OBJECT public: diff --git a/doc/html/qsizepolicy-h.html b/doc/html/qsizepolicy-h.html index 20e171641..14e5c9652 100644 --- a/doc/html/qsizepolicy-h.html +++ b/doc/html/qsizepolicy-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } // 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/doc/html/qsjiscodec-h.html b/doc/html/qsjiscodec-h.html index c209770df..e0f3789fc 100644 --- a/doc/html/qsjiscodec-h.html +++ b/doc/html/qsjiscodec-h.html @@ -116,7 +116,7 @@ body { background: #ffffff; color: black; } #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP Q_EXPORT +#define Q_EXPORT_CODECS_JP TQ_EXPORT #endif class Q_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { diff --git a/doc/html/qslider-h.html b/doc/html/qslider-h.html index bca498b70..909fd6194 100644 --- a/doc/html/qslider-h.html +++ b/doc/html/qslider-h.html @@ -88,7 +88,7 @@ struct TQSliderPrivate; class TQTimer; -class Q_EXPORT TQSlider : public TQWidget, public TQRangeControl +class TQ_EXPORT TQSlider : public TQWidget, public TQRangeControl { TQ_OBJECT TQ_ENUMS( TickSetting ) diff --git a/doc/html/qsocket-h.html b/doc/html/qsocket-h.html index fcdddeb8e..1ccd6e3f1 100644 --- a/doc/html/qsocket-h.html +++ b/doc/html/qsocket-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK #else -#define TQM_EXPORT_NETWORK Q_EXPORT +#define TQM_EXPORT_NETWORK TQ_EXPORT #endif #ifndef TQT_NO_NETWORK diff --git a/doc/html/qsocketdevice-h.html b/doc/html/qsocketdevice-h.html index 697e1abe0..1816f2531 100644 --- a/doc/html/qsocketdevice-h.html +++ b/doc/html/qsocketdevice-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK #else -#define TQM_EXPORT_NETWORK Q_EXPORT +#define TQM_EXPORT_NETWORK TQ_EXPORT #endif #ifndef TQT_NO_NETWORK diff --git a/doc/html/qsocketnotifier-h.html b/doc/html/qsocketnotifier-h.html index 3e501718e..ad9a3bb68 100644 --- a/doc/html/qsocketnotifier-h.html +++ b/doc/html/qsocketnotifier-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQSocketNotifier : public TQObject +class TQ_EXPORT TQSocketNotifier : public TQObject { TQ_OBJECT public: diff --git a/doc/html/qsound-h.html b/doc/html/qsound-h.html index 7f9c5e886..d7d0632fb 100644 --- a/doc/html/qsound-h.html +++ b/doc/html/qsound-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } class TQSoundData; -class Q_EXPORT TQSound : public TQObject { +class TQ_EXPORT TQSound : public TQObject { TQ_OBJECT public: static bool isAvailable(); diff --git a/doc/html/qspinbox-h.html b/doc/html/qspinbox-h.html index d74e72159..edc115f27 100644 --- a/doc/html/qspinbox-h.html +++ b/doc/html/qspinbox-h.html @@ -88,7 +88,7 @@ class TQLineEdit; class TQValidator; class TQSpinBoxPrivate; -class Q_EXPORT TQSpinBox: public TQWidget, public TQRangeControl +class TQ_EXPORT TQSpinBox: public TQWidget, public TQRangeControl { TQ_OBJECT TQ_ENUMS( ButtonSymbols ) diff --git a/doc/html/qsplashscreen-h.html b/doc/html/qsplashscreen-h.html index f4670f7f1..2abc16774 100644 --- a/doc/html/qsplashscreen-h.html +++ b/doc/html/qsplashscreen-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_SPLASHSCREEN class TQSplashScreenPrivate; -class Q_EXPORT TQSplashScreen : public TQWidget +class TQ_EXPORT TQSplashScreen : public TQWidget { TQ_OBJECT public: diff --git a/doc/html/qsplitter-h.html b/doc/html/qsplitter-h.html index 3e17e13a3..01e61ef0f 100644 --- a/doc/html/qsplitter-h.html +++ b/doc/html/qsplitter-h.html @@ -89,7 +89,7 @@ class TQSplitterPrivate; class TQSplitterLayoutStruct; class TQTextStream; -class Q_EXPORT TQSplitter : public TQFrame +class TQ_EXPORT TQSplitter : public TQFrame { TQ_OBJECT TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) @@ -184,8 +184,8 @@ private: friend class TQSplitterHandle; #ifndef TQT_NO_TEXTSTREAM - friend Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); - friend Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); + friend TQ_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); + friend TQ_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); #endif private: @@ -196,8 +196,8 @@ private: }; #ifndef TQT_NO_TEXTSTREAM -Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); -Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); +TQ_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); +TQ_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); #endif #endif // TQT_NO_SPLITTER diff --git a/doc/html/qsql-h.html b/doc/html/qsql-h.html index 86dde02e7..c6aefa61d 100644 --- a/doc/html/qsql-h.html +++ b/doc/html/qsql-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/doc/html/qsqlcursor-h.html b/doc/html/qsqlcursor-h.html index 577df0e67..1378a70ab 100644 --- a/doc/html/qsqlcursor-h.html +++ b/doc/html/qsqlcursor-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/doc/html/qsqldatabase-h.html b/doc/html/qsqldatabase-h.html index 83dd396f2..e89c2d5d2 100644 --- a/doc/html/qsqldatabase-h.html +++ b/doc/html/qsqldatabase-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/doc/html/qsqldriver-h.html b/doc/html/qsqldriver-h.html index 1c221ab33..f322d74ed 100644 --- a/doc/html/qsqldriver-h.html +++ b/doc/html/qsqldriver-h.html @@ -91,7 +91,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/doc/html/qsqldriverplugin-h.html b/doc/html/qsqldriverplugin-h.html index 963731623..442a23fa7 100644 --- a/doc/html/qsqldriverplugin-h.html +++ b/doc/html/qsqldriverplugin-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } class TQSqlDriver; class TQSqlDriverPluginPrivate; -class Q_EXPORT TQSqlDriverPlugin : public TQGPlugin +class TQ_EXPORT TQSqlDriverPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/doc/html/qsqleditorfactory-h.html b/doc/html/qsqleditorfactory-h.html index 2f6a63cdb..cd1185ef8 100644 --- a/doc/html/qsqleditorfactory-h.html +++ b/doc/html/qsqleditorfactory-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_EDIT_WIDGETS diff --git a/doc/html/qsqlerror-h.html b/doc/html/qsqlerror-h.html index 0dda255a7..4b1a2bdf6 100644 --- a/doc/html/qsqlerror-h.html +++ b/doc/html/qsqlerror-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/doc/html/qsqlfield-h.html b/doc/html/qsqlfield-h.html index c4fec20bf..b7b6365cd 100644 --- a/doc/html/qsqlfield-h.html +++ b/doc/html/qsqlfield-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/doc/html/qsqlform-h.html b/doc/html/qsqlform-h.html index 87cac2b77..182b5e754 100644 --- a/doc/html/qsqlform-h.html +++ b/doc/html/qsqlform-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_FORM diff --git a/doc/html/qsqlindex-h.html b/doc/html/qsqlindex-h.html index 18fe46b21..ecc1b1969 100644 --- a/doc/html/qsqlindex-h.html +++ b/doc/html/qsqlindex-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL #define TQM_TEMPLATE_EXTERN_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #define TQM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN #endif diff --git a/doc/html/qsqlpropertymap-h.html b/doc/html/qsqlpropertymap-h.html index 7d7439983..299e5ee5f 100644 --- a/doc/html/qsqlpropertymap-h.html +++ b/doc/html/qsqlpropertymap-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } class TQWidget; class TQSqlPropertyMapPrivate; -class Q_EXPORT TQSqlPropertyMap { +class TQ_EXPORT TQSqlPropertyMap { public: TQSqlPropertyMap(); virtual ~TQSqlPropertyMap(); diff --git a/doc/html/qsqlquery-h.html b/doc/html/qsqlquery-h.html index 9d3161d16..9aa878f5d 100644 --- a/doc/html/qsqlquery-h.html +++ b/doc/html/qsqlquery-h.html @@ -92,7 +92,7 @@ class TQSqlDriver; class TQSqlResult; class TQSqlDatabase; -class Q_EXPORT TQSqlResultShared : public TQObject, public TQShared +class TQ_EXPORT TQSqlResultShared : public TQObject, public TQShared { TQ_OBJECT public: @@ -104,7 +104,7 @@ private slots: void slotResultDestroyed(); }; -class Q_EXPORT TQSqlQuery +class TQ_EXPORT TQSqlQuery { public: TQSqlQuery( TQSqlResult * r ); diff --git a/doc/html/qsqlrecord-h.html b/doc/html/qsqlrecord-h.html index 430200fca..f6c74f6f3 100644 --- a/doc/html/qsqlrecord-h.html +++ b/doc/html/qsqlrecord-h.html @@ -97,7 +97,7 @@ public: TQSqlRecordPrivate* d; }; -class Q_EXPORT TQSqlRecord +class TQ_EXPORT TQSqlRecord { public: TQSqlRecord(); @@ -152,13 +152,13 @@ private: #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQSqlFieldInfo>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQSqlFieldInfo>; // MOC_SKIP_END #endif typedef TQValueList<TQSqlFieldInfo> TQSqlFieldInfoList; -class Q_EXPORT TQSqlRecordInfo: public TQSqlFieldInfoList +class TQ_EXPORT TQSqlRecordInfo: public TQSqlFieldInfoList { public: TQSqlRecordInfo(): TQSqlFieldInfoList() {} diff --git a/doc/html/qsqlresult-h.html b/doc/html/qsqlresult-h.html index 50980a7b3..58d32909a 100644 --- a/doc/html/qsqlresult-h.html +++ b/doc/html/qsqlresult-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/doc/html/qsqlselectcursor-h.html b/doc/html/qsqlselectcursor-h.html index be80501b7..0f96650e4 100644 --- a/doc/html/qsqlselectcursor-h.html +++ b/doc/html/qsqlselectcursor-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/doc/html/qstatusbar-h.html b/doc/html/qstatusbar-h.html index c7ba0b143..41f2087d4 100644 --- a/doc/html/qstatusbar-h.html +++ b/doc/html/qstatusbar-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQStatusBarPrivate; -class Q_EXPORT TQStatusBar: public TQWidget +class TQ_EXPORT TQStatusBar: public TQWidget { TQ_OBJECT TQ_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled ) diff --git a/doc/html/qstring-h.html b/doc/html/qstring-h.html index 272e62586..1c566e581 100644 --- a/doc/html/qstring-h.html +++ b/doc/html/qstring-h.html @@ -109,7 +109,7 @@ class TQString; class TQCharRef; template <class T> class TQDeepCopy; -class Q_EXPORT TQChar { +class TQ_EXPORT TQChar { public: TQChar(); TQChar( char c ); @@ -394,7 +394,7 @@ inline bool operator>( char ch, TQChar c ) { return !(c>=ch); } inline bool operator>( TQChar c1, TQChar c2 ) { return !(c2>=c1); } // internal -struct Q_EXPORT TQStringData : public TQShared { +struct TQ_EXPORT TQStringData : public TQShared { TQStringData() : TQShared(), unicode(0), ascii(0), len(0), issimpletext(TRUE), maxl(0), islatin1(FALSE) { ref(); } TQStringData(TQChar *u, uint l, uint m) : @@ -433,7 +433,7 @@ private: }; -class Q_EXPORT TQString +class TQ_EXPORT TQString { public: TQString(); // make null string @@ -723,7 +723,7 @@ public: { return s1.localeAwareCompare( s2 ); } #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif void compose(); @@ -789,7 +789,7 @@ private: friend class TQDeepCopy<TQString>; }; -class Q_EXPORT TQCharRef { +class TQ_EXPORT TQCharRef { friend class TQString; TQString& s; uint p; @@ -849,7 +849,7 @@ inline TQCharRef TQString::at( uint i ) { return TQCharRef(this,i); } inline TQCharRef TQString::operator[]( int i ) { return at((uint)i); } -class Q_EXPORT TQConstString : private TQString { +class TQ_EXPORT TQConstString : private TQString { public: TQConstString( const TQChar* unicode, uint length ); ~TQConstString(); @@ -861,8 +861,8 @@ public: TQString stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif /***************************************************************************** @@ -1050,28 +1050,28 @@ inline int TQString::findRev( const char* str, int index ) const TQString non-member operators *****************************************************************************/ -Q_EXPORT bool operator!=( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator<( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator<=( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator==( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator>( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator>=( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator!=( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator<( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator<=( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator==( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator>( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator>=( const TQString &s1, const TQString &s2 ); #ifndef TQT_NO_CAST_ASCII -Q_EXPORT bool operator!=( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator<( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator<=( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator==( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator>( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator>=( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator!=( const char *s1, const TQString &s2 ); -Q_EXPORT bool operator<( const char *s1, const TQString &s2 ); -Q_EXPORT bool operator<=( const char *s1, const TQString &s2 ); -Q_EXPORT bool operator==( const char *s1, const TQString &s2 ); -//Q_EXPORT bool operator>( const char *s1, const TQString &s2 ); // MSVC++ -Q_EXPORT bool operator>=( const char *s1, const TQString &s2 ); -#endif - -Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 ) +TQ_EXPORT bool operator!=( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator<( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator<=( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator==( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator>( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator>=( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator!=( const char *s1, const TQString &s2 ); +TQ_EXPORT bool operator<( const char *s1, const TQString &s2 ); +TQ_EXPORT bool operator<=( const char *s1, const TQString &s2 ); +TQ_EXPORT bool operator==( const char *s1, const TQString &s2 ); +//TQ_EXPORT bool operator>( const char *s1, const TQString &s2 ); // MSVC++ +TQ_EXPORT bool operator>=( const char *s1, const TQString &s2 ); +#endif + +TQ_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 ) { TQString tmp( s1 ); tmp += s2; @@ -1079,14 +1079,14 @@ Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString } #ifndef TQT_NO_CAST_ASCII -Q_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 ) +TQ_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 ) { TQString tmp( s1 ); tmp += TQString::fromAscii(s2); return tmp; } -Q_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 ) +TQ_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 ) { TQString tmp = TQString::fromAscii( s1 ); tmp += s2; @@ -1094,21 +1094,21 @@ Q_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 } #endif -Q_EXPORT inline const TQString operator+( const TQString &s1, TQChar c2 ) +TQ_EXPORT inline const TQString operator+( const TQString &s1, TQChar c2 ) { TQString tmp( s1 ); tmp += c2; return tmp; } -Q_EXPORT inline const TQString operator+( const TQString &s1, char c2 ) +TQ_EXPORT inline const TQString operator+( const TQString &s1, char c2 ) { TQString tmp( s1 ); tmp += c2; return tmp; } -Q_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 ) +TQ_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 ) { TQString tmp; tmp += c1; @@ -1116,7 +1116,7 @@ Q_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 ) return tmp; } -Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) +TQ_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) { TQString tmp; tmp += c1; @@ -1125,12 +1125,12 @@ Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) } #ifndef TQT_NO_STL -Q_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2) +TQ_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2) { return s1 + TQString(s2); } -Q_EXPORT inline const TQString operator+(const std::string& s1, const TQString& s2) +TQ_EXPORT inline const TQString operator+(const std::string& s1, const TQString& s2) { TQString tmp(s2); return TQString(tmp.prepend(s1)); @@ -1139,11 +1139,11 @@ Q_EXPORT inline const TQString operator+(const std::string& s1, const TQStri #if defined(Q_OS_WIN32) -extern Q_EXPORT TQString qt_winTQString(void*); -extern Q_EXPORT const void* qt_winTchar(const TQString& str, bool addnul); -extern Q_EXPORT void* qt_winTchar_new(const TQString& str); -extern Q_EXPORT TQCString qt_winTQString2MB( const TQString& s, int len=-1 ); -extern Q_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 ); +extern TQ_EXPORT TQString qt_winTQString(void*); +extern TQ_EXPORT const void* qt_winTchar(const TQString& str, bool addnul); +extern TQ_EXPORT void* qt_winTchar_new(const TQString& str); +extern TQ_EXPORT TQCString qt_winTQString2MB( const TQString& s, int len=-1 ); +extern TQ_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 ); #endif #define Q_DEFINED_QSTRING diff --git a/doc/html/qstringlist-h.html b/doc/html/qstringlist-h.html index 90b19186b..3b7fe84d5 100644 --- a/doc/html/qstringlist-h.html +++ b/doc/html/qstringlist-h.html @@ -90,11 +90,11 @@ template <class T> class TQDeepCopy; #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQString>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQString>; // MOC_SKIP_END #endif -class Q_EXPORT TQStringList : public TQValueList<TQString> +class TQ_EXPORT TQStringList : public TQValueList<TQString> { public: TQStringList() { } @@ -134,8 +134,8 @@ protected: #ifndef TQT_NO_DATASTREAM class TQDataStream; -extern Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQStringList& ); -extern Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQStringList& ); +extern TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQStringList& ); +extern TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQStringList& ); #endif #endif // TQT_NO_STRINGLIST diff --git a/doc/html/qstrlist-h.html b/doc/html/qstrlist-h.html index 5de07fcf5..4624cfca1 100644 --- a/doc/html/qstrlist-h.html +++ b/doc/html/qstrlist-h.html @@ -91,7 +91,7 @@ class TQStrListIterator : public TQPtrListIterator<char> typedef TQPtrListIterator<char> TQStrListIterator; #endif -class Q_EXPORT TQStrList : public TQPtrList<char> +class TQ_EXPORT TQStrList : public TQPtrList<char> { public: TQStrList( bool deepCopies=TRUE ) { dc = deepCopies; del_item = deepCopies; } @@ -114,7 +114,7 @@ private: }; -class Q_EXPORT TQStrIList : public TQStrList // case insensitive string list +class TQ_EXPORT TQStrIList : public TQStrList // case insensitive string list { public: TQStrIList( bool deepCopies=TRUE ) : TQStrList( deepCopies ) {} diff --git a/doc/html/qstyle-h.html b/doc/html/qstyle-h.html index 8f8fa19da..e5248ea17 100644 --- a/doc/html/qstyle-h.html +++ b/doc/html/qstyle-h.html @@ -157,7 +157,7 @@ private: class TQStyleHintReturn; // not defined yet -class Q_EXPORT TQStyle: public TQObject +class TQ_EXPORT TQStyle: public TQObject { TQ_OBJECT diff --git a/doc/html/qstylefactory-h.html b/doc/html/qstylefactory-h.html index daa18ddc8..9f4066f8f 100644 --- a/doc/html/qstylefactory-h.html +++ b/doc/html/qstylefactory-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } class TQString; class TQStyle; -class Q_EXPORT TQStyleFactory +class TQ_EXPORT TQStyleFactory { public: #ifndef TQT_NO_STRINGLIST diff --git a/doc/html/qstyleplugin-h.html b/doc/html/qstyleplugin-h.html index a80b1ea81..33329a5e2 100644 --- a/doc/html/qstyleplugin-h.html +++ b/doc/html/qstyleplugin-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } class TQStyle; class TQStylePluginPrivate; -class Q_EXPORT TQStylePlugin : public TQGPlugin +class TQ_EXPORT TQStylePlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/doc/html/qstylesheet-h.html b/doc/html/qstylesheet-h.html index 0cfa5e2ef..03e40160f 100644 --- a/doc/html/qstylesheet-h.html +++ b/doc/html/qstylesheet-h.html @@ -92,7 +92,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 ); @@ -230,10 +230,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 @@ -241,7 +241,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQStyleSheetItem::ListS class TQTextCustomItem; #endif -class Q_EXPORT TQStyleSheet : public TQObject +class TQ_EXPORT TQStyleSheet : public TQObject { TQ_OBJECT public: diff --git a/doc/html/qsyntaxhighlighter-h.html b/doc/html/qsyntaxhighlighter-h.html index 7c67186a6..459aeb752 100644 --- a/doc/html/qsyntaxhighlighter-h.html +++ b/doc/html/qsyntaxhighlighter-h.html @@ -88,7 +88,7 @@ class TQSyntaxHighlighterInternal; class TQSyntaxHighlighterPrivate; class TQTextParagraph; -class Q_EXPORT TQSyntaxHighlighter : public TQt +class TQ_EXPORT TQSyntaxHighlighter : public TQt { friend class TQSyntaxHighlighterInternal; diff --git a/doc/html/qtabbar-h.html b/doc/html/qtabbar-h.html index 6ea01f854..3c9ab9489 100644 --- a/doc/html/qtabbar-h.html +++ b/doc/html/qtabbar-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQTabBar; class TQIconSet; -class Q_EXPORT TQTab : public TQt +class TQ_EXPORT TQTab : public TQt { friend class TQTabBar; friend class TQTabWidget; @@ -121,7 +121,7 @@ private: struct TQTabPrivate; //class *TQAccel; -class Q_EXPORT TQTabBar: public TQWidget +class TQ_EXPORT TQTabBar: public TQWidget { TQ_OBJECT TQ_ENUMS( Shape ) diff --git a/doc/html/qtabdialog-h.html b/doc/html/qtabdialog-h.html index 94b665495..e95391a13 100644 --- a/doc/html/qtabdialog-h.html +++ b/doc/html/qtabdialog-h.html @@ -88,7 +88,7 @@ class TQTabBar; class TQTab; class TQTabDialogPrivate; -class Q_EXPORT TQTabDialog : public TQDialog +class TQ_EXPORT TQTabDialog : public TQDialog { TQ_OBJECT public: diff --git a/doc/html/qtable-h.html b/doc/html/qtable-h.html index a49e02bb4..362ba7f62 100644 --- a/doc/html/qtable-h.html +++ b/doc/html/qtable-h.html @@ -98,7 +98,7 @@ body { background: #ffffff; color: black; } # define TQM_TEMPLATE_EXTERN_TABLE #endif #else -#define TQM_EXPORT_TABLE Q_EXPORT +#define TQM_EXPORT_TABLE TQ_EXPORT #define TQM_TEMPLATE_EXTERN_TABLE Q_TEMPLATE_EXTERN #endif diff --git a/doc/html/qtabwidget-h.html b/doc/html/qtabwidget-h.html index 3c7bbef5c..4b938cff9 100644 --- a/doc/html/qtabwidget-h.html +++ b/doc/html/qtabwidget-h.html @@ -90,7 +90,7 @@ class TQTab; class TQWidgetStack; -class Q_EXPORT TQTabWidget : public TQWidget +class TQ_EXPORT TQTabWidget : public TQWidget { TQ_OBJECT TQ_ENUMS( TabPosition ) diff --git a/doc/html/qtextbrowser-h.html b/doc/html/qtextbrowser-h.html index c69ef81eb..65596b236 100644 --- a/doc/html/qtextbrowser-h.html +++ b/doc/html/qtextbrowser-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } class TQTextBrowserData; -class Q_EXPORT TQTextBrowser : public TQTextEdit +class TQ_EXPORT TQTextBrowser : public TQTextEdit { TQ_OBJECT TQ_PROPERTY( TQString source READ source WRITE setSource ) diff --git a/doc/html/qtextcodec-h.html b/doc/html/qtextcodec-h.html index 8cdc20e77..5920e6aa5 100644 --- a/doc/html/qtextcodec-h.html +++ b/doc/html/qtextcodec-h.html @@ -87,19 +87,19 @@ class TQTextCodec; class TQIODevice; class TQFont; -class Q_EXPORT TQTextEncoder { +class TQ_EXPORT TQTextEncoder { public: virtual ~TQTextEncoder(); virtual TQCString fromUnicode(const TQString& uc, int& lenInOut) = 0; }; -class Q_EXPORT TQTextDecoder { +class TQ_EXPORT TQTextDecoder { public: virtual ~TQTextDecoder(); virtual TQString toUnicode(const char* chars, int len) = 0; }; -class Q_EXPORT TQTextCodec { +class TQ_EXPORT TQTextCodec { public: virtual ~TQTextCodec(); diff --git a/doc/html/qtextcodecplugin-h.html b/doc/html/qtextcodecplugin-h.html index bf98ff129..2a9d27a4d 100644 --- a/doc/html/qtextcodecplugin-h.html +++ b/doc/html/qtextcodecplugin-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } class TQTextCodec; class TQTextCodecPluginPrivate; -class Q_EXPORT TQTextCodecPlugin : public TQGPlugin +class TQ_EXPORT TQTextCodecPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/doc/html/qtextedit-h.html b/doc/html/qtextedit-h.html index a22442917..a34a8c4f1 100644 --- a/doc/html/qtextedit-h.html +++ b/doc/html/qtextedit-h.html @@ -168,7 +168,7 @@ public: }; #endif -class Q_EXPORT TQTextEdit : public TQScrollView +class TQ_EXPORT TQTextEdit : public TQScrollView { friend class TQTextBrowser; friend class TQSyntaxHighlighter; @@ -503,7 +503,7 @@ private slots: void clipboardChanged(); private: - struct Q_EXPORT UndoRedoInfo { + struct TQ_EXPORT UndoRedoInfo { enum Type { Invalid, Insert, Delete, Backspace, Return, RemoveSelected, Format, Style, IME }; UndoRedoInfo( TQTextDocument *dc ); diff --git a/doc/html/qtextstream-h.html b/doc/html/qtextstream-h.html index 4240a2c90..f82e70216 100644 --- a/doc/html/qtextstream-h.html +++ b/doc/html/qtextstream-h.html @@ -89,7 +89,7 @@ class TQTextDecoder; class TQTextStreamPrivate; -class Q_EXPORT TQTextStream // text stream class +class TQ_EXPORT TQTextStream // text stream class { public: enum Encoding { Locale, Latin1, Unicode, UnicodeNetworkOrder, @@ -234,7 +234,7 @@ private: // Disabled copy constructor and operator= typedef TQTextStream TQTS; -class Q_EXPORT TQTextIStream : public TQTextStream { +class TQ_EXPORT TQTextIStream : public TQTextStream { public: TQTextIStream( const TQString* s ) : TQTextStream((TQString*)s,IO_ReadOnly) { } @@ -250,7 +250,7 @@ private: // Disabled copy constructor and operator= #endif }; -class Q_EXPORT TQTextOStream : public TQTextStream { +class TQ_EXPORT TQTextOStream : public TQTextStream { public: TQTextOStream( TQString* s ) : TQTextStream(s,IO_WriteOnly) { } @@ -325,7 +325,7 @@ inline TQChar TQTextStream::ts_getc() typedef TQTextStream & (*TQTSFUNC)(TQTextStream &);// manipulator function typedef int (TQTextStream::*TQTSMFI)(int); // manipulator w/int argument -class Q_EXPORT TQTSManip { // text stream manipulator +class TQ_EXPORT TQTSManip { // text stream manipulator public: TQTSManip( TQTSMFI m, int a ) { mf=m; arg=a; } void exec( TQTextStream &s ) { (s.*mf)(arg); } @@ -334,37 +334,37 @@ private: int arg; // member function argument }; -Q_EXPORT inline TQTextStream &operator>>( TQTextStream &s, TQTSFUNC f ) +TQ_EXPORT inline TQTextStream &operator>>( TQTextStream &s, TQTSFUNC f ) { return (*f)( s ); } -Q_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSFUNC f ) +TQ_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSFUNC f ) { return (*f)( s ); } -Q_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSManip m ) +TQ_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSManip m ) { m.exec(s); return s; } -Q_EXPORT TQTextStream &bin( TQTextStream &s ); // set bin notation -Q_EXPORT TQTextStream &oct( TQTextStream &s ); // set oct notation -Q_EXPORT TQTextStream &dec( TQTextStream &s ); // set dec notation -Q_EXPORT TQTextStream &hex( TQTextStream &s ); // set hex notation -Q_EXPORT TQTextStream &endl( TQTextStream &s ); // insert EOL ('\n') -Q_EXPORT TQTextStream &flush( TQTextStream &s ); // flush output -Q_EXPORT TQTextStream &ws( TQTextStream &s ); // eat whitespace on input -Q_EXPORT TQTextStream &reset( TQTextStream &s ); // set default flags +TQ_EXPORT TQTextStream &bin( TQTextStream &s ); // set bin notation +TQ_EXPORT TQTextStream &oct( TQTextStream &s ); // set oct notation +TQ_EXPORT TQTextStream &dec( TQTextStream &s ); // set dec notation +TQ_EXPORT TQTextStream &hex( TQTextStream &s ); // set hex notation +TQ_EXPORT TQTextStream &endl( TQTextStream &s ); // insert EOL ('\n') +TQ_EXPORT TQTextStream &flush( TQTextStream &s ); // flush output +TQ_EXPORT TQTextStream &ws( TQTextStream &s ); // eat whitespace on input +TQ_EXPORT TQTextStream &reset( TQTextStream &s ); // set default flags -Q_EXPORT inline TQTSManip qSetW( int w ) +TQ_EXPORT inline TQTSManip qSetW( int w ) { TQTSMFI func = &TQTextStream::width; return TQTSManip(func,w); } -Q_EXPORT inline TQTSManip qSetFill( int f ) +TQ_EXPORT inline TQTSManip qSetFill( int f ) { TQTSMFI func = &TQTextStream::fill; return TQTSManip(func,f); } -Q_EXPORT inline TQTSManip qSetPrecision( int p ) +TQ_EXPORT inline TQTSManip qSetPrecision( int p ) { TQTSMFI func = &TQTextStream::precision; return TQTSManip(func,p); diff --git a/doc/html/qtextview-h.html b/doc/html/qtextview-h.html index 31d593a6e..9c2aa2ba7 100644 --- a/doc/html/qtextview-h.html +++ b/doc/html/qtextview-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_TEXTVIEW -class Q_EXPORT TQTextView : public TQTextEdit +class TQ_EXPORT TQTextView : public TQTextEdit { TQ_OBJECT TQ_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false ) diff --git a/doc/html/qthread-h.html b/doc/html/qthread-h.html index 00fc81ffe..cbde3d13e 100644 --- a/doc/html/qthread-h.html +++ b/doc/html/qthread-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQThreadInstance; -class Q_EXPORT TQThread : public TQt +class TQ_EXPORT TQThread : public TQt { public: static TQt::HANDLE currentThread(); diff --git a/doc/html/qthreadstorage-h.html b/doc/html/qthreadstorage-h.html index 7c60605b1..7efc05556 100644 --- a/doc/html/qthreadstorage-h.html +++ b/doc/html/qthreadstorage-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqglobal.h" #endif // QT_H -class Q_EXPORT TQThreadStorageData +class TQ_EXPORT TQThreadStorageData { public: TQThreadStorageData( void (*func)(void *) ); diff --git a/doc/html/qtimer-h.html b/doc/html/qtimer-h.html index b639bee72..72c62daab 100644 --- a/doc/html/qtimer-h.html +++ b/doc/html/qtimer-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -class Q_EXPORT TQTimer : public TQObject +class TQ_EXPORT TQTimer : public TQObject { TQ_OBJECT public: diff --git a/doc/html/qtoolbar-h.html b/doc/html/qtoolbar-h.html index b2cab845a..5dba2d321 100644 --- a/doc/html/qtoolbar-h.html +++ b/doc/html/qtoolbar-h.html @@ -88,7 +88,7 @@ class TQButton; class TQBoxLayout; class TQToolBarPrivate; -class Q_EXPORT TQToolBar: public TQDockWindow +class TQ_EXPORT TQToolBar: public TQDockWindow { TQ_OBJECT TQ_PROPERTY( TQString label READ label WRITE setLabel ) diff --git a/doc/html/qtoolbox-h.html b/doc/html/qtoolbox-h.html index eb46a0d6e..9facc7fc0 100644 --- a/doc/html/qtoolbox-h.html +++ b/doc/html/qtoolbox-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQToolBoxPrivate; class TQWidgetList; -class Q_EXPORT TQToolBox : public TQFrame +class TQ_EXPORT TQToolBox : public TQFrame { TQ_OBJECT TQ_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex ) diff --git a/doc/html/qtoolbutton-h.html b/doc/html/qtoolbutton-h.html index bd585da5d..f9711d445 100644 --- a/doc/html/qtoolbutton-h.html +++ b/doc/html/qtoolbutton-h.html @@ -90,7 +90,7 @@ class TQToolButtonPrivate; class TQToolBar; class TQPopupMenu; -class Q_EXPORT TQToolButton : public TQButton +class TQ_EXPORT TQToolButton : public TQButton { TQ_OBJECT TQ_ENUMS( TextPosition ) diff --git a/doc/html/qtooltip-h.html b/doc/html/qtooltip-h.html index f62e44569..13add5a83 100644 --- a/doc/html/qtooltip-h.html +++ b/doc/html/qtooltip-h.html @@ -89,7 +89,7 @@ class TQTipManager; class TQIconViewToolTip; class TQListViewToolTip; -class Q_EXPORT TQToolTipGroup: public TQObject +class TQ_EXPORT TQToolTipGroup: public TQObject { TQ_OBJECT TQ_PROPERTY( bool delay READ delay WRITE setDelay ) @@ -124,7 +124,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQToolTip: public TQt +class TQ_EXPORT TQToolTip: public TQt { public: TQToolTip( TQWidget *, TQToolTipGroup * = 0 ); diff --git a/doc/html/qtranslator-h.html b/doc/html/qtranslator-h.html index adba2bff4..d8c00b669 100644 --- a/doc/html/qtranslator-h.html +++ b/doc/html/qtranslator-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQTranslatorPrivate; -class Q_EXPORT TQTranslatorMessage +class TQ_EXPORT TQTranslatorMessage { public: TQTranslatorMessage(); @@ -138,7 +138,7 @@ private: }; -class Q_EXPORT TQTranslator: public TQObject +class TQ_EXPORT TQTranslator: public TQObject { TQ_OBJECT public: diff --git a/doc/html/qtsciicodec-h.html b/doc/html/qtsciicodec-h.html index 55180b4f0..174a44217 100644 --- a/doc/html/qtsciicodec-h.html +++ b/doc/html/qtsciicodec-h.html @@ -110,7 +110,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_CODECS -class Q_EXPORT TQTsciiCodec : public TQTextCodec { +class TQ_EXPORT TQTsciiCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/qurl-h.html b/doc/html/qurl-h.html index 9c0834e1c..073f2a32d 100644 --- a/doc/html/qurl-h.html +++ b/doc/html/qurl-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } class TQUrlPrivate; -class Q_EXPORT TQUrl +class TQ_EXPORT TQUrl { public: TQUrl(); diff --git a/doc/html/qurlinfo-h.html b/doc/html/qurlinfo-h.html index 316ab4849..410a5e9a1 100644 --- a/doc/html/qurlinfo-h.html +++ b/doc/html/qurlinfo-h.html @@ -86,7 +86,7 @@ class TQUrlOperator; class TQUrl; class TQUrlInfoPrivate; -class Q_EXPORT TQUrlInfo +class TQ_EXPORT TQUrlInfo { public: enum PermissionSpec { diff --git a/doc/html/qurloperator-h.html b/doc/html/qurloperator-h.html index af8880690..5a1b87d18 100644 --- a/doc/html/qurloperator-h.html +++ b/doc/html/qurloperator-h.html @@ -90,7 +90,7 @@ body { background: #ffffff; color: black; } 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/doc/html/quuid-h.html b/doc/html/quuid-h.html index 0c4d14331..71a19fbd8 100644 --- a/doc/html/quuid-h.html +++ b/doc/html/quuid-h.html @@ -97,7 +97,7 @@ typedef struct _GUID #endif -struct Q_EXPORT TQUuid +struct TQ_EXPORT TQUuid { enum Variant { VarUnknown =-1, @@ -223,8 +223,8 @@ struct Q_EXPORT TQUuid }; #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQUuid & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQUuid & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQUuid & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQUuid & ); #endif #endif //TQUUID_H diff --git a/doc/html/qvalidator-h.html b/doc/html/qvalidator-h.html index 81c50a770..8bf5b930c 100644 --- a/doc/html/qvalidator-h.html +++ b/doc/html/qvalidator-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_VALIDATOR -class Q_EXPORT TQValidator : public TQObject +class TQ_EXPORT TQValidator : public TQObject { TQ_OBJECT public: @@ -106,7 +106,7 @@ private: }; -class Q_EXPORT TQIntValidator : public TQValidator +class TQ_EXPORT TQIntValidator : public TQValidator { TQ_OBJECT TQ_PROPERTY( int bottom READ bottom WRITE setBottom ) @@ -138,7 +138,7 @@ private: #ifndef TQT_NO_REGEXP -class Q_EXPORT TQDoubleValidator : public TQValidator +class TQ_EXPORT TQDoubleValidator : public TQValidator { TQ_OBJECT TQ_PROPERTY( double bottom READ bottom WRITE setBottom ) @@ -173,7 +173,7 @@ private: }; -class Q_EXPORT TQRegExpValidator : public TQValidator +class TQ_EXPORT TQRegExpValidator : public TQValidator { TQ_OBJECT // TQ_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp ) diff --git a/doc/html/qvariant-h.html b/doc/html/qvariant-h.html index b4e7f021b..7b8783753 100644 --- a/doc/html/qvariant-h.html +++ b/doc/html/qvariant-h.html @@ -118,7 +118,7 @@ template <class Key, class T> class TQMap; template <class Key, class T> class TQMapConstIterator; #endif -class Q_EXPORT TQVariant +class TQ_EXPORT TQVariant { public: enum Type { @@ -422,10 +422,10 @@ inline TQMapConstIterator<TQString,TQVariant> TQVariant::mapFind( const TQ #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/doc/html/qvbox-h.html b/doc/html/qvbox-h.html index 90e2468c7..e0a6ac3ca 100644 --- a/doc/html/qvbox-h.html +++ b/doc/html/qvbox-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_VBOX -class Q_EXPORT TQVBox : public TQHBox +class TQ_EXPORT TQVBox : public TQHBox { TQ_OBJECT public: diff --git a/doc/html/qvbuttongroup-h.html b/doc/html/qvbuttongroup-h.html index 949fce9ba..aba7be2c0 100644 --- a/doc/html/qvbuttongroup-h.html +++ b/doc/html/qvbuttongroup-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_VBUTTONGROUP -class Q_EXPORT TQVButtonGroup : public TQButtonGroup +class TQ_EXPORT TQVButtonGroup : public TQButtonGroup { TQ_OBJECT public: diff --git a/doc/html/qvgroupbox-h.html b/doc/html/qvgroupbox-h.html index 91c4c0824..195b9d267 100644 --- a/doc/html/qvgroupbox-h.html +++ b/doc/html/qvgroupbox-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_VGROUPBOX -class Q_EXPORT TQVGroupBox : public TQGroupBox +class TQ_EXPORT TQVGroupBox : public TQGroupBox { TQ_OBJECT public: diff --git a/doc/html/qwaitcondition-h.html b/doc/html/qwaitcondition-h.html index bc5a7336a..06589092f 100644 --- a/doc/html/qwaitcondition-h.html +++ b/doc/html/qwaitcondition-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } class TQWaitConditionPrivate; class TQMutex; -class Q_EXPORT TQWaitCondition +class TQ_EXPORT TQWaitCondition { public: TQWaitCondition(); diff --git a/doc/html/qwhatsthis-h.html b/doc/html/qwhatsthis-h.html index 96714f6d9..a73e03c6a 100644 --- a/doc/html/qwhatsthis-h.html +++ b/doc/html/qwhatsthis-h.html @@ -87,7 +87,7 @@ class TQToolButton; class TQPopupMenu; class TQStyleSheet; -class Q_EXPORT TQWhatsThis: public TQt +class TQ_EXPORT TQWhatsThis: public TQt { public: TQWhatsThis( TQWidget *); diff --git a/doc/html/qwidget-h.html b/doc/html/qwidget-h.html index a39ba25ed..966fd263c 100644 --- a/doc/html/qwidget-h.html +++ b/doc/html/qwidget-h.html @@ -96,7 +96,7 @@ class TQCursor; class TQWSRegionManager; class TQStyle; -class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice +class TQ_EXPORT TQWidget : public TQObject, public TQPaintDevice { TQ_OBJECT TQ_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin ) @@ -964,7 +964,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 @@ -1013,7 +1013,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/doc/html/qwidgetplugin-h.html b/doc/html/qwidgetplugin-h.html index d63cabbe7..7d644e3b1 100644 --- a/doc/html/qwidgetplugin-h.html +++ b/doc/html/qwidgetplugin-h.html @@ -97,7 +97,7 @@ body { background: #ffffff; color: black; } class TQWidgetPluginPrivate; class TQWidget; -class Q_EXPORT TQWidgetPlugin : public TQGPlugin +class TQ_EXPORT TQWidgetPlugin : public TQGPlugin { TQ_OBJECT public: @@ -122,7 +122,7 @@ private: class TQWidgetContainerPluginPrivate; -class Q_EXPORT TQWidgetContainerPlugin : public TQWidgetPlugin +class TQ_EXPORT TQWidgetContainerPlugin : public TQWidgetPlugin { public: diff --git a/doc/html/qwidgetstack-h.html b/doc/html/qwidgetstack-h.html index 14034c379..0bb7deb0c 100644 --- a/doc/html/qwidgetstack-h.html +++ b/doc/html/qwidgetstack-h.html @@ -89,7 +89,7 @@ body { background: #ffffff; color: black; } class TQWidgetStackPrivate; -class Q_EXPORT TQWidgetStack: public TQFrame +class TQ_EXPORT TQWidgetStack: public TQFrame { TQ_OBJECT public: diff --git a/doc/html/qwindowdefs-h.html b/doc/html/qwindowdefs-h.html index 4ff4fd5e6..680b9a87a 100644 --- a/doc/html/qwindowdefs-h.html +++ b/doc/html/qwindowdefs-h.html @@ -183,14 +183,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 @@ -216,13 +216,13 @@ 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 </pre> diff --git a/doc/html/qwindowsstyle-h.html b/doc/html/qwindowsstyle-h.html index 7c39d881f..17961081b 100644 --- a/doc/html/qwindowsstyle-h.html +++ b/doc/html/qwindowsstyle-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_WINDOWS #else -#define Q_EXPORT_STYLE_WINDOWS Q_EXPORT +#define Q_EXPORT_STYLE_WINDOWS TQ_EXPORT #endif diff --git a/doc/html/qwizard-h.html b/doc/html/qwizard-h.html index cef129f1f..c72ed832c 100644 --- a/doc/html/qwizard-h.html +++ b/doc/html/qwizard-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } class TQHBoxLayout; class TQWizardPrivate; -class Q_EXPORT TQWizard : public TQDialog +class TQ_EXPORT TQWizard : public TQDialog { TQ_OBJECT TQ_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont ) diff --git a/doc/html/qwmatrix-h.html b/doc/html/qwmatrix-h.html index 5c76b794c..8ce01f7f3 100644 --- a/doc/html/qwmatrix-h.html +++ b/doc/html/qwmatrix-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_WMATRIX -class Q_EXPORT TQWMatrix // 2D transform matrix +class TQ_EXPORT TQWMatrix // 2D transform matrix { public: TQWMatrix(); @@ -149,15 +149,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/doc/html/qworkspace-h.html b/doc/html/qworkspace-h.html index 6d0470e7f..cc4764698 100644 --- a/doc/html/qworkspace-h.html +++ b/doc/html/qworkspace-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #if !defined( TQT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE ) #define TQM_EXPORT_WORKSPACE #else -#define TQM_EXPORT_WORKSPACE Q_EXPORT +#define TQM_EXPORT_WORKSPACE TQ_EXPORT #endif class TQWorkspaceChild; diff --git a/doc/html/qxml-h.html b/doc/html/qxml-h.html index b5ea5100f..ec1d10935 100644 --- a/doc/html/qxml-h.html +++ b/doc/html/qxml-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } #if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML ) #define TQM_EXPORT_XML #else -#define TQM_EXPORT_XML Q_EXPORT +#define TQM_EXPORT_XML TQ_EXPORT #endif #ifndef TQT_NO_XML diff --git a/doc/html/sql-driver.html b/doc/html/sql-driver.html index f523502f3..1145f5048 100644 --- a/doc/html/sql-driver.html +++ b/doc/html/sql-driver.html @@ -584,7 +584,7 @@ TQt SQL driver, both of these classes must to be subclassed and the abstract virtual methods in each class must be implemented. <p> To implement a TQt SQL driver as a plugin (so that it is recognized and loaded by the TQt library at runtime), the driver must use the -<tt>Q_EXPORT_PLUGIN</tt> macro. Read the <a href="plugins-howto.html">TQt +<tt>TQ_EXPORT_PLUGIN</tt> macro. Read the <a href="plugins-howto.html">TQt Plugin</a> documentation for more information on this. You can also check out how this is done in the SQL plugins that is provided with TQt in <tt>TQTDIR/plugins/src/sqldrivers</tt> and diff --git a/doc/man/man3/tqimageformatplugin.3qt b/doc/man/man3/tqimageformatplugin.3qt index 11aaeaf38..a7946ab61 100644 --- a/doc/man/man3/tqimageformatplugin.3qt +++ b/doc/man/man3/tqimageformatplugin.3qt @@ -31,12 +31,12 @@ The QImageFormatPlugin class provides an abstract base for custom image format p .PP The image format plugin is a simple plugin interface that makes it easy to create custom image formats that can be used transparently by applications. .PP -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 Plugins documentation for details. +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 TQ_EXPORT_PLUGIN macro. See the Plugins documentation for details. .PP See also Plugins. .SH MEMBER FUNCTION DOCUMENTATION .SH "QImageFormatPlugin::QImageFormatPlugin ()" -Constructs an image format plugin. This is invoked automatically by the Q_EXPORT_PLUGIN macro. +Constructs an image format plugin. This is invoked automatically by the TQ_EXPORT_PLUGIN macro. .SH "QImageFormatPlugin::~QImageFormatPlugin ()" Destroys the image format plugin. .PP diff --git a/doc/plugins-howto.doc b/doc/plugins-howto.doc index 6c46283ec..ac1f31f90 100644 --- a/doc/plugins-howto.doc +++ b/doc/plugins-howto.doc @@ -109,7 +109,7 @@ to make available as a plugin. The required code is straightforward: } }; - Q_EXPORT_PLUGIN( MyStylePlugin ) + TQ_EXPORT_PLUGIN( MyStylePlugin ) \endcode (Note that QStyleFactory is case-insensitive, and the lower case diff --git a/doc/sql-driver.doc b/doc/sql-driver.doc index 00f479c22..657c50a41 100644 --- a/doc/sql-driver.doc +++ b/doc/sql-driver.doc @@ -694,7 +694,7 @@ abstract virtual methods in each class must be implemented. To implement a TQt SQL driver as a plugin (so that it is recognized and loaded by the TQt library at runtime), the driver must use the -\c Q_EXPORT_PLUGIN macro. Read the \link plugins-howto.html Qt +\c TQ_EXPORT_PLUGIN macro. Read the \link plugins-howto.html Qt Plugin\endlink documentation for more information on this. You can also check out how this is done in the SQL plugins that is provided with TQt in \c{TQTDIR/plugins/src/sqldrivers} and diff --git a/extensions/nsplugin/src/qnp.cpp b/extensions/nsplugin/src/qnp.cpp index 492da1808..ebd652cba 100644 --- a/extensions/nsplugin/src/qnp.cpp +++ b/extensions/nsplugin/src/qnp.cpp @@ -212,8 +212,8 @@ static int qnps_no_call_back = 0; #ifdef Q_WS_WIN // defined in qapplication_win.cpp -Q_EXPORT extern bool qt_win_use_simple_timers; -Q_EXPORT void qWinProcessConfigRequests(); +TQ_EXPORT extern bool qt_win_use_simple_timers; +TQ_EXPORT void qWinProcessConfigRequests(); static HHOOK hhook = 0; LRESULT CALLBACK FilterProc( int nCode, WPARAM wParam, LPARAM lParam ) diff --git a/plugins/src/codecs/cn/main.cpp b/plugins/src/codecs/cn/main.cpp index 29b552c57..36ea2709e 100644 --- a/plugins/src/codecs/cn/main.cpp +++ b/plugins/src/codecs/cn/main.cpp @@ -49,4 +49,4 @@ TQTextCodec *CNTextCodecs::createForName( const TQString &name ) } -Q_EXPORT_PLUGIN( CNTextCodecs ); +TQ_EXPORT_PLUGIN( CNTextCodecs ); diff --git a/plugins/src/codecs/jp/main.cpp b/plugins/src/codecs/jp/main.cpp index 3f71cbc10..5c34c16d2 100644 --- a/plugins/src/codecs/jp/main.cpp +++ b/plugins/src/codecs/jp/main.cpp @@ -53,4 +53,4 @@ TQTextCodec *JPTextCodecs::createForName( const TQString &name ) } -Q_EXPORT_PLUGIN( JPTextCodecs ); +TQ_EXPORT_PLUGIN( JPTextCodecs ); diff --git a/plugins/src/codecs/kr/main.cpp b/plugins/src/codecs/kr/main.cpp index 0d28d2c75..e024d64c0 100644 --- a/plugins/src/codecs/kr/main.cpp +++ b/plugins/src/codecs/kr/main.cpp @@ -44,4 +44,4 @@ TQTextCodec *KRTextCodecs::createForName( const TQString &name ) } -Q_EXPORT_PLUGIN( KRTextCodecs ); +TQ_EXPORT_PLUGIN( KRTextCodecs ); diff --git a/plugins/src/codecs/tw/main.cpp b/plugins/src/codecs/tw/main.cpp index d91909541..85e746b32 100644 --- a/plugins/src/codecs/tw/main.cpp +++ b/plugins/src/codecs/tw/main.cpp @@ -43,5 +43,5 @@ TQTextCodec *TWTextCodecs::createForName( const TQString &name ) } -Q_EXPORT_PLUGIN( TWTextCodecs ); +TQ_EXPORT_PLUGIN( TWTextCodecs ); diff --git a/plugins/src/imageformats/jpeg/main.cpp b/plugins/src/imageformats/jpeg/main.cpp index f329756f5..d4f66b064 100644 --- a/plugins/src/imageformats/jpeg/main.cpp +++ b/plugins/src/imageformats/jpeg/main.cpp @@ -68,6 +68,6 @@ bool JPEGFormat::installIOHandler( const TQString &name ) return TRUE; } -Q_EXPORT_PLUGIN( JPEGFormat ) +TQ_EXPORT_PLUGIN( JPEGFormat ) #endif // TQT_NO_IMAGEFORMATPLUGIN diff --git a/plugins/src/imageformats/mng/main.cpp b/plugins/src/imageformats/mng/main.cpp index 74aca8e76..f08dc3166 100644 --- a/plugins/src/imageformats/mng/main.cpp +++ b/plugins/src/imageformats/mng/main.cpp @@ -50,6 +50,6 @@ bool MNGFormat::installIOHandler( const TQString &name ) return TRUE; } -Q_EXPORT_PLUGIN( MNGFormat ) +TQ_EXPORT_PLUGIN( MNGFormat ) #endif // TQT_NO_IMAGEFORMATPLUGIN diff --git a/plugins/src/imageformats/png/main.cpp b/plugins/src/imageformats/png/main.cpp index ce37abb44..7724c9112 100644 --- a/plugins/src/imageformats/png/main.cpp +++ b/plugins/src/imageformats/png/main.cpp @@ -68,6 +68,6 @@ bool PNGFormat::installIOHandler( const TQString &name ) return TRUE; } -Q_EXPORT_PLUGIN( PNGFormat ) +TQ_EXPORT_PLUGIN( PNGFormat ) #endif // TQT_NO_IMAGEFORMATPLUGIN diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp index 942ee0251..ac588edf7 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp @@ -83,6 +83,6 @@ TQString TQMultiInputContextPlugin::description( const TQString &key ) } -Q_EXPORT_PLUGIN( TQMultiInputContextPlugin ) +TQ_EXPORT_PLUGIN( TQMultiInputContextPlugin ) #endif diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp index b42f126e0..b4d2e2be5 100644 --- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp +++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp @@ -96,6 +96,6 @@ TQString TQNoneInputContextPlugin::description( const TQString &key ) } -Q_EXPORT_PLUGIN( TQNoneInputContextPlugin ) +TQ_EXPORT_PLUGIN( TQNoneInputContextPlugin ) #endif diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp index 539d35a6d..8c2a4dc32 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp +++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp @@ -81,6 +81,6 @@ TQString TQSimpleInputContextPlugin::description( const TQString & ) } -Q_EXPORT_PLUGIN( TQSimpleInputContextPlugin ) +TQ_EXPORT_PLUGIN( TQSimpleInputContextPlugin ) #endif diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp index 9b35ef9a0..dc21f49ab 100644 --- a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp +++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp @@ -81,6 +81,6 @@ TQString TQXIMInputContextPlugin::description( const TQString & ) } -Q_EXPORT_PLUGIN( TQXIMInputContextPlugin ) +TQ_EXPORT_PLUGIN( TQXIMInputContextPlugin ) #endif diff --git a/plugins/src/sqldrivers/ibase/main.cpp b/plugins/src/sqldrivers/ibase/main.cpp index 2397d85c9..98fccbc67 100644 --- a/plugins/src/sqldrivers/ibase/main.cpp +++ b/plugins/src/sqldrivers/ibase/main.cpp @@ -71,4 +71,4 @@ TQStringList TQIBaseDriverPlugin::keys() const return l; } -Q_EXPORT_PLUGIN( TQIBaseDriverPlugin ) +TQ_EXPORT_PLUGIN( TQIBaseDriverPlugin ) diff --git a/plugins/src/sqldrivers/mysql/main.cpp b/plugins/src/sqldrivers/mysql/main.cpp index 49494e756..d34233663 100644 --- a/plugins/src/sqldrivers/mysql/main.cpp +++ b/plugins/src/sqldrivers/mysql/main.cpp @@ -71,4 +71,4 @@ TQStringList TQMYSQLDriverPlugin::keys() const return l; } -Q_EXPORT_PLUGIN( TQMYSQLDriverPlugin ) +TQ_EXPORT_PLUGIN( TQMYSQLDriverPlugin ) diff --git a/plugins/src/sqldrivers/odbc/main.cpp b/plugins/src/sqldrivers/odbc/main.cpp index 87b0d6384..4ee6e59b3 100644 --- a/plugins/src/sqldrivers/odbc/main.cpp +++ b/plugins/src/sqldrivers/odbc/main.cpp @@ -71,4 +71,4 @@ TQStringList TQODBCDriverPlugin::keys() const return l; } -Q_EXPORT_PLUGIN( TQODBCDriverPlugin ) +TQ_EXPORT_PLUGIN( TQODBCDriverPlugin ) diff --git a/plugins/src/sqldrivers/psql/main.cpp b/plugins/src/sqldrivers/psql/main.cpp index 789bb7526..5332dfb2d 100644 --- a/plugins/src/sqldrivers/psql/main.cpp +++ b/plugins/src/sqldrivers/psql/main.cpp @@ -71,4 +71,4 @@ TQStringList TQPSQLDriverPlugin::keys() const return l; } -Q_EXPORT_PLUGIN( TQPSQLDriverPlugin ) +TQ_EXPORT_PLUGIN( TQPSQLDriverPlugin ) diff --git a/plugins/src/sqldrivers/sqlite/smain.cpp b/plugins/src/sqldrivers/sqlite/smain.cpp index 747eed79b..63af92d73 100644 --- a/plugins/src/sqldrivers/sqlite/smain.cpp +++ b/plugins/src/sqldrivers/sqlite/smain.cpp @@ -71,4 +71,4 @@ TQStringList TQSQLiteDriverPlugin::keys() const return l; } -Q_EXPORT_PLUGIN( TQSQLiteDriverPlugin ) +TQ_EXPORT_PLUGIN( TQSQLiteDriverPlugin ) diff --git a/plugins/src/sqldrivers/sqlite3/smain.cpp b/plugins/src/sqldrivers/sqlite3/smain.cpp index b3da49434..510199694 100644 --- a/plugins/src/sqldrivers/sqlite3/smain.cpp +++ b/plugins/src/sqldrivers/sqlite3/smain.cpp @@ -67,4 +67,4 @@ TQStringList TQSQLite3DriverPlugin::keys() const return l; } -Q_EXPORT_PLUGIN( TQSQLite3DriverPlugin ) +TQ_EXPORT_PLUGIN( TQSQLite3DriverPlugin ) diff --git a/plugins/src/styles/cde/main.cpp b/plugins/src/styles/cde/main.cpp index 014bfbcfb..3b6dd2e79 100644 --- a/plugins/src/styles/cde/main.cpp +++ b/plugins/src/styles/cde/main.cpp @@ -30,4 +30,4 @@ TQStyle* CDEStyle::create( const TQString& s ) return 0; } -Q_EXPORT_PLUGIN( CDEStyle ) +TQ_EXPORT_PLUGIN( CDEStyle ) diff --git a/plugins/src/styles/compact/main.cpp b/plugins/src/styles/compact/main.cpp index 9ee71a257..1ffd1bb3a 100644 --- a/plugins/src/styles/compact/main.cpp +++ b/plugins/src/styles/compact/main.cpp @@ -31,5 +31,5 @@ TQStyle* CompactStyle::create( const TQString& s ) } -Q_EXPORT_PLUGIN( CompactStyle ) +TQ_EXPORT_PLUGIN( CompactStyle ) diff --git a/plugins/src/styles/motif/main.cpp b/plugins/src/styles/motif/main.cpp index 118a577df..f871f21e2 100644 --- a/plugins/src/styles/motif/main.cpp +++ b/plugins/src/styles/motif/main.cpp @@ -30,5 +30,5 @@ TQStyle* MotifStyle::create( const TQString& s ) return 0; } -Q_EXPORT_PLUGIN( MotifStyle ) +TQ_EXPORT_PLUGIN( MotifStyle ) diff --git a/plugins/src/styles/motifplus/main.cpp b/plugins/src/styles/motifplus/main.cpp index bd2e75ac8..185d64f2f 100644 --- a/plugins/src/styles/motifplus/main.cpp +++ b/plugins/src/styles/motifplus/main.cpp @@ -31,5 +31,5 @@ TQStyle* MotifPlusStyle::create( const TQString& s ) return 0; } -Q_EXPORT_PLUGIN( MotifPlusStyle ) +TQ_EXPORT_PLUGIN( MotifPlusStyle ) diff --git a/plugins/src/styles/platinum/main.cpp b/plugins/src/styles/platinum/main.cpp index 1db67f159..a86f7735b 100644 --- a/plugins/src/styles/platinum/main.cpp +++ b/plugins/src/styles/platinum/main.cpp @@ -31,4 +31,4 @@ TQStyle* PlatinumStyle::create( const TQString& s ) } -Q_EXPORT_PLUGIN( PlatinumStyle ) +TQ_EXPORT_PLUGIN( PlatinumStyle ) diff --git a/plugins/src/styles/sgi/main.cpp b/plugins/src/styles/sgi/main.cpp index b1579b68e..f85675974 100644 --- a/plugins/src/styles/sgi/main.cpp +++ b/plugins/src/styles/sgi/main.cpp @@ -30,4 +30,4 @@ TQStyle* SGIStyle::create( const TQString& s ) return 0; } -Q_EXPORT_PLUGIN( SGIStyle ) +TQ_EXPORT_PLUGIN( SGIStyle ) diff --git a/plugins/src/styles/windows/main.cpp b/plugins/src/styles/windows/main.cpp index ae823c318..93684d495 100644 --- a/plugins/src/styles/windows/main.cpp +++ b/plugins/src/styles/windows/main.cpp @@ -30,5 +30,5 @@ TQStyle* WindowsStyle::create( const TQString& s ) return 0; } -Q_EXPORT_PLUGIN( WindowsStyle ) +TQ_EXPORT_PLUGIN( WindowsStyle ) diff --git a/qmake/main.cpp b/qmake/main.cpp index ceb8e468c..379f949b4 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -58,7 +58,7 @@ bool tqt_resolve_symlinks = FALSE; #endif #if defined(Q_WS_WIN) -extern Q_EXPORT int qt_ntfs_permission_lookup; +extern TQ_EXPORT int qt_ntfs_permission_lookup; #endif int main(int argc, char **argv) diff --git a/src/canvas/ntqcanvas.h b/src/canvas/ntqcanvas.h index 1b18dab4e..9bf3d729c 100644 --- a/src/canvas/ntqcanvas.h +++ b/src/canvas/ntqcanvas.h @@ -55,7 +55,7 @@ #define TQM_EXPORT_CANVAS #define TQM_TEMPLATE_EXTERN_CANVAS #else -#define TQM_EXPORT_CANVAS Q_EXPORT +#define TQM_EXPORT_CANVAS TQ_EXPORT #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN #endif diff --git a/src/codecs/ntqeucjpcodec.h b/src/codecs/ntqeucjpcodec.h index eb140e947..6ccbcddb2 100644 --- a/src/codecs/ntqeucjpcodec.h +++ b/src/codecs/ntqeucjpcodec.h @@ -80,7 +80,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP Q_EXPORT +#define Q_EXPORT_CODECS_JP TQ_EXPORT #endif class Q_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { diff --git a/src/codecs/ntqeuckrcodec.h b/src/codecs/ntqeuckrcodec.h index 00b260293..fcd97a964 100644 --- a/src/codecs/ntqeuckrcodec.h +++ b/src/codecs/ntqeuckrcodec.h @@ -75,7 +75,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_KR #else -#define Q_EXPORT_CODECS_KR Q_EXPORT +#define Q_EXPORT_CODECS_KR TQ_EXPORT #endif class Q_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { diff --git a/src/codecs/ntqgb18030codec.h b/src/codecs/ntqgb18030codec.h index 5369a6c35..676a08a18 100644 --- a/src/codecs/ntqgb18030codec.h +++ b/src/codecs/ntqgb18030codec.h @@ -51,7 +51,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_CN #else -#define Q_EXPORT_CODECS_CN Q_EXPORT +#define Q_EXPORT_CODECS_CN TQ_EXPORT #endif class Q_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { diff --git a/src/codecs/ntqjiscodec.h b/src/codecs/ntqjiscodec.h index c464df003..b96d0aec2 100644 --- a/src/codecs/ntqjiscodec.h +++ b/src/codecs/ntqjiscodec.h @@ -80,7 +80,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP Q_EXPORT +#define Q_EXPORT_CODECS_JP TQ_EXPORT #endif class Q_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { diff --git a/src/codecs/ntqjpunicode.h b/src/codecs/ntqjpunicode.h index 689c0abb0..2daa893b7 100644 --- a/src/codecs/ntqjpunicode.h +++ b/src/codecs/ntqjpunicode.h @@ -79,7 +79,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP Q_EXPORT +#define Q_EXPORT_CODECS_JP TQ_EXPORT #endif class Q_EXPORT_CODECS_JP TQJpUnicodeConv { diff --git a/src/codecs/ntqrtlcodec.h b/src/codecs/ntqrtlcodec.h index 859da5cad..f40161250 100644 --- a/src/codecs/ntqrtlcodec.h +++ b/src/codecs/ntqrtlcodec.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_CODEC_HEBREW -class Q_EXPORT TQHebrewCodec : public TQTextCodec { +class TQ_EXPORT TQHebrewCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/ntqsjiscodec.h b/src/codecs/ntqsjiscodec.h index 9187672f4..a1acc053e 100644 --- a/src/codecs/ntqsjiscodec.h +++ b/src/codecs/ntqsjiscodec.h @@ -80,7 +80,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP Q_EXPORT +#define Q_EXPORT_CODECS_JP TQ_EXPORT #endif class Q_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { diff --git a/src/codecs/ntqtextcodec.h b/src/codecs/ntqtextcodec.h index ad49b5870..6d0267603 100644 --- a/src/codecs/ntqtextcodec.h +++ b/src/codecs/ntqtextcodec.h @@ -51,19 +51,19 @@ class TQTextCodec; class TQIODevice; class TQFont; -class Q_EXPORT TQTextEncoder { +class TQ_EXPORT TQTextEncoder { public: virtual ~TQTextEncoder(); virtual TQCString fromUnicode(const TQString& uc, int& lenInOut) = 0; }; -class Q_EXPORT TQTextDecoder { +class TQ_EXPORT TQTextDecoder { public: virtual ~TQTextDecoder(); virtual TQString toUnicode(const char* chars, int len) = 0; }; -class Q_EXPORT TQTextCodec { +class TQ_EXPORT TQTextCodec { public: virtual ~TQTextCodec(); diff --git a/src/codecs/ntqtextcodecfactory.h b/src/codecs/ntqtextcodecfactory.h index 947d32f7a..621e2e01b 100644 --- a/src/codecs/ntqtextcodecfactory.h +++ b/src/codecs/ntqtextcodecfactory.h @@ -47,7 +47,7 @@ class TQTextCodec; -class Q_EXPORT TQTextCodecFactory +class TQ_EXPORT TQTextCodecFactory { public: static TQTextCodec *createForName( const TQString & ); diff --git a/src/codecs/ntqtextcodecplugin.h b/src/codecs/ntqtextcodecplugin.h index 70c1ce12c..094290545 100644 --- a/src/codecs/ntqtextcodecplugin.h +++ b/src/codecs/ntqtextcodecplugin.h @@ -50,7 +50,7 @@ class TQTextCodec; class TQTextCodecPluginPrivate; -class Q_EXPORT TQTextCodecPlugin : public TQGPlugin +class TQ_EXPORT TQTextCodecPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/src/codecs/ntqtsciicodec.h b/src/codecs/ntqtsciicodec.h index d9486f237..bbea40f2d 100644 --- a/src/codecs/ntqtsciicodec.h +++ b/src/codecs/ntqtsciicodec.h @@ -74,7 +74,7 @@ #ifndef TQT_NO_CODECS -class Q_EXPORT TQTsciiCodec : public TQTextCodec { +class TQ_EXPORT TQTsciiCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/ntqutfcodec.h b/src/codecs/ntqutfcodec.h index 9c6408af1..c6303a3c4 100644 --- a/src/codecs/ntqutfcodec.h +++ b/src/codecs/ntqutfcodec.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_TEXTCODEC -class Q_EXPORT TQUtf8Codec : public TQTextCodec { +class TQ_EXPORT TQUtf8Codec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; @@ -63,7 +63,7 @@ public: int heuristicContentMatch(const char* chars, int len) const; }; -class Q_EXPORT TQUtf16Codec : public TQTextCodec { +class TQ_EXPORT TQUtf16Codec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/qtextcodecinterface_p.h b/src/codecs/qtextcodecinterface_p.h index cba2cdd61..5a8baa04a 100644 --- a/src/codecs/qtextcodecinterface_p.h +++ b/src/codecs/qtextcodecinterface_p.h @@ -68,7 +68,7 @@ class TQTextCodec; #endif -struct Q_EXPORT TQTextCodecFactoryInterface : public TQFeatureListInterface +struct TQ_EXPORT TQTextCodecFactoryInterface : public TQFeatureListInterface { virtual TQTextCodec *createForMib( int mib ) = 0; virtual TQTextCodec *createForName( const TQString &name ) = 0; diff --git a/src/codecs/qtextcodecplugin.cpp b/src/codecs/qtextcodecplugin.cpp index e4f0d6afe..d59e8684d 100644 --- a/src/codecs/qtextcodecplugin.cpp +++ b/src/codecs/qtextcodecplugin.cpp @@ -55,7 +55,7 @@ Writing a text codec plugin is achieved by subclassing this base class, reimplementing the pure virtual functions names(), createForName(), mibEnums() and createForMib(), and exporting the - class with the \c Q_EXPORT_PLUGIN macro. See the \link + class with the \c TQ_EXPORT_PLUGIN macro. See the \link plugins-howto.html TQt Plugins documentation \endlink for details. See the \link http://www.iana.org/assignments/character-sets IANA @@ -166,7 +166,7 @@ TQTextCodec *TQTextCodecPluginPrivate::createForName( const TQString &name ) /*! Constructs a text codec plugin. This is invoked automatically by - the \c Q_EXPORT_PLUGIN macro. + the \c TQ_EXPORT_PLUGIN macro. */ TQTextCodecPlugin::TQTextCodecPlugin() : TQGPlugin( d = new TQTextCodecPluginPrivate( this ) ) diff --git a/src/dialogs/ntqcolordialog.h b/src/dialogs/ntqcolordialog.h index 07c695fe8..0941a020d 100644 --- a/src/dialogs/ntqcolordialog.h +++ b/src/dialogs/ntqcolordialog.h @@ -49,7 +49,7 @@ class TQColorDialogPrivate; -class Q_EXPORT TQColorDialog : public TQDialog +class TQ_EXPORT TQColorDialog : public TQDialog { TQ_OBJECT diff --git a/src/dialogs/ntqdialog.h b/src/dialogs/ntqdialog.h index dc20b730d..37582e557 100644 --- a/src/dialogs/ntqdialog.h +++ b/src/dialogs/ntqdialog.h @@ -52,7 +52,7 @@ TQ_OBJECT class TQPushButton; class TQDialogPrivate; -class Q_EXPORT TQDialog : public TQWidget +class TQ_EXPORT TQDialog : public TQWidget { friend class TQPushButton; TQ_OBJECT diff --git a/src/dialogs/ntqerrormessage.h b/src/dialogs/ntqerrormessage.h index f17db5ea2..6c776d2d5 100644 --- a/src/dialogs/ntqerrormessage.h +++ b/src/dialogs/ntqerrormessage.h @@ -54,7 +54,7 @@ class TQStringList; template<class type> class TQDict; -class Q_EXPORT TQErrorMessage: public TQDialog { +class TQ_EXPORT TQErrorMessage: public TQDialog { TQ_OBJECT public: TQErrorMessage( TQWidget* parent, const char* name=0 ); diff --git a/src/dialogs/ntqfiledialog.h b/src/dialogs/ntqfiledialog.h index a26cdd662..a2eb6324e 100644 --- a/src/dialogs/ntqfiledialog.h +++ b/src/dialogs/ntqfiledialog.h @@ -67,7 +67,7 @@ class TQFileDialogTQFileListView; #ifndef TQT_NO_FILEDIALOG -class Q_EXPORT TQFileIconProvider : public TQObject +class TQ_EXPORT TQFileIconProvider : public TQObject { TQ_OBJECT public: @@ -81,7 +81,7 @@ private: // Disabled copy constructor and operator= #endif }; -class Q_EXPORT TQFilePreview +class TQ_EXPORT TQFilePreview { public: TQFilePreview(); @@ -89,7 +89,7 @@ public: }; -class Q_EXPORT TQFileDialog : public TQDialog +class TQ_EXPORT TQFileDialog : public TQDialog { TQ_OBJECT TQ_ENUMS( Mode ViewMode PreviewMode ) diff --git a/src/dialogs/ntqfontdialog.h b/src/dialogs/ntqfontdialog.h index 88321cb42..743738170 100644 --- a/src/dialogs/ntqfontdialog.h +++ b/src/dialogs/ntqfontdialog.h @@ -62,7 +62,7 @@ class TQFontDialogPrivate; -class Q_EXPORT TQFontDialog: public TQDialog +class TQ_EXPORT TQFontDialog: public TQDialog { TQ_OBJECT diff --git a/src/dialogs/ntqinputdialog.h b/src/dialogs/ntqinputdialog.h index afbdf0f1a..125b3556d 100644 --- a/src/dialogs/ntqinputdialog.h +++ b/src/dialogs/ntqinputdialog.h @@ -53,7 +53,7 @@ class TQSpinBox; class TQComboBox; class TQInputDialogPrivate; -class Q_EXPORT TQInputDialog : public TQDialog +class TQ_EXPORT TQInputDialog : public TQDialog { TQ_OBJECT diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/ntqmessagebox.h index e41f20101..b4fc27d8f 100644 --- a/src/dialogs/ntqmessagebox.h +++ b/src/dialogs/ntqmessagebox.h @@ -51,7 +51,7 @@ class TQLabel; class TQPushButton; struct TQMessageBoxData; -class Q_EXPORT TQMessageBox : public TQDialog +class TQ_EXPORT TQMessageBox : public TQDialog { TQ_OBJECT TQ_ENUMS( Icon ) diff --git a/src/dialogs/ntqprintdialog.h b/src/dialogs/ntqprintdialog.h index 696897602..c578e0ff3 100644 --- a/src/dialogs/ntqprintdialog.h +++ b/src/dialogs/ntqprintdialog.h @@ -51,7 +51,7 @@ class TQGroupBox; class TQPrintDialogPrivate; class TQListView; -class Q_EXPORT TQPrintDialog : public TQDialog +class TQ_EXPORT TQPrintDialog : public TQDialog { TQ_OBJECT public: diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h index effc6c965..eb5e065a1 100644 --- a/src/dialogs/ntqprogressdialog.h +++ b/src/dialogs/ntqprogressdialog.h @@ -53,7 +53,7 @@ class TQPushButton; class TQTimer; class TQProgressDialogData; -class Q_EXPORT TQProgressDialog : public TQDialog +class TQ_EXPORT TQProgressDialog : public TQDialog { TQ_OBJECT TQ_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0 diff --git a/src/dialogs/ntqtabdialog.h b/src/dialogs/ntqtabdialog.h index dd91a4bcd..8d6b67ccd 100644 --- a/src/dialogs/ntqtabdialog.h +++ b/src/dialogs/ntqtabdialog.h @@ -52,7 +52,7 @@ class TQTabBar; class TQTab; class TQTabDialogPrivate; -class Q_EXPORT TQTabDialog : public TQDialog +class TQ_EXPORT TQTabDialog : public TQDialog { TQ_OBJECT public: diff --git a/src/dialogs/ntqwizard.h b/src/dialogs/ntqwizard.h index 281ab3f7d..b09e90202 100644 --- a/src/dialogs/ntqwizard.h +++ b/src/dialogs/ntqwizard.h @@ -51,7 +51,7 @@ class TQHBoxLayout; class TQWizardPrivate; -class Q_EXPORT TQWizard : public TQDialog +class TQ_EXPORT TQWizard : public TQDialog { TQ_OBJECT TQ_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont ) diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 6de17f9db..835742d2a 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -3398,7 +3398,7 @@ void TQFileDialog::rereadDir() */ extern bool tqt_resolve_symlinks; // defined in qapplication.cpp -bool Q_EXPORT tqt_use_native_dialogs = TRUE; +bool TQ_EXPORT tqt_use_native_dialogs = TRUE; /*! This is a convenience static function that returns an existing file diff --git a/src/embedded/qgfxdriverinterface_p.h b/src/embedded/qgfxdriverinterface_p.h index 310f2262e..55a3c0b23 100644 --- a/src/embedded/qgfxdriverinterface_p.h +++ b/src/embedded/qgfxdriverinterface_p.h @@ -64,7 +64,7 @@ class TQScreen; -struct Q_EXPORT TQGfxDriverInterface : public TQFeatureListInterface +struct TQ_EXPORT TQGfxDriverInterface : public TQFeatureListInterface { virtual TQScreen* create( const TQString& driver, int displayId ) = 0; }; diff --git a/src/embedded/qkbddriverinterface_p.h b/src/embedded/qkbddriverinterface_p.h index 002d70141..9ab7f0c6b 100644 --- a/src/embedded/qkbddriverinterface_p.h +++ b/src/embedded/qkbddriverinterface_p.h @@ -64,7 +64,7 @@ class TQWSKeyboardHandler; -struct Q_EXPORT TQKbdDriverInterface : public TQFeatureListInterface +struct TQ_EXPORT TQKbdDriverInterface : public TQFeatureListInterface { virtual TQWSKeyboardHandler* create( const TQString& driver, const TQString& device ) = 0; }; diff --git a/src/embedded/qmousedriverinterface_p.h b/src/embedded/qmousedriverinterface_p.h index d4caea4b5..b07cdcde5 100644 --- a/src/embedded/qmousedriverinterface_p.h +++ b/src/embedded/qmousedriverinterface_p.h @@ -64,7 +64,7 @@ class TQWSMouseHandler; -struct Q_EXPORT TQMouseDriverInterface : public TQFeatureListInterface +struct TQ_EXPORT TQMouseDriverInterface : public TQFeatureListInterface { virtual TQWSMouseHandler* create( const TQString& driver, const TQString &device ) = 0; }; diff --git a/src/inputmethod/ntqinputcontextfactory.h b/src/inputmethod/ntqinputcontextfactory.h index 9e0160630..ed3536f10 100644 --- a/src/inputmethod/ntqinputcontextfactory.h +++ b/src/inputmethod/ntqinputcontextfactory.h @@ -45,7 +45,7 @@ class TQInputContext; class TQWidget; -class Q_EXPORT TQInputContextFactory +class TQ_EXPORT TQInputContextFactory { public: static TQStringList keys(); diff --git a/src/inputmethod/ntqinputcontextplugin.h b/src/inputmethod/ntqinputcontextplugin.h index 5c99341de..4026b9cf3 100644 --- a/src/inputmethod/ntqinputcontextplugin.h +++ b/src/inputmethod/ntqinputcontextplugin.h @@ -47,7 +47,7 @@ class TQInputContext; class TQInputContextPluginPrivate; -class Q_EXPORT TQInputContextPlugin : public TQGPlugin +class TQ_EXPORT TQInputContextPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/src/inputmethod/qinputcontextinterface_p.h b/src/inputmethod/qinputcontextinterface_p.h index fc2b50969..d42f81c50 100644 --- a/src/inputmethod/qinputcontextinterface_p.h +++ b/src/inputmethod/qinputcontextinterface_p.h @@ -73,7 +73,7 @@ class TQInputContext; #define IID_QInputContextFactory TQUuid(0x9ef05c7f, 0x0272, 0x11d9, 0x84, 0x6c, 0x00, 0x0d, 0x60, 0x77, 0xa7, 0x8d) #endif -struct Q_EXPORT TQInputContextFactoryInterface : public TQFeatureListInterface +struct TQ_EXPORT TQInputContextFactoryInterface : public TQFeatureListInterface { virtual TQInputContext *create( const TQString &key ) = 0; virtual TQStringList languages( const TQString &key ) = 0; diff --git a/src/inputmethod/qinputcontextplugin.cpp b/src/inputmethod/qinputcontextplugin.cpp index 452d9238e..1e2a6701e 100644 --- a/src/inputmethod/qinputcontextplugin.cpp +++ b/src/inputmethod/qinputcontextplugin.cpp @@ -55,7 +55,7 @@ Writing a input context plugin is achieved by subclassing this base class, reimplementing the pure virtual functions keys(), create(), languages(), displayName() description() and exporting - the class with the \c Q_EXPORT_PLUGIN macro. See the \link + the class with the \c TQ_EXPORT_PLUGIN macro. See the \link plugins-howto.html TQt Plugins documentation \endlink for details. \sa TQInputContext @@ -209,7 +209,7 @@ TQString TQInputContextPluginPrivate::description( const TQString &key ) /*! Constructs a input context plugin. This is invoked automatically by the - \c Q_EXPORT_PLUGIN macro. + \c TQ_EXPORT_PLUGIN macro. */ TQInputContextPlugin::TQInputContextPlugin() : TQGPlugin( d = new TQInputContextPluginPrivate( this ) ) diff --git a/src/kernel/ntqaccel.h b/src/kernel/ntqaccel.h index 42ee4f77a..ef578242a 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 7df830ffd..fb826d4f0 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 e00289ab6..d657e2647 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 b307490ea..54255978a 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 b585032f4..1fea830be 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 a4e49a362..22307b551 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 6c13f2308..93b375a68 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 34e9ed509..390508889 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 30acc281f..d45dd4f5a 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 e505fcd7b..b259d9866 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 38f55c48c..8e7b10ce2 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 9fd400458..51fbc8230 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 a255d0fe5..bc63a07d5 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 c315cb5b2..fb6f70257 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 952be802c..3e95cdc3f 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 d5db5ce82..ae344371e 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 cc76fb75b..9f802dbd2 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 8a44a5031..29c804c20 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 cdbd069d6..6f347e411 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 7ea425155..fd19761c6 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 175aaa320..25c269ff6 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 99bdbe0d1..e5a649759 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 3b645ab2f..71f3e00db 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 3d1fe4813..c0b7084a3 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 3276f3213..d9a90460e 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 214af452b..d571aae01 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 d595881c5..237817e9f 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 d45657af6..0b1dfe90d 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 84475a17e..5036e69d3 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 a9962e47c..6e0749098 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 7676cec48..2ee4fad0d 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 55d3962e3..d4ed34e14 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 08b5334b9..719f83b01 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 5c1b5f745..939f10c93 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 ef772989a..b044494b1 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 1877d168a..fa245f9c2 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 c1760dfac..fc16c50bd 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 74f4dae8d..82fe6d9b2 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 e274ee435..fac233ce3 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 b3fcd282e..4ee49faf2 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 1cb73a55b..80c353f0d 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 68014152b..114cf8b1c 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 e618a1d26..1db8ad7df 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 2f95272f3..96b5c13c3 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 7b0d6f0aa..ba673085f 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 b3e471f17..248fdc6cf 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 4acbdc33e..e6b5bc912 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 5c23c7514..94d923626 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 29bcb82e0..2f2d1372d 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 f0a3819a9..ebb817d6a 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 62b60f3a6..c38e379b2 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 85c05e534..bd7b50fbc 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 276f9afcb..3d281da7c 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 bb854be2d..1e57c3307 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 7b243c7ae..b03ffe647 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 97cc62e80..c56d637d4 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 911f085c8..934dd9816 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 e39cd7626..b70559ee2 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 3d482e5b6..942eaaeb9 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 50cbb29b2..b8125e57b 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 e1c3bf0f5..375f8eaa8 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 8b0a28fe9..f4b11e650 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 01905dfd3..5ac364822 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 37a5a337d..93e95aade 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 3fc4dd2fb..2c764d33b 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 ec42bd191..7a9c56fb3 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 02b2e881c..19f1ba4ec 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 b79901fc9..5ebbb2c5e 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 2e91b36ca..17f13a25b 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 dc0df0828..695a61fb7 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 7496a22cb..1b3045caa 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 5d6709db8..beb6f5528 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 7286648f9..c984788f5 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 f726aa329..9a2f35a8c 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 d7ab440f7..1644922aa 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 42a39804c..f0657b499 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 b6c261cca..3a9f32eb3 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 512f7830e..f5c924b23 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 03e40b7cf..af912f812 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 6d57f2148..6ec8f7796 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 f4e6c9bfb..1a7153b79 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 db717f7b7..ffd253934 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 9b04e1d20..d67b34dd0 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 c0c59d59e..abeceee64 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 c53ef91ad..de2c62d27 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 468eff81d..d0571fc5a 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 eed239ebe..9f86734a4 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 6d184ecf3..8abe49c2d 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 89d04960a..3982053e0 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 57c5dcd15..e8142c8f5 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 c37811c32..149e04fd7 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 ddff6cd29..560c0a9ea 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 0165f7002..70ed6b5d5 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 53cb69169..1adfa9455 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 4f04d37df..28a820277 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 0eb1cf044..d0bfa97a2 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 42c1b8bc1..d8bb1d46e 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 35513e12b..6b96a965d 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 3f1e48285..439355135 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 4d88323a1..df6b0a272 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 701db02ce..04faa33b0 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 b4763c8e5..b2430e055 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 f183fd622..ad4dacb5c 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 31185921a..3d64b6fe2 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; diff --git a/src/network/ntqdns.h b/src/network/ntqdns.h index 553c31e52..1c0559151 100644 --- a/src/network/ntqdns.h +++ b/src/network/ntqdns.h @@ -51,7 +51,7 @@ #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_DNS #else -#define TQM_EXPORT_DNS Q_EXPORT +#define TQM_EXPORT_DNS TQ_EXPORT #endif #ifndef TQT_NO_DNS diff --git a/src/network/ntqftp.h b/src/network/ntqftp.h index da4a23e88..dd375b696 100644 --- a/src/network/ntqftp.h +++ b/src/network/ntqftp.h @@ -50,7 +50,7 @@ #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_FTP #else -#define TQM_EXPORT_FTP Q_EXPORT +#define TQM_EXPORT_FTP TQ_EXPORT #endif #ifndef TQT_NO_NETWORKPROTOCOL_FTP diff --git a/src/network/ntqhostaddress.h b/src/network/ntqhostaddress.h index d8a30af42..d1c686edb 100644 --- a/src/network/ntqhostaddress.h +++ b/src/network/ntqhostaddress.h @@ -48,7 +48,7 @@ #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK #else -#define TQM_EXPORT_NETWORK Q_EXPORT +#define TQM_EXPORT_NETWORK TQ_EXPORT #endif #ifndef TQT_NO_NETWORK diff --git a/src/network/ntqhttp.h b/src/network/ntqhttp.h index c4c2714a5..8fc966bc3 100644 --- a/src/network/ntqhttp.h +++ b/src/network/ntqhttp.h @@ -51,7 +51,7 @@ #define TQM_EXPORT_HTTP #define TQM_TEMPLATE_EXTERN_HTTP #else -#define TQM_EXPORT_HTTP Q_EXPORT +#define TQM_EXPORT_HTTP TQ_EXPORT #define TQM_TEMPLATE_EXTERN_HTTP Q_TEMPLATE_EXTERN #endif diff --git a/src/network/ntqnetwork.h b/src/network/ntqnetwork.h index b8dabc086..7f6de06d3 100644 --- a/src/network/ntqnetwork.h +++ b/src/network/ntqnetwork.h @@ -48,7 +48,7 @@ #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK #else -#define TQM_EXPORT_NETWORK Q_EXPORT +#define TQM_EXPORT_NETWORK TQ_EXPORT #endif #ifndef TQT_NO_NETWORK diff --git a/src/network/ntqserversocket.h b/src/network/ntqserversocket.h index 57ebf341d..f00f4c775 100644 --- a/src/network/ntqserversocket.h +++ b/src/network/ntqserversocket.h @@ -51,7 +51,7 @@ #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK #else -#define TQM_EXPORT_NETWORK Q_EXPORT +#define TQM_EXPORT_NETWORK TQ_EXPORT #endif class TQServerSocketPrivate; diff --git a/src/network/ntqsocket.h b/src/network/ntqsocket.h index 3324699fd..90f1f74ac 100644 --- a/src/network/ntqsocket.h +++ b/src/network/ntqsocket.h @@ -50,7 +50,7 @@ #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK #else -#define TQM_EXPORT_NETWORK Q_EXPORT +#define TQM_EXPORT_NETWORK TQ_EXPORT #endif #ifndef TQT_NO_NETWORK diff --git a/src/network/ntqsocketdevice.h b/src/network/ntqsocketdevice.h index 420cd29ad..cad469017 100644 --- a/src/network/ntqsocketdevice.h +++ b/src/network/ntqsocketdevice.h @@ -49,7 +49,7 @@ #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK #else -#define TQM_EXPORT_NETWORK Q_EXPORT +#define TQM_EXPORT_NETWORK TQ_EXPORT #endif #ifndef TQT_NO_NETWORK diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h index 191f6161a..4b0657161 100644 --- a/src/opengl/ntqgl.h +++ b/src/opengl/ntqgl.h @@ -49,7 +49,7 @@ #if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_OPENGL #else -#define TQM_EXPORT_OPENGL Q_EXPORT +#define TQM_EXPORT_OPENGL TQ_EXPORT #endif #ifndef TQT_NO_COMPAT diff --git a/src/opengl/ntqglcolormap.h b/src/opengl/ntqglcolormap.h index 8fb249216..9a78d636f 100644 --- a/src/opengl/ntqglcolormap.h +++ b/src/opengl/ntqglcolormap.h @@ -50,7 +50,7 @@ #if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_OPENGL #else -#define TQM_EXPORT_OPENGL Q_EXPORT +#define TQM_EXPORT_OPENGL TQ_EXPORT #endif class TQWidget; diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h index 46f8afae4..42d1d1ec5 100644 --- a/src/sql/drivers/cache/qsqlcachedresult.h +++ b/src/sql/drivers/cache/qsqlcachedresult.h @@ -60,7 +60,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h index e4646256d..f2266af03 100644 --- a/src/sql/drivers/mysql/qsql_mysql.h +++ b/src/sql/drivers/mysql/qsql_mysql.h @@ -55,7 +55,7 @@ #ifdef QT_PLUGIN #define Q_EXPORT_SQLDRIVER_MYSQL #else -#define Q_EXPORT_SQLDRIVER_MYSQL Q_EXPORT +#define Q_EXPORT_SQLDRIVER_MYSQL TQ_EXPORT #endif class TQMYSQLDriverPrivate; diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h index 619212d4a..2fa820810 100644 --- a/src/sql/drivers/odbc/qsql_odbc.h +++ b/src/sql/drivers/odbc/qsql_odbc.h @@ -62,7 +62,7 @@ #ifdef QT_PLUGIN #define Q_EXPORT_SQLDRIVER_ODBC #else -#define Q_EXPORT_SQLDRIVER_ODBC Q_EXPORT +#define Q_EXPORT_SQLDRIVER_ODBC TQ_EXPORT #endif #ifdef Q_OS_UNIX diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h index 6f9c4f5f1..841ff568d 100644 --- a/src/sql/drivers/psql/qsql_psql.h +++ b/src/sql/drivers/psql/qsql_psql.h @@ -49,7 +49,7 @@ #ifdef QT_PLUGIN #define Q_EXPORT_SQLDRIVER_PSQL #else -#define Q_EXPORT_SQLDRIVER_PSQL Q_EXPORT +#define Q_EXPORT_SQLDRIVER_PSQL TQ_EXPORT #endif class TQPSQLPrivate; diff --git a/src/sql/ntqdatabrowser.h b/src/sql/ntqdatabrowser.h index 8c5cc7016..6dc3aab3b 100644 --- a/src/sql/ntqdatabrowser.h +++ b/src/sql/ntqdatabrowser.h @@ -56,7 +56,7 @@ class TQSqlForm; class TQDataBrowserPrivate; -class Q_EXPORT TQDataBrowser : public TQWidget +class TQ_EXPORT TQDataBrowser : public TQWidget { TQ_OBJECT TQ_PROPERTY( bool boundaryChecking READ boundaryChecking WRITE setBoundaryChecking ) diff --git a/src/sql/ntqdatatable.h b/src/sql/ntqdatatable.h index d03f9f7b7..d854c456d 100644 --- a/src/sql/ntqdatatable.h +++ b/src/sql/ntqdatatable.h @@ -55,7 +55,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_VIEW_WIDGETS diff --git a/src/sql/ntqdataview.h b/src/sql/ntqdataview.h index 9d982e1e8..245bb5eab 100644 --- a/src/sql/ntqdataview.h +++ b/src/sql/ntqdataview.h @@ -48,7 +48,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_VIEW_WIDGETS diff --git a/src/sql/ntqeditorfactory.h b/src/sql/ntqeditorfactory.h index 2a18b4b47..212424003 100644 --- a/src/sql/ntqeditorfactory.h +++ b/src/sql/ntqeditorfactory.h @@ -49,7 +49,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_EDIT_WIDGETS diff --git a/src/sql/ntqsql.h b/src/sql/ntqsql.h index f1c8b0883..28a8204b2 100644 --- a/src/sql/ntqsql.h +++ b/src/sql/ntqsql.h @@ -48,7 +48,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/ntqsqlcursor.h b/src/sql/ntqsqlcursor.h index 9541fe7b1..e253324af 100644 --- a/src/sql/ntqsqlcursor.h +++ b/src/sql/ntqsqlcursor.h @@ -51,7 +51,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/ntqsqldatabase.h b/src/sql/ntqsqldatabase.h index 6017bfcfe..a6d744877 100644 --- a/src/sql/ntqsqldatabase.h +++ b/src/sql/ntqsqldatabase.h @@ -51,7 +51,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/ntqsqldriver.h b/src/sql/ntqsqldriver.h index 5e5c625ed..b1b2fcb3a 100644 --- a/src/sql/ntqsqldriver.h +++ b/src/sql/ntqsqldriver.h @@ -56,7 +56,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/ntqsqldriverplugin.h b/src/sql/ntqsqldriverplugin.h index 8a6d3944a..97e7addb3 100644 --- a/src/sql/ntqsqldriverplugin.h +++ b/src/sql/ntqsqldriverplugin.h @@ -52,7 +52,7 @@ class TQSqlDriver; class TQSqlDriverPluginPrivate; -class Q_EXPORT TQSqlDriverPlugin : public TQGPlugin +class TQ_EXPORT TQSqlDriverPlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/src/sql/ntqsqleditorfactory.h b/src/sql/ntqsqleditorfactory.h index eb100952c..667ad8651 100644 --- a/src/sql/ntqsqleditorfactory.h +++ b/src/sql/ntqsqleditorfactory.h @@ -48,7 +48,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_EDIT_WIDGETS diff --git a/src/sql/ntqsqlerror.h b/src/sql/ntqsqlerror.h index 7fb816614..2d60c2f21 100644 --- a/src/sql/ntqsqlerror.h +++ b/src/sql/ntqsqlerror.h @@ -48,7 +48,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/ntqsqlfield.h b/src/sql/ntqsqlfield.h index f917b6e92..a9d5e8947 100644 --- a/src/sql/ntqsqlfield.h +++ b/src/sql/ntqsqlfield.h @@ -49,7 +49,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/ntqsqlform.h b/src/sql/ntqsqlform.h index c39382449..3d3b6272f 100644 --- a/src/sql/ntqsqlform.h +++ b/src/sql/ntqsqlform.h @@ -49,7 +49,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL_FORM diff --git a/src/sql/ntqsqlindex.h b/src/sql/ntqsqlindex.h index b387ea7da..aa0ad102b 100644 --- a/src/sql/ntqsqlindex.h +++ b/src/sql/ntqsqlindex.h @@ -52,7 +52,7 @@ #define TQM_EXPORT_SQL #define TQM_TEMPLATE_EXTERN_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #define TQM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN #endif diff --git a/src/sql/ntqsqlpropertymap.h b/src/sql/ntqsqlpropertymap.h index 893e8b6ab..c7bff6eb7 100644 --- a/src/sql/ntqsqlpropertymap.h +++ b/src/sql/ntqsqlpropertymap.h @@ -51,7 +51,7 @@ class TQWidget; class TQSqlPropertyMapPrivate; -class Q_EXPORT TQSqlPropertyMap { +class TQ_EXPORT TQSqlPropertyMap { public: TQSqlPropertyMap(); virtual ~TQSqlPropertyMap(); diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h index 7cba01016..d1f56f858 100644 --- a/src/sql/ntqsqlquery.h +++ b/src/sql/ntqsqlquery.h @@ -57,7 +57,7 @@ class TQSqlDriver; class TQSqlResult; class TQSqlDatabase; -class Q_EXPORT TQSqlResultShared : public TQObject, public TQShared +class TQ_EXPORT TQSqlResultShared : public TQObject, public TQShared { TQ_OBJECT public: @@ -69,7 +69,7 @@ private slots: void slotResultDestroyed(); }; -class Q_EXPORT TQSqlQuery +class TQ_EXPORT TQSqlQuery { public: TQSqlQuery( TQSqlResult * r ); diff --git a/src/sql/ntqsqlrecord.h b/src/sql/ntqsqlrecord.h index bf3ebfc4f..9b4e1e9e8 100644 --- a/src/sql/ntqsqlrecord.h +++ b/src/sql/ntqsqlrecord.h @@ -52,7 +52,7 @@ class TQSqlRecordPrivate; -class Q_EXPORT TQSqlRecordShared : public TQShared +class TQ_EXPORT TQSqlRecordShared : public TQShared { public: TQSqlRecordShared( TQSqlRecordPrivate* sqlRecordPrivate ) @@ -62,7 +62,7 @@ public: TQSqlRecordPrivate* d; }; -class Q_EXPORT TQSqlRecord +class TQ_EXPORT TQSqlRecord { public: TQSqlRecord(); @@ -117,13 +117,13 @@ private: #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQSqlFieldInfo>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQSqlFieldInfo>; // MOC_SKIP_END #endif typedef TQValueList<TQSqlFieldInfo> TQSqlFieldInfoList; -class Q_EXPORT TQSqlRecordInfo: public TQSqlFieldInfoList +class TQ_EXPORT TQSqlRecordInfo: public TQSqlFieldInfoList { public: TQSqlRecordInfo(): TQSqlFieldInfoList() {} diff --git a/src/sql/ntqsqlresult.h b/src/sql/ntqsqlresult.h index 4e0255a8f..0b0763498 100644 --- a/src/sql/ntqsqlresult.h +++ b/src/sql/ntqsqlresult.h @@ -52,7 +52,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/ntqsqlselectcursor.h b/src/sql/ntqsqlselectcursor.h index 7168dbefd..b1f0802b0 100644 --- a/src/sql/ntqsqlselectcursor.h +++ b/src/sql/ntqsqlselectcursor.h @@ -48,7 +48,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp index 0dddb3b17..8c42452d2 100644 --- a/src/sql/qsqldatabase.cpp +++ b/src/sql/qsqldatabase.cpp @@ -95,7 +95,7 @@ TQPtrDict<TQSqlOpenExtension> *qt_open_extension_dict = 0; static TQSingleCleanupHandler< TQPtrDict<TQSqlDriverExtension> > qt_driver_ext_cleanup; static TQSingleCleanupHandler< TQPtrDict<TQSqlOpenExtension> > qt_open_ext_cleanup; -Q_EXPORT TQPtrDict<TQSqlDriverExtension> *tqSqlDriverExtDict() +TQ_EXPORT TQPtrDict<TQSqlDriverExtension> *tqSqlDriverExtDict() { if ( !qt_driver_extension_dict ) { qt_driver_extension_dict = new TQPtrDict<TQSqlDriverExtension>; @@ -104,7 +104,7 @@ Q_EXPORT TQPtrDict<TQSqlDriverExtension> *tqSqlDriverExtDict() return qt_driver_extension_dict; } -Q_EXPORT TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict() +TQ_EXPORT TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict() { if ( !qt_open_extension_dict ) { qt_open_extension_dict = new TQPtrDict<TQSqlOpenExtension>; diff --git a/src/sql/qsqldriverinterface_p.h b/src/sql/qsqldriverinterface_p.h index 7f0678288..851770366 100644 --- a/src/sql/qsqldriverinterface_p.h +++ b/src/sql/qsqldriverinterface_p.h @@ -60,7 +60,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/sql/qsqldriverplugin.cpp b/src/sql/qsqldriverplugin.cpp index 451a9aa2f..f0c2f39f8 100644 --- a/src/sql/qsqldriverplugin.cpp +++ b/src/sql/qsqldriverplugin.cpp @@ -58,7 +58,7 @@ Writing a SQL plugin is achieved by subclassing this base class, reimplementing the pure virtual functions keys() and create(), and - exporting the class with the \c Q_EXPORT_PLUGIN macro. See the SQL + exporting the class with the \c TQ_EXPORT_PLUGIN macro. See the SQL plugins that come with TQt for example implementations (in the \c{plugins/src/sqldrivers} subdirectory of the source distribution). Read the \link plugins-howto.html plugins @@ -138,7 +138,7 @@ TQSqlDriver *TQSqlDriverPluginPrivate::create( const TQString &key ) /*! Constructs a SQL driver plugin. This is invoked automatically by - the \c Q_EXPORT_PLUGIN macro. + the \c TQ_EXPORT_PLUGIN macro. */ TQSqlDriverPlugin::TQSqlDriverPlugin() diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h index e042089fc..ff2580635 100644 --- a/src/sql/qsqlextension_p.h +++ b/src/sql/qsqlextension_p.h @@ -67,7 +67,7 @@ #define TQM_EXPORT_SQL #define TQM_TEMPLATE_EXTERN_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #define TQM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN #endif diff --git a/src/sql/qsqlmanager_p.h b/src/sql/qsqlmanager_p.h index d9ef527e5..c919b9df6 100644 --- a/src/sql/qsqlmanager_p.h +++ b/src/sql/qsqlmanager_p.h @@ -66,7 +66,7 @@ #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) #define TQM_EXPORT_SQL #else -#define TQM_EXPORT_SQL Q_EXPORT +#define TQM_EXPORT_SQL TQ_EXPORT #endif #ifndef TQT_NO_SQL diff --git a/src/styles/ntqcdestyle.h b/src/styles/ntqcdestyle.h index 90857223d..a0f02be28 100644 --- a/src/styles/ntqcdestyle.h +++ b/src/styles/ntqcdestyle.h @@ -51,7 +51,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_CDE #else -#define Q_EXPORT_STYLE_CDE Q_EXPORT +#define Q_EXPORT_STYLE_CDE TQ_EXPORT #endif class Q_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle diff --git a/src/styles/ntqcommonstyle.h b/src/styles/ntqcommonstyle.h index d77f72801..47edfe2cb 100644 --- a/src/styles/ntqcommonstyle.h +++ b/src/styles/ntqcommonstyle.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_STYLE -class Q_EXPORT TQCommonStyle: public TQStyle +class TQ_EXPORT TQCommonStyle: public TQStyle { TQ_OBJECT diff --git a/src/styles/ntqcompactstyle.h b/src/styles/ntqcompactstyle.h index a7d28c84e..b022002c5 100644 --- a/src/styles/ntqcompactstyle.h +++ b/src/styles/ntqcompactstyle.h @@ -50,7 +50,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_COMPACT #else -#define Q_EXPORT_STYLE_COMPACT Q_EXPORT +#define Q_EXPORT_STYLE_COMPACT TQ_EXPORT #endif class Q_EXPORT_STYLE_COMPACT TQCompactStyle : public TQWindowsStyle diff --git a/src/styles/ntqinterlacestyle.h b/src/styles/ntqinterlacestyle.h index a3487b651..61a0ed054 100644 --- a/src/styles/ntqinterlacestyle.h +++ b/src/styles/ntqinterlacestyle.h @@ -50,7 +50,7 @@ #include "ntqpalette.h" -class Q_EXPORT TQInterlaceStyle : public TQMotifStyle +class TQ_EXPORT TQInterlaceStyle : public TQMotifStyle { public: TQInterlaceStyle(); diff --git a/src/styles/ntqmotifplusstyle.h b/src/styles/ntqmotifplusstyle.h index e7c546192..bb590fc9d 100644 --- a/src/styles/ntqmotifplusstyle.h +++ b/src/styles/ntqmotifplusstyle.h @@ -51,7 +51,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_MOTIFPLUS #else -#define Q_EXPORT_STYLE_MOTIFPLUS Q_EXPORT +#define Q_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT #endif class Q_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle diff --git a/src/styles/ntqmotifstyle.h b/src/styles/ntqmotifstyle.h index 75abd98fc..b2501e483 100644 --- a/src/styles/ntqmotifstyle.h +++ b/src/styles/ntqmotifstyle.h @@ -52,7 +52,7 @@ class TQPalette; #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_MOTIF #else -#define Q_EXPORT_STYLE_MOTIF Q_EXPORT +#define Q_EXPORT_STYLE_MOTIF TQ_EXPORT #endif diff --git a/src/styles/ntqplatinumstyle.h b/src/styles/ntqplatinumstyle.h index 69b119bd9..54d0a94dd 100644 --- a/src/styles/ntqplatinumstyle.h +++ b/src/styles/ntqplatinumstyle.h @@ -52,7 +52,7 @@ class TQPalette; #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_PLATINUM #else -#define Q_EXPORT_STYLE_PLATINUM Q_EXPORT +#define Q_EXPORT_STYLE_PLATINUM TQ_EXPORT #endif class Q_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle diff --git a/src/styles/ntqsgistyle.h b/src/styles/ntqsgistyle.h index a7cbe2f4e..29582bf69 100644 --- a/src/styles/ntqsgistyle.h +++ b/src/styles/ntqsgistyle.h @@ -52,7 +52,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_SGI #else -#define Q_EXPORT_STYLE_SGI Q_EXPORT +#define Q_EXPORT_STYLE_SGI TQ_EXPORT #endif class TQSGIStylePrivate; diff --git a/src/styles/ntqstylefactory.h b/src/styles/ntqstylefactory.h index b2c1ba9d8..b715c19b8 100644 --- a/src/styles/ntqstylefactory.h +++ b/src/styles/ntqstylefactory.h @@ -48,7 +48,7 @@ class TQString; class TQStyle; -class Q_EXPORT TQStyleFactory +class TQ_EXPORT TQStyleFactory { public: #ifndef TQT_NO_STRINGLIST diff --git a/src/styles/ntqstyleplugin.h b/src/styles/ntqstyleplugin.h index 0142d36fe..4acd2b11a 100644 --- a/src/styles/ntqstyleplugin.h +++ b/src/styles/ntqstyleplugin.h @@ -52,7 +52,7 @@ class TQStyle; class TQStylePluginPrivate; -class Q_EXPORT TQStylePlugin : public TQGPlugin +class TQ_EXPORT TQStylePlugin : public TQGPlugin { TQ_OBJECT public: diff --git a/src/styles/ntqwindowsstyle.h b/src/styles/ntqwindowsstyle.h index c10afef85..d7df8b98d 100644 --- a/src/styles/ntqwindowsstyle.h +++ b/src/styles/ntqwindowsstyle.h @@ -50,7 +50,7 @@ #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_WINDOWS #else -#define Q_EXPORT_STYLE_WINDOWS Q_EXPORT +#define Q_EXPORT_STYLE_WINDOWS TQ_EXPORT #endif diff --git a/src/styles/qstyleinterface_p.h b/src/styles/qstyleinterface_p.h index afca34be7..500dcfef3 100644 --- a/src/styles/qstyleinterface_p.h +++ b/src/styles/qstyleinterface_p.h @@ -65,7 +65,7 @@ class TQStyle; #define IID_QStyleFactory TQUuid(0xfc1b6ebe, 0x53c, 0x49c1, 0xa4, 0x83, 0xc3, 0x77, 0x73, 0x9a, 0xb9, 0xa5) #endif -struct Q_EXPORT TQStyleFactoryInterface : public TQFeatureListInterface +struct TQ_EXPORT TQStyleFactoryInterface : public TQFeatureListInterface { virtual TQStyle* create( const TQString& style ) = 0; }; diff --git a/src/styles/qstyleplugin.cpp b/src/styles/qstyleplugin.cpp index 665e6230f..c6512de1f 100644 --- a/src/styles/qstyleplugin.cpp +++ b/src/styles/qstyleplugin.cpp @@ -59,7 +59,7 @@ Writing a style plugin is achieved by subclassing this base class, reimplementing the pure virtual functions keys() and create(), and - exporting the class with the \c Q_EXPORT_PLUGIN macro. See the + exporting the class with the \c TQ_EXPORT_PLUGIN macro. See the \link plugins-howto.html plugins documentation\endlink for an example. */ @@ -163,7 +163,7 @@ bool TQStylePluginPrivate::canUnload() const /*! Constructs a style plugin. This is invoked automatically by the - \c Q_EXPORT_PLUGIN macro. + \c TQ_EXPORT_PLUGIN macro. */ TQStylePlugin::TQStylePlugin() : TQGPlugin( (TQStyleFactoryInterface*)(d = new TQStylePluginPrivate( this )) ) diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h index a89d8fbaf..490909e1c 100644 --- a/src/table/ntqtable.h +++ b/src/table/ntqtable.h @@ -63,7 +63,7 @@ # define TQM_TEMPLATE_EXTERN_TABLE #endif #else -#define TQM_EXPORT_TABLE Q_EXPORT +#define TQM_EXPORT_TABLE TQ_EXPORT #define TQM_TEMPLATE_EXTERN_TABLE Q_TEMPLATE_EXTERN #endif diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp index 2f5d4c259..93d389e3b 100644 --- a/src/table/qtable.cpp +++ b/src/table/qtable.cpp @@ -70,7 +70,7 @@ static bool qt_update_cell_widget = TRUE; static bool qt_table_clipper_enabled = TRUE; #ifndef QT_INTERNAL_TABLE -Q_EXPORT +TQ_EXPORT #endif void tqt_set_table_clipper_enabled( bool enabled ) { diff --git a/src/tools/ntqbitarray.h b/src/tools/ntqbitarray.h index c63e4ac3f..b6e6e545d 100644 --- a/src/tools/ntqbitarray.h +++ b/src/tools/ntqbitarray.h @@ -52,7 +52,7 @@ class TQBitArray; -class Q_EXPORT TQBitVal +class TQ_EXPORT TQBitVal { private: TQBitArray *array; @@ -69,7 +69,7 @@ public: TQBitArray class *****************************************************************************/ -class Q_EXPORT TQBitArray : public TQByteArray +class TQ_EXPORT TQBitArray : public TQByteArray { public: TQBitArray(); @@ -135,9 +135,9 @@ inline bool TQBitArray::operator[]( int index ) const Misc. TQBitArray operator functions *****************************************************************************/ -Q_EXPORT TQBitArray operator&( const TQBitArray &, const TQBitArray & ); -Q_EXPORT TQBitArray operator|( const TQBitArray &, const TQBitArray & ); -Q_EXPORT TQBitArray operator^( const TQBitArray &, const TQBitArray & ); +TQ_EXPORT TQBitArray operator&( const TQBitArray &, const TQBitArray & ); +TQ_EXPORT TQBitArray operator|( const TQBitArray &, const TQBitArray & ); +TQ_EXPORT TQBitArray operator^( const TQBitArray &, const TQBitArray & ); inline TQBitVal::operator int() @@ -162,8 +162,8 @@ inline TQBitVal &TQBitVal::operator=( bool v ) TQBitArray stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBitArray & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBitArray & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBitArray & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQBitArray & ); #endif #endif // TQBITARRAY_H diff --git a/src/tools/ntqbuffer.h b/src/tools/ntqbuffer.h index e50f1917a..e4ba24115 100644 --- a/src/tools/ntqbuffer.h +++ b/src/tools/ntqbuffer.h @@ -47,7 +47,7 @@ #endif // QT_H -class Q_EXPORT TQBuffer : public TQIODevice +class TQ_EXPORT TQBuffer : public TQIODevice { public: TQBuffer(); diff --git a/src/tools/ntqcstring.h b/src/tools/ntqcstring.h index e009b0c09..e0054bf3a 100644 --- a/src/tools/ntqcstring.h +++ b/src/tools/ntqcstring.h @@ -53,38 +53,38 @@ Safe and portable C string functions; extensions to standard string.h *****************************************************************************/ -Q_EXPORT void *tqmemmove( void *dst, const void *src, uint len ); +TQ_EXPORT void *tqmemmove( void *dst, const void *src, uint len ); -Q_EXPORT char *tqstrdup( const char * ); +TQ_EXPORT char *tqstrdup( const char * ); -Q_EXPORT inline uint tqstrlen( const char *str ) +TQ_EXPORT inline uint tqstrlen( const char *str ) { return str ? (uint)strlen(str) : 0u; } -Q_EXPORT inline char *qstrcpy( char *dst, const char *src ) +TQ_EXPORT inline char *qstrcpy( char *dst, const char *src ) { return src ? strcpy(dst, src) : 0; } -Q_EXPORT char *tqstrncpy( char *dst, const char *src, uint len ); +TQ_EXPORT char *tqstrncpy( char *dst, const char *src, uint len ); -Q_EXPORT inline int qstrcmp( const char *str1, const char *str2 ) +TQ_EXPORT inline int qstrcmp( const char *str1, const char *str2 ) { return ( str1 && str2 ) ? strcmp( str1, str2 ) : ( str1 ? 1 : ( str2 ? -1 : 0 ) ); } -Q_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len ) +TQ_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len ) { return ( str1 && str2 ) ? strncmp( str1, str2, len ) : ( str1 ? 1 : ( str2 ? -1 : 0 ) ); } -Q_EXPORT int tqstricmp( const char *, const char * ); +TQ_EXPORT int tqstricmp( const char *, const char * ); -Q_EXPORT int tqstrnicmp( const char *, const char *, uint len ); +TQ_EXPORT int tqstrnicmp( const char *, const char *, uint len ); // tqChecksum: Internet checksum -Q_EXPORT TQ_UINT16 tqChecksum( const char *s, uint len ); +TQ_EXPORT TQ_UINT16 tqChecksum( const char *s, uint len ); /***************************************************************************** TQByteArray class @@ -106,11 +106,11 @@ typedef TQMemArray<char> TQByteArray; #endif #ifndef TQT_NO_COMPRESS -Q_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes ); -Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes ); -Q_EXPORT inline TQByteArray tqCompress( const TQByteArray& data) +TQ_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes ); +TQ_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes ); +TQ_EXPORT inline TQByteArray tqCompress( const TQByteArray& data) { return tqCompress( (const uchar*)data.data(), data.size() ); } -Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) +TQ_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) { return tqUncompress( (const uchar*)data.data(), data.size() ); } #endif @@ -118,8 +118,8 @@ Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) TQByteArray stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQByteArray & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQByteArray & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & ); #endif /***************************************************************************** @@ -128,7 +128,7 @@ Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & ); class TQRegExp; -class Q_EXPORT TQCString : public TQByteArray // C string class +class TQ_EXPORT TQCString : public TQByteArray // C string class { public: TQCString() {} // make null string @@ -230,8 +230,8 @@ private: TQCString stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCString & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCString & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCString & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQCString & ); #endif /***************************************************************************** @@ -288,61 +288,61 @@ inline TQCString::operator const char *() const TQCString non-member operators *****************************************************************************/ -Q_EXPORT inline bool operator==( const TQCString &s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator==( const TQCString &s1, const TQCString &s2 ) { return qstrcmp( s1.data(), s2.data() ) == 0; } -Q_EXPORT inline bool operator==( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator==( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) == 0; } -Q_EXPORT inline bool operator==( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator==( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) == 0; } -Q_EXPORT inline bool operator!=( const TQCString &s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator!=( const TQCString &s1, const TQCString &s2 ) { return qstrcmp( s1.data(), s2.data() ) != 0; } -Q_EXPORT inline bool operator!=( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator!=( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) != 0; } -Q_EXPORT inline bool operator!=( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator!=( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) != 0; } -Q_EXPORT inline bool operator<( const TQCString &s1, const TQCString& s2 ) +TQ_EXPORT inline bool operator<( const TQCString &s1, const TQCString& s2 ) { return qstrcmp( s1.data(), s2.data() ) < 0; } -Q_EXPORT inline bool operator<( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator<( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) < 0; } -Q_EXPORT inline bool operator<( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator<( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) < 0; } -Q_EXPORT inline bool operator<=( const TQCString &s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator<=( const TQCString &s1, const TQCString &s2 ) { return qstrcmp( s1.data(), s2.data() ) <= 0; } -Q_EXPORT inline bool operator<=( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator<=( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) <= 0; } -Q_EXPORT inline bool operator<=( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator<=( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) <= 0; } -Q_EXPORT inline bool operator>( const TQCString &s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator>( const TQCString &s1, const TQCString &s2 ) { return qstrcmp( s1.data(), s2.data() ) > 0; } -Q_EXPORT inline bool operator>( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator>( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) > 0; } -Q_EXPORT inline bool operator>( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator>( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) > 0; } -Q_EXPORT inline bool operator>=( const TQCString &s1, const TQCString& s2 ) +TQ_EXPORT inline bool operator>=( const TQCString &s1, const TQCString& s2 ) { return qstrcmp( s1.data(), s2.data() ) >= 0; } -Q_EXPORT inline bool operator>=( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline bool operator>=( const TQCString &s1, const char *s2 ) { return qstrcmp( s1.data(), s2 ) >= 0; } -Q_EXPORT inline bool operator>=( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline bool operator>=( const char *s1, const TQCString &s2 ) { return qstrcmp( s1, s2.data() ) >= 0; } -Q_EXPORT inline const TQCString operator+( const TQCString &s1, +TQ_EXPORT inline const TQCString operator+( const TQCString &s1, const TQCString &s2 ) { TQCString tmp( s1.data() ); @@ -350,28 +350,28 @@ Q_EXPORT inline const TQCString operator+( const TQCString &s1, return tmp; } -Q_EXPORT inline const TQCString operator+( const TQCString &s1, const char *s2 ) +TQ_EXPORT inline const TQCString operator+( const TQCString &s1, const char *s2 ) { TQCString tmp( s1.data() ); tmp += s2; return tmp; } -Q_EXPORT inline const TQCString operator+( const char *s1, const TQCString &s2 ) +TQ_EXPORT inline const TQCString operator+( const char *s1, const TQCString &s2 ) { TQCString tmp( s1 ); tmp += s2; return tmp; } -Q_EXPORT inline const TQCString operator+( const TQCString &s1, char c2 ) +TQ_EXPORT inline const TQCString operator+( const TQCString &s1, char c2 ) { TQCString tmp( s1.data() ); tmp += c2; return tmp; } -Q_EXPORT inline const TQCString operator+( char c1, const TQCString &s2 ) +TQ_EXPORT inline const TQCString operator+( char c1, const TQCString &s2 ) { TQCString tmp; tmp += c1; diff --git a/src/tools/ntqdatastream.h b/src/tools/ntqdatastream.h index 47c6c2d38..9cd74f66d 100644 --- a/src/tools/ntqdatastream.h +++ b/src/tools/ntqdatastream.h @@ -47,7 +47,7 @@ #endif // QT_H #ifndef TQT_NO_DATASTREAM -class Q_EXPORT TQDataStream // data stream class +class TQ_EXPORT TQDataStream // data stream class { public: TQDataStream(); diff --git a/src/tools/ntqdatetime.h b/src/tools/ntqdatetime.h index f4d989d14..f64a86ecc 100644 --- a/src/tools/ntqdatetime.h +++ b/src/tools/ntqdatetime.h @@ -52,7 +52,7 @@ TQDate class *****************************************************************************/ -class Q_EXPORT TQDate +class TQ_EXPORT TQDate { public: TQDate() { jd = 0; } @@ -114,8 +114,8 @@ private: uint jd; friend class TQDateTime; #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); #endif }; @@ -124,7 +124,7 @@ private: TQTime class *****************************************************************************/ -class Q_EXPORT TQTime +class TQ_EXPORT TQTime { public: TQTime() { ds=0; } // set null time @@ -175,8 +175,8 @@ private: uint ds; friend class TQDateTime; #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); #endif }; @@ -185,7 +185,7 @@ private: TQDateTime class *****************************************************************************/ -class Q_EXPORT TQDateTime +class TQ_EXPORT TQDateTime { public: TQDateTime() {} // set null date and null time @@ -231,8 +231,8 @@ private: TQDate d; TQTime t; #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime &); - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); + friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime &); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); #endif }; @@ -242,12 +242,12 @@ private: *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); #endif // TQT_NO_DATASTREAM #endif // TQDATETIME_H diff --git a/src/tools/ntqdir.h b/src/tools/ntqdir.h index 332cc960e..657f1f7ec 100644 --- a/src/tools/ntqdir.h +++ b/src/tools/ntqdir.h @@ -55,7 +55,7 @@ class TQStringList; template <class T> class TQDeepCopy; -class Q_EXPORT TQDir +class TQ_EXPORT TQDir { public: enum FilterSpec { Dirs = 0x001, diff --git a/src/tools/ntqfile.h b/src/tools/ntqfile.h index c007d5cbe..0fc684b94 100644 --- a/src/tools/ntqfile.h +++ b/src/tools/ntqfile.h @@ -50,7 +50,7 @@ class TQDir; class TQFilePrivate; -class Q_EXPORT TQFile : public TQIODevice // file I/O device class +class TQ_EXPORT TQFile : public TQIODevice // file I/O device class { public: TQFile(); diff --git a/src/tools/ntqfileinfo.h b/src/tools/ntqfileinfo.h index 86cfe6b2e..eab7f63d1 100644 --- a/src/tools/ntqfileinfo.h +++ b/src/tools/ntqfileinfo.h @@ -52,7 +52,7 @@ struct TQFileInfoCache; template <class T> class TQDeepCopy; -class Q_EXPORT TQFileInfo +class TQ_EXPORT TQFileInfo { public: enum PermissionSpec { diff --git a/src/tools/ntqgarray.h b/src/tools/ntqgarray.h index 76a5cf34a..4d239dd66 100644 --- a/src/tools/ntqgarray.h +++ b/src/tools/ntqgarray.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQGArray // generic array +class TQ_EXPORT TQGArray // generic array { friend class TQBuffer; public: diff --git a/src/tools/ntqgcache.h b/src/tools/ntqgcache.h index d9a3e1edb..cbcb0723f 100644 --- a/src/tools/ntqgcache.h +++ b/src/tools/ntqgcache.h @@ -53,7 +53,7 @@ class TQCListIt; class TQCDict; -class Q_EXPORT TQGCache : public TQPtrCollection // generic LRU cache +class TQ_EXPORT TQGCache : public TQPtrCollection // generic LRU cache { friend class TQGCacheIterator; protected: @@ -98,7 +98,7 @@ private: }; -class Q_EXPORT TQGCacheIterator // generic cache iterator +class TQ_EXPORT TQGCacheIterator // generic cache iterator { protected: TQGCacheIterator( const TQGCache & ); diff --git a/src/tools/ntqgdict.h b/src/tools/ntqgdict.h index ace621ab3..c3f8fb365 100644 --- a/src/tools/ntqgdict.h +++ b/src/tools/ntqgdict.h @@ -104,7 +104,7 @@ private: }; -class Q_EXPORT TQGDict : public TQPtrCollection // generic dictionary class +class TQ_EXPORT TQGDict : public TQPtrCollection // generic dictionary class { public: uint count() const { return numItems; } @@ -167,7 +167,7 @@ private: }; -class Q_EXPORT TQGDictIterator // generic dictionary iterator +class TQ_EXPORT TQGDictIterator // generic dictionary iterator { friend class TQGDict; public: diff --git a/src/tools/ntqglist.h b/src/tools/ntqglist.h index a3fce491e..247c4f68f 100644 --- a/src/tools/ntqglist.h +++ b/src/tools/ntqglist.h @@ -45,7 +45,7 @@ #include "ntqptrcollection.h" #endif // QT_H -class Q_EXPORT TQLNode +class TQ_EXPORT TQLNode { friend class TQGList; friend class TQGListIterator; @@ -63,7 +63,7 @@ class TQMutex; class TQGListPrivate; class TQGListIteratorList; // internal helper class -class Q_EXPORT TQGList : public TQPtrCollection // doubly linked generic list +class TQ_EXPORT TQGList : public TQPtrCollection // doubly linked generic list { friend class TQGListIterator; friend class TQGListIteratorList; @@ -212,15 +212,15 @@ inline TQPtrCollection::Item TQGList::clast() const *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQGList & ); -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGList & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQGList & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGList & ); #endif /***************************************************************************** TQGListIterator class *****************************************************************************/ -class Q_EXPORT TQGListIterator // TQGList iterator +class TQ_EXPORT TQGListIterator // TQGList iterator { friend class TQGList; friend class TQGListIteratorList; @@ -265,7 +265,7 @@ inline TQPtrCollection::Item TQGListIterator::get() const return curNode ? curNode->data : 0; } -class Q_EXPORT TQGListStdIterator +class TQ_EXPORT TQGListStdIterator { public: inline TQGListStdIterator( TQLNode* n ) : node( n ){} diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index 040d846ba..f249b7050 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -846,12 +846,12 @@ class TQString; # if defined(QT_DLL) # undef QT_DLL # endif -# define Q_EXPORT __declspec(dllexport) +# define TQ_EXPORT __declspec(dllexport) # define Q_TEMPLATEDLL # define Q_TEMPLATE_EXTERN # undef TQ_DISABLE_COPY /* avoid unresolved externals */ # elif defined(QT_DLL) /* use a TQt DLL library */ -# define Q_EXPORT __declspec(dllimport) +# define TQ_EXPORT __declspec(dllimport) # define Q_TEMPLATEDLL # ifndef Q_TEMPLATE_EXTERN # if defined(Q_CC_MSVC_NET) @@ -864,7 +864,7 @@ class TQString; # endif #elif defined(Q_OS_LINUX) && defined(Q_CC_BOR) # if defined(QT_SHARED) /* create a TQt shared library */ -# define Q_EXPORT __declspec(dllexport) +# define TQ_EXPORT __declspec(dllexport) # define Q_TEMPLATEDLL # define Q_TEMPLATE_EXTERN # undef TQ_DISABLE_COPY /* avoid unresolved externals */ @@ -874,7 +874,7 @@ class TQString; # undef TQ_DISABLE_COPY /* avoid unresolved externals */ # endif #elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4 -# define Q_EXPORT __attribute__((visibility("default"))) +# define TQ_EXPORT __attribute__((visibility("default"))) # undef QT_MAKEDLL /* ignore these for other platforms */ # undef QT_DLL #else @@ -882,8 +882,8 @@ class TQString; # undef QT_DLL #endif -#ifndef Q_EXPORT -# define Q_EXPORT +#ifndef TQ_EXPORT +# define TQ_EXPORT #endif @@ -892,7 +892,7 @@ class TQString; // #if defined(Q_WS_WIN) -extern Q_EXPORT bool qt_winunicode; +extern TQ_EXPORT bool qt_winunicode; #endif @@ -900,13 +900,13 @@ extern Q_EXPORT bool qt_winunicode; // System information // -Q_EXPORT const char *tqVersion(); -Q_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian ); -Q_EXPORT bool tqSharedBuild(); +TQ_EXPORT const char *tqVersion(); +TQ_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian ); +TQ_EXPORT bool tqSharedBuild(); #if defined(Q_OS_MAC) int qMacVersion(); #elif defined(Q_WS_WIN) -Q_EXPORT int qWinVersion(); +TQ_EXPORT int qWinVersion(); #if defined(UNICODE) #define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi } #define QT_WA_INLINE( uni, ansi ) ( qt_winunicode ? uni : ansi ) @@ -961,31 +961,31 @@ Q_EXPORT int qWinVersion(); #endif -Q_EXPORT void tqDebug( const TQString& ); // print debug message -Q_EXPORT void tqDebug( const TQCString& ); // print debug message -Q_EXPORT void tqDebug( const char *, ... ) // print debug message +TQ_EXPORT void tqDebug( const TQString& ); // print debug message +TQ_EXPORT void tqDebug( const TQCString& ); // print debug message +TQ_EXPORT void tqDebug( const char *, ... ) // print debug message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqWarning( const TQString& ); // print warning message -Q_EXPORT void tqWarning( const TQCString& ); // print warning message -Q_EXPORT void tqWarning( const char *, ... ) // print warning message +TQ_EXPORT void tqWarning( const TQString& ); // print warning message +TQ_EXPORT void tqWarning( const TQCString& ); // print warning message +TQ_EXPORT void tqWarning( const char *, ... ) // print warning message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqFatal( const TQString& ); // print fatal message and exit -Q_EXPORT void tqFatal( const TQCString& ); // print fatal message and exit -Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit +TQ_EXPORT void tqFatal( const TQString& ); // print fatal message and exit +TQ_EXPORT void tqFatal( const TQCString& ); // print fatal message and exit +TQ_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit #if defined(Q_CC_GNU) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); +TQ_EXPORT void tqSystemWarning( const char *, int code = -1 ); #if !defined(Q_ASSERT) @@ -1009,7 +1009,7 @@ Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); #endif // TQT_NO_COMPAT -Q_EXPORT bool tqt_check_pointer( bool c, const char *, int ); +TQ_EXPORT bool tqt_check_pointer( bool c, const char *, int ); #if defined(QT_CHECK_NULL) # define TQ_CHECK_PTR(p) (tqt_check_pointer((p)==0,__FILE__,__LINE__)) @@ -1020,34 +1020,34 @@ Q_EXPORT bool tqt_check_pointer( bool c, const char *, int ); enum TQtMsgType { TQtDebugMsg, TQtWarningMsg, TQtFatalMsg }; typedef void (*TQtMsgHandler)(TQtMsgType, const char *); -Q_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler ); +TQ_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler ); #if !defined(TQT_NO_COMPAT) // compatibility with TQt 2 typedef TQtMsgHandler msg_handler; #endif // TQT_NO_COMPAT -Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE ); +TQ_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE ); -Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc, +TQ_EXPORT void tqObsolete( const char *obj, const char *oldfunc, const char *newfunc ); -Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc ); -Q_EXPORT void tqObsolete( const char *message ); +TQ_EXPORT void tqObsolete( const char *obj, const char *oldfunc ); +TQ_EXPORT void tqObsolete( const char *message ); // // Install paths from configure // -Q_EXPORT const char *tqInstallPath(); -Q_EXPORT const char *tqInstallPathDocs(); -Q_EXPORT const char *tqInstallPathHeaders(); -Q_EXPORT const char *tqInstallPathLibs(); -Q_EXPORT const char *tqInstallPathBins(); -Q_EXPORT const char *tqInstallPathPlugins(); -Q_EXPORT const char *tqInstallPathData(); -Q_EXPORT const char *tqInstallPathTranslations(); -Q_EXPORT const char *tqInstallPathSysconf(); -Q_EXPORT const char *tqInstallPathShare(); +TQ_EXPORT const char *tqInstallPath(); +TQ_EXPORT const char *tqInstallPathDocs(); +TQ_EXPORT const char *tqInstallPathHeaders(); +TQ_EXPORT const char *tqInstallPathLibs(); +TQ_EXPORT const char *tqInstallPathBins(); +TQ_EXPORT const char *tqInstallPathPlugins(); +TQ_EXPORT const char *tqInstallPathData(); +TQ_EXPORT const char *tqInstallPathTranslations(); +TQ_EXPORT const char *tqInstallPathSysconf(); +TQ_EXPORT const char *tqInstallPathShare(); #endif /* __cplusplus */ diff --git a/src/tools/ntqgvector.h b/src/tools/ntqgvector.h index ad4b81f9e..4702c0e4a 100644 --- a/src/tools/ntqgvector.h +++ b/src/tools/ntqgvector.h @@ -46,7 +46,7 @@ #endif // QT_H -class Q_EXPORT TQGVector : public TQPtrCollection // generic vector +class TQ_EXPORT TQGVector : public TQPtrCollection // generic vector { friend class TQGList; // needed by TQGList::toVector public: @@ -117,8 +117,8 @@ private: *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQGVector & ); -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGVector & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQGVector & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGVector & ); #endif #endif // TQGVECTOR_H diff --git a/src/tools/ntqiodevice.h b/src/tools/ntqiodevice.h index 543ab8515..c9001bc15 100644 --- a/src/tools/ntqiodevice.h +++ b/src/tools/ntqiodevice.h @@ -88,7 +88,7 @@ #define IO_UnspecifiedError 8 // unspecified error -class Q_EXPORT TQIODevice +class TQ_EXPORT TQIODevice { public: typedef TQ_ULONG Offset; diff --git a/src/tools/ntqlibrary.h b/src/tools/ntqlibrary.h index 046d86855..df9af20b1 100644 --- a/src/tools/ntqlibrary.h +++ b/src/tools/ntqlibrary.h @@ -49,7 +49,7 @@ class TQLibraryPrivate; -class Q_EXPORT TQLibrary +class TQ_EXPORT TQLibrary { public: TQLibrary( const TQString& filename ); diff --git a/src/tools/ntqlocale.h b/src/tools/ntqlocale.h index 5cfaa32c6..1cbc54bad 100644 --- a/src/tools/ntqlocale.h +++ b/src/tools/ntqlocale.h @@ -43,7 +43,7 @@ struct TQLocalePrivate; -class Q_EXPORT TQLocale +class TQ_EXPORT TQLocale { friend class TQString; diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h index f34f665cc..f1c41be96 100644 --- a/src/tools/ntqmap.h +++ b/src/tools/ntqmap.h @@ -57,7 +57,7 @@ //#define QT_CHECK_MAP_RANGE -struct Q_EXPORT TQMapNodeBase +struct TQ_EXPORT TQMapNodeBase { enum Color { Red, Black }; @@ -328,7 +328,7 @@ TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec() } // ### 4.0: rename to something without Private in it. Not really internal. -class Q_EXPORT TQMapPrivateBase : public TQShared +class TQ_EXPORT TQMapPrivateBase : public TQShared { public: TQMapPrivateBase() { diff --git a/src/tools/ntqmutex.h b/src/tools/ntqmutex.h index e23f66fe8..c517c6355 100644 --- a/src/tools/ntqmutex.h +++ b/src/tools/ntqmutex.h @@ -52,7 +52,7 @@ class TQMutexPrivate; const int Q_MUTEX_NORMAL = 0; const int Q_MUTEX_RECURSIVE = 1; -class Q_EXPORT TQMutex +class TQ_EXPORT TQMutex { friend class TQThread; friend class TQWaitCondition; @@ -79,7 +79,7 @@ public: int level(); }; -class Q_EXPORT TQMutexLocker +class TQ_EXPORT TQMutexLocker { public: TQMutexLocker( TQMutex * ); diff --git a/src/tools/ntqptrcollection.h b/src/tools/ntqptrcollection.h index 2b69899f8..da6fc6670 100644 --- a/src/tools/ntqptrcollection.h +++ b/src/tools/ntqptrcollection.h @@ -50,7 +50,7 @@ class TQGList; class TQGDict; -class Q_EXPORT TQPtrCollection // inherited by all collections +class TQ_EXPORT TQPtrCollection // inherited by all collections { public: bool autoDelete() const { return del_item; } diff --git a/src/tools/ntqregexp.h b/src/tools/ntqregexp.h index c61437452..4588263ae 100644 --- a/src/tools/ntqregexp.h +++ b/src/tools/ntqregexp.h @@ -49,7 +49,7 @@ class TQRegExpEngine; struct TQRegExpPrivate; -class Q_EXPORT TQRegExp +class TQ_EXPORT TQRegExp { public: enum CaretMode { CaretAtZero, CaretAtOffset, CaretWontMatch }; diff --git a/src/tools/ntqsemaphore.h b/src/tools/ntqsemaphore.h index 3d418e074..0dc8e81de 100644 --- a/src/tools/ntqsemaphore.h +++ b/src/tools/ntqsemaphore.h @@ -49,7 +49,7 @@ class TQSemaphorePrivate; -class Q_EXPORT TQSemaphore +class TQ_EXPORT TQSemaphore { public: TQSemaphore( int ); diff --git a/src/tools/ntqsettings.h b/src/tools/ntqsettings.h index a788d35f2..a9d5cd29b 100644 --- a/src/tools/ntqsettings.h +++ b/src/tools/ntqsettings.h @@ -51,7 +51,7 @@ class TQSettingsPrivate; -class Q_EXPORT TQSettings +class TQ_EXPORT TQSettings { public: enum Format { diff --git a/src/tools/ntqshared.h b/src/tools/ntqshared.h index a556ac200..fbd4dd457 100644 --- a/src/tools/ntqshared.h +++ b/src/tools/ntqshared.h @@ -45,7 +45,7 @@ #include "ntqglobal.h" #endif // QT_H -struct Q_EXPORT TQShared +struct TQ_EXPORT TQShared { TQShared() : count( 1 ) { } void ref() { count++; } diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h index 4c4c4173e..e98aba40a 100644 --- a/src/tools/ntqstring.h +++ b/src/tools/ntqstring.h @@ -78,7 +78,7 @@ class TQCharRef; class TQMutex; template <class T> class TQDeepCopy; -class Q_EXPORT TQChar { +class TQ_EXPORT TQChar { public: TQChar(); TQChar( char c ); @@ -363,7 +363,7 @@ inline bool operator>( char ch, TQChar c ) { return !(c>=ch); } inline bool operator>( TQChar c1, TQChar c2 ) { return !(c2>=c1); } // internal -struct Q_EXPORT TQStringData : public TQShared { +struct TQ_EXPORT TQStringData : public TQShared { TQStringData(); TQStringData(TQChar *u, uint l, uint m); ~TQStringData(); @@ -398,7 +398,7 @@ private: }; -class Q_EXPORT TQString +class TQ_EXPORT TQString { public: TQString(); // make null string @@ -687,7 +687,7 @@ public: { return s1.localeAwareCompare( s2 ); } #ifndef TQT_NO_DATASTREAM - friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); + friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif void compose(); @@ -758,7 +758,7 @@ private: friend class TQLineEdit; }; -class Q_EXPORT TQCharRef { +class TQ_EXPORT TQCharRef { friend class TQString; TQString& s; uint p; @@ -818,7 +818,7 @@ inline TQCharRef TQString::at( uint i ) { return TQCharRef(this,i); } inline TQCharRef TQString::operator[]( int i ) { return at((uint)i); } -class Q_EXPORT TQConstString : private TQString { +class TQ_EXPORT TQConstString : private TQString { public: TQConstString( const TQChar* unicode, uint length ); ~TQConstString(); @@ -830,8 +830,8 @@ public: TQString stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif /***************************************************************************** @@ -1000,28 +1000,28 @@ inline int TQString::findRev( const char* str, int index ) const TQString non-member operators *****************************************************************************/ -Q_EXPORT bool operator!=( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator<( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator<=( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator==( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator>( const TQString &s1, const TQString &s2 ); -Q_EXPORT bool operator>=( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator!=( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator<( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator<=( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator==( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator>( const TQString &s1, const TQString &s2 ); +TQ_EXPORT bool operator>=( const TQString &s1, const TQString &s2 ); #ifndef TQT_NO_CAST_ASCII -Q_EXPORT bool operator!=( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator<( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator<=( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator==( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator>( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator>=( const TQString &s1, const char *s2 ); -Q_EXPORT bool operator!=( const char *s1, const TQString &s2 ); -Q_EXPORT bool operator<( const char *s1, const TQString &s2 ); -Q_EXPORT bool operator<=( const char *s1, const TQString &s2 ); -Q_EXPORT bool operator==( const char *s1, const TQString &s2 ); -//Q_EXPORT bool operator>( const char *s1, const TQString &s2 ); // MSVC++ -Q_EXPORT bool operator>=( const char *s1, const TQString &s2 ); -#endif - -Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 ) +TQ_EXPORT bool operator!=( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator<( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator<=( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator==( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator>( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator>=( const TQString &s1, const char *s2 ); +TQ_EXPORT bool operator!=( const char *s1, const TQString &s2 ); +TQ_EXPORT bool operator<( const char *s1, const TQString &s2 ); +TQ_EXPORT bool operator<=( const char *s1, const TQString &s2 ); +TQ_EXPORT bool operator==( const char *s1, const TQString &s2 ); +//TQ_EXPORT bool operator>( const char *s1, const TQString &s2 ); // MSVC++ +TQ_EXPORT bool operator>=( const char *s1, const TQString &s2 ); +#endif + +TQ_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 ) { TQString tmp( s1 ); tmp += s2; @@ -1029,14 +1029,14 @@ Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 } #ifndef TQT_NO_CAST_ASCII -Q_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 ) +TQ_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 ) { TQString tmp( s1 ); tmp += TQString::fromAscii(s2); return tmp; } -Q_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 ) +TQ_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 ) { TQString tmp = TQString::fromAscii( s1 ); tmp += s2; @@ -1044,21 +1044,21 @@ Q_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 ) } #endif -Q_EXPORT inline const TQString operator+( const TQString &s1, TQChar c2 ) +TQ_EXPORT inline const TQString operator+( const TQString &s1, TQChar c2 ) { TQString tmp( s1 ); tmp += c2; return tmp; } -Q_EXPORT inline const TQString operator+( const TQString &s1, char c2 ) +TQ_EXPORT inline const TQString operator+( const TQString &s1, char c2 ) { TQString tmp( s1 ); tmp += c2; return tmp; } -Q_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 ) +TQ_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 ) { TQString tmp; tmp += c1; @@ -1066,7 +1066,7 @@ Q_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 ) return tmp; } -Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) +TQ_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) { TQString tmp; tmp += c1; @@ -1075,12 +1075,12 @@ Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) } #ifndef TQT_NO_STL -Q_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2) +TQ_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2) { return s1 + TQString(s2); } -Q_EXPORT inline const TQString operator+(const std::string& s1, const TQString& s2) +TQ_EXPORT inline const TQString operator+(const std::string& s1, const TQString& s2) { TQString tmp(s2); return TQString(tmp.prepend(s1)); @@ -1089,11 +1089,11 @@ Q_EXPORT inline const TQString operator+(const std::string& s1, const TQString& #if defined(Q_OS_WIN32) -extern Q_EXPORT TQString qt_winTQString(void*); -extern Q_EXPORT const void* qt_winTchar(const TQString& str, bool addnul); -extern Q_EXPORT void* qt_winTchar_new(const TQString& str); -extern Q_EXPORT TQCString qt_winTQString2MB( const TQString& s, int len=-1 ); -extern Q_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 ); +extern TQ_EXPORT TQString qt_winTQString(void*); +extern TQ_EXPORT const void* qt_winTchar(const TQString& str, bool addnul); +extern TQ_EXPORT void* qt_winTchar_new(const TQString& str); +extern TQ_EXPORT TQCString qt_winTQString2MB( const TQString& s, int len=-1 ); +extern TQ_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 ); #endif #define Q_DEFINED_QSTRING diff --git a/src/tools/ntqstringlist.h b/src/tools/ntqstringlist.h index 5fc82435d..7bda85877 100644 --- a/src/tools/ntqstringlist.h +++ b/src/tools/ntqstringlist.h @@ -54,11 +54,11 @@ template <class T> class TQDeepCopy; #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQString>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQString>; // MOC_SKIP_END #endif -class Q_EXPORT TQStringList : public TQValueList<TQString> +class TQ_EXPORT TQStringList : public TQValueList<TQString> { public: TQStringList() { } @@ -98,8 +98,8 @@ protected: #ifndef TQT_NO_DATASTREAM class TQDataStream; -extern Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQStringList& ); -extern Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQStringList& ); +extern TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQStringList& ); +extern TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQStringList& ); #endif #endif // TQT_NO_STRINGLIST diff --git a/src/tools/ntqstrlist.h b/src/tools/ntqstrlist.h index 2d278a1e8..2495f55a5 100644 --- a/src/tools/ntqstrlist.h +++ b/src/tools/ntqstrlist.h @@ -55,7 +55,7 @@ class TQStrListIterator : public TQPtrListIterator<char> typedef TQPtrListIterator<char> TQStrListIterator; #endif -class Q_EXPORT TQStrList : public TQPtrList<char> +class TQ_EXPORT TQStrList : public TQPtrList<char> { public: TQStrList( bool deepCopies=TRUE ) { dc = deepCopies; del_item = deepCopies; } @@ -78,7 +78,7 @@ private: }; -class Q_EXPORT TQStrIList : public TQStrList // case insensitive string list +class TQ_EXPORT TQStrIList : public TQStrList // case insensitive string list { public: TQStrIList( bool deepCopies=TRUE ) : TQStrList( deepCopies ) {} diff --git a/src/tools/ntqstrvec.h b/src/tools/ntqstrvec.h index a1c538663..9f2245081 100644 --- a/src/tools/ntqstrvec.h +++ b/src/tools/ntqstrvec.h @@ -47,7 +47,7 @@ #include "ntqdatastream.h" #endif // QT_H -class Q_EXPORT TQStrVec : public TQPtrVector<char> +class TQ_EXPORT TQStrVec : public TQPtrVector<char> { public: TQStrVec() { dc = TRUE; } @@ -69,7 +69,7 @@ private: }; -class Q_EXPORT TQStrIVec : public TQStrVec // case insensitive string vec +class TQ_EXPORT TQStrIVec : public TQStrVec // case insensitive string vec { public: TQStrIVec() {} diff --git a/src/tools/ntqtextstream.h b/src/tools/ntqtextstream.h index 7e7345d91..5277c960b 100644 --- a/src/tools/ntqtextstream.h +++ b/src/tools/ntqtextstream.h @@ -53,7 +53,7 @@ class TQTextDecoder; class TQTextStreamPrivate; -class Q_EXPORT TQTextStream // text stream class +class TQ_EXPORT TQTextStream // text stream class { public: enum Encoding { Locale, Latin1, Unicode, UnicodeNetworkOrder, @@ -201,7 +201,7 @@ private: // Disabled copy constructor and operator= typedef TQTextStream TQTS; -class Q_EXPORT TQTextIStream : public TQTextStream { +class TQ_EXPORT TQTextIStream : public TQTextStream { public: TQTextIStream( const TQString* s ) : TQTextStream((TQString*)s,IO_ReadOnly) { } @@ -217,7 +217,7 @@ private: // Disabled copy constructor and operator= #endif }; -class Q_EXPORT TQTextOStream : public TQTextStream { +class TQ_EXPORT TQTextOStream : public TQTextStream { public: TQTextOStream( TQString* s ) : TQTextStream(s,IO_WriteOnly) { } @@ -292,7 +292,7 @@ inline TQChar TQTextStream::ts_getc() typedef TQTextStream & (*TQTSFUNC)(TQTextStream &);// manipulator function typedef int (TQTextStream::*TQTSMFI)(int); // manipulator w/int argument -class Q_EXPORT TQTSManip { // text stream manipulator +class TQ_EXPORT TQTSManip { // text stream manipulator public: TQTSManip( TQTSMFI m, int a ) { mf=m; arg=a; } void exec( TQTextStream &s ) { (s.*mf)(arg); } @@ -301,37 +301,37 @@ private: int arg; // member function argument }; -Q_EXPORT inline TQTextStream &operator>>( TQTextStream &s, TQTSFUNC f ) +TQ_EXPORT inline TQTextStream &operator>>( TQTextStream &s, TQTSFUNC f ) { return (*f)( s ); } -Q_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSFUNC f ) +TQ_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSFUNC f ) { return (*f)( s ); } -Q_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSManip m ) +TQ_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSManip m ) { m.exec(s); return s; } -Q_EXPORT TQTextStream &bin( TQTextStream &s ); // set bin notation -Q_EXPORT TQTextStream &oct( TQTextStream &s ); // set oct notation -Q_EXPORT TQTextStream &dec( TQTextStream &s ); // set dec notation -Q_EXPORT TQTextStream &hex( TQTextStream &s ); // set hex notation -Q_EXPORT TQTextStream &endl( TQTextStream &s ); // insert EOL ('\n') -Q_EXPORT TQTextStream &flush( TQTextStream &s ); // flush output -Q_EXPORT TQTextStream &ws( TQTextStream &s ); // eat whitespace on input -Q_EXPORT TQTextStream &reset( TQTextStream &s ); // set default flags +TQ_EXPORT TQTextStream &bin( TQTextStream &s ); // set bin notation +TQ_EXPORT TQTextStream &oct( TQTextStream &s ); // set oct notation +TQ_EXPORT TQTextStream &dec( TQTextStream &s ); // set dec notation +TQ_EXPORT TQTextStream &hex( TQTextStream &s ); // set hex notation +TQ_EXPORT TQTextStream &endl( TQTextStream &s ); // insert EOL ('\n') +TQ_EXPORT TQTextStream &flush( TQTextStream &s ); // flush output +TQ_EXPORT TQTextStream &ws( TQTextStream &s ); // eat whitespace on input +TQ_EXPORT TQTextStream &reset( TQTextStream &s ); // set default flags -Q_EXPORT inline TQTSManip qSetW( int w ) +TQ_EXPORT inline TQTSManip qSetW( int w ) { TQTSMFI func = &TQTextStream::width; return TQTSManip(func,w); } -Q_EXPORT inline TQTSManip qSetFill( int f ) +TQ_EXPORT inline TQTSManip qSetFill( int f ) { TQTSMFI func = &TQTextStream::fill; return TQTSManip(func,f); } -Q_EXPORT inline TQTSManip qSetPrecision( int p ) +TQ_EXPORT inline TQTSManip qSetPrecision( int p ) { TQTSMFI func = &TQTextStream::precision; return TQTSManip(func,p); diff --git a/src/tools/ntqthreadstorage.h b/src/tools/ntqthreadstorage.h index 9d9f20cf8..588621237 100644 --- a/src/tools/ntqthreadstorage.h +++ b/src/tools/ntqthreadstorage.h @@ -45,7 +45,7 @@ #include "ntqglobal.h" #endif // QT_H -class Q_EXPORT TQThreadStorageData +class TQ_EXPORT TQThreadStorageData { public: TQThreadStorageData( void (*func)(void *) ); diff --git a/src/tools/ntquuid.h b/src/tools/ntquuid.h index 317a0af82..1403c364e 100644 --- a/src/tools/ntquuid.h +++ b/src/tools/ntquuid.h @@ -61,7 +61,7 @@ typedef struct _GUID #endif -struct Q_EXPORT TQUuid +struct TQ_EXPORT TQUuid { enum Variant { VarUnknown =-1, @@ -187,8 +187,8 @@ struct Q_EXPORT TQUuid }; #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQUuid & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQUuid & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQUuid & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQUuid & ); #endif #endif //TQUUID_H diff --git a/src/tools/ntqwaitcondition.h b/src/tools/ntqwaitcondition.h index b85baf920..503d5d6c9 100644 --- a/src/tools/ntqwaitcondition.h +++ b/src/tools/ntqwaitcondition.h @@ -52,7 +52,7 @@ class TQWaitConditionPrivate; class TQMutex; -class Q_EXPORT TQWaitCondition +class TQ_EXPORT TQWaitCondition { public: TQWaitCondition(); diff --git a/src/tools/ntqwinexport.h b/src/tools/ntqwinexport.h index c3fc2146f..a8f051d33 100644 --- a/src/tools/ntqwinexport.h +++ b/src/tools/ntqwinexport.h @@ -41,151 +41,151 @@ #if defined(Q_DEFINED_QASCIIDICT) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(Q_EXPORTED_QASCIIDICT_TEMPLATES) #define Q_EXPORTED_QASCIIDICT_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQAsciiDictIterator<TQConnectionList>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQAsciiDict<TQConnectionList>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQAsciiDictIterator<TQConnectionList>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQAsciiDict<TQConnectionList>; #endif #if defined(Q_DEFINED_QSTYLESHEET) && defined(Q_DEFINED_QDICT) && !defined(Q_EXPORTED_QSTYLESHEET_TEMPLATES) #define Q_EXPORTED_QSTYLESHEET_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQDict<TQStyleSheetItem>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQStyleSheetItem>; #endif #if defined(Q_DEFINED_QLIBRARY) && defined(Q_DEFINED_QDICT) && !defined(Q_EXPORTED_QDICTLIBRARY_TEMPLATES) #define Q_EXPORTED_QDICTLIBRARY_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQDict<TQLibrary>; // for TQtopia +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQLibrary>; // for TQtopia #endif #if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QOBJECT) && !defined(Q_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES) #define Q_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQGuardedPtr<TQObject>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQGuardedPtr<TQObject>; #endif // needed for TQtopia #if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES) #define Q_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQGuardedPtr<TQWidget>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQGuardedPtr<TQWidget>; #endif #if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QACCESSIBLE_OBJECT) && !defined(Q_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES) #define Q_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQGuardedPtr<TQAccessibleObject>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQGuardedPtr<TQAccessibleObject>; #endif #if defined(Q_DEFINED_QINTDICT) && !defined(Q_EXPORTED_QINTDICT_TEMPLATES) #define Q_EXPORTED_QINTDICT_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQIntDict<int>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDict<int>; #endif #if defined(Q_DEFINED_QINTDICT) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED__TEMPLATES) #define Q_EXPORTED__TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQIntDictIterator<TQWidget>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQIntDict<TQWidget>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDictIterator<TQWidget>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDict<TQWidget>; #endif #if defined(Q_DEFINED_QMAP) && !defined(Q_EXPORTED_QMAPBASIC_TEMPLATES) #define Q_EXPORTED_QMAPBASIC_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, int>; // for TQtopia -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, bool>; // for TQtopia +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, int>; // for TQtopia +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, bool>; // for TQtopia #endif #if defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QMAPTQSTRING_TEMPLATES) #define Q_EXPORTED_QMAPTQSTRING_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<TQString, TQString>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<TQString, int>; // for TQtopia -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, TQString>; // for TQtopia +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<TQString, TQString>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<TQString, int>; // for TQtopia +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, TQString>; // for TQtopia #endif #if defined(Q_DEFINED_QMEMARRAY) && !defined(Q_EXPORTED_QMEMARRAY_BASIC_TEMPLATES) #define Q_EXPORTED_QMEMARRAY_BASIC_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<int>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<bool>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<char>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<int>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<bool>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<char>; #endif #if defined(Q_DEFINED_QMEMARRAY) && defined(Q_DEFINED_QPOINT) && !defined(Q_EXPORTED_QMEMARAYPOINT_TEMPLATES) #define Q_EXPORTED_QMEMARAYPOINT_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<TQPoint>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<TQPoint>; #endif #if defined(Q_DEFINED_QPTRLIST) && !defined(Q_EXPORTED_QPTRLIST_BASIC_TEMPLATES) #define Q_EXPORTED_QPTRLIST_BASIC_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<char>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<char>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<char>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<char>; #endif #if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED_QPTRLISTWIDGET_TEMPLATES) #define Q_EXPORTED_QPTRLISTWIDGET_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<TQWidget>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQWidget>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQWidget>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQWidget>; #endif #if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QCONNECTION) && !defined(Q_EXPORTED_QPTRLISTCONNECTION_TEMPLATES) #define Q_EXPORTED_QPTRLISTCONNECTION_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<TQConnection>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQConnection>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQConnection>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQConnection>; #endif #if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QOBJECT) && !defined(Q_EXPORTED_QPTRLISTOBJECT_TEMPLATES) #define Q_EXPORTED_QPTRLISTOBJECT_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<TQObject>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQObject>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQObject>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQObject>; #endif #if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QDOCKWINDOW) && !defined(Q_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES) #define Q_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<TQDockWindow>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQDockWindow>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQDockWindow>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQDockWindow>; #endif #if defined(Q_DEFINED_QPTRVECTOR) && !defined(Q_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES) #define Q_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<int>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<int>; #endif #if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET) && !defined(Q_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES) #define Q_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQStyleSheetItem>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQStyleSheetItem>; #endif #if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED_QPTRVECTORWIDGET_TEMPLATES) #define Q_EXPORTED_QPTRVECTORWIDGET_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQWidget>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQWidget>; #endif #if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(Q_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES) #define Q_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQConnectionList>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQConnectionList>; #endif #if defined(Q_DEFINED_QVALUELIST) && !defined(Q_EXPORTED_QVALUELIST_BASIC_TEMPLATES) #define Q_EXPORTED_QVALUELIST_BASIC_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueListIterator<bool>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<bool>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueListIterator<int>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<int>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<bool>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<bool>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<int>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<int>; #endif #if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QRECT) && !defined(Q_EXPORTED_QVALUELISTRECT_TEMPLATES) #define Q_EXPORTED_QVALUELISTRECT_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueListIterator<TQRect>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQRect>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<TQRect>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQRect>; #endif #if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QVALUELISTSTRING_TEMPLATES) #define Q_EXPORTED_QVALUELISTSTRING_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueListIterator<TQString>; -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQString>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<TQString>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQString>; #endif // TQStylesheet template exports #if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET) && !defined(Q_EXPORTED_QSTYLESHEETITEM1_TEMPLATES) #define Q_EXPORTED_QSTYLESHEETITEM1_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList< TQPtrVector< TQStyleSheetItem> >; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList< TQPtrVector< TQStyleSheetItem> >; #endif #if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTYLESHEET) && !defined(Q_EXPORTED_QSTYLESHEETITEM2_TEMPLATES) #define Q_EXPORTED_QSTYLESHEETITEM2_TEMPLATES -Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQStyleSheetItem::ListStyle>; +Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQStyleSheetItem::ListStyle>; #endif // qcanvas template exports @@ -209,7 +209,7 @@ TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrVector<TQTableIte #endif #if defined(Q_DEFINED_QTABLE) && defined(Q_DEFINED_QPTRVECTOR) -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQTable>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQTable>; #endif // qsqlextension template exports diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h index 79c5880fa..ab390e7fa 100644 --- a/src/tools/qcom_p.h +++ b/src/tools/qcom_p.h @@ -82,7 +82,7 @@ struct TQUObject; #define IID_QUnknown TQUuid(0x1d8518cd, 0xe8f5, 0x4366, 0x99, 0xe8, 0x87, 0x9f, 0xd7, 0xe4, 0x82, 0xde) #endif -struct Q_EXPORT TQUnknownInterface +struct TQ_EXPORT TQUnknownInterface { virtual TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ) = 0; virtual ulong addRef() = 0; @@ -96,7 +96,7 @@ struct Q_EXPORT TQUnknownInterface // the dispatch interface that inherits the unknown interface.. It is // used to explore interfaces during runtime and to do dynamic calls. -struct Q_EXPORT TQDispatchInterface : public TQUnknownInterface +struct TQ_EXPORT TQDispatchInterface : public TQUnknownInterface { // returns the interface description of this dispatch interface. virtual const TQUInterfaceDescription* interfaceDescription() const = 0; @@ -189,7 +189,7 @@ private: #define IID_QObject TQUuid( 0x10a1501b, 0x4c5f, 0x4914, 0x95, 0xdd, 0xc4, 0x00, 0x48, 0x6c, 0xf9, 0x00) #endif -struct Q_EXPORT TQObjectInterface +struct TQ_EXPORT TQObjectInterface { virtual TQObject* qObject() = 0; }; @@ -199,7 +199,7 @@ struct Q_EXPORT TQObjectInterface #define IID_QComponentInformation TQUuid(0x5f3968a5, 0xf451, 0x45b1, 0x96, 0xfb, 0x6, 0x1a, 0xd9, 0x8f, 0x92, 0x6e) #endif -struct Q_EXPORT TQComponentInformationInterface : public TQUnknownInterface +struct TQ_EXPORT TQComponentInformationInterface : public TQUnknownInterface { virtual TQString name() const = 0; virtual TQString description() const = 0; @@ -212,7 +212,7 @@ struct Q_EXPORT TQComponentInformationInterface : public TQUnknownInterface #define IID_QComponentFactory TQUuid( 0x6caa771b, 0x17bb, 0x4988, 0x9e, 0x78, 0xba, 0x5c, 0xdd, 0xaa, 0xc3, 0x1e) #endif -struct Q_EXPORT TQComponentFactoryInterface : public TQUnknownInterface +struct TQ_EXPORT TQComponentFactoryInterface : public TQUnknownInterface { virtual TQRESULT createInstance( const TQUuid &cid, const TQUuid &iid, TQUnknownInterface** instance, TQUnknownInterface *outer ) = 0; }; @@ -222,7 +222,7 @@ struct Q_EXPORT TQComponentFactoryInterface : public TQUnknownInterface #define IID_QLibrary TQUuid( 0xd16111d4, 0xe1e7, 0x4c47, 0x85, 0x99, 0x24, 0x48, 0x3d, 0xae, 0x2e, 0x07) #endif -struct Q_EXPORT TQLibraryInterface : public TQUnknownInterface +struct TQ_EXPORT TQLibraryInterface : public TQUnknownInterface { virtual bool init() = 0; virtual void cleanup() = 0; @@ -234,7 +234,7 @@ struct Q_EXPORT TQLibraryInterface : public TQUnknownInterface #define IID_QFeatureList TQUuid(0x3f8fdc44, 0x3015, 0x4f3e, 0xb6, 0xd6, 0xe4, 0xaa, 0xaa, 0xbd, 0xea, 0xad) #endif -struct Q_EXPORT TQFeatureListInterface : public TQUnknownInterface +struct TQ_EXPORT TQFeatureListInterface : public TQUnknownInterface { virtual TQStringList featureList() const = 0; }; @@ -244,14 +244,14 @@ struct Q_EXPORT TQFeatureListInterface : public TQUnknownInterface #define IID_QComponentRegistration TQUuid( 0xb5feb5de, 0xe0cd, 0x4e37, 0xb0, 0xeb, 0x8a, 0x81, 0x24, 0x99, 0xa0, 0xc1) #endif -struct Q_EXPORT TQComponentRegistrationInterface : public TQUnknownInterface +struct TQ_EXPORT TQComponentRegistrationInterface : public TQUnknownInterface { virtual bool registerComponents( const TQString &filepath ) const = 0; virtual bool unregisterComponents() const = 0; }; // internal class that wraps an initialized ulong -struct Q_EXPORT TQtULong +struct TQ_EXPORT TQtULong { TQtULong() : ref( 0 ) { } operator unsigned long () const { return ref; } @@ -281,11 +281,11 @@ public: \ #define Q_UCM_FLAGS_STRING "01" #endif -#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 @@ -315,26 +315,26 @@ public: \ # ifdef Q_CC_BOR # define Q_EXPORT_COMPONENT() \ Q_UCM_VERIFICATION_DATA \ - Q_EXTERN_C __declspec(dllexport) \ + TQ_EXTERN_C __declspec(dllexport) \ const char * __stdcall qt_ucm_query_verification_data() \ { return qt_ucm_verification_data; } \ - Q_EXTERN_C Q_EXPORT __declspec(dllexport) TQUnknownInterface* \ + TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* \ __stdcall ucm_instantiate() # else # define Q_EXPORT_COMPONENT() \ Q_UCM_VERIFICATION_DATA \ - Q_EXTERN_C __declspec(dllexport) \ + TQ_EXTERN_C __declspec(dllexport) \ const char *qt_ucm_query_verification_data() \ { return qt_ucm_verification_data; } \ - Q_EXTERN_C Q_EXPORT __declspec(dllexport) TQUnknownInterface* ucm_instantiate() + TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* ucm_instantiate() # endif # else # define Q_EXPORT_COMPONENT() \ Q_UCM_VERIFICATION_DATA \ - Q_EXTERN_C \ + TQ_EXTERN_C \ const char *qt_ucm_query_verification_data() \ { return qt_ucm_verification_data; } \ - Q_EXTERN_C Q_EXPORT TQUnknownInterface* ucm_instantiate() + TQ_EXTERN_C TQ_EXPORT TQUnknownInterface* ucm_instantiate() # endif # define Q_EXPORT_INTERFACE() Q_EXPORT_COMPONENT() #endif diff --git a/src/tools/qcomlibrary_p.h b/src/tools/qcomlibrary_p.h index 8d53e2952..f738aff52 100644 --- a/src/tools/qcomlibrary_p.h +++ b/src/tools/qcomlibrary_p.h @@ -58,7 +58,7 @@ #ifndef TQT_NO_COMPONENT -class Q_EXPORT TQComLibrary : public TQLibrary +class TQ_EXPORT TQComLibrary : public TQLibrary { public: TQComLibrary( const TQString &filename ); diff --git a/src/tools/qcomponentfactory_p.h b/src/tools/qcomponentfactory_p.h index 0c343c74d..89399152f 100644 --- a/src/tools/qcomponentfactory_p.h +++ b/src/tools/qcomponentfactory_p.h @@ -59,7 +59,7 @@ #ifndef TQT_NO_COMPONENT -class Q_EXPORT TQComponentFactory +class TQ_EXPORT TQComponentFactory { public: static TQRESULT createInstance( const TQString &cid, const TQUuid &iid, TQUnknownInterface** instance, TQUnknownInterface *outer = 0 ); diff --git a/src/tools/qgpluginmanager_p.h b/src/tools/qgpluginmanager_p.h index 371299e9a..c531b1ab1 100644 --- a/src/tools/qgpluginmanager_p.h +++ b/src/tools/qgpluginmanager_p.h @@ -63,11 +63,11 @@ #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN -//Q_TEMPLATE_EXTERN template class Q_EXPORT TQDict<TQLibrary>; +//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQLibrary>; // MOC_SKIP_END #endif -class Q_EXPORT TQGPluginManager +class TQ_EXPORT TQGPluginManager { public: TQGPluginManager( const TQUuid& id, const TQStringList& paths = TQString::null, const TQString &suffix = TQString::null, bool cs = TRUE ); diff --git a/src/tools/qmutexpool.cpp b/src/tools/qmutexpool.cpp index 18cd55606..72c66c8ca 100644 --- a/src/tools/qmutexpool.cpp +++ b/src/tools/qmutexpool.cpp @@ -42,7 +42,7 @@ #include <ntqthread.h> -Q_EXPORT TQMutexPool *tqt_global_mutexpool = 0; +TQ_EXPORT TQMutexPool *tqt_global_mutexpool = 0; /*! diff --git a/src/tools/qmutexpool_p.h b/src/tools/qmutexpool_p.h index cb2eef205..a0bb28562 100644 --- a/src/tools/qmutexpool_p.h +++ b/src/tools/qmutexpool_p.h @@ -58,7 +58,7 @@ #include "ntqmemarray.h" #endif // QT_H -class Q_EXPORT TQMutexPool +class TQ_EXPORT TQMutexPool { public: TQMutexPool( bool recursive = FALSE, int size = 17 ); @@ -73,7 +73,7 @@ private: bool recurs; }; -extern Q_EXPORT TQMutexPool *tqt_global_mutexpool; +extern TQ_EXPORT TQMutexPool *tqt_global_mutexpool; #endif // TQT_THREAD_SUPPORT diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 9c205e950..01d90c1f7 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -1456,7 +1456,7 @@ char* TQString::unicodeToLatin1(const TQChar *uc, uint l, bool unpaged) flags. */ -Q_EXPORT TQStringData *TQString::shared_null = 0; +TQ_EXPORT TQStringData *TQString::shared_null = 0; QT_STATIC_CONST_IMPL TQString TQString::null; QT_STATIC_CONST_IMPL TQChar TQChar::null; QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd); diff --git a/src/tools/qstringlist.cpp b/src/tools/qstringlist.cpp index 71427d4e7..732bd7cf3 100644 --- a/src/tools/qstringlist.cpp +++ b/src/tools/qstringlist.cpp @@ -436,12 +436,12 @@ TQString TQStringList::join( const TQString &sep ) const } #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator>>( TQDataStream & s, TQStringList& l ) +TQ_EXPORT TQDataStream &operator>>( TQDataStream & s, TQStringList& l ) { return s >> (TQValueList<TQString>&)l; } -Q_EXPORT TQDataStream &operator<<( TQDataStream & s, const TQStringList& l ) +TQ_EXPORT TQDataStream &operator<<( TQDataStream & s, const TQStringList& l ) { return s << (const TQValueList<TQString>&)l; } diff --git a/src/tools/qucom_p.h b/src/tools/qucom_p.h index f4f7ea81b..db752560f 100644 --- a/src/tools/qucom_p.h +++ b/src/tools/qucom_p.h @@ -72,7 +72,7 @@ struct TQUnknownInterface; struct TQDispatchInterface; -struct Q_EXPORT TQUBuffer +struct TQ_EXPORT TQUBuffer { virtual long read( char *data, ulong maxlen ) = 0; virtual long write( const char *data, ulong len ) = 0; @@ -80,7 +80,7 @@ struct Q_EXPORT TQUBuffer // A type for a TQUObject -struct Q_EXPORT TQUType +struct TQ_EXPORT TQUType { virtual const TQUuid *uuid() const = 0; virtual const char *desc() const = 0; @@ -106,8 +106,8 @@ struct Q_EXPORT TQUType // {DE56510E-4E9F-4b76-A3C2-D1E2EF42F1AC} -extern Q_EXPORT const TQUuid TID_QUType_Null; -struct Q_EXPORT TQUType_Null : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_Null; +struct TQ_EXPORT TQUType_Null : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -120,11 +120,11 @@ struct Q_EXPORT TQUType_Null : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_Null static_QUType_Null; +extern TQ_EXPORT TQUType_Null static_QUType_Null; // The magic TQUObject -struct Q_EXPORT TQUObject +struct TQ_EXPORT TQUObject { public: // scary MSVC bug makes this necessary TQUObject() : type( &static_QUType_Null ), isLastObject(false) {} @@ -192,7 +192,7 @@ public: // scary MSVC bug makes this necessary // A parameter description describes one method parameters. A // parameter has a name, a type and a flag describing whether it's an // in parameter, an out parameter, or both ways -struct Q_EXPORT TQUParameter +struct TQ_EXPORT TQUParameter { const char* name; TQUType *type; @@ -203,7 +203,7 @@ struct Q_EXPORT TQUParameter // A method description describes one method. A method has a name and // an array of parameters. -struct Q_EXPORT TQUMethod +struct TQ_EXPORT TQUMethod { const char* name; int count; @@ -211,7 +211,7 @@ struct Q_EXPORT TQUMethod }; // A Property description. Not used yet in the example. -struct Q_EXPORT TQUProperty +struct TQ_EXPORT TQUProperty { const char* name; TQUType* type; @@ -226,7 +226,7 @@ struct Q_EXPORT TQUProperty // An interface description describes one interface, that is all its // methods and properties. -struct Q_EXPORT TQUInterfaceDescription +struct TQ_EXPORT TQUInterfaceDescription { int methodCount; const TQUMethod* methods; @@ -238,7 +238,7 @@ struct Q_EXPORT TQUInterfaceDescription // A component description describe one component, that is its name, // vendor, release, info, its component uuid and all its interface // uuids. -struct Q_EXPORT TQUComponentDescription +struct TQ_EXPORT TQUComponentDescription { const char* name; const char* vendor; @@ -253,7 +253,7 @@ struct Q_EXPORT TQUComponentDescription // A component server description describe one component server, that // is its name, vendor, release, info and the descriptions of all // components it can instantiate. -struct Q_EXPORT TQUComponentServerDescription +struct TQ_EXPORT TQUComponentServerDescription { const char* name; const char* vendor; @@ -265,13 +265,13 @@ struct Q_EXPORT TQUComponentServerDescription -struct Q_EXPORT TQUEnumItem // - a name/value pair +struct TQ_EXPORT TQUEnumItem // - a name/value pair { const char *key; int value; }; -struct Q_EXPORT TQUEnum +struct TQ_EXPORT TQUEnum { const char *name; // - enumerator name unsigned int count; // - number of values @@ -291,8 +291,8 @@ inline bool TQUType::check( TQUObject* o, TQUType* t ) { // {7EE17B08-5419-47e2-9776-8EEA112DCAEC} -extern Q_EXPORT const TQUuid TID_QUType_enum; -struct Q_EXPORT TQUType_enum : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_enum; +struct TQ_EXPORT TQUType_enum : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -307,12 +307,12 @@ struct Q_EXPORT TQUType_enum : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_enum static_QUType_enum; +extern TQ_EXPORT TQUType_enum static_QUType_enum; // {8AC26448-5AB4-49eb-968C-8F30AB13D732} -extern Q_EXPORT const TQUuid TID_QUType_ptr; -struct Q_EXPORT TQUType_ptr : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_ptr; +struct TQ_EXPORT TQUType_ptr : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -327,11 +327,11 @@ struct Q_EXPORT TQUType_ptr : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_ptr static_QUType_ptr; +extern TQ_EXPORT TQUType_ptr static_QUType_ptr; // {97A2594D-6496-4402-A11E-55AEF2D4D25C} -extern Q_EXPORT const TQUuid TID_QUType_iface; -struct Q_EXPORT TQUType_iface : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_iface; +struct TQ_EXPORT TQUType_iface : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -346,11 +346,11 @@ struct Q_EXPORT TQUType_iface : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_iface static_QUType_iface; +extern TQ_EXPORT TQUType_iface static_QUType_iface; // {2F358164-E28F-4bf4-9FA9-4E0CDCABA50B} -extern Q_EXPORT const TQUuid TID_QUType_idisp; -struct Q_EXPORT TQUType_idisp : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_idisp; +struct TQ_EXPORT TQUType_idisp : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -365,11 +365,11 @@ struct Q_EXPORT TQUType_idisp : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_idisp static_QUType_idisp; +extern TQ_EXPORT TQUType_idisp static_QUType_idisp; // {CA42115D-13D0-456c-82B5-FC10187F313E} -extern Q_EXPORT const TQUuid TID_QUType_bool; -struct Q_EXPORT TQUType_bool : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_bool; +struct TQ_EXPORT TQUType_bool : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -384,11 +384,11 @@ struct Q_EXPORT TQUType_bool : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_bool static_QUType_bool; +extern TQ_EXPORT TQUType_bool static_QUType_bool; // {53C1F3BE-73C3-4c7d-9E05-CCF09EB676B5} -extern Q_EXPORT const TQUuid TID_QUType_int; -struct Q_EXPORT TQUType_int : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_int; +struct TQ_EXPORT TQUType_int : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -403,12 +403,12 @@ struct Q_EXPORT TQUType_int : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_int static_QUType_int; +extern TQ_EXPORT TQUType_int static_QUType_int; // {2D0974E5-0BA6-4ec2-8837-C198972CB48C} -extern Q_EXPORT const TQUuid TID_QUType_double; -struct Q_EXPORT TQUType_double : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_double; +struct TQ_EXPORT TQUType_double : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -423,12 +423,12 @@ struct Q_EXPORT TQUType_double : public TQUType int serializeTo( TQUObject *, TQUBuffer * ); int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_double static_QUType_double; +extern TQ_EXPORT TQUType_double static_QUType_double; // {EFCDD1D4-77A3-4b8e-8D46-DC14B8D393E9} -extern Q_EXPORT const TQUuid TID_QUType_charstar; -struct Q_EXPORT TQUType_charstar : public TQUType +extern TQ_EXPORT const TQUuid TID_QUType_charstar; +struct TQ_EXPORT TQUType_charstar : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -444,12 +444,12 @@ struct Q_EXPORT TQUType_charstar : public TQUType int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_charstar static_QUType_charstar; +extern TQ_EXPORT TQUType_charstar static_QUType_charstar; // {44C2A547-01E7-4e56-8559-35AF9D2F42B7} extern const TQUuid TID_QUType_TQString; -struct Q_EXPORT TQUType_TQString : public TQUType +struct TQ_EXPORT TQUType_TQString : public TQUType { const TQUuid *uuid() const; const char *desc() const; @@ -466,7 +466,7 @@ struct Q_EXPORT TQUType_TQString : public TQUType int serializeFrom( TQUObject *, TQUBuffer * ); }; -extern Q_EXPORT TQUType_TQString static_QUType_TQString; +extern TQ_EXPORT TQUType_TQString static_QUType_TQString; #endif // TQUCOM_P_H diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h index cb568071d..a00d7d8fd 100644 --- a/src/widgets/ntqaction.h +++ b/src/widgets/ntqaction.h @@ -56,7 +56,7 @@ class TQStatusBar; class TQPopupMenu; class TQToolTipGroup; -class Q_EXPORT TQAction : public TQObject +class TQ_EXPORT TQAction : public TQObject { TQ_OBJECT TQ_PROPERTY( bool toggleAction READ isToggleAction WRITE setToggleAction) @@ -151,7 +151,7 @@ private: #endif }; -class Q_EXPORT TQActionGroup : public TQAction +class TQ_EXPORT TQActionGroup : public TQAction { TQ_OBJECT TQ_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive ) diff --git a/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h index 50d10e662..0d0aa65ef 100644 --- a/src/widgets/ntqbutton.h +++ b/src/widgets/ntqbutton.h @@ -53,7 +53,7 @@ class TQButtonGroup; class TQToolBar; class TQButtonData; -class Q_EXPORT TQButton : public TQWidget +class TQ_EXPORT TQButton : public TQWidget { TQ_OBJECT TQ_ENUMS( ToggleType ToggleState ) diff --git a/src/widgets/ntqbuttongroup.h b/src/widgets/ntqbuttongroup.h index 0903ae913..1eff32887 100644 --- a/src/widgets/ntqbuttongroup.h +++ b/src/widgets/ntqbuttongroup.h @@ -52,7 +52,7 @@ class TQButton; class TQButtonList; -class Q_EXPORT TQButtonGroup : public TQGroupBox +class TQ_EXPORT TQButtonGroup : public TQGroupBox { TQ_OBJECT TQ_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive ) diff --git a/src/widgets/ntqcheckbox.h b/src/widgets/ntqcheckbox.h index 4c91197e7..4a63e4b4a 100644 --- a/src/widgets/ntqcheckbox.h +++ b/src/widgets/ntqcheckbox.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_CHECKBOX -class Q_EXPORT TQCheckBox : public TQButton +class TQ_EXPORT TQCheckBox : public TQButton { TQ_OBJECT TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) diff --git a/src/widgets/ntqcombobox.h b/src/widgets/ntqcombobox.h index faca22c2f..f7bf2e422 100644 --- a/src/widgets/ntqcombobox.h +++ b/src/widgets/ntqcombobox.h @@ -56,7 +56,7 @@ class TQListBox; class TQComboBoxData; class TQWheelEvent; -class Q_EXPORT TQComboBox : public TQWidget +class TQ_EXPORT TQComboBox : public TQWidget { TQ_OBJECT TQ_ENUMS( Policy ) diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/ntqdatetimeedit.h index b96ff38dc..6ff8f0215 100644 --- a/src/widgets/ntqdatetimeedit.h +++ b/src/widgets/ntqdatetimeedit.h @@ -49,7 +49,7 @@ #ifndef TQT_NO_DATETIMEEDIT -class Q_EXPORT TQDateTimeEditBase : public TQWidget +class TQ_EXPORT TQDateTimeEditBase : public TQWidget { TQ_OBJECT public: @@ -74,7 +74,7 @@ private: class TQDateEditPrivate; -class Q_EXPORT TQDateEdit : public TQDateTimeEditBase +class TQ_EXPORT TQDateEdit : public TQDateTimeEditBase { TQ_OBJECT TQ_ENUMS( Order ) @@ -154,7 +154,7 @@ private: class TQTimeEditPrivate; -class Q_EXPORT TQTimeEdit : public TQDateTimeEditBase +class TQ_EXPORT TQTimeEdit : public TQDateTimeEditBase { TQ_OBJECT TQ_SETS( Display ) @@ -238,7 +238,7 @@ private: class TQDateTimeEditPrivate; -class Q_EXPORT TQDateTimeEdit : public TQWidget +class TQ_EXPORT TQDateTimeEdit : public TQWidget { TQ_OBJECT TQ_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime ) diff --git a/src/widgets/ntqdial.h b/src/widgets/ntqdial.h index bb1f17377..b4dba6eec 100644 --- a/src/widgets/ntqdial.h +++ b/src/widgets/ntqdial.h @@ -51,7 +51,7 @@ class TQDialPrivate; -class Q_EXPORT TQDial: public TQWidget, public TQRangeControl +class TQ_EXPORT TQDial: public TQWidget, public TQRangeControl { TQ_OBJECT TQ_PROPERTY( bool tracking READ tracking WRITE setTracking ) diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h index 39ad32a59..e3a767c4d 100644 --- a/src/widgets/ntqdockarea.h +++ b/src/widgets/ntqdockarea.h @@ -60,7 +60,7 @@ class TQMouseEvent; class TQDockWindowResizeHandle; class TQDockAreaPrivate; -class Q_EXPORT TQDockAreaLayout : public TQLayout +class TQ_EXPORT TQDockAreaLayout : public TQLayout { TQ_OBJECT friend class TQDockArea; @@ -103,7 +103,7 @@ private: #endif }; -class Q_EXPORT TQDockArea : public TQWidget +class TQ_EXPORT TQDockArea : public TQWidget { TQ_OBJECT TQ_ENUMS( HandlePosition ) @@ -180,8 +180,8 @@ private: // Disabled copy constructor and operator= }; #ifndef TQT_NO_TEXTSTREAM -Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQDockArea & ); -Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & ); +TQ_EXPORT TQTextStream &operator<<( TQTextStream &, const TQDockArea & ); +TQ_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & ); #endif #define Q_DEFINED_QDOCKAREA diff --git a/src/widgets/ntqdockwindow.h b/src/widgets/ntqdockwindow.h index 6f5d69fd4..51d8ab456 100644 --- a/src/widgets/ntqdockwindow.h +++ b/src/widgets/ntqdockwindow.h @@ -62,7 +62,7 @@ class TQDockWindowPrivate; class TQToolBar; class TQWindowsXPStyle; -class Q_EXPORT TQDockWindow : public TQFrame +class TQ_EXPORT TQDockWindow : public TQFrame { TQ_OBJECT TQ_ENUMS( CloseMode Place ) diff --git a/src/widgets/ntqframe.h b/src/widgets/ntqframe.h index 74710e0c7..e0afe5923 100644 --- a/src/widgets/ntqframe.h +++ b/src/widgets/ntqframe.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_FRAME -class Q_EXPORT TQFrame : public TQWidget +class TQ_EXPORT TQFrame : public TQWidget { TQ_OBJECT TQ_ENUMS( Shape Shadow ) diff --git a/src/widgets/ntqgrid.h b/src/widgets/ntqgrid.h index 7479b9548..8fd72e4d6 100644 --- a/src/widgets/ntqgrid.h +++ b/src/widgets/ntqgrid.h @@ -45,7 +45,7 @@ class TQGridLayout; -class Q_EXPORT TQGrid : public TQFrame +class TQ_EXPORT TQGrid : public TQFrame { TQ_OBJECT public: diff --git a/src/widgets/ntqgridview.h b/src/widgets/ntqgridview.h index e08adfa5e..6a8a3c182 100644 --- a/src/widgets/ntqgridview.h +++ b/src/widgets/ntqgridview.h @@ -49,7 +49,7 @@ class TQGridViewPrivate; -class Q_EXPORT TQGridView : public TQScrollView +class TQ_EXPORT TQGridView : public TQScrollView { TQ_OBJECT TQ_PROPERTY( int numRows READ numRows WRITE setNumRows ) diff --git a/src/widgets/ntqgroupbox.h b/src/widgets/ntqgroupbox.h index 42c674b4b..5a33f1329 100644 --- a/src/widgets/ntqgroupbox.h +++ b/src/widgets/ntqgroupbox.h @@ -54,7 +54,7 @@ class TQVBoxLayout; class TQGridLayout; class TQSpacerItem; -class Q_EXPORT TQGroupBox : public TQFrame +class TQ_EXPORT TQGroupBox : public TQFrame { TQ_OBJECT TQ_PROPERTY( TQString title READ title WRITE setTitle ) diff --git a/src/widgets/ntqhbox.h b/src/widgets/ntqhbox.h index b2fd75946..8b45cb751 100644 --- a/src/widgets/ntqhbox.h +++ b/src/widgets/ntqhbox.h @@ -48,7 +48,7 @@ class TQBoxLayout; -class Q_EXPORT TQHBox : public TQFrame +class TQ_EXPORT TQHBox : public TQFrame { TQ_OBJECT public: diff --git a/src/widgets/ntqhbuttongroup.h b/src/widgets/ntqhbuttongroup.h index acc4b0fc5..b101a4c6b 100644 --- a/src/widgets/ntqhbuttongroup.h +++ b/src/widgets/ntqhbuttongroup.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_HBUTTONGROUP -class Q_EXPORT TQHButtonGroup : public TQButtonGroup +class TQ_EXPORT TQHButtonGroup : public TQButtonGroup { TQ_OBJECT public: diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h index 65df516ad..7030fe11d 100644 --- a/src/widgets/ntqheader.h +++ b/src/widgets/ntqheader.h @@ -53,7 +53,7 @@ class TQShowEvent; class TQHeaderData; class TQTable; -class Q_EXPORT TQHeader : public TQWidget +class TQ_EXPORT TQHeader : public TQWidget { friend class TQTable; friend class TQTableHeader; @@ -212,7 +212,7 @@ inline TQHeader::Orientation TQHeader::orientation() const inline void TQHeader::setTracking( bool enable ) { trackingIsOn = enable; } inline bool TQHeader::tracking() const { return trackingIsOn; } -extern Q_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition +extern TQ_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition #endif // TQT_NO_HEADER diff --git a/src/widgets/ntqhgroupbox.h b/src/widgets/ntqhgroupbox.h index a6f818930..b71776a05 100644 --- a/src/widgets/ntqhgroupbox.h +++ b/src/widgets/ntqhgroupbox.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_HGROUPBOX -class Q_EXPORT TQHGroupBox : public TQGroupBox +class TQ_EXPORT TQHGroupBox : public TQGroupBox { TQ_OBJECT public: diff --git a/src/widgets/ntqiconview.h b/src/widgets/ntqiconview.h index e9c5d9490..c7ebd66dd 100644 --- a/src/widgets/ntqiconview.h +++ b/src/widgets/ntqiconview.h @@ -72,7 +72,7 @@ class TQIconDragPrivate; #ifndef TQT_NO_DRAGANDDROP -class Q_EXPORT TQIconDragItem +class TQ_EXPORT TQIconDragItem { public: TQIconDragItem(); @@ -86,7 +86,7 @@ private: }; -class Q_EXPORT TQIconDrag : public TQDragObject +class TQ_EXPORT TQIconDrag : public TQDragObject { TQ_OBJECT public: @@ -116,7 +116,7 @@ private: class TQIconViewToolTip; class TQIconViewItemPrivate; -class Q_EXPORT TQIconViewItem : public TQt +class TQ_EXPORT TQIconViewItem : public TQt { friend class TQIconView; friend class TQIconViewToolTip; @@ -263,7 +263,7 @@ private: class TQIconViewPrivate; /* don't touch */ -class Q_EXPORT TQIconView : public TQScrollView +class TQ_EXPORT TQIconView : public TQScrollView { friend class TQIconViewItem; friend class TQIconViewPrivate; diff --git a/src/widgets/ntqlabel.h b/src/widgets/ntqlabel.h index e9c348e4e..f8d728807 100644 --- a/src/widgets/ntqlabel.h +++ b/src/widgets/ntqlabel.h @@ -50,7 +50,7 @@ class TQSimpleRichText; class TQLabelPrivate; -class Q_EXPORT TQLabel : public TQFrame +class TQ_EXPORT TQLabel : public TQFrame { TQ_OBJECT TQ_PROPERTY( TQString text READ text WRITE setText ) diff --git a/src/widgets/ntqlcdnumber.h b/src/widgets/ntqlcdnumber.h index 140131290..780f4af28 100644 --- a/src/widgets/ntqlcdnumber.h +++ b/src/widgets/ntqlcdnumber.h @@ -51,7 +51,7 @@ class TQLCDNumberPrivate; -class Q_EXPORT TQLCDNumber : public TQFrame // LCD number widget +class TQ_EXPORT TQLCDNumber : public TQFrame // LCD number widget { TQ_OBJECT TQ_ENUMS( Mode SegmentStyle ) diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h index 1542acbdd..0748a5d23 100644 --- a/src/widgets/ntqlineedit.h +++ b/src/widgets/ntqlineedit.h @@ -56,7 +56,7 @@ class TQPopupMenu; class TQTextParagraph; class TQTextCursor; -class Q_EXPORT TQLineEdit : public TQFrame +class TQ_EXPORT TQLineEdit : public TQFrame { TQ_OBJECT TQ_ENUMS( EchoMode ) diff --git a/src/widgets/ntqlistbox.h b/src/widgets/ntqlistbox.h index 6a44866b7..a0eba4324 100644 --- a/src/widgets/ntqlistbox.h +++ b/src/widgets/ntqlistbox.h @@ -56,7 +56,7 @@ class TQStrList; class TQStringList; -class Q_EXPORT TQListBox : public TQScrollView +class TQ_EXPORT TQListBox : public TQScrollView { friend class TQListBoxItem; friend class TQListBoxPrivate; @@ -315,7 +315,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQListBoxItem +class TQ_EXPORT TQListBoxItem { public: TQListBoxItem( TQListBox* listbox = 0 ); @@ -373,7 +373,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQListBoxText : public TQListBoxItem +class TQ_EXPORT TQListBoxText : public TQListBoxItem { public: TQListBoxText( TQListBox* listbox, const TQString & text=TQString::null ); @@ -398,7 +398,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQListBoxPixmap : public TQListBoxItem +class TQ_EXPORT TQListBoxPixmap : public TQListBoxItem { public: TQListBoxPixmap( TQListBox* listbox, const TQPixmap & ); diff --git a/src/widgets/ntqlistview.h b/src/widgets/ntqlistview.h index 250389a56..b46513372 100644 --- a/src/widgets/ntqlistview.h +++ b/src/widgets/ntqlistview.h @@ -63,7 +63,7 @@ class TQMimeSource; class TQLineEdit; class TQListViewToolTip; -class Q_EXPORT TQListViewItem : public TQt +class TQ_EXPORT TQListViewItem : public TQt { friend class TQListViewItemIterator; friend class TQListViewToolTip; @@ -234,7 +234,7 @@ private: class TQCheckListItem; -class Q_EXPORT TQListView: public TQScrollView +class TQ_EXPORT TQListView: public TQScrollView { friend class TQListViewItemIterator; friend class TQListViewItem; @@ -468,7 +468,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQCheckListItem : public TQListViewItem +class TQ_EXPORT TQCheckListItem : public TQListViewItem { public: enum Type { RadioButton, @@ -540,7 +540,7 @@ private: TQCheckListItemPrivate *d; }; -class Q_EXPORT TQListViewItemIterator +class TQ_EXPORT TQListViewItemIterator { friend struct TQListViewPrivate; friend class TQListView; diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h index 1104608a4..02e2939a3 100644 --- a/src/widgets/ntqmainwindow.h +++ b/src/widgets/ntqmainwindow.h @@ -57,7 +57,7 @@ class TQMainWindowPrivate; class TQMainWindowLayout; class TQPopupMenu; -class Q_EXPORT TQMainWindow: public TQWidget +class TQ_EXPORT TQMainWindow: public TQWidget { TQ_OBJECT TQ_PROPERTY( bool rightJustification READ rightJustification WRITE setRightJustification DESIGNABLE false ) @@ -252,8 +252,8 @@ inline void TQMainWindow::setToolBarsMovable( bool b ) #endif #ifndef TQT_NO_TEXTSTREAM -Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQMainWindow & ); -Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQMainWindow & ); +TQ_EXPORT TQTextStream &operator<<( TQTextStream &, const TQMainWindow & ); +TQ_EXPORT TQTextStream &operator>>( TQTextStream &, TQMainWindow & ); #endif #endif // TQT_NO_MAINWINDOW diff --git a/src/widgets/ntqmenubar.h b/src/widgets/ntqmenubar.h index 03b7cc1d2..5212ca520 100644 --- a/src/widgets/ntqmenubar.h +++ b/src/widgets/ntqmenubar.h @@ -51,7 +51,7 @@ class TQPopupMenu; -class Q_EXPORT TQMenuBar : public TQFrame, public TQMenuData +class TQ_EXPORT TQMenuBar : public TQFrame, public TQMenuData { TQ_OBJECT TQ_ENUMS( Separator ) diff --git a/src/widgets/ntqmenudata.h b/src/widgets/ntqmenudata.h index 620c0daf9..0f7e08afc 100644 --- a/src/widgets/ntqmenudata.h +++ b/src/widgets/ntqmenudata.h @@ -59,7 +59,7 @@ class TQObject; class TQCustomMenuItem; class TQMenuItemData; -class Q_EXPORT TQMenuItem // internal menu item class +class TQ_EXPORT TQMenuItem // internal menu item class { friend class TQMenuData; public: @@ -137,7 +137,7 @@ typedef TQPtrList<TQMenuItem> TQMenuItemList; typedef TQPtrListIterator<TQMenuItem> TQMenuItemListIt; -class Q_EXPORT TQCustomMenuItem : public TQt +class TQ_EXPORT TQCustomMenuItem : public TQt { public: TQCustomMenuItem(); @@ -151,7 +151,7 @@ public: }; -class Q_EXPORT TQMenuData // menu data class +class TQ_EXPORT TQMenuData // menu data class { friend class TQMenuBar; friend class TQPopupMenu; diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/ntqmultilineedit.h index a40e8df92..bbf22d8bd 100644 --- a/src/widgets/ntqmultilineedit.h +++ b/src/widgets/ntqmultilineedit.h @@ -51,7 +51,7 @@ class TQMultiLineEditCommand; class TQValidator; class TQMultiLineEditData; -class Q_EXPORT TQMultiLineEdit : public TQTextEdit +class TQ_EXPORT TQMultiLineEdit : public TQTextEdit { TQ_OBJECT TQ_PROPERTY( int numLines READ numLines ) diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/ntqpopupmenu.h index 6fb1e1b4d..04ae7db85 100644 --- a/src/widgets/ntqpopupmenu.h +++ b/src/widgets/ntqpopupmenu.h @@ -49,7 +49,7 @@ #ifndef TQT_NO_POPUPMENU class TQPopupMenuPrivate; -class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData +class TQ_EXPORT TQPopupMenu : public TQFrame, public TQMenuData { TQ_OBJECT TQ_PROPERTY( bool checkable READ isCheckable WRITE setCheckable ) diff --git a/src/widgets/ntqprogressbar.h b/src/widgets/ntqprogressbar.h index 4515b0989..c84b8d852 100644 --- a/src/widgets/ntqprogressbar.h +++ b/src/widgets/ntqprogressbar.h @@ -51,7 +51,7 @@ class TQProgressBarPrivate; -class Q_EXPORT TQProgressBar : public TQFrame +class TQ_EXPORT TQProgressBar : public TQFrame { TQ_OBJECT TQ_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps ) diff --git a/src/widgets/ntqpushbutton.h b/src/widgets/ntqpushbutton.h index fc52aac39..1b77f5d4d 100644 --- a/src/widgets/ntqpushbutton.h +++ b/src/widgets/ntqpushbutton.h @@ -50,7 +50,7 @@ class TQPushButtonPrivate; class TQPopupMenu; -class Q_EXPORT TQPushButton : public TQButton +class TQ_EXPORT TQPushButton : public TQButton { TQ_OBJECT diff --git a/src/widgets/ntqradiobutton.h b/src/widgets/ntqradiobutton.h index b660eadb7..1c7c0ae34 100644 --- a/src/widgets/ntqradiobutton.h +++ b/src/widgets/ntqradiobutton.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_RADIOBUTTON -class Q_EXPORT TQRadioButton : public TQButton +class TQ_EXPORT TQRadioButton : public TQButton { TQ_OBJECT TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) diff --git a/src/widgets/ntqrangecontrol.h b/src/widgets/ntqrangecontrol.h index 63f101664..46072b589 100644 --- a/src/widgets/ntqrangecontrol.h +++ b/src/widgets/ntqrangecontrol.h @@ -52,7 +52,7 @@ class TQRangeControlPrivate; -class Q_EXPORT TQRangeControl +class TQ_EXPORT TQRangeControl { public: TQRangeControl(); @@ -127,7 +127,7 @@ inline int TQRangeControl::pageStep() const #ifndef TQT_NO_SPINWIDGET class TQSpinWidgetPrivate; -class Q_EXPORT TQSpinWidget : public TQWidget +class TQ_EXPORT TQSpinWidget : public TQWidget { TQ_OBJECT public: diff --git a/src/widgets/ntqscrollbar.h b/src/widgets/ntqscrollbar.h index dffd09930..ab52ff626 100644 --- a/src/widgets/ntqscrollbar.h +++ b/src/widgets/ntqscrollbar.h @@ -50,7 +50,7 @@ class TQTimer; #ifndef TQT_NO_SCROLLBAR -class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl +class TQ_EXPORT TQScrollBar : public TQWidget, public TQRangeControl { TQ_OBJECT TQ_PROPERTY( int minValue READ minValue WRITE setMinValue ) diff --git a/src/widgets/ntqscrollview.h b/src/widgets/ntqscrollview.h index abad327eb..c9dcc8846 100644 --- a/src/widgets/ntqscrollview.h +++ b/src/widgets/ntqscrollview.h @@ -49,7 +49,7 @@ class TQScrollViewData; -class Q_EXPORT TQScrollView : public TQFrame +class TQ_EXPORT TQScrollView : public TQFrame { TQ_OBJECT TQ_ENUMS( ResizePolicy ScrollBarMode ) diff --git a/src/widgets/ntqslider.h b/src/widgets/ntqslider.h index c5e922f95..1bf9a6c6b 100644 --- a/src/widgets/ntqslider.h +++ b/src/widgets/ntqslider.h @@ -52,7 +52,7 @@ struct TQSliderPrivate; class TQTimer; -class Q_EXPORT TQSlider : public TQWidget, public TQRangeControl +class TQ_EXPORT TQSlider : public TQWidget, public TQRangeControl { TQ_OBJECT TQ_ENUMS( TickSetting ) diff --git a/src/widgets/ntqspinbox.h b/src/widgets/ntqspinbox.h index 0657b3b57..5b1abd8b0 100644 --- a/src/widgets/ntqspinbox.h +++ b/src/widgets/ntqspinbox.h @@ -52,7 +52,7 @@ class TQLineEdit; class TQValidator; class TQSpinBoxPrivate; -class Q_EXPORT TQSpinBox: public TQWidget, public TQRangeControl +class TQ_EXPORT TQSpinBox: public TQWidget, public TQRangeControl { TQ_OBJECT TQ_ENUMS( ButtonSymbols ) diff --git a/src/widgets/ntqsplashscreen.h b/src/widgets/ntqsplashscreen.h index 131ab1aa1..6649923e6 100644 --- a/src/widgets/ntqsplashscreen.h +++ b/src/widgets/ntqsplashscreen.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_SPLASHSCREEN class TQSplashScreenPrivate; -class Q_EXPORT TQSplashScreen : public TQWidget +class TQ_EXPORT TQSplashScreen : public TQWidget { TQ_OBJECT public: diff --git a/src/widgets/ntqsplitter.h b/src/widgets/ntqsplitter.h index cc8c431c7..887b1b265 100644 --- a/src/widgets/ntqsplitter.h +++ b/src/widgets/ntqsplitter.h @@ -69,7 +69,7 @@ public: int handleWidth; }; -class Q_EXPORT TQSplitterLayoutStruct : public TQt +class TQ_EXPORT TQSplitterLayoutStruct : public TQt { public: TQCOORD sizer; @@ -83,7 +83,7 @@ public: TQCOORD getSizer( Orientation orient ); }; -class Q_EXPORT TQSplitter : public TQFrame +class TQ_EXPORT TQSplitter : public TQFrame { TQ_OBJECT TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) @@ -186,11 +186,11 @@ private: }; #ifndef TQT_NO_TEXTSTREAM -Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); -Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); +TQ_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); +TQ_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); #endif -class Q_EXPORT TQSplitterHandle : public TQWidget +class TQ_EXPORT TQSplitterHandle : public TQWidget { TQ_OBJECT public: diff --git a/src/widgets/ntqstatusbar.h b/src/widgets/ntqstatusbar.h index 91fe500b4..4b3f98f32 100644 --- a/src/widgets/ntqstatusbar.h +++ b/src/widgets/ntqstatusbar.h @@ -51,7 +51,7 @@ class TQStatusBarPrivate; -class Q_EXPORT TQStatusBar: public TQWidget +class TQ_EXPORT TQStatusBar: public TQWidget { TQ_OBJECT TQ_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled ) diff --git a/src/widgets/ntqsyntaxhighlighter.h b/src/widgets/ntqsyntaxhighlighter.h index 344211008..7ecb07403 100644 --- a/src/widgets/ntqsyntaxhighlighter.h +++ b/src/widgets/ntqsyntaxhighlighter.h @@ -52,7 +52,7 @@ class TQSyntaxHighlighterInternal; class TQSyntaxHighlighterPrivate; class TQTextParagraph; -class Q_EXPORT TQSyntaxHighlighter : public TQt +class TQ_EXPORT TQSyntaxHighlighter : public TQt { friend class TQSyntaxHighlighterInternal; diff --git a/src/widgets/ntqtabbar.h b/src/widgets/ntqtabbar.h index 8aa5bb023..9e8f71667 100644 --- a/src/widgets/ntqtabbar.h +++ b/src/widgets/ntqtabbar.h @@ -49,7 +49,7 @@ class TQTabBar; class TQIconSet; -class Q_EXPORT TQTab : public TQt +class TQ_EXPORT TQTab : public TQt { friend class TQTabBar; friend class TQTabWidget; @@ -85,7 +85,7 @@ private: struct TQTabPrivate; //class *TQAccel; -class Q_EXPORT TQTabBar: public TQWidget +class TQ_EXPORT TQTabBar: public TQWidget { TQ_OBJECT TQ_ENUMS( Shape ) diff --git a/src/widgets/ntqtabwidget.h b/src/widgets/ntqtabwidget.h index f60739bd4..e2ba055c4 100644 --- a/src/widgets/ntqtabwidget.h +++ b/src/widgets/ntqtabwidget.h @@ -54,7 +54,7 @@ class TQTab; class TQWidgetStack; -class Q_EXPORT TQTabWidget : public TQWidget +class TQ_EXPORT TQTabWidget : public TQWidget { TQ_OBJECT TQ_ENUMS( TabPosition ) diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/ntqtextbrowser.h index c852fa3a6..32806a539 100644 --- a/src/widgets/ntqtextbrowser.h +++ b/src/widgets/ntqtextbrowser.h @@ -52,7 +52,7 @@ class TQTextBrowserData; -class Q_EXPORT TQTextBrowser : public TQTextEdit +class TQ_EXPORT TQTextBrowser : public TQTextEdit { TQ_OBJECT TQ_PROPERTY( TQString source READ source WRITE setSource ) diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h index b103cc29d..3cd475c94 100644 --- a/src/widgets/ntqtextedit.h +++ b/src/widgets/ntqtextedit.h @@ -132,7 +132,7 @@ public: }; #endif -class Q_EXPORT TQTextEdit : public TQScrollView +class TQ_EXPORT TQTextEdit : public TQScrollView { friend class TQTextBrowser; friend class TQSyntaxHighlighter; @@ -470,7 +470,7 @@ private slots: void clipboardChanged(); private: - struct Q_EXPORT UndoRedoInfo { + struct TQ_EXPORT UndoRedoInfo { enum Type { Invalid, Insert, Delete, Backspace, Return, RemoveSelected, Format, Style, IME }; UndoRedoInfo( TQTextDocument *dc ); diff --git a/src/widgets/ntqtextview.h b/src/widgets/ntqtextview.h index 4d2431811..2d0d73cfe 100644 --- a/src/widgets/ntqtextview.h +++ b/src/widgets/ntqtextview.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_TEXTVIEW -class Q_EXPORT TQTextView : public TQTextEdit +class TQ_EXPORT TQTextView : public TQTextEdit { TQ_OBJECT TQ_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false ) diff --git a/src/widgets/ntqtoolbar.h b/src/widgets/ntqtoolbar.h index 87163aef8..5571d9931 100644 --- a/src/widgets/ntqtoolbar.h +++ b/src/widgets/ntqtoolbar.h @@ -52,7 +52,7 @@ class TQButton; class TQBoxLayout; class TQToolBarPrivate; -class Q_EXPORT TQToolBar: public TQDockWindow +class TQ_EXPORT TQToolBar: public TQDockWindow { TQ_OBJECT TQ_PROPERTY( TQString label READ label WRITE setLabel ) diff --git a/src/widgets/ntqtoolbox.h b/src/widgets/ntqtoolbox.h index 5b0030b20..4b6cf672b 100644 --- a/src/widgets/ntqtoolbox.h +++ b/src/widgets/ntqtoolbox.h @@ -51,7 +51,7 @@ class TQToolBoxPrivate; class TQWidgetList; -class Q_EXPORT TQToolBox : public TQFrame +class TQ_EXPORT TQToolBox : public TQFrame { TQ_OBJECT TQ_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex ) diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h index 48d222f94..144ac8074 100644 --- a/src/widgets/ntqtoolbutton.h +++ b/src/widgets/ntqtoolbutton.h @@ -54,7 +54,7 @@ class TQToolButtonPrivate; class TQToolBar; class TQPopupMenu; -class Q_EXPORT TQToolButton : public TQButton +class TQ_EXPORT TQToolButton : public TQButton { TQ_OBJECT TQ_ENUMS( TextPosition ) diff --git a/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h index 2bd4af521..e5673511d 100644 --- a/src/widgets/ntqtooltip.h +++ b/src/widgets/ntqtooltip.h @@ -53,7 +53,7 @@ class TQTipManager; class TQIconViewToolTip; class TQListViewToolTip; -class Q_EXPORT TQToolTipGroup: public TQObject +class TQ_EXPORT TQToolTipGroup: public TQObject { TQ_OBJECT TQ_PROPERTY( bool delay READ delay WRITE setDelay ) @@ -88,7 +88,7 @@ private: // Disabled copy constructor and operator= }; -class Q_EXPORT TQToolTip: public TQt +class TQ_EXPORT TQToolTip: public TQt { public: TQToolTip( TQWidget *, TQToolTipGroup * = 0 ); diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h index a66f99a63..c5ddedaac 100644 --- a/src/widgets/ntqvalidator.h +++ b/src/widgets/ntqvalidator.h @@ -50,7 +50,7 @@ #ifndef TQT_NO_VALIDATOR -class Q_EXPORT TQValidator : public TQObject +class TQ_EXPORT TQValidator : public TQObject { TQ_OBJECT public: @@ -70,7 +70,7 @@ private: }; -class Q_EXPORT TQIntValidator : public TQValidator +class TQ_EXPORT TQIntValidator : public TQValidator { TQ_OBJECT TQ_PROPERTY( int bottom READ bottom WRITE setBottom ) @@ -102,7 +102,7 @@ private: #ifndef TQT_NO_REGEXP -class Q_EXPORT TQDoubleValidator : public TQValidator +class TQ_EXPORT TQDoubleValidator : public TQValidator { TQ_OBJECT TQ_PROPERTY( double bottom READ bottom WRITE setBottom ) @@ -137,7 +137,7 @@ private: }; -class Q_EXPORT TQRegExpValidator : public TQValidator +class TQ_EXPORT TQRegExpValidator : public TQValidator { TQ_OBJECT // TQ_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp ) diff --git a/src/widgets/ntqvbox.h b/src/widgets/ntqvbox.h index 8328ebd71..ae1d5fabd 100644 --- a/src/widgets/ntqvbox.h +++ b/src/widgets/ntqvbox.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_VBOX -class Q_EXPORT TQVBox : public TQHBox +class TQ_EXPORT TQVBox : public TQHBox { TQ_OBJECT public: diff --git a/src/widgets/ntqvbuttongroup.h b/src/widgets/ntqvbuttongroup.h index cfccba708..605b69a04 100644 --- a/src/widgets/ntqvbuttongroup.h +++ b/src/widgets/ntqvbuttongroup.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_VBUTTONGROUP -class Q_EXPORT TQVButtonGroup : public TQButtonGroup +class TQ_EXPORT TQVButtonGroup : public TQButtonGroup { TQ_OBJECT public: diff --git a/src/widgets/ntqvgroupbox.h b/src/widgets/ntqvgroupbox.h index 27cb9216a..4a4505c8e 100644 --- a/src/widgets/ntqvgroupbox.h +++ b/src/widgets/ntqvgroupbox.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_VGROUPBOX -class Q_EXPORT TQVGroupBox : public TQGroupBox +class TQ_EXPORT TQVGroupBox : public TQGroupBox { TQ_OBJECT public: diff --git a/src/widgets/ntqwhatsthis.h b/src/widgets/ntqwhatsthis.h index 22ecafa7d..98f1fd9fa 100644 --- a/src/widgets/ntqwhatsthis.h +++ b/src/widgets/ntqwhatsthis.h @@ -51,7 +51,7 @@ class TQToolButton; class TQPopupMenu; class TQStyleSheet; -class Q_EXPORT TQWhatsThis: public TQt +class TQ_EXPORT TQWhatsThis: public TQt { public: TQWhatsThis( TQWidget *); diff --git a/src/widgets/ntqwidgetplugin.h b/src/widgets/ntqwidgetplugin.h index 51cf6cd1e..16c24eb26 100644 --- a/src/widgets/ntqwidgetplugin.h +++ b/src/widgets/ntqwidgetplugin.h @@ -61,7 +61,7 @@ class TQWidgetPluginPrivate; class TQWidget; -class Q_EXPORT TQWidgetPlugin : public TQGPlugin +class TQ_EXPORT TQWidgetPlugin : public TQGPlugin { TQ_OBJECT public: @@ -86,7 +86,7 @@ private: class TQWidgetContainerPluginPrivate; -class Q_EXPORT TQWidgetContainerPlugin : public TQWidgetPlugin +class TQ_EXPORT TQWidgetContainerPlugin : public TQWidgetPlugin { public: diff --git a/src/widgets/ntqwidgetstack.h b/src/widgets/ntqwidgetstack.h index 2844042db..4967804c8 100644 --- a/src/widgets/ntqwidgetstack.h +++ b/src/widgets/ntqwidgetstack.h @@ -53,7 +53,7 @@ class TQWidgetStackPrivate; -class Q_EXPORT TQWidgetStack: public TQFrame +class TQ_EXPORT TQWidgetStack: public TQFrame { TQ_OBJECT public: diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp index 346217920..2989678ac 100644 --- a/src/widgets/qdatetimeedit.cpp +++ b/src/widgets/qdatetimeedit.cpp @@ -58,7 +58,7 @@ #define TQDATETIMEEDIT_HIDDEN_CHAR '0' -class Q_EXPORT TQNumberSection +class TQ_EXPORT TQNumberSection { public: TQNumberSection( int selStart = 0, int selEnd = 0, bool separat = TRUE, int actual = -1 ) diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp index 1d9d3ac3a..a763cdc53 100644 --- a/src/widgets/qdockarea.cpp +++ b/src/widgets/qdockarea.cpp @@ -52,7 +52,7 @@ //#define TQDOCKAREA_DEBUG -struct Q_EXPORT DockData +struct TQ_EXPORT DockData { DockData() : w( 0 ), rect() {} DockData( TQDockWindow *dw, const TQRect &r ) : w( dw ), rect( r ) {} diff --git a/src/widgets/qeffects_p.h b/src/widgets/qeffects_p.h index 918dca0bd..4f5cecd21 100644 --- a/src/widgets/qeffects_p.h +++ b/src/widgets/qeffects_p.h @@ -74,8 +74,8 @@ struct TQEffects typedef uint DirFlags; }; -extern void Q_EXPORT qScrollEffect( TQWidget*, TQEffects::DirFlags dir = TQEffects::DownScroll, int time = -1 ); -extern void Q_EXPORT qFadeEffect( TQWidget*, int time = -1 ); +extern void TQ_EXPORT qScrollEffect( TQWidget*, TQEffects::DirFlags dir = TQEffects::DownScroll, int time = -1 ); +extern void TQ_EXPORT qFadeEffect( TQWidget*, int time = -1 ); #endif // TQT_NO_EFFECTS #endif // TQEFFECTS_P_H diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp index 6e801ccb0..8ce8cfb9a 100644 --- a/src/widgets/qiconview.cpp +++ b/src/widgets/qiconview.cpp @@ -166,7 +166,7 @@ static TQPixmap *get_qiv_buffer_pixmap( const TQSize &s ) #ifndef TQT_NO_DRAGANDDROP -class Q_EXPORT TQIconDragData +class TQ_EXPORT TQIconDragData { public: TQIconDragData(); @@ -184,7 +184,7 @@ public: bool operator==( const TQIconDragData &i ) const; }; -class Q_EXPORT TQIconDragDataItem +class TQ_EXPORT TQIconDragDataItem { public: TQIconDragDataItem() {} diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h index d45ec0717..d19a5c440 100644 --- a/src/widgets/qtitlebar_p.h +++ b/src/widgets/qtitlebar_p.h @@ -66,7 +66,7 @@ class TQToolTip; class TQTitleBarPrivate; class TQPixmap; -class Q_EXPORT TQTitleBar : public TQWidget +class TQ_EXPORT TQTitleBar : public TQWidget { TQ_OBJECT TQ_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise ) diff --git a/src/widgets/qwidgetplugin.cpp b/src/widgets/qwidgetplugin.cpp index ca92e9e8d..f7d0bb2f9 100644 --- a/src/widgets/qwidgetplugin.cpp +++ b/src/widgets/qwidgetplugin.cpp @@ -61,7 +61,7 @@ Writing a widget plugin is achieved by subclassing this base class, reimplementing the pure virtual functions keys(), create(), group(), iconSet(), includeFile(), toolTip(), whatsThis() and - isContainer(), and exporting the class with the \c Q_EXPORT_PLUGIN + isContainer(), and exporting the class with the \c TQ_EXPORT_PLUGIN macro. See the \link designer-manual.book TQt Designer manual's\endlink, @@ -351,7 +351,7 @@ TQString TQWidgetPluginPrivate::createCode( const TQString &key, const TQString /*! Constructs a widget plugin. This is invoked automatically by the - \c Q_EXPORT_PLUGIN macro. + \c TQ_EXPORT_PLUGIN macro. */ TQWidgetPlugin::TQWidgetPlugin() : TQGPlugin( (TQWidgetFactoryInterface*)(d = new TQWidgetPluginPrivate( this )) ) @@ -461,7 +461,7 @@ bool TQWidgetPlugin::isContainer( const TQString & ) const subclassing this base class. First by reimplementing TQWidgetPlugin's pure virtual functions keys(), create(), group(), iconSet(), includeFile(), toolTip(), whatsThis() and - isContainer(), and exporting the class with the \c Q_EXPORT_PLUGIN + isContainer(), and exporting the class with the \c TQ_EXPORT_PLUGIN macro. In addition containerOfWidget(), isPassiveInteractor() and supportsPages() must be reimplemented. If the widget supportsPages(), count(), currentIndex(), pageLabel(), page(), @@ -475,7 +475,7 @@ bool TQWidgetPlugin::isContainer( const TQString & ) const /*! Constructs a complex container widget plugin. This is invoked - automatically by the \c Q_EXPORT_PLUGIN macro. + automatically by the \c TQ_EXPORT_PLUGIN macro. */ TQWidgetContainerPlugin::TQWidgetContainerPlugin() diff --git a/src/widgets/qwidgetresizehandler_p.h b/src/widgets/qwidgetresizehandler_p.h index c65f47bdf..08f04b65d 100644 --- a/src/widgets/qwidgetresizehandler_p.h +++ b/src/widgets/qwidgetresizehandler_p.h @@ -60,7 +60,7 @@ class TQMouseEvent; class TQKeyEvent; -class Q_EXPORT TQWidgetResizeHandler : public TQObject +class TQ_EXPORT TQWidgetResizeHandler : public TQObject { TQ_OBJECT diff --git a/src/workspace/ntqworkspace.h b/src/workspace/ntqworkspace.h index 45ba1dd24..eee079d32 100644 --- a/src/workspace/ntqworkspace.h +++ b/src/workspace/ntqworkspace.h @@ -51,7 +51,7 @@ #if !defined( TQT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE ) #define TQM_EXPORT_WORKSPACE #else -#define TQM_EXPORT_WORKSPACE Q_EXPORT +#define TQM_EXPORT_WORKSPACE TQ_EXPORT #endif class TQWorkspaceChild; diff --git a/src/xml/ntqdom.h b/src/xml/ntqdom.h index aa250520f..1a7089a81 100644 --- a/src/xml/ntqdom.h +++ b/src/xml/ntqdom.h @@ -48,7 +48,7 @@ #if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML ) #define TQM_EXPORT_DOM #else -#define TQM_EXPORT_DOM Q_EXPORT +#define TQM_EXPORT_DOM TQ_EXPORT #endif #ifndef TQT_NO_DOM diff --git a/src/xml/ntqxml.h b/src/xml/ntqxml.h index b6a08d828..b2f86dc93 100644 --- a/src/xml/ntqxml.h +++ b/src/xml/ntqxml.h @@ -52,7 +52,7 @@ #if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML ) #define TQM_EXPORT_XML #else -#define TQM_EXPORT_XML Q_EXPORT +#define TQM_EXPORT_XML TQ_EXPORT #endif #ifndef TQT_NO_XML diff --git a/src/xml/qsvgdevice_p.h b/src/xml/qsvgdevice_p.h index 388f671bb..391a08e07 100644 --- a/src/xml/qsvgdevice_p.h +++ b/src/xml/qsvgdevice_p.h @@ -62,7 +62,7 @@ #if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML ) #define TQM_EXPORT_SVG #else -#define TQM_EXPORT_SVG Q_EXPORT +#define TQM_EXPORT_SVG TQ_EXPORT #endif #ifndef TQT_NO_SVG diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h index c2eefbecd..c3856e068 100644 --- a/tools/assistant/lib/ntqassistantclient.h +++ b/tools/assistant/lib/ntqassistantclient.h @@ -39,7 +39,7 @@ class TQSocket; class TQProcess; -class Q_EXPORT TQAssistantClient : public TQObject +class TQ_EXPORT TQAssistantClient : public TQObject { TQ_OBJECT TQ_PROPERTY( bool open READ isOpen ) diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h index 662f890cb..789b085eb 100644 --- a/tools/assistant/mainwindow.ui.h +++ b/tools/assistant/mainwindow.ui.h @@ -47,7 +47,7 @@ TQPtrList<MainWindow> *MainWindow::windows = 0; #if defined(Q_WS_WIN) -extern Q_EXPORT int qt_ntfs_permission_lookup; +extern TQ_EXPORT int qt_ntfs_permission_lookup; #endif void MainWindow::init() diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp index 2eba6e507..caa4b0b30 100644 --- a/tools/designer/designer/designerapp.cpp +++ b/tools/designer/designer/designerapp.cpp @@ -58,7 +58,7 @@ void set_splash_status( const TQString &txt ) splash->message( splashText, TQt::AlignRight|TQt::AlignTop ); } -Q_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv ) +TQ_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv ) : TQApplication( argc, argv ) { #if defined(Q_WS_WIN) @@ -69,7 +69,7 @@ Q_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv ) #endif } -Q_EXPORT TQSplashScreen *DesignerApplication::showSplash() +TQ_EXPORT TQSplashScreen *DesignerApplication::showSplash() { TQRect screen = TQApplication::desktop()->screenGeometry(); TQSettings config; @@ -101,7 +101,7 @@ void DesignerApplication::closeSplash() static TQString *settings_key = 0; static TQString *old_settings_key = 0; -Q_EXPORT TQString DesignerApplication::settingsKey() +TQ_EXPORT TQString DesignerApplication::settingsKey() { if ( !settings_key ) settings_key = new TQString( "/TQt Designer/" + diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 969ba868a..cf72b728b 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -129,7 +129,7 @@ extern void set_splash_status( const TQString &txt ); extern TQObject* qwf_form_object; extern TQString *qwf_plugin_dir; -Q_EXPORT MainWindow *MainWindow::self = 0; +TQ_EXPORT MainWindow *MainWindow::self = 0; TQString assistantPath() { @@ -150,7 +150,7 @@ static TQString textNoAccel( const TQString& text) } -Q_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &plgDir ) +TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &plgDir ) : TQMainWindow( 0, "designer_mainwindow", WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader ), grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), fileFilter( tr( "TQt User-Interface Files (*.ui)" ) ), client( asClient ), diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index aa4949b8d..bae9ed2ee 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -1175,7 +1175,7 @@ void MainWindow::projectInsertFile() fileOpen( "", "" ); } -Q_EXPORT void MainWindow::fileOpen( const TQString &filter, const TQString &extension, const TQString &fn, bool inProject ) +TQ_EXPORT void MainWindow::fileOpen( const TQString &filter, const TQString &extension, const TQString &fn, bool inProject ) { statusBar()->message( tr( "Open a file...") ); @@ -1278,7 +1278,7 @@ Q_EXPORT void MainWindow::fileOpen( const TQString &filter, const TQString &exte } } -Q_EXPORT FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFileName, FormFile *ff ) +TQ_EXPORT FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFileName, FormFile *ff ) { if ( filename.isEmpty() ) return 0; diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp index dea1ae648..5d069f7ab 100644 --- a/tools/designer/designer/outputwindow.cpp +++ b/tools/designer/designer/outputwindow.cpp @@ -45,7 +45,7 @@ #include <ntqpainter.h> static TQTextEdit *debugoutput = 0; -Q_EXPORT bool debugToStderr = FALSE; +TQ_EXPORT bool debugToStderr = FALSE; TQtMsgHandler OutputWindow::oldMsgHandler = 0; diff --git a/tools/designer/examples/filechooser/plugin/plugin.cpp b/tools/designer/examples/filechooser/plugin/plugin.cpp index 4f7334c8d..be8105ff5 100644 --- a/tools/designer/examples/filechooser/plugin/plugin.cpp +++ b/tools/designer/examples/filechooser/plugin/plugin.cpp @@ -92,4 +92,4 @@ bool CustomWidgetPlugin::isContainer( const TQString& ) const } -Q_EXPORT_PLUGIN( CustomWidgetPlugin ) +TQ_EXPORT_PLUGIN( CustomWidgetPlugin ) diff --git a/tools/designer/shared/domtool.h b/tools/designer/shared/domtool.h index f53e205f5..8eea8d676 100644 --- a/tools/designer/shared/domtool.h +++ b/tools/designer/shared/domtool.h @@ -40,7 +40,7 @@ class TQDomElement; class TQDomDocument; -class Q_EXPORT DomTool : public TQt +class TQ_EXPORT DomTool : public TQt { public: static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp index 9352a917e..b4618618c 100644 --- a/tools/designer/uic/embed.cpp +++ b/tools/designer/uic/embed.cpp @@ -283,7 +283,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima out << "static TQMimeSourceFactory* factory = 0;\n"; out << "\n"; - out << "Q_EXPORT void qInitImages_" << cProject << "()\n"; + out << "TQ_EXPORT void qInitImages_" << cProject << "()\n"; out << "{\n"; out << " if ( !factory ) {\n"; out << "\tfactory = new MimeSourceFactory_" << cProject << ";\n"; diff --git a/tools/designer/uilib/ntqwidgetfactory.h b/tools/designer/uilib/ntqwidgetfactory.h index 19bf1834a..fb54e8ae1 100644 --- a/tools/designer/uilib/ntqwidgetfactory.h +++ b/tools/designer/uilib/ntqwidgetfactory.h @@ -55,7 +55,7 @@ class TQWidget; class TQWidgetFactoryPrivate; class UibStrTable; -class Q_EXPORT TQWidgetFactory +class TQ_EXPORT TQWidgetFactory { public: TQWidgetFactory(); diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp index 6d9014469..428385d5d 100644 --- a/tools/designer/uilib/qwidgetfactory.cpp +++ b/tools/designer/uilib/qwidgetfactory.cpp @@ -120,13 +120,13 @@ static TQPluginManager<WidgetInterface> *widgetInterfaceManager = 0; static TQMap<TQString, bool> *availableWidgetMap = 0; static TQStringList *availableWidgetList = 0; -Q_EXPORT TQMap<TQWidget*, TQString> *qwf_forms = 0; +TQ_EXPORT TQMap<TQWidget*, TQString> *qwf_forms = 0; TQString *qwf_language = 0; -Q_EXPORT bool qwf_execute_code = TRUE; +TQ_EXPORT bool qwf_execute_code = TRUE; bool qwf_stays_on_top = FALSE; TQString qwf_currFileName = ""; TQObject *qwf_form_object = 0; -Q_EXPORT TQString *qwf_plugin_dir = 0; +TQ_EXPORT TQString *qwf_plugin_dir = 0; static void setupPluginDir() { diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp index d72b911c6..c5ed953b0 100644 --- a/tools/linguist/lupdate/fetchtr.cpp +++ b/tools/linguist/lupdate/fetchtr.cpp @@ -496,8 +496,8 @@ static void parse( MetaTranslator *tor, const char *initialContext, /* This code should execute only once, but we play safe with impure definitions such as - 'class Q_EXPORT TQMessageBox', in which case - 'TQMessageBox' is the class name, not 'Q_EXPORT'. + 'class TQ_EXPORT TQMessageBox', in which case + 'TQMessageBox' is the class name, not 'TQ_EXPORT'. */ functionContext = yyIdent; yyTok = getToken(); diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index ed7992df9..6b116a48b 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -60,7 +60,7 @@ // from qapplication.cpp and qapplication_x11.cpp - These are NOT for // external use ignore them -extern bool Q_EXPORT tqt_resolve_symlinks; +extern bool TQ_EXPORT tqt_resolve_symlinks; static const char *appearance_text = |