diff options
42 files changed, 166 insertions, 166 deletions
diff --git a/doc/html/qcanvas-h.html b/doc/html/qcanvas-h.html index 7790f434b..07a88d961 100644 --- a/doc/html/qcanvas-h.html +++ b/doc/html/qcanvas-h.html @@ -111,7 +111,7 @@ class TQCanvasItem; class TQCanvasView; class TQCanvasPixmap; -#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) ) +#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) ) // MOC_SKIP_BEGIN TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueListIterator< TQCanvasItem* >; TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueList< TQCanvasItem* >; diff --git a/doc/html/qcdestyle-h.html b/doc/html/qcdestyle-h.html index 5bb262696..cacde0104 100644 --- a/doc/html/qcdestyle-h.html +++ b/doc/html/qcdestyle-h.html @@ -85,12 +85,12 @@ body { background: #ffffff; color: black; } #if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_CDE +#define TQ_EXPORT_STYLE_CDE #else -#define Q_EXPORT_STYLE_CDE TQ_EXPORT +#define TQ_EXPORT_STYLE_CDE TQ_EXPORT #endif -class Q_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle +class TQ_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle { TQ_OBJECT public: diff --git a/doc/html/qeucjpcodec-h.html b/doc/html/qeucjpcodec-h.html index 8c28e8982..1a9203524 100644 --- a/doc/html/qeucjpcodec-h.html +++ b/doc/html/qeucjpcodec-h.html @@ -114,12 +114,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/qeuckrcodec-h.html b/doc/html/qeuckrcodec-h.html index 0446d1a58..af2e73abb 100644 --- a/doc/html/qeuckrcodec-h.html +++ b/doc/html/qeuckrcodec-h.html @@ -109,12 +109,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_KR +#define TQ_EXPORT_CODECS_KR #else -#define Q_EXPORT_CODECS_KR TQ_EXPORT +#define TQ_EXPORT_CODECS_KR TQ_EXPORT #endif -class Q_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/qgb18030codec-h.html b/doc/html/qgb18030codec-h.html index 663055631..6fec328de 100644 --- a/doc/html/qgb18030codec-h.html +++ b/doc/html/qgb18030codec-h.html @@ -85,12 +85,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_CN +#define TQ_EXPORT_CODECS_CN #else -#define Q_EXPORT_CODECS_CN TQ_EXPORT +#define TQ_EXPORT_CODECS_CN TQ_EXPORT #endif -class Q_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { +class TQ_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { public: TQGb18030Codec(); @@ -109,7 +109,7 @@ public: int heuristicNameMatch(const char* hint) const; }; -class Q_EXPORT_CODECS_CN TQGbkCodec : public TQGb18030Codec { +class TQ_EXPORT_CODECS_CN TQGbkCodec : public TQGb18030Codec { public: TQGbkCodec(); @@ -128,7 +128,7 @@ public: int heuristicNameMatch(const char* hint) const; }; -class Q_EXPORT_CODECS_CN TQGb2312Codec : public TQGb18030Codec { +class TQ_EXPORT_CODECS_CN TQGb2312Codec : public TQGb18030Codec { public: TQGb2312Codec(); diff --git a/doc/html/qjiscodec-h.html b/doc/html/qjiscodec-h.html index afe800535..045109e30 100644 --- a/doc/html/qjiscodec-h.html +++ b/doc/html/qjiscodec-h.html @@ -114,12 +114,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/qmacstyle_mac-h.html b/doc/html/qmacstyle_mac-h.html index c795d9e14..62155f22d 100644 --- a/doc/html/qmacstyle_mac-h.html +++ b/doc/html/qmacstyle_mac-h.html @@ -86,14 +86,14 @@ body { background: #ffffff; color: black; } class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MAC +#define TQ_EXPORT_STYLE_MAC #else -#define Q_EXPORT_STYLE_MAC TQ_EXPORT +#define TQ_EXPORT_STYLE_MAC TQ_EXPORT #endif class TQMacStylePrivate; -class Q_EXPORT_STYLE_MAC TQMacStyle : public TQWindowsStyle +class TQ_EXPORT_STYLE_MAC TQMacStyle : public TQWindowsStyle { TQ_OBJECT public: diff --git a/doc/html/qmotifplusstyle-h.html b/doc/html/qmotifplusstyle-h.html index ed53cdebe..70361a874 100644 --- a/doc/html/qmotifplusstyle-h.html +++ b/doc/html/qmotifplusstyle-h.html @@ -85,12 +85,12 @@ body { background: #ffffff; color: black; } #if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MOTIFPLUS +#define TQ_EXPORT_STYLE_MOTIFPLUS #else -#define Q_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT +#define TQ_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT #endif -class Q_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle +class TQ_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle { TQ_OBJECT diff --git a/doc/html/qmotifstyle-h.html b/doc/html/qmotifstyle-h.html index 91df3fa15..a9b37a275 100644 --- a/doc/html/qmotifstyle-h.html +++ b/doc/html/qmotifstyle-h.html @@ -86,13 +86,13 @@ body { background: #ffffff; color: black; } class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MOTIF +#define TQ_EXPORT_STYLE_MOTIF #else -#define Q_EXPORT_STYLE_MOTIF TQ_EXPORT +#define TQ_EXPORT_STYLE_MOTIF TQ_EXPORT #endif -class Q_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle +class TQ_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle { TQ_OBJECT public: diff --git a/doc/html/qplatinumstyle-h.html b/doc/html/qplatinumstyle-h.html index 012aeb73e..be40be621 100644 --- a/doc/html/qplatinumstyle-h.html +++ b/doc/html/qplatinumstyle-h.html @@ -86,12 +86,12 @@ body { background: #ffffff; color: black; } class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_PLATINUM +#define TQ_EXPORT_STYLE_PLATINUM #else -#define Q_EXPORT_STYLE_PLATINUM TQ_EXPORT +#define TQ_EXPORT_STYLE_PLATINUM TQ_EXPORT #endif -class Q_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle +class TQ_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle { TQ_OBJECT public: diff --git a/doc/html/qsgistyle-h.html b/doc/html/qsgistyle-h.html index 73a6b98d1..719a17206 100644 --- a/doc/html/qsgistyle-h.html +++ b/doc/html/qsgistyle-h.html @@ -86,14 +86,14 @@ body { background: #ffffff; color: black; } #if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_SGI +#define TQ_EXPORT_STYLE_SGI #else -#define Q_EXPORT_STYLE_SGI TQ_EXPORT +#define TQ_EXPORT_STYLE_SGI TQ_EXPORT #endif class TQSGIStylePrivate; -class Q_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle +class TQ_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle { TQ_OBJECT public: diff --git a/doc/html/qsjiscodec-h.html b/doc/html/qsjiscodec-h.html index e0f3789fc..65044ceaf 100644 --- a/doc/html/qsjiscodec-h.html +++ b/doc/html/qsjiscodec-h.html @@ -114,12 +114,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/qwindowsstyle-h.html b/doc/html/qwindowsstyle-h.html index 17961081b..fc30bba1e 100644 --- a/doc/html/qwindowsstyle-h.html +++ b/doc/html/qwindowsstyle-h.html @@ -84,13 +84,13 @@ body { background: #ffffff; color: black; } #if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_WINDOWS +#define TQ_EXPORT_STYLE_WINDOWS #else -#define Q_EXPORT_STYLE_WINDOWS TQ_EXPORT +#define TQ_EXPORT_STYLE_WINDOWS TQ_EXPORT #endif -class Q_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle +class TQ_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle { TQ_OBJECT public: diff --git a/plugins/src/accessible/widgets/main.cpp b/plugins/src/accessible/widgets/main.cpp index 88e1d022e..67bd7b96e 100644 --- a/plugins/src/accessible/widgets/main.cpp +++ b/plugins/src/accessible/widgets/main.cpp @@ -220,7 +220,7 @@ bool AccessibleFactory::canUnload() const return (TQAccessibleWidget::objects == 0); } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( AccessibleFactory ) } diff --git a/src/canvas/ntqcanvas.h b/src/canvas/ntqcanvas.h index 9bf3d729c..1dccedf6b 100644 --- a/src/canvas/ntqcanvas.h +++ b/src/canvas/ntqcanvas.h @@ -75,7 +75,7 @@ class TQCanvasItem; class TQCanvasView; class TQCanvasPixmap; -#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) ) +#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) ) // MOC_SKIP_BEGIN TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueListIterator< TQCanvasItem* >; TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueList< TQCanvasItem* >; diff --git a/src/codecs/ntqeucjpcodec.h b/src/codecs/ntqeucjpcodec.h index 6ccbcddb2..dad8e4888 100644 --- a/src/codecs/ntqeucjpcodec.h +++ b/src/codecs/ntqeucjpcodec.h @@ -78,12 +78,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/ntqeuckrcodec.h b/src/codecs/ntqeuckrcodec.h index fcd97a964..d1bc05950 100644 --- a/src/codecs/ntqeuckrcodec.h +++ b/src/codecs/ntqeuckrcodec.h @@ -73,12 +73,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_KR +#define TQ_EXPORT_CODECS_KR #else -#define Q_EXPORT_CODECS_KR TQ_EXPORT +#define TQ_EXPORT_CODECS_KR TQ_EXPORT #endif -class Q_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/ntqgb18030codec.h b/src/codecs/ntqgb18030codec.h index 676a08a18..190714ee1 100644 --- a/src/codecs/ntqgb18030codec.h +++ b/src/codecs/ntqgb18030codec.h @@ -49,12 +49,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_CN +#define TQ_EXPORT_CODECS_CN #else -#define Q_EXPORT_CODECS_CN TQ_EXPORT +#define TQ_EXPORT_CODECS_CN TQ_EXPORT #endif -class Q_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { +class TQ_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { public: TQGb18030Codec(); @@ -73,7 +73,7 @@ public: int heuristicNameMatch(const char* hint) const; }; -class Q_EXPORT_CODECS_CN TQGbkCodec : public TQGb18030Codec { +class TQ_EXPORT_CODECS_CN TQGbkCodec : public TQGb18030Codec { public: TQGbkCodec(); @@ -92,7 +92,7 @@ public: int heuristicNameMatch(const char* hint) const; }; -class Q_EXPORT_CODECS_CN TQGb2312Codec : public TQGb18030Codec { +class TQ_EXPORT_CODECS_CN TQGb2312Codec : public TQGb18030Codec { public: TQGb2312Codec(); diff --git a/src/codecs/ntqjiscodec.h b/src/codecs/ntqjiscodec.h index b96d0aec2..fd1791fe6 100644 --- a/src/codecs/ntqjiscodec.h +++ b/src/codecs/ntqjiscodec.h @@ -78,12 +78,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/ntqjpunicode.h b/src/codecs/ntqjpunicode.h index 2daa893b7..ef75369c8 100644 --- a/src/codecs/ntqjpunicode.h +++ b/src/codecs/ntqjpunicode.h @@ -77,12 +77,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQJpUnicodeConv { +class TQ_EXPORT_CODECS_JP TQJpUnicodeConv { public: virtual ~TQJpUnicodeConv() {} diff --git a/src/codecs/ntqsjiscodec.h b/src/codecs/ntqsjiscodec.h index a1acc053e..b9af07337 100644 --- a/src/codecs/ntqsjiscodec.h +++ b/src/codecs/ntqsjiscodec.h @@ -78,12 +78,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/kernel/ntqsignalslotimp.h b/src/kernel/ntqsignalslotimp.h index 375f8eaa8..95e3e837d 100644 --- a/src/kernel/ntqsignalslotimp.h +++ b/src/kernel/ntqsignalslotimp.h @@ -68,7 +68,7 @@ public: #if defined(Q_TEMPLATEDLL) && defined(Q_CC_INTEL) // MOC_SKIP_BEGIN Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQConnectionList>; -#define Q_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES +#define TQ_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES // MOC_SKIP_END #endif diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h index f2266af03..a9f28611c 100644 --- a/src/sql/drivers/mysql/qsql_mysql.h +++ b/src/sql/drivers/mysql/qsql_mysql.h @@ -53,9 +53,9 @@ #include <mysql.h> #ifdef QT_PLUGIN -#define Q_EXPORT_SQLDRIVER_MYSQL +#define TQ_EXPORT_SQLDRIVER_MYSQL #else -#define Q_EXPORT_SQLDRIVER_MYSQL TQ_EXPORT +#define TQ_EXPORT_SQLDRIVER_MYSQL TQ_EXPORT #endif class TQMYSQLDriverPrivate; @@ -86,7 +86,7 @@ private: TQMYSQLResultPrivate* d; }; -class Q_EXPORT_SQLDRIVER_MYSQL TQMYSQLDriver : public TQSqlDriver +class TQ_EXPORT_SQLDRIVER_MYSQL TQMYSQLDriver : public TQSqlDriver { friend class TQMYSQLResult; public: diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h index 2fa820810..73b469fdd 100644 --- a/src/sql/drivers/odbc/qsql_odbc.h +++ b/src/sql/drivers/odbc/qsql_odbc.h @@ -60,9 +60,9 @@ #endif #ifdef QT_PLUGIN -#define Q_EXPORT_SQLDRIVER_ODBC +#define TQ_EXPORT_SQLDRIVER_ODBC #else -#define Q_EXPORT_SQLDRIVER_ODBC TQ_EXPORT +#define TQ_EXPORT_SQLDRIVER_ODBC TQ_EXPORT #endif #ifdef Q_OS_UNIX @@ -115,7 +115,7 @@ private: NullCache nullCache; }; -class Q_EXPORT_SQLDRIVER_ODBC TQODBCDriver : public TQSqlDriver +class TQ_EXPORT_SQLDRIVER_ODBC TQODBCDriver : public TQSqlDriver { public: TQODBCDriver( TQObject * parent=0, const char * name=0 ); diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h index 841ff568d..7da3f1a72 100644 --- a/src/sql/drivers/psql/qsql_psql.h +++ b/src/sql/drivers/psql/qsql_psql.h @@ -47,9 +47,9 @@ #include <libpq-fe.h> #ifdef QT_PLUGIN -#define Q_EXPORT_SQLDRIVER_PSQL +#define TQ_EXPORT_SQLDRIVER_PSQL #else -#define Q_EXPORT_SQLDRIVER_PSQL TQ_EXPORT +#define TQ_EXPORT_SQLDRIVER_PSQL TQ_EXPORT #endif class TQPSQLPrivate; @@ -78,7 +78,7 @@ private: TQPSQLPrivate* d; }; -class Q_EXPORT_SQLDRIVER_PSQL TQPSQLDriver : public TQSqlDriver +class TQ_EXPORT_SQLDRIVER_PSQL TQPSQLDriver : public TQSqlDriver { public: enum Protocol { diff --git a/src/styles/ntqcdestyle.h b/src/styles/ntqcdestyle.h index a0f02be28..72775cdf2 100644 --- a/src/styles/ntqcdestyle.h +++ b/src/styles/ntqcdestyle.h @@ -49,12 +49,12 @@ #if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_CDE +#define TQ_EXPORT_STYLE_CDE #else -#define Q_EXPORT_STYLE_CDE TQ_EXPORT +#define TQ_EXPORT_STYLE_CDE TQ_EXPORT #endif -class Q_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle +class TQ_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle { TQ_OBJECT public: diff --git a/src/styles/ntqcompactstyle.h b/src/styles/ntqcompactstyle.h index b022002c5..36e75b892 100644 --- a/src/styles/ntqcompactstyle.h +++ b/src/styles/ntqcompactstyle.h @@ -48,12 +48,12 @@ #if !defined(TQT_NO_STYLE_COMPACT) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_COMPACT +#define TQ_EXPORT_STYLE_COMPACT #else -#define Q_EXPORT_STYLE_COMPACT TQ_EXPORT +#define TQ_EXPORT_STYLE_COMPACT TQ_EXPORT #endif -class Q_EXPORT_STYLE_COMPACT TQCompactStyle : public TQWindowsStyle +class TQ_EXPORT_STYLE_COMPACT TQCompactStyle : public TQWindowsStyle { public: TQCompactStyle(); diff --git a/src/styles/ntqmotifplusstyle.h b/src/styles/ntqmotifplusstyle.h index bb590fc9d..4b018b5c5 100644 --- a/src/styles/ntqmotifplusstyle.h +++ b/src/styles/ntqmotifplusstyle.h @@ -49,12 +49,12 @@ #if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MOTIFPLUS +#define TQ_EXPORT_STYLE_MOTIFPLUS #else -#define Q_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT +#define TQ_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT #endif -class Q_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle +class TQ_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle { TQ_OBJECT diff --git a/src/styles/ntqmotifstyle.h b/src/styles/ntqmotifstyle.h index b2501e483..08d08aac6 100644 --- a/src/styles/ntqmotifstyle.h +++ b/src/styles/ntqmotifstyle.h @@ -50,13 +50,13 @@ class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MOTIF +#define TQ_EXPORT_STYLE_MOTIF #else -#define Q_EXPORT_STYLE_MOTIF TQ_EXPORT +#define TQ_EXPORT_STYLE_MOTIF TQ_EXPORT #endif -class Q_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle +class TQ_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle { TQ_OBJECT public: diff --git a/src/styles/ntqplatinumstyle.h b/src/styles/ntqplatinumstyle.h index 54d0a94dd..41fa3b4e3 100644 --- a/src/styles/ntqplatinumstyle.h +++ b/src/styles/ntqplatinumstyle.h @@ -50,12 +50,12 @@ class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_PLATINUM +#define TQ_EXPORT_STYLE_PLATINUM #else -#define Q_EXPORT_STYLE_PLATINUM TQ_EXPORT +#define TQ_EXPORT_STYLE_PLATINUM TQ_EXPORT #endif -class Q_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle +class TQ_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle { TQ_OBJECT public: diff --git a/src/styles/ntqsgistyle.h b/src/styles/ntqsgistyle.h index 29582bf69..e9821b3b7 100644 --- a/src/styles/ntqsgistyle.h +++ b/src/styles/ntqsgistyle.h @@ -50,14 +50,14 @@ #if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_SGI +#define TQ_EXPORT_STYLE_SGI #else -#define Q_EXPORT_STYLE_SGI TQ_EXPORT +#define TQ_EXPORT_STYLE_SGI TQ_EXPORT #endif class TQSGIStylePrivate; -class Q_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle +class TQ_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle { TQ_OBJECT public: diff --git a/src/styles/ntqwindowsstyle.h b/src/styles/ntqwindowsstyle.h index d7df8b98d..5f92e33af 100644 --- a/src/styles/ntqwindowsstyle.h +++ b/src/styles/ntqwindowsstyle.h @@ -48,13 +48,13 @@ #if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_WINDOWS +#define TQ_EXPORT_STYLE_WINDOWS #else -#define Q_EXPORT_STYLE_WINDOWS TQ_EXPORT +#define TQ_EXPORT_STYLE_WINDOWS TQ_EXPORT #endif -class Q_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle +class TQ_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle { TQ_OBJECT public: diff --git a/src/tools/ntqwinexport.h b/src/tools/ntqwinexport.h index a8f051d33..dc5928391 100644 --- a/src/tools/ntqwinexport.h +++ b/src/tools/ntqwinexport.h @@ -36,161 +36,161 @@ ** **********************************************************************/ -#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) ) +#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) ) // MOC_SKIP_BEGIN -#if defined(Q_DEFINED_QASCIIDICT) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(Q_EXPORTED_QASCIIDICT_TEMPLATES) -#define Q_EXPORTED_QASCIIDICT_TEMPLATES +#if defined(Q_DEFINED_QASCIIDICT) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(TQ_EXPORTED_QASCIIDICT_TEMPLATES) +#define TQ_EXPORTED_QASCIIDICT_TEMPLATES 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 +#if defined(Q_DEFINED_QSTYLESHEET) && defined(Q_DEFINED_QDICT) && !defined(TQ_EXPORTED_QSTYLESHEET_TEMPLATES) +#define TQ_EXPORTED_QSTYLESHEET_TEMPLATES 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 +#if defined(Q_DEFINED_QLIBRARY) && defined(Q_DEFINED_QDICT) && !defined(TQ_EXPORTED_QDICTLIBRARY_TEMPLATES) +#define TQ_EXPORTED_QDICTLIBRARY_TEMPLATES 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 +#if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QOBJECT) && !defined(TQ_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES) +#define TQ_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES 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 +#if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QWIDGET) && !defined(TQ_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES) +#define TQ_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES 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 +#if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QACCESSIBLE_OBJECT) && !defined(TQ_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES) +#define TQ_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES 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 +#if defined(Q_DEFINED_QINTDICT) && !defined(TQ_EXPORTED_QINTDICT_TEMPLATES) +#define TQ_EXPORTED_QINTDICT_TEMPLATES 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 +#if defined(Q_DEFINED_QINTDICT) && defined(Q_DEFINED_QWIDGET) && !defined(TQ_EXPORTED__TEMPLATES) +#define TQ_EXPORTED__TEMPLATES 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 +#if defined(Q_DEFINED_QMAP) && !defined(TQ_EXPORTED_QMAPBASIC_TEMPLATES) +#define TQ_EXPORTED_QMAPBASIC_TEMPLATES 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 +#if defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QSTRING) && !defined(TQ_EXPORTED_QMAPTQSTRING_TEMPLATES) +#define TQ_EXPORTED_QMAPTQSTRING_TEMPLATES 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 +#if defined(Q_DEFINED_QMEMARRAY) && !defined(TQ_EXPORTED_QMEMARRAY_BASIC_TEMPLATES) +#define TQ_EXPORTED_QMEMARRAY_BASIC_TEMPLATES 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 +#if defined(Q_DEFINED_QMEMARRAY) && defined(Q_DEFINED_QPOINT) && !defined(TQ_EXPORTED_QMEMARAYPOINT_TEMPLATES) +#define TQ_EXPORTED_QMEMARAYPOINT_TEMPLATES 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 +#if defined(Q_DEFINED_QPTRLIST) && !defined(TQ_EXPORTED_QPTRLIST_BASIC_TEMPLATES) +#define TQ_EXPORTED_QPTRLIST_BASIC_TEMPLATES 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 +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QWIDGET) && !defined(TQ_EXPORTED_QPTRLISTWIDGET_TEMPLATES) +#define TQ_EXPORTED_QPTRLISTWIDGET_TEMPLATES 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 +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QCONNECTION) && !defined(TQ_EXPORTED_QPTRLISTCONNECTION_TEMPLATES) +#define TQ_EXPORTED_QPTRLISTCONNECTION_TEMPLATES 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 +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QOBJECT) && !defined(TQ_EXPORTED_QPTRLISTOBJECT_TEMPLATES) +#define TQ_EXPORTED_QPTRLISTOBJECT_TEMPLATES 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 +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QDOCKWINDOW) && !defined(TQ_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES) +#define TQ_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES 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 +#if defined(Q_DEFINED_QPTRVECTOR) && !defined(TQ_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES) +#define TQ_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES 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 +#if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET) && !defined(TQ_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES) +#define TQ_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES 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 +#if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QWIDGET) && !defined(TQ_EXPORTED_QPTRVECTORWIDGET_TEMPLATES) +#define TQ_EXPORTED_QPTRVECTORWIDGET_TEMPLATES 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 +#if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(TQ_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES) +#define TQ_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES 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 +#if defined(Q_DEFINED_QVALUELIST) && !defined(TQ_EXPORTED_QVALUELIST_BASIC_TEMPLATES) +#define TQ_EXPORTED_QVALUELIST_BASIC_TEMPLATES 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 +#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QRECT) && !defined(TQ_EXPORTED_QVALUELISTRECT_TEMPLATES) +#define TQ_EXPORTED_QVALUELISTRECT_TEMPLATES 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 +#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTRING) && !defined(TQ_EXPORTED_QVALUELISTSTRING_TEMPLATES) +#define TQ_EXPORTED_QVALUELISTSTRING_TEMPLATES 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 +#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET) && !defined(TQ_EXPORTED_QSTYLESHEETITEM1_TEMPLATES) +#define TQ_EXPORTED_QSTYLESHEETITEM1_TEMPLATES 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 +#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTYLESHEET) && !defined(TQ_EXPORTED_QSTYLESHEETITEM2_TEMPLATES) +#define TQ_EXPORTED_QSTYLESHEETITEM2_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQStyleSheetItem::ListStyle>; #endif // qcanvas template exports -#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QCANVAS) && !defined(Q_EXPORTED_QCANVAS1_TEMPLATES) -#define Q_EXPORTED_QCANVAS1_TEMPLATES +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QCANVAS) && !defined(TQ_EXPORTED_QCANVAS1_TEMPLATES) +#define TQ_EXPORTED_QCANVAS1_TEMPLATES TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrListIterator< TQCanvasItem >; TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrList< TQCanvasItem >; TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrListIterator< TQCanvasView >; @@ -198,13 +198,13 @@ TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrList< TQCanvasV #endif // qtable template exports -#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QTABLE_SELECTION) && !defined(Q_EXPORTED_QTABLESELECTION_TEMPLATES) -#define Q_EXPORTED_QTABLESELECTION_TEMPLATES +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QTABLE_SELECTION) && !defined(TQ_EXPORTED_QTABLESELECTION_TEMPLATES) +#define TQ_EXPORTED_QTABLESELECTION_TEMPLATES TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrList<TQTableSelection>; #endif -#if defined(Q_DEFINED_QTABLE_ITEM) && defined(Q_DEFINED_QPTRVECTOR) && !defined(Q_EXPORTED_QTABLEITEM_TEMPLATES) -#define Q_EXPORTED_QTABLEITEM_TEMPLATES +#if defined(Q_DEFINED_QTABLE_ITEM) && defined(Q_DEFINED_QPTRVECTOR) && !defined(TQ_EXPORTED_QTABLEITEM_TEMPLATES) +#define TQ_EXPORTED_QTABLEITEM_TEMPLATES TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrVector<TQTableItem>; #endif @@ -213,8 +213,8 @@ TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrVector<TQTableIte #endif // qsqlextension template exports -#if defined(Q_DEFINED_QSQLEXTENSION) && defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QVALUEVECTOR) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QSQLEXTENSION_TEMPLATES) -#define Q_EXPORTED_QSQLEXTENSION_TEMPLATES +#if defined(Q_DEFINED_QSQLEXTENSION) && defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QVALUEVECTOR) && defined(Q_DEFINED_QSTRING) && !defined(TQ_EXPORTED_QSQLEXTENSION_TEMPLATES) +#define TQ_EXPORTED_QSQLEXTENSION_TEMPLATES TQM_TEMPLATE_EXTERN_SQL template class TQM_EXPORT_SQL TQMap<TQString,TQSqlParam>; TQM_TEMPLATE_EXTERN_SQL template class TQM_EXPORT_SQL TQValueVector<Holder>; #endif diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h index e11d63f27..9590468ae 100644 --- a/src/tools/qcom_p.h +++ b/src/tools/qcom_p.h @@ -272,7 +272,7 @@ public: \ ulong addRef() {return qtrefcount++;} \ ulong release() {if(!--qtrefcount){delete this;return 0;}return qtrefcount;} -#ifndef Q_EXPORT_COMPONENT +#ifndef TQ_EXPORT_COMPONENT #if defined(TQT_THREAD_SUPPORT) #define QT_THREADED_BUILD 1 #define Q_UCM_FLAGS_STRING "11" @@ -313,7 +313,7 @@ public: \ # ifdef TQ_WS_WIN # ifdef Q_CC_BOR -# define Q_EXPORT_COMPONENT() \ +# define TQ_EXPORT_COMPONENT() \ Q_UCM_VERIFICATION_DATA \ TQ_EXTERN_C __declspec(dllexport) \ const char * __stdcall qt_ucm_query_verification_data() \ @@ -321,7 +321,7 @@ public: \ TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* \ __stdcall ucm_instantiate() # else -# define Q_EXPORT_COMPONENT() \ +# define TQ_EXPORT_COMPONENT() \ Q_UCM_VERIFICATION_DATA \ TQ_EXTERN_C __declspec(dllexport) \ const char *qt_ucm_query_verification_data() \ @@ -329,14 +329,14 @@ public: \ TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* ucm_instantiate() # endif # else -# define Q_EXPORT_COMPONENT() \ +# define TQ_EXPORT_COMPONENT() \ Q_UCM_VERIFICATION_DATA \ TQ_EXTERN_C \ const char *qt_ucm_query_verification_data() \ { return qt_ucm_verification_data; } \ TQ_EXTERN_C TQ_EXPORT TQUnknownInterface* ucm_instantiate() # endif -# define Q_EXPORT_INTERFACE() Q_EXPORT_COMPONENT() +# define TQ_EXPORT_INTERFACE() TQ_EXPORT_COMPONENT() #endif #endif //TQT_NO_COMPONENT diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp index 38592c9bb..40223c996 100644 --- a/src/tools/qwinexport.cpp +++ b/src/tools/qwinexport.cpp @@ -1,4 +1,4 @@ -#define Q_EXPORT_TEMPLATES +#define TQ_EXPORT_TEMPLATES #include <ntqcanvas.h> #include <ntqaccessible.h> diff --git a/tools/designer/examples/opengl/main.cpp b/tools/designer/examples/opengl/main.cpp index 81a4b4ef3..08168e48c 100644 --- a/tools/designer/examples/opengl/main.cpp +++ b/tools/designer/examples/opengl/main.cpp @@ -299,7 +299,7 @@ TQRESULT OpenGLWidgetInterface::queryInterface( const TQUuid& uuid, TQUnknownInt return TQS_OK; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( OpenGLWidgetInterface ); } diff --git a/tools/designer/plugins/cppeditor/common.cpp b/tools/designer/plugins/cppeditor/common.cpp index 02c80de11..7a8e94d73 100644 --- a/tools/designer/plugins/cppeditor/common.cpp +++ b/tools/designer/plugins/cppeditor/common.cpp @@ -105,7 +105,7 @@ TQRESULT CommonInterface::queryInterface( const TQUuid &uuid, TQUnknownInterface } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( CommonInterface ) } diff --git a/tools/designer/plugins/dlg/main.cpp b/tools/designer/plugins/dlg/main.cpp index 2aa9cef5a..70fc9f340 100644 --- a/tools/designer/plugins/dlg/main.cpp +++ b/tools/designer/plugins/dlg/main.cpp @@ -102,7 +102,7 @@ bool DlgFilter::canUnload() const return TRUE; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( DlgFilter ) } diff --git a/tools/designer/plugins/glade/main.cpp b/tools/designer/plugins/glade/main.cpp index e0df6460f..8cb0353f5 100644 --- a/tools/designer/plugins/glade/main.cpp +++ b/tools/designer/plugins/glade/main.cpp @@ -103,7 +103,7 @@ bool GladeFilter::canUnload() const return TRUE; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( GladeFilter ) } diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp index d12cd12cf..a9ddde96a 100644 --- a/tools/designer/plugins/kdevdlg/main.cpp +++ b/tools/designer/plugins/kdevdlg/main.cpp @@ -114,7 +114,7 @@ bool KDevDlgFilter::canUnload() const return TRUE; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( KDevDlgFilter ) } diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp index 9825ea649..aebdb0aba 100644 --- a/tools/designer/plugins/rc/main.cpp +++ b/tools/designer/plugins/rc/main.cpp @@ -111,7 +111,7 @@ bool RCFilter::canUnload() const return TRUE; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( RCFilter ) } diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp index ed0a36e30..7a84ef115 100644 --- a/tools/designer/plugins/wizards/main.cpp +++ b/tools/designer/plugins/wizards/main.cpp @@ -136,7 +136,7 @@ TQRESULT StandardTemplateWizardInterface::queryInterface( const TQUuid& uuid, TQ return TQS_OK; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( StandardTemplateWizardInterface ) } |