diff options
Diffstat (limited to 'plugins')
49 files changed, 139 insertions, 139 deletions
diff --git a/plugins/src/accessible/widgets/main.cpp b/plugins/src/accessible/widgets/main.cpp index 7fe1f2250..e63219240 100644 --- a/plugins/src/accessible/widgets/main.cpp +++ b/plugins/src/accessible/widgets/main.cpp @@ -1,9 +1,9 @@ #include "qaccessiblewidget.h" #include "qaccessiblemenu.h" -#include <qtoolbutton.h> -#include <qtoolbar.h> -#include <qvariant.h> +#include <ntqtoolbutton.h> +#include <ntqtoolbar.h> +#include <ntqvariant.h> class AccessibleFactory : public TQAccessibleFactoryInterface, public TQLibraryInterface { diff --git a/plugins/src/accessible/widgets/qaccessiblemenu.cpp b/plugins/src/accessible/widgets/qaccessiblemenu.cpp index f3e2f2cd4..6a61fa558 100644 --- a/plugins/src/accessible/widgets/qaccessiblemenu.cpp +++ b/plugins/src/accessible/widgets/qaccessiblemenu.cpp @@ -1,8 +1,8 @@ #include "qaccessiblemenu.h" -#include <qpopupmenu.h> -#include <qmenubar.h> -#include <qstyle.h> +#include <ntqpopupmenu.h> +#include <ntqmenubar.h> +#include <ntqstyle.h> class MyPopupMenu : public TQPopupMenu { diff --git a/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/plugins/src/accessible/widgets/qaccessiblewidget.cpp index 4c9e588f3..fe27f8091 100644 --- a/plugins/src/accessible/widgets/qaccessiblewidget.cpp +++ b/plugins/src/accessible/widgets/qaccessiblewidget.cpp @@ -1,32 +1,32 @@ #include "qaccessiblewidget.h" -#include <qapplication.h> -#include <qstyle.h> -#include <qobjectlist.h> -#include <qpushbutton.h> -#include <qslider.h> -#include <qdial.h> -#include <qspinbox.h> -#include <qscrollbar.h> -#include <qslider.h> -#include <qlineedit.h> -#include <qlabel.h> -#include <qlcdnumber.h> -#include <qprogressbar.h> -#include <qgroupbox.h> -#include <qtoolbutton.h> -#include <qwhatsthis.h> -#include <qtooltip.h> -#include <qscrollview.h> -#include <qheader.h> -#include <qtabbar.h> -#include <qcombobox.h> -#include <qrangecontrol.h> -#include <qlistbox.h> -#include <qlistview.h> -#include <qiconview.h> -#include <qtextedit.h> -#include <qwidgetstack.h> +#include <ntqapplication.h> +#include <ntqstyle.h> +#include <ntqobjectlist.h> +#include <ntqpushbutton.h> +#include <ntqslider.h> +#include <ntqdial.h> +#include <ntqspinbox.h> +#include <ntqscrollbar.h> +#include <ntqslider.h> +#include <ntqlineedit.h> +#include <ntqlabel.h> +#include <ntqlcdnumber.h> +#include <ntqprogressbar.h> +#include <ntqgroupbox.h> +#include <ntqtoolbutton.h> +#include <ntqwhatsthis.h> +#include <ntqtooltip.h> +#include <ntqscrollview.h> +#include <ntqheader.h> +#include <ntqtabbar.h> +#include <ntqcombobox.h> +#include <ntqrangecontrol.h> +#include <ntqlistbox.h> +#include <ntqlistview.h> +#include <ntqiconview.h> +#include <ntqtextedit.h> +#include <ntqwidgetstack.h> #include <private/qtitlebar_p.h> @@ -442,7 +442,7 @@ TQMemArray<int> TQAccessibleWidget::selection() const } /*! - \class TQAccessibleWidgetStack qaccessible.h + \class TQAccessibleWidgetStack ntqaccessible.h \brief The TQAccessibleWidgetStack class implements the TQAccessibleInterface for widget stacks. */ @@ -483,7 +483,7 @@ TQRESULT TQAccessibleWidgetStack::queryChild( int control, TQAccessibleInterface /*! - \class TQAccessibleButton qaccessible.h + \class TQAccessibleButton ntqaccessible.h \brief The TQAccessibleButton class implements the TQAccessibleInterface for button type widgets. */ diff --git a/plugins/src/accessible/widgets/qaccessiblewidget.h b/plugins/src/accessible/widgets/qaccessiblewidget.h index 0a781b177..903271747 100644 --- a/plugins/src/accessible/widgets/qaccessiblewidget.h +++ b/plugins/src/accessible/widgets/qaccessiblewidget.h @@ -1,7 +1,7 @@ #ifndef TQACCESSIBLEWIDGET_H #define TQACCESSIBLEWIDGET_H -#include <qaccessible.h> +#include <ntqaccessible.h> class TQButton; class TQScrollView; diff --git a/plugins/src/codecs/cn/cn.pro b/plugins/src/codecs/cn/cn.pro index 496912905..91e0b11fc 100644 --- a/plugins/src/codecs/cn/cn.pro +++ b/plugins/src/codecs/cn/cn.pro @@ -6,7 +6,7 @@ DESTDIR = ../../../codecs REQUIRES = !bigcodecs -HEADERS = ../../../../include/qgb18030codec.h \ +HEADERS = ../../../../include/ntqgb18030codec.h \ ../../../../include/private/qfontcodecs_p.h SOURCES = ../../../../src/codecs/qgb18030codec.cpp \ diff --git a/plugins/src/codecs/cn/main.cpp b/plugins/src/codecs/cn/main.cpp index 23cec30c8..29b552c57 100644 --- a/plugins/src/codecs/cn/main.cpp +++ b/plugins/src/codecs/cn/main.cpp @@ -1,9 +1,9 @@ -#include <qtextcodecplugin.h> -#include <qtextcodec.h> -#include <qptrlist.h> -#include <qapplication.h> +#include <ntqtextcodecplugin.h> +#include <ntqtextcodec.h> +#include <ntqptrlist.h> +#include <ntqapplication.h> -#include <qgb18030codec.h> +#include <ntqgb18030codec.h> #include <private/qfontcodecs_p.h> diff --git a/plugins/src/codecs/jp/jp.pro b/plugins/src/codecs/jp/jp.pro index 59687543c..8cf766d03 100644 --- a/plugins/src/codecs/jp/jp.pro +++ b/plugins/src/codecs/jp/jp.pro @@ -6,10 +6,10 @@ DESTDIR = ../../../codecs REQUIRES = !bigcodecs -HEADERS = ../../../../include/qeucjpcodec.h \ - ../../../../include/qjiscodec.h \ - ../../../../include/qsjiscodec.h \ - ../../../../include/qjpunicode.h \ +HEADERS = ../../../../include/ntqeucjpcodec.h \ + ../../../../include/ntqjiscodec.h \ + ../../../../include/ntqsjiscodec.h \ + ../../../../include/ntqjpunicode.h \ ../../../../include/private/qfontcodecs_p.h SOURCES = ../../../../src/codecs/qeucjpcodec.cpp \ diff --git a/plugins/src/codecs/jp/main.cpp b/plugins/src/codecs/jp/main.cpp index 1c7b4b0df..3f71cbc10 100644 --- a/plugins/src/codecs/jp/main.cpp +++ b/plugins/src/codecs/jp/main.cpp @@ -1,10 +1,10 @@ -#include <qtextcodecplugin.h> -#include <qtextcodec.h> -#include <qptrlist.h> +#include <ntqtextcodecplugin.h> +#include <ntqtextcodec.h> +#include <ntqptrlist.h> -#include <qeucjpcodec.h> -#include <qjiscodec.h> -#include <qsjiscodec.h> +#include <ntqeucjpcodec.h> +#include <ntqjiscodec.h> +#include <ntqsjiscodec.h> #include <private/qfontcodecs_p.h> diff --git a/plugins/src/codecs/kr/kr.pro b/plugins/src/codecs/kr/kr.pro index 472373f41..3f13422c2 100644 --- a/plugins/src/codecs/kr/kr.pro +++ b/plugins/src/codecs/kr/kr.pro @@ -6,7 +6,7 @@ DESTDIR = ../../../codecs REQUIRES = !bigcodecs -HEADERS = ../../../../include/qeuckrcodec.h \ +HEADERS = ../../../../include/ntqeuckrcodec.h \ ../../../../include/private/qfontcodecs_p.h SOURCES = ../../../../src/codecs/qeuckrcodec.cpp \ diff --git a/plugins/src/codecs/kr/main.cpp b/plugins/src/codecs/kr/main.cpp index 2515d594c..0d28d2c75 100644 --- a/plugins/src/codecs/kr/main.cpp +++ b/plugins/src/codecs/kr/main.cpp @@ -1,8 +1,8 @@ -#include <qtextcodecplugin.h> -#include <qtextcodec.h> -#include <qptrlist.h> +#include <ntqtextcodecplugin.h> +#include <ntqtextcodec.h> +#include <ntqptrlist.h> -#include <qeuckrcodec.h> +#include <ntqeuckrcodec.h> #include <private/qfontcodecs_p.h> diff --git a/plugins/src/codecs/tw/main.cpp b/plugins/src/codecs/tw/main.cpp index 5b4134040..d91909541 100644 --- a/plugins/src/codecs/tw/main.cpp +++ b/plugins/src/codecs/tw/main.cpp @@ -1,8 +1,8 @@ -#include <qtextcodecplugin.h> -#include <qtextcodec.h> -#include <qptrlist.h> +#include <ntqtextcodecplugin.h> +#include <ntqtextcodec.h> +#include <ntqptrlist.h> -#include <qbig5codec.h> +#include <ntqbig5codec.h> #include <private/qfontcodecs_p.h> diff --git a/plugins/src/codecs/tw/tw.pro b/plugins/src/codecs/tw/tw.pro index 6c705c8e1..55aa75b11 100644 --- a/plugins/src/codecs/tw/tw.pro +++ b/plugins/src/codecs/tw/tw.pro @@ -6,7 +6,7 @@ DESTDIR = ../../../codecs REQUIRES = !bigcodecs -HEADERS = ../../../../include/qbig5codec.h \ +HEADERS = ../../../../include/ntqbig5codec.h \ ../../../../include/private/qfontcodecs_p.h SOURCES = ../../../../src/codecs/qbig5codec.cpp \ ../../../../src/codecs/qfonttwcodec.cpp \ diff --git a/plugins/src/imageformats/jpeg/main.cpp b/plugins/src/imageformats/jpeg/main.cpp index 691322bf3..ef8fd9dde 100644 --- a/plugins/src/imageformats/jpeg/main.cpp +++ b/plugins/src/imageformats/jpeg/main.cpp @@ -1,7 +1,7 @@ #ifndef QT_CLEAN_NAMESPACE #define QT_CLEAN_NAMESPACE #endif -#include <qimageformatplugin.h> +#include <ntqimageformatplugin.h> #ifndef QT_NO_IMAGEFORMATPLUGIN diff --git a/plugins/src/imageformats/mng/main.cpp b/plugins/src/imageformats/mng/main.cpp index 287a5cb21..4b09c8992 100644 --- a/plugins/src/imageformats/mng/main.cpp +++ b/plugins/src/imageformats/mng/main.cpp @@ -2,7 +2,7 @@ #define QT_CLEAN_NAMESPACE #endif -#include <qimageformatplugin.h> +#include <ntqimageformatplugin.h> #ifndef QT_NO_IMAGEFORMATPLUGIN diff --git a/plugins/src/imageformats/png/main.cpp b/plugins/src/imageformats/png/main.cpp index 7c1cd03b2..91101194a 100644 --- a/plugins/src/imageformats/png/main.cpp +++ b/plugins/src/imageformats/png/main.cpp @@ -1,7 +1,7 @@ #ifndef QT_CLEAN_NAMESPACE #define QT_CLEAN_NAMESPACE #endif -#include <qimageformatplugin.h> +#include <ntqimageformatplugin.h> #ifndef QT_NO_IMAGEFORMATPLUGIN diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp index c164af267..5e8d36cc0 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -42,11 +42,11 @@ #ifndef QT_NO_IM #include "qmultiinputcontext.h" -#include <qinputcontextfactory.h> -#include <qstringlist.h> -#include <qpopupmenu.h> +#include <ntqinputcontextfactory.h> +#include <ntqstringlist.h> +#include <ntqpopupmenu.h> #ifndef QT_NO_IM_EXTENSIONS -#include <qsettings.h> +#include <ntqsettings.h> #endif #include <cstdlib> diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h index 7e7421ab2..2a2980d94 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h @@ -45,11 +45,11 @@ #ifndef QT_NO_IM -#include <qnamespace.h> -#include <qwidget.h> -#include <qinputcontext.h> -#include <qguardedptr.h> -#include <qintdict.h> +#include <ntqnamespace.h> +#include <ntqwidget.h> +#include <ntqinputcontext.h> +#include <ntqguardedptr.h> +#include <ntqintdict.h> class TQPopupMenu; diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp index cc99e12d2..08d0a1ddd 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp @@ -43,8 +43,8 @@ #ifndef QT_NO_IM #include "qmultiinputcontext.h" #include "qmultiinputcontextplugin.h" -#include <qinputcontextplugin.h> -#include <qstringlist.h> +#include <ntqinputcontextplugin.h> +#include <ntqstringlist.h> TQMultiInputContextPlugin::TQMultiInputContextPlugin() diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h index 13b60254a..9b2039d96 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h @@ -42,8 +42,8 @@ #ifndef QT_NO_IM #include "qmultiinputcontext.h" -#include <qinputcontextplugin.h> -#include <qstringlist.h> +#include <ntqinputcontextplugin.h> +#include <ntqstringlist.h> class TQMultiInputContextPlugin : public TQInputContextPlugin diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp index 39bebe190..9f6014be5 100644 --- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp +++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp @@ -42,8 +42,8 @@ #ifndef QT_NO_IM #include "qnoneinputcontextplugin.h" -#include <qinputcontextfactory.h> -#include <qsettings.h> +#include <ntqinputcontextfactory.h> +#include <ntqsettings.h> #include <cstdlib> diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h index 37e59f8cd..a521555f0 100644 --- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h +++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h @@ -41,8 +41,8 @@ **********************************************************************/ #ifndef QT_NO_IM -#include <qinputcontextplugin.h> -#include <qstringlist.h> +#include <ntqinputcontextplugin.h> +#include <ntqstringlist.h> class TQNoneInputContextPlugin : public TQInputContextPlugin diff --git a/plugins/src/inputmethods/simple/composetable.cpp b/plugins/src/inputmethods/simple/composetable.cpp index 2fa3e09bb..0fd2a6709 100644 --- a/plugins/src/inputmethods/simple/composetable.cpp +++ b/plugins/src/inputmethods/simple/composetable.cpp @@ -51,7 +51,7 @@ #include "qsimpleinputcontext.h" -#include <qnamespace.h> +#include <ntqnamespace.h> static const TQComposeTableElement defaultTable[] = { // /* broken */ { {0x0000, 0x0000, 0, 0, 0, 0}, 0x1eda }, // U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp index 2e8398fb0..b0cb94c11 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp +++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp @@ -42,9 +42,9 @@ #include "qsimpleinputcontext.h" -#include <qnamespace.h> -#include <qevent.h> -#include <qglobal.h> +#include <ntqnamespace.h> +#include <ntqevent.h> +#include <ntqglobal.h> #include <algorithm> static const int ignoreKeys[] = { diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.h b/plugins/src/inputmethods/simple/qsimpleinputcontext.h index f2028d8de..3eb56133f 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontext.h +++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.h @@ -43,8 +43,8 @@ #ifndef TQSIMPLEINPUT_CONTEXT_H #define TQSIMPLEINPUT_CONTEXT_H -#include <qinputcontext.h> -#include <qnamespace.h> +#include <ntqinputcontext.h> +#include <ntqnamespace.h> #define QT_KEYSETQUENCE_MAX_LEN 6 #define UNITIZE(qkey) (0x02000000|qkey) diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp index d98ea5a10..a7d2bb320 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp +++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp @@ -43,8 +43,8 @@ #ifndef QT_NO_IM #include "qsimpleinputcontext.h" #include "qsimpleinputcontextplugin.h" -#include <qinputcontextplugin.h> -#include <qstringlist.h> +#include <ntqinputcontextplugin.h> +#include <ntqstringlist.h> TQSimpleInputContextPlugin::TQSimpleInputContextPlugin() diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h index 1f5bbb4b1..dbe7f4715 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h +++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h @@ -42,8 +42,8 @@ #ifndef QT_NO_IM #include "qsimpleinputcontext.h" -#include <qinputcontextplugin.h> -#include <qstringlist.h> +#include <ntqinputcontextplugin.h> +#include <ntqstringlist.h> class TQSimpleInputContextPlugin : public TQInputContextPlugin diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h index 96afee5eb..70499de36 100644 --- a/plugins/src/inputmethods/xim/qximinputcontext.h +++ b/plugins/src/inputmethods/xim/qximinputcontext.h @@ -51,10 +51,10 @@ #if !defined(Q_NO_IM) -#include "qglobal.h" -#include <qinputcontext.h> -#include <qfont.h> -#include <qcstring.h> +#include "ntqglobal.h" +#include <ntqinputcontext.h> +#include <ntqfont.h> +#include <ntqcstring.h> class TQKeyEvent; class TQWidget; @@ -63,8 +63,8 @@ class TQString; #ifdef Q_WS_X11 -#include "qarray.h" -#include "qwindowdefs.h" +#include "ntqarray.h" +#include "ntqwindowdefs.h" #include <private/qt_x11_p.h> #endif diff --git a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp index b1f460b42..43328071b 100644 --- a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp +++ b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp @@ -45,12 +45,12 @@ const int XKeyRelease = KeyRelease; #include "qplatformdefs.h" -#include "qapplication.h" -#include "qwidget.h" -#include "qstring.h" -#include "qptrlist.h" -#include "qintdict.h" -#include "qtextcodec.h" +#include "ntqapplication.h" +#include "ntqwidget.h" +#include "ntqstring.h" +#include "ntqptrlist.h" +#include "ntqintdict.h" +#include "ntqtextcodec.h" #include <stdlib.h> #include <limits.h> diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp index 1b1fa270f..381b808a8 100644 --- a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp +++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp @@ -43,8 +43,8 @@ #ifndef QT_NO_IM #include "qximinputcontext.h" #include "qximinputcontextplugin.h" -#include <qinputcontextplugin.h> -#include <qstringlist.h> +#include <ntqinputcontextplugin.h> +#include <ntqstringlist.h> TQXIMInputContextPlugin::TQXIMInputContextPlugin() diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.h b/plugins/src/inputmethods/xim/qximinputcontextplugin.h index 6d566190f..d58d5d53b 100644 --- a/plugins/src/inputmethods/xim/qximinputcontextplugin.h +++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.h @@ -42,8 +42,8 @@ #ifndef QT_NO_IM #include "qximinputcontext.h" -#include <qinputcontextplugin.h> -#include <qstringlist.h> +#include <ntqinputcontextplugin.h> +#include <ntqstringlist.h> class TQXIMInputContextPlugin : public TQInputContextPlugin diff --git a/plugins/src/sqldrivers/ibase/main.cpp b/plugins/src/sqldrivers/ibase/main.cpp index 57005245b..2397d85c9 100644 --- a/plugins/src/sqldrivers/ibase/main.cpp +++ b/plugins/src/sqldrivers/ibase/main.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include <qsqldriverplugin.h> +#include <ntqsqldriverplugin.h> #include "../../../../src/sql/drivers/ibase/qsql_ibase.h" class TQIBaseDriverPlugin : public TQSqlDriverPlugin diff --git a/plugins/src/sqldrivers/mysql/main.cpp b/plugins/src/sqldrivers/mysql/main.cpp index 68afff736..49494e756 100644 --- a/plugins/src/sqldrivers/mysql/main.cpp +++ b/plugins/src/sqldrivers/mysql/main.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include <qsqldriverplugin.h> +#include <ntqsqldriverplugin.h> #include "../../../../src/sql/drivers/mysql/qsql_mysql.h" class TQMYSQLDriverPlugin : public TQSqlDriverPlugin diff --git a/plugins/src/sqldrivers/odbc/main.cpp b/plugins/src/sqldrivers/odbc/main.cpp index 94636e4d7..87b0d6384 100644 --- a/plugins/src/sqldrivers/odbc/main.cpp +++ b/plugins/src/sqldrivers/odbc/main.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include <qsqldriverplugin.h> +#include <ntqsqldriverplugin.h> #include "../../../../src/sql/drivers/odbc/qsql_odbc.h" class TQODBCDriverPlugin : public TQSqlDriverPlugin diff --git a/plugins/src/sqldrivers/psql/main.cpp b/plugins/src/sqldrivers/psql/main.cpp index 04d9a766d..789bb7526 100644 --- a/plugins/src/sqldrivers/psql/main.cpp +++ b/plugins/src/sqldrivers/psql/main.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include <qsqldriverplugin.h> +#include <ntqsqldriverplugin.h> #include "../../../../src/sql/drivers/psql/qsql_psql.h" class TQPSQLDriverPlugin : public TQSqlDriverPlugin diff --git a/plugins/src/sqldrivers/sqlite/smain.cpp b/plugins/src/sqldrivers/sqlite/smain.cpp index c2b8f3e12..747eed79b 100644 --- a/plugins/src/sqldrivers/sqlite/smain.cpp +++ b/plugins/src/sqldrivers/sqlite/smain.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include <qsqldriverplugin.h> +#include <ntqsqldriverplugin.h> #include "../../../../src/sql/drivers/sqlite/qsql_sqlite.h" class TQSQLiteDriverPlugin : public TQSqlDriverPlugin diff --git a/plugins/src/styles/cde/cde.pro b/plugins/src/styles/cde/cde.pro index 744703699..999b35c0c 100644 --- a/plugins/src/styles/cde/cde.pro +++ b/plugins/src/styles/cde/cde.pro @@ -4,12 +4,12 @@ TARGET = qcdestyle CONFIG += qt warn_off release plugin DESTDIR = ../../../styles -HEADERS = ../../../../include/qcdestyle.h +HEADERS = ../../../../include/ntqcdestyle.h SOURCES = main.cpp \ ../../../../src/styles/qcdestyle.cpp !contains(styles, motif) { - HEADERS += ../../../../include/qmotifstyle.h + HEADERS += ../../../../include/ntqmotifstyle.h SOURCES += ../../../../src/styles/qmotifstyle.cpp } diff --git a/plugins/src/styles/cde/main.cpp b/plugins/src/styles/cde/main.cpp index 97892cbac..014bfbcfb 100644 --- a/plugins/src/styles/cde/main.cpp +++ b/plugins/src/styles/cde/main.cpp @@ -1,5 +1,5 @@ -#include <qstyleplugin.h> -#include <qcdestyle.h> +#include <ntqstyleplugin.h> +#include <ntqcdestyle.h> class CDEStyle : public TQStylePlugin { diff --git a/plugins/src/styles/compact/compact.pro b/plugins/src/styles/compact/compact.pro index c746f2380..1dff0374a 100644 --- a/plugins/src/styles/compact/compact.pro +++ b/plugins/src/styles/compact/compact.pro @@ -4,13 +4,13 @@ TARGET = qcompactstyle CONFIG += qt warn_off release plugin DESTDIR = ../../../styles -HEADERS = ../../../../include/qcompactstyle.h +HEADERS = ../../../../include/ntqcompactstyle.h SOURCES = main.cpp \ ../../../../src/styles/qcompactstyle.cpp !contains(styles, windows) { - HEADERS += ../../../../include/qwindowsstyle.h + HEADERS += ../../../../include/ntqwindowsstyle.h SOURCES += ../../../../src/styles/qwindowsstyle.cpp } diff --git a/plugins/src/styles/compact/main.cpp b/plugins/src/styles/compact/main.cpp index ddee9c212..9ee71a257 100644 --- a/plugins/src/styles/compact/main.cpp +++ b/plugins/src/styles/compact/main.cpp @@ -1,5 +1,5 @@ -#include <qstyleplugin.h> -#include <qcompactstyle.h> +#include <ntqstyleplugin.h> +#include <ntqcompactstyle.h> class CompactStyle : public TQStylePlugin { diff --git a/plugins/src/styles/motif/main.cpp b/plugins/src/styles/motif/main.cpp index b0241ce1e..118a577df 100644 --- a/plugins/src/styles/motif/main.cpp +++ b/plugins/src/styles/motif/main.cpp @@ -1,5 +1,5 @@ -#include <qstyleplugin.h> -#include <qmotifstyle.h> +#include <ntqstyleplugin.h> +#include <ntqmotifstyle.h> class MotifStyle : public TQStylePlugin { diff --git a/plugins/src/styles/motif/motif.pro b/plugins/src/styles/motif/motif.pro index 2aee623c9..61f228c1c 100644 --- a/plugins/src/styles/motif/motif.pro +++ b/plugins/src/styles/motif/motif.pro @@ -4,7 +4,7 @@ TARGET = qmotifstyle CONFIG += qt warn_off release plugin DESTDIR = ../../../styles -HEADERS = ../../../../include/qmotifstyle.h +HEADERS = ../../../../include/ntqmotifstyle.h SOURCES = main.cpp \ ../../../../src/styles/qmotifstyle.cpp diff --git a/plugins/src/styles/motifplus/main.cpp b/plugins/src/styles/motifplus/main.cpp index 37b6c81d3..bd2e75ac8 100644 --- a/plugins/src/styles/motifplus/main.cpp +++ b/plugins/src/styles/motifplus/main.cpp @@ -1,5 +1,5 @@ -#include <qstyleplugin.h> -#include <qmotifplusstyle.h> +#include <ntqstyleplugin.h> +#include <ntqmotifplusstyle.h> class MotifPlusStyle : public TQStylePlugin { diff --git a/plugins/src/styles/motifplus/motifplus.pro b/plugins/src/styles/motifplus/motifplus.pro index 64a1f8e85..0f1ca9be5 100644 --- a/plugins/src/styles/motifplus/motifplus.pro +++ b/plugins/src/styles/motifplus/motifplus.pro @@ -4,12 +4,12 @@ TARGET = qmotifplusstyle CONFIG += qt warn_off release plugin DESTDIR = ../../../styles -HEADERS = ../../../../include/qmotifplusstyle.h +HEADERS = ../../../../include/ntqmotifplusstyle.h SOURCES = main.cpp \ ../../../../src/styles/qmotifplusstyle.cpp !contains(styles, motif) { - HEADERS += ../../../../include/qmotifstyle.h + HEADERS += ../../../../include/ntqmotifstyle.h SOURCES += ../../../../src/styles/qmotifstyle.cpp } diff --git a/plugins/src/styles/platinum/main.cpp b/plugins/src/styles/platinum/main.cpp index c7ad26912..1db67f159 100644 --- a/plugins/src/styles/platinum/main.cpp +++ b/plugins/src/styles/platinum/main.cpp @@ -1,5 +1,5 @@ -#include <qplatinumstyle.h> -#include <qstyleplugin.h> +#include <ntqplatinumstyle.h> +#include <ntqstyleplugin.h> class PlatinumStyle : public TQStylePlugin { diff --git a/plugins/src/styles/platinum/platinum.pro b/plugins/src/styles/platinum/platinum.pro index 23fe42955..8ddff3cc4 100644 --- a/plugins/src/styles/platinum/platinum.pro +++ b/plugins/src/styles/platinum/platinum.pro @@ -4,12 +4,12 @@ TARGET = qplatinumstyle CONFIG += qt warn_off release plugin DESTDIR = ../../../styles -HEADERS = ../../../../include/qplatinumstyle.h +HEADERS = ../../../../include/ntqplatinumstyle.h SOURCES = main.cpp \ ../../../../src/styles/qplatinumstyle.cpp !contains(styles, windows) { - HEADERS += ../../../../include/qwindowsstyle.h + HEADERS += ../../../../include/ntqwindowsstyle.h SOURCES += ../../../../src/styles/qwindowsstyle.cpp } diff --git a/plugins/src/styles/sgi/main.cpp b/plugins/src/styles/sgi/main.cpp index 0314525e5..b1579b68e 100644 --- a/plugins/src/styles/sgi/main.cpp +++ b/plugins/src/styles/sgi/main.cpp @@ -1,5 +1,5 @@ -#include <qstyleplugin.h> -#include <qsgistyle.h> +#include <ntqstyleplugin.h> +#include <ntqsgistyle.h> class SGIStyle : public TQStylePlugin { diff --git a/plugins/src/styles/sgi/sgi.pro b/plugins/src/styles/sgi/sgi.pro index 0892c1047..ce7776d18 100644 --- a/plugins/src/styles/sgi/sgi.pro +++ b/plugins/src/styles/sgi/sgi.pro @@ -4,12 +4,12 @@ TARGET = qsgistyle CONFIG += qt warn_off release plugin DESTDIR = ../../../styles -HEADERS = ../../../../include/qsgistyle.h +HEADERS = ../../../../include/ntqsgistyle.h SOURCES = main.cpp \ ../../../../src/styles/qsgistyle.cpp !contains(styles, motif) { - HEADERS += ../../../../include/qmotifstyle.h + HEADERS += ../../../../include/ntqmotifstyle.h SOURCES += ../../../../src/styles/qmotifstyle.cpp } diff --git a/plugins/src/styles/windows/main.cpp b/plugins/src/styles/windows/main.cpp index 9128994ad..ae823c318 100644 --- a/plugins/src/styles/windows/main.cpp +++ b/plugins/src/styles/windows/main.cpp @@ -1,5 +1,5 @@ -#include <qstyleplugin.h> -#include <qwindowsstyle.h> +#include <ntqstyleplugin.h> +#include <ntqwindowsstyle.h> class WindowsStyle : public TQStylePlugin { diff --git a/plugins/src/styles/windows/windows.pro b/plugins/src/styles/windows/windows.pro index f9d97e308..c1a3732c6 100644 --- a/plugins/src/styles/windows/windows.pro +++ b/plugins/src/styles/windows/windows.pro @@ -4,7 +4,7 @@ TARGET = qwindowsstyle CONFIG += qt warn_off release plugin DESTDIR = ../../../styles -HEADERS = ../../../../include/qwindowsstyle.h +HEADERS = ../../../../include/ntqwindowsstyle.h SOURCES = main.cpp \ ../../../../src/styles/qwindowsstyle.cpp |