Update to latest tqt3 automated conversion

23 files changed, 185 insertions, 185 deletions

diff --git a/src/styles/qcdestyle.h b/src/styles/ntqcdestyle.h
index 47de74162..f82236e1f 100644
--- a/src/styles/qcdestyle.h
+++ b/src/styles/ntqcdestyle.h
@@ -43,7 +43,7 @@
 #define TQCDESTYLE_H
 
 #ifndef QT_H
-#include "qmotifstyle.h"
+#include "ntqmotifstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_CDE) || defined(QT_PLUGIN)
diff --git a/src/styles/qcommonstyle.h b/src/styles/ntqcommonstyle.h
index a1579ce12..573121765 100644
--- a/src/styles/qcommonstyle.h
+++ b/src/styles/ntqcommonstyle.h
@@ -42,7 +42,7 @@
 #define TQCOMMONSTYLE_H
 
 #ifndef QT_H
-#include "qstyle.h"
+#include "ntqstyle.h"
 #endif // QT_H
 
 #ifndef QT_NO_STYLE
diff --git a/src/styles/qcompactstyle.h b/src/styles/ntqcompactstyle.h
index ecc5c0b6c..60e298a8e 100644
--- a/src/styles/qcompactstyle.h
+++ b/src/styles/ntqcompactstyle.h
@@ -42,7 +42,7 @@
 #define TQCOMPACTSTYLE_H
 
 #ifndef QT_H
-#include "qwindowsstyle.h"
+#include "ntqwindowsstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
diff --git a/src/styles/qinterlacestyle.h b/src/styles/ntqinterlacestyle.h
index d2caecbe0..7c00675d9 100644
--- a/src/styles/qinterlacestyle.h
+++ b/src/styles/ntqinterlacestyle.h
@@ -43,12 +43,12 @@
 #define TQINTERLACESTYLE_H
 
 #ifndef QT_H
-#include "qmotifstyle.h"
+#include "ntqmotifstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
 
-#include "qpalette.h"
+#include "ntqpalette.h"
 
 class Q_EXPORT TQInterlaceStyle : public TQMotifStyle
 {
diff --git a/src/styles/qmotifplusstyle.h b/src/styles/ntqmotifplusstyle.h
index 8490e84c1..1034d0857 100644
--- a/src/styles/qmotifplusstyle.h
+++ b/src/styles/ntqmotifplusstyle.h
@@ -43,7 +43,7 @@
 
 
 #ifndef QT_H
-#include "qmotifstyle.h"
+#include "ntqmotifstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
diff --git a/src/styles/qmotifstyle.h b/src/styles/ntqmotifstyle.h
index 6490f5d9e..443886601 100644
--- a/src/styles/qmotifstyle.h
+++ b/src/styles/ntqmotifstyle.h
@@ -42,7 +42,7 @@
 #define TQMOTIFSTYLE_H
 
 #ifndef QT_H
-#include "qcommonstyle.h"
+#include "ntqcommonstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
diff --git a/src/styles/qplatinumstyle.h b/src/styles/ntqplatinumstyle.h
index a2f3e5b6d..994cf0516 100644
--- a/src/styles/qplatinumstyle.h
+++ b/src/styles/ntqplatinumstyle.h
@@ -42,7 +42,7 @@
 #define TQPLATINUMSTYLE_H
 
 #ifndef QT_H
-#include "qwindowsstyle.h"
+#include "ntqwindowsstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
diff --git a/src/styles/qsgistyle.h b/src/styles/ntqsgistyle.h
index df0ccb6be..16d3a8ba0 100644
--- a/src/styles/qsgistyle.h
+++ b/src/styles/ntqsgistyle.h
@@ -42,9 +42,9 @@
 #define TQSGISTYLE_H
 
 #ifndef QT_H
-#include "qmotifstyle.h"
-#include "qguardedptr.h"
-#include "qwidget.h"
+#include "ntqmotifstyle.h"
+#include "ntqguardedptr.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_SGI) || defined(QT_PLUGIN)
diff --git a/src/styles/qstylefactory.h b/src/styles/ntqstylefactory.h
index 0d2a79b37..d011fe999 100644
--- a/src/styles/qstylefactory.h
+++ b/src/styles/ntqstylefactory.h
@@ -40,7 +40,7 @@
 #define TQSTYLEFACTORY_H
 
 #ifndef QT_H
-#include "qstringlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_STYLE
diff --git a/src/styles/qstyleplugin.h b/src/styles/ntqstyleplugin.h
index c282be8ca..d527be7ef 100644
--- a/src/styles/qstyleplugin.h
+++ b/src/styles/ntqstyleplugin.h
@@ -42,8 +42,8 @@
 #define TQSTYLEPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_STYLE
diff --git a/src/styles/qwindowsstyle.h b/src/styles/ntqwindowsstyle.h
index ab3cc4b78..0bfec6199 100644
--- a/src/styles/qwindowsstyle.h
+++ b/src/styles/ntqwindowsstyle.h
@@ -42,7 +42,7 @@
 #define TQWINDOWSSTYLE_H
 
 #ifndef QT_H
-#include "qcommonstyle.h"
+#include "ntqcommonstyle.h"
 #endif // QT_H
 
 #if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
diff --git a/src/styles/qcdestyle.cpp b/src/styles/qcdestyle.cpp
index fd03ab049..7a4f2693d 100644
--- a/src/styles/qcdestyle.cpp
+++ b/src/styles/qcdestyle.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qcdestyle.h"
+#include "ntqcdestyle.h"
 
 #if !defined(QT_NO_STYLE_CDE) || defined(QT_PLUGIN)
 
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qbutton.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqbutton.h"
 #include <limits.h>
 
 /*!
-    \class TQCDEStyle qcdestyle.h
+    \class TQCDEStyle ntqcdestyle.h
     \brief The TQCDEStyle class provides a CDE look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 153174ba6..fb04f7e52 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -38,39 +38,39 @@
 **
 **********************************************************************/
 
-#include "qcommonstyle.h"
+#include "ntqcommonstyle.h"
 
 #ifndef QT_NO_STYLE
 
-#include "qmenubar.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpushbutton.h"
-#include "qtabbar.h"
-#include "qscrollbar.h"
-#include "qtoolbutton.h"
-#include "qtoolbar.h"
-#include "qdockarea.h"
-#include "qheader.h"
-#include "qspinbox.h"
-#include "qrangecontrol.h"
-#include "qgroupbox.h"
-#include "qslider.h"
-#include "qlistview.h"
-#include "qcheckbox.h"
-#include "qradiobutton.h"
-#include "qbitmap.h"
-#include "qprogressbar.h"
+#include "ntqmenubar.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpushbutton.h"
+#include "ntqtabbar.h"
+#include "ntqscrollbar.h"
+#include "ntqtoolbutton.h"
+#include "ntqtoolbar.h"
+#include "ntqdockarea.h"
+#include "ntqheader.h"
+#include "ntqspinbox.h"
+#include "ntqrangecontrol.h"
+#include "ntqgroupbox.h"
+#include "ntqslider.h"
+#include "ntqlistview.h"
+#include "ntqcheckbox.h"
+#include "ntqradiobutton.h"
+#include "ntqbitmap.h"
+#include "ntqprogressbar.h"
 #include "private/qdialogbuttons_p.h"
 #include <limits.h>
-#include <qpixmap.h>
+#include <ntqpixmap.h>
 #include "../widgets/qtitlebar_p.h"
-#include <qtoolbox.h>
+#include <ntqtoolbox.h>
 
 /*!
-    \class TQCommonStyle qcommonstyle.h
+    \class TQCommonStyle ntqcommonstyle.h
     \brief The TQCommonStyle class encapsulates the common Look and Feel of a GUI.
 
     \ingroup appearance
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/qcompactstyle.cpp
index 59cb2a232..7dc0ab37c 100644
--- a/src/styles/qcompactstyle.cpp
+++ b/src/styles/qcompactstyle.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qcompactstyle.h"
+#include "ntqcompactstyle.h"
 
 #if !defined(QT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
 
-#include "qfontmetrics.h"
-#include "qpalette.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qmenudata.h"
-#include "qpopupmenu.h"
+#include "ntqfontmetrics.h"
+#include "ntqpalette.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqmenudata.h"
+#include "ntqpopupmenu.h"
 
 TQCompactStyle::TQCompactStyle()
 : TQWindowsStyle()
diff --git a/src/styles/qinterlacestyle.cpp b/src/styles/qinterlacestyle.cpp
index 871554716..cf1efe43c 100644
--- a/src/styles/qinterlacestyle.cpp
+++ b/src/styles/qinterlacestyle.cpp
@@ -40,26 +40,26 @@
 
 #if 0 // ###### not ported to new API yet
 
-#include "qinterlacestyle.h"
+#include "ntqinterlacestyle.h"
 
 #if !defined(QT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
 
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qdrawutil.h" // for now
-#include "qpalette.h" // for now
-#include "qwidget.h"
-#include "qlabel.h"
-#include "qpushbutton.h"
-#include "qwidget.h"
-#include "qrangecontrol.h"
-#include "qscrollbar.h"
-#include "qlistbox.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h" // for now
+#include "ntqpalette.h" // for now
+#include "ntqwidget.h"
+#include "ntqlabel.h"
+#include "ntqpushbutton.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
+#include "ntqscrollbar.h"
+#include "ntqlistbox.h"
 
 #include <limits.h>
 
 /*!
-  \class TQInterlaceStyle qinterlacestyle.h
+  \class TQInterlaceStyle ntqinterlacestyle.h
   \brief The TQInterlaceStyle class provides a Look and Feel suitable for interlaced displays.
   \ingroup appearance
 
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index a3ff8aeb6..528e6dce8 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -38,28 +38,28 @@
 **
 **********************************************************************/
 
-#include "qmotifplusstyle.h"
+#include "ntqmotifplusstyle.h"
 
 #if !defined(QT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
 
-#include "qmenubar.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qframe.h"
-#include "qpushbutton.h"
-#include "qcheckbox.h"
-#include "qradiobutton.h"
-#include "qcombobox.h"
-#include "qlineedit.h"
-#include "qspinbox.h"
-#include "qslider.h"
-#include "qdrawutil.h"
-#include "qscrollbar.h"
-#include "qtabbar.h"
-#include "qtoolbar.h"
-#include "qguardedptr.h"
-#include "qlayout.h"
+#include "ntqmenubar.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqpalette.h"
+#include "ntqframe.h"
+#include "ntqpushbutton.h"
+#include "ntqcheckbox.h"
+#include "ntqradiobutton.h"
+#include "ntqcombobox.h"
+#include "ntqlineedit.h"
+#include "ntqspinbox.h"
+#include "ntqslider.h"
+#include "ntqdrawutil.h"
+#include "ntqscrollbar.h"
+#include "ntqtabbar.h"
+#include "ntqtoolbar.h"
+#include "ntqguardedptr.h"
+#include "ntqlayout.h"
 
 
 struct TQMotifPlusStylePrivate
@@ -132,7 +132,7 @@ static void drawMotifPlusShade(TQPainter *p,
 
 
 /*!
-    \class TQMotifPlusStyle qmotifplusstyle.h
+    \class TQMotifPlusStyle ntqmotifplusstyle.h
     \brief The TQMotifPlusStyle class provides a more sophisticated Motif-ish look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index 89ea23316..ce25794f9 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -38,29 +38,29 @@
 **
 **********************************************************************/
 
-#include "qmotifstyle.h"
+#include "ntqmotifstyle.h"
 
 #if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
 
-#include "qpopupmenu.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpalette.h"
-#include "qwidget.h"
-#include "qpushbutton.h"
-#include "qscrollbar.h"
-#include "qtabbar.h"
-#include "qtabwidget.h"
-#include "qlistview.h"
-#include "qsplitter.h"
-#include "qslider.h"
-#include "qcombobox.h"
-#include "qdockwindow.h"
-#include "qdockarea.h"
-#include "qprogressbar.h"
-#include "qimage.h"
+#include "ntqpopupmenu.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpalette.h"
+#include "ntqwidget.h"
+#include "ntqpushbutton.h"
+#include "ntqscrollbar.h"
+#include "ntqtabbar.h"
+#include "ntqtabwidget.h"
+#include "ntqlistview.h"
+#include "ntqsplitter.h"
+#include "ntqslider.h"
+#include "ntqcombobox.h"
+#include "ntqdockwindow.h"
+#include "ntqdockarea.h"
+#include "ntqprogressbar.h"
+#include "ntqimage.h"
 #include <limits.h>
 
 
@@ -77,7 +77,7 @@ static const int motifCheckMarkSpace    = 12;
 
 
 /*!
-    \class TQMotifStyle qmotifstyle.h
+    \class TQMotifStyle ntqmotifstyle.h
     \brief The TQMotifStyle class provides Motif look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qplatinumstyle.cpp b/src/styles/qplatinumstyle.cpp
index ce6bd78b8..8f9f9ab75 100644
--- a/src/styles/qplatinumstyle.cpp
+++ b/src/styles/qplatinumstyle.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qplatinumstyle.h"
+#include "ntqplatinumstyle.h"
 
 #if !defined(QT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
 
-#include "qapplication.h"
-#include "qcombobox.h"
-#include "qdrawutil.h"
-#include "qpainter.h"
-#include "qpalette.h"
-#include "qpixmap.h"
-#include "qpushbutton.h"
-#include "qscrollbar.h"
-#include "qslider.h"
+#include "ntqapplication.h"
+#include "ntqcombobox.h"
+#include "ntqdrawutil.h"
+#include "ntqpainter.h"
+#include "ntqpalette.h"
+#include "ntqpixmap.h"
+#include "ntqpushbutton.h"
+#include "ntqscrollbar.h"
+#include "ntqslider.h"
 #include <limits.h>
 
 /*!
-    \class TQPlatinumStyle qplatinumstyle.h
+    \class TQPlatinumStyle ntqplatinumstyle.h
     \brief The TQPlatinumStyle class provides Mac/Platinum look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index f17562eb7..e09b4aa30 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -38,26 +38,26 @@
 **
 **********************************************************************/
 
-#include "qsgistyle.h"
+#include "ntqsgistyle.h"
 
 #if !defined(QT_NO_STYLE_SGI) || defined(QT_PLUGIN)
 
-#include "qpopupmenu.h"
-#include "qapplication.h"
-#include "qbutton.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpalette.h"
-#include "qwidget.h"
-#include "qpushbutton.h"
-#include "qscrollbar.h"
-#include "qcombobox.h"
-#include "qslider.h"
-#include "qtextedit.h"
-#include "qtoolbar.h"
-#include "qlineedit.h"
-#include "qmenubar.h"
+#include "ntqpopupmenu.h"
+#include "ntqapplication.h"
+#include "ntqbutton.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpalette.h"
+#include "ntqwidget.h"
+#include "ntqpushbutton.h"
+#include "ntqscrollbar.h"
+#include "ntqcombobox.h"
+#include "ntqslider.h"
+#include "ntqtextedit.h"
+#include "ntqtoolbar.h"
+#include "ntqlineedit.h"
+#include "ntqmenubar.h"
 #include <limits.h>
 
 #ifndef QT_NO_SLIDER
@@ -97,7 +97,7 @@ public:
 };
 
 /*!
-    \class TQSGIStyle qsgistyle.h
+    \class TQSGIStyle ntqsgistyle.h
     \brief The TQSGIStyle class provides SGI/Irix look and feel.
 
     \ingroup appearance
diff --git a/src/styles/qstylefactory.cpp b/src/styles/qstylefactory.cpp
index 85e312889..88f25642d 100644
--- a/src/styles/qstylefactory.cpp
+++ b/src/styles/qstylefactory.cpp
@@ -39,18 +39,18 @@
 **********************************************************************/
 
 #include "qstyleinterface_p.h" // up here for GCC 2.7.* compatibility
-#include "qstylefactory.h"
+#include "ntqstylefactory.h"
 
 #ifndef QT_NO_STYLE
 
-#include "qapplication.h"
-#include "qwindowsstyle.h"
-#include "qmotifstyle.h"
-#include "qcdestyle.h"
-#include "qmotifplusstyle.h"
-#include "qplatinumstyle.h"
-#include "qsgistyle.h"
-#include "qcompactstyle.h"
+#include "ntqapplication.h"
+#include "ntqwindowsstyle.h"
+#include "ntqmotifstyle.h"
+#include "ntqcdestyle.h"
+#include "ntqmotifplusstyle.h"
+#include "ntqplatinumstyle.h"
+#include "ntqsgistyle.h"
+#include "ntqcompactstyle.h"
 #ifndef QT_NO_STYLE_WINDOWSXP
 #include "qwindowsxpstyle.h"
 #endif
@@ -99,7 +99,7 @@ TQStyleFactoryPrivate::~TQStyleFactoryPrivate()
 #endif //QT_NO_COMPONENT
 
 /*!
-    \class TQStyleFactory qstylefactory.h
+    \class TQStyleFactory ntqstylefactory.h
     \brief The TQStyleFactory class creates TQStyle objects.
 
     The style factory creates a TQStyle object for a given key with
diff --git a/src/styles/qstyleplugin.cpp b/src/styles/qstyleplugin.cpp
index 22b29bf5b..a76b4d1a4 100644
--- a/src/styles/qstyleplugin.cpp
+++ b/src/styles/qstyleplugin.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qstyleplugin.h"
+#include "ntqstyleplugin.h"
 
 #ifndef QT_NO_STYLE
 #ifndef QT_NO_COMPONENT
 
 #include "qstyleinterface_p.h"
-#include "qobjectcleanuphandler.h"
-#include "qstyle.h"
+#include "ntqobjectcleanuphandler.h"
+#include "ntqstyle.h"
 
 /*!
-    \class TQStylePlugin qstyleplugin.h
+    \class TQStylePlugin ntqstyleplugin.h
     \brief The TQStylePlugin class provides an abstract base for custom TQStyle plugins.
 
     \ingroup plugins
diff --git a/src/styles/qt_styles.pri b/src/styles/qt_styles.pri
index 913828eab..4f3e1be56 100644
--- a/src/styles/qt_styles.pri
+++ b/src/styles/qt_styles.pri
@@ -2,10 +2,10 @@
 
 styles {
 	STYLES_P = styles
-	HEADERS +=$$STYLES_H/qstylefactory.h \
+	HEADERS +=$$STYLES_H/ntqstylefactory.h \
 		  $$STYLES_P/qstyleinterface_p.h \
-		  $$STYLES_H/qstyleplugin.h \
-		  $$STYLES_H/qcommonstyle.h
+		  $$STYLES_H/ntqstyleplugin.h \
+		  $$STYLES_H/ntqcommonstyle.h
 	SOURCES +=$$STYLES_CPP/qstylefactory.cpp \
 		  $$STYLES_CPP/qstyleplugin.cpp \
 		  $$STYLES_CPP/qcommonstyle.cpp
@@ -44,7 +44,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_AQUA
 
 	contains( styles, cde ) {
-		HEADERS +=$$STYLES_H/qcdestyle.h
+		HEADERS +=$$STYLES_H/ntqcdestyle.h
 		SOURCES +=$$STYLES_CPP/qcdestyle.cpp
 
 		!contains( styles, motif ) {
@@ -55,7 +55,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_CDE
 
 	contains( styles, motifplus ) {
-		HEADERS +=$$STYLES_H/qmotifplusstyle.h
+		HEADERS +=$$STYLES_H/ntqmotifplusstyle.h
 		SOURCES +=$$STYLES_CPP/qmotifplusstyle.cpp
 		!contains( styles, motif ) {
 			message( motifplus requires motif )
@@ -65,7 +65,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_MOTIFPLUS
 
 	contains( styles, interlace ) {
-		HEADERS +=$$STYLES_H/qinterlacestyle.h
+		HEADERS +=$$STYLES_H/ntqinterlacestyle.h
 		SOURCES +=$$STYLES_CPP/qinterlacestyle.cpp
 		!contains( styles, windows ) {
 			message( interlace requires windows )
@@ -75,7 +75,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_INTERLACE
 
 	contains( styles, platinum ) {
-		HEADERS +=$$STYLES_H/qplatinumstyle.h
+		HEADERS +=$$STYLES_H/ntqplatinumstyle.h
 		SOURCES +=$$STYLES_CPP/qplatinumstyle.cpp
 		!contains( styles, windows ) {
 			message( platinum requires windows )
@@ -95,7 +95,7 @@ styles {
         else:DEFINES += QT_NO_STYLE_WINDOWSXP
 
 	contains( styles, sgi ) {
-		HEADERS +=$$STYLES_H/qsgistyle.h
+		HEADERS +=$$STYLES_H/ntqsgistyle.h
 		SOURCES +=$$STYLES_CPP/qsgistyle.cpp
 		!contains( styles, motif ) {
 			message( sgi requires motif )
@@ -105,7 +105,7 @@ styles {
 	else:DEFINES += QT_NO_STYLE_SGI
 
 	contains( styles, compact ) {
-		HEADERS +=$$STYLES_H/qcompactstyle.h
+		HEADERS +=$$STYLES_H/ntqcompactstyle.h
 		SOURCES +=$$STYLES_CPP/qcompactstyle.cpp
 		!contains( styles, windows ) {
 			message( compact requires windows )
@@ -127,13 +127,13 @@ styles {
         else:DEFINES += QT_NO_STYLE_POCKETPC
         
 	contains( styles, windows ) {
-		HEADERS +=$$STYLES_H/qwindowsstyle.h
+		HEADERS +=$$STYLES_H/ntqwindowsstyle.h
 		SOURCES +=$$STYLES_CPP/qwindowsstyle.cpp
 	}
 	else:DEFINES += QT_NO_STYLE_WINDOWS
 
 	contains( styles, motif ) {
-		HEADERS +=$$STYLES_H/qmotifstyle.h
+		HEADERS +=$$STYLES_H/ntqmotifstyle.h
 		SOURCES +=$$STYLES_CPP/qmotifstyle.cpp
 	}
 	else:DEFINES += QT_NO_STYLE_MOTIF
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index c7677ca02..92c6de147 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -38,33 +38,33 @@
 **
 **********************************************************************/
 
-#include "qwindowsstyle.h"
+#include "ntqwindowsstyle.h"
 
 #if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
 
-#include "qpopupmenu.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qdrawutil.h" // for now
-#include "qpixmap.h" // for now
-#include "qwidget.h"
-#include "qlabel.h"
-#include "qimage.h"
-#include "qpushbutton.h"
-#include "qcombobox.h"
-#include "qlistbox.h"
-#include "qwidget.h"
-#include "qrangecontrol.h"
-#include "qscrollbar.h"
-#include "qslider.h"
-#include "qtabwidget.h"
-#include "qtabbar.h"
-#include "qlistview.h"
-#include "qbitmap.h"
-#include "qcleanuphandler.h"
-#include "qdockwindow.h"
-#include "qobjectlist.h"
-#include "qmenubar.h"
+#include "ntqpopupmenu.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h" // for now
+#include "ntqpixmap.h" // for now
+#include "ntqwidget.h"
+#include "ntqlabel.h"
+#include "ntqimage.h"
+#include "ntqpushbutton.h"
+#include "ntqcombobox.h"
+#include "ntqlistbox.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
+#include "ntqscrollbar.h"
+#include "ntqslider.h"
+#include "ntqtabwidget.h"
+#include "ntqtabbar.h"
+#include "ntqlistview.h"
+#include "ntqbitmap.h"
+#include "ntqcleanuphandler.h"
+#include "ntqdockwindow.h"
+#include "ntqobjectlist.h"
+#include "ntqmenubar.h"
 
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
@@ -209,7 +209,7 @@ bool TQWindowsStyle::Private::eventFilter(TQObject *o, TQEvent *e)
 }
 
 /*!
-    \class TQWindowsStyle qwindowsstyle.h
+    \class TQWindowsStyle ntqwindowsstyle.h
     \brief The TQWindowsStyle class provides a Microsoft Windows-like look and feel.
 
     \ingroup appearance