summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-08-24 20:19:50 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-08-29 22:23:35 +0900
commitd35eedcd87d59e716c6d49bbb6b634ef1a7660c5 (patch)
tree204d752457acf6403c99f3928f02b612ff14d178 /src
parentddce1c91f8582885497b463b24bac59f6fdfdf63 (diff)
downloadtqt3-d35eedcd87d59e716c6d49bbb6b634ef1a7660c5.tar.gz
tqt3-d35eedcd87d59e716c6d49bbb6b634ef1a7660c5.zip
Rename style nt* related files to equivalent tq*
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src')
-rw-r--r--src/kernel/ntqnamespace.h2
-rw-r--r--src/kernel/ntqt.h20
-rw-r--r--src/kernel/qt_kernel.pri2
-rw-r--r--src/kernel/tqcolor_p.h2
-rw-r--r--src/kernel/tqmotifdnd_x11.cpp (renamed from src/kernel/qmotifdnd_x11.cpp)0
-rw-r--r--src/kernel/tqobject.cpp2
-rw-r--r--src/styles/qt_styles.pri40
-rw-r--r--src/styles/tqcdestyle.cpp (renamed from src/styles/qcdestyle.cpp)4
-rw-r--r--src/styles/tqcdestyle.h (renamed from src/styles/ntqcdestyle.h)2
-rw-r--r--src/styles/tqcommonstyle.cpp (renamed from src/styles/qcommonstyle.cpp)4
-rw-r--r--src/styles/tqcommonstyle.h (renamed from src/styles/ntqcommonstyle.h)0
-rw-r--r--src/styles/tqcompactstyle.cpp (renamed from src/styles/qcompactstyle.cpp)2
-rw-r--r--src/styles/tqcompactstyle.h (renamed from src/styles/ntqcompactstyle.h)2
-rw-r--r--src/styles/tqinterlacestyle.cpp (renamed from src/styles/qinterlacestyle.cpp)4
-rw-r--r--src/styles/tqinterlacestyle.h (renamed from src/styles/ntqinterlacestyle.h)2
-rw-r--r--src/styles/tqmotifplusstyle.cpp (renamed from src/styles/qmotifplusstyle.cpp)4
-rw-r--r--src/styles/tqmotifplusstyle.h (renamed from src/styles/ntqmotifplusstyle.h)2
-rw-r--r--src/styles/tqmotifstyle.cpp (renamed from src/styles/qmotifstyle.cpp)4
-rw-r--r--src/styles/tqmotifstyle.h (renamed from src/styles/ntqmotifstyle.h)2
-rw-r--r--src/styles/tqplatinumstyle.cpp (renamed from src/styles/qplatinumstyle.cpp)4
-rw-r--r--src/styles/tqplatinumstyle.h (renamed from src/styles/ntqplatinumstyle.h)2
-rw-r--r--src/styles/tqsgistyle.cpp (renamed from src/styles/qsgistyle.cpp)4
-rw-r--r--src/styles/tqsgistyle.h (renamed from src/styles/ntqsgistyle.h)2
-rw-r--r--src/styles/tqstylefactory.cpp16
-rw-r--r--src/styles/tqwindowsstyle.cpp (renamed from src/styles/qwindowsstyle.cpp)4
-rw-r--r--src/styles/tqwindowsstyle.h (renamed from src/styles/ntqwindowsstyle.h)2
26 files changed, 67 insertions, 67 deletions
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index d40ec2e74..dd2cdedab 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -738,7 +738,7 @@ public:
Key_unknown = 0xffff
};
- // documented in qcommonstyle.cpp
+ // documented in tqcommonstyle.cpp
enum ArrowType {
UpArrow,
DownArrow,
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index f72ec4e66..875323a6d 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -82,7 +82,7 @@
#include "tqdialog.h"
#include <tqdataview.h>
#include "ntqdockwindow.h"
-#include "ntqcommonstyle.h"
+#include "tqcommonstyle.h"
#include "tqnetworkprotocol.h"
#include <tqeuckrcodec.h>
#include <tqgb18030codec.h>
@@ -110,7 +110,7 @@
#include "tqlineedit.h"
#include <tqintcache.h>
#include "tqintdict.h"
-#include "ntqmotifstyle.h"
+#include "tqmotifstyle.h"
#include "tqpicture.h"
#include <tqjiscodec.h>
#include <tqeucjpcodec.h>
@@ -124,7 +124,7 @@
#include "tqscrollbar.h"
#include "tqscrollview.h"
#include "tqdir.h"
-#include "ntqwindowsstyle.h"
+#include "tqwindowsstyle.h"
#include "ntqconnection.h"
#include "tqbitmap.h"
#include "ntqvariant.h"
@@ -132,8 +132,8 @@
#include <ntqmessagebox.h>
#include "ntqmetaobject.h"
#include "tqheader.h"
-#include <ntqmotifplusstyle.h>
-#include <ntqcdestyle.h>
+#include <tqmotifplusstyle.h>
+#include <tqcdestyle.h>
#include <tqmovie.h>
#include "tqptrvector.h"
#include "tqmutex.h"
@@ -153,7 +153,7 @@
#include "tqdragobject.h"
#include <tqiconview.h>
#include <tqpixmapcache.h>
-#include <ntqplatinumstyle.h>
+#include <tqplatinumstyle.h>
#include <tqpngio.h>
#include <ntqcursor.h>
#include <ntqerrormessage.h>
@@ -183,7 +183,7 @@
#include "tqsocketdevice.h"
#include <tqsessionmanager.h>
#include <tqsettings.h>
-#include <ntqsgistyle.h>
+#include <tqsgistyle.h>
#include <tqfontdialog.h>
#include "tqtimer.h"
#include <tqsignalmapper.h>
@@ -221,7 +221,7 @@
#include <tqcanvas.h>
#include "tqtranslator.h"
#include <tqstrvec.h>
-#include <ntqinterlacestyle.h>
+#include <tqinterlacestyle.h>
#include <tqstylefactory.h>
#include <tqstyleplugin.h>
#include "tqtextedit.h"
@@ -265,7 +265,7 @@
#include <tqwidgetplugin.h>
#include <tqwidgetstack.h>
#include <tqcheckbox.h>
-#include <ntqcompactstyle.h>
+#include <tqcompactstyle.h>
#include <tqwizard.h>
#include <tqpainter.h>
#include <tqworkspace.h>
@@ -317,7 +317,7 @@
#endif // TQ_WS_MAC
#ifdef TQ_WS_WIN
-#include <qwindowsxpstyle.h>
+#include <tqwindowsxpstyle.h>
#endif
#ifdef TQ_WS_WCE
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 279ac107b..bd93c7c29 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -142,7 +142,7 @@ kernel {
$$KERNEL_CPP/tqfont_x11.cpp \
$$KERNEL_CPP/qinputcontext.cpp \
$$KERNEL_CPP/qinputcontext_x11.cpp \
- $$KERNEL_CPP/qmotifdnd_x11.cpp \
+ $$KERNEL_CPP/tqmotifdnd_x11.cpp \
$$KERNEL_CPP/tqpixmap_x11.cpp \
$$KERNEL_CPP/tqpaintdevice_x11.cpp \
$$KERNEL_CPP/tqpainter_x11.cpp \
diff --git a/src/kernel/tqcolor_p.h b/src/kernel/tqcolor_p.h
index d85cbf362..136c3e741 100644
--- a/src/kernel/tqcolor_p.h
+++ b/src/kernel/tqcolor_p.h
@@ -49,7 +49,7 @@
//
// This file is not part of the TQt API. It exists for the convenience
// of tqmenudata.cpp, tqmenubar.cpp, tqmenubar.cpp, tqpopupmenu.cpp,
-// qmotifstyle.cpp and qwindowssstyle.cpp. This header file may change
+// tqmotifstyle.cpp and tqwindowssstyle.cpp. This header file may change
// from version to version without notice, or even be removed.
//
// We mean it.
diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/tqmotifdnd_x11.cpp
index 8bd2d8b8f..8bd2d8b8f 100644
--- a/src/kernel/qmotifdnd_x11.cpp
+++ b/src/kernel/tqmotifdnd_x11.cpp
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index cfb026fbf..756117fff 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -61,7 +61,7 @@
#include <ctype.h>
#include <stdlib.h>
-// Keep in sync with duplicate definition in qcommonstyle.cpp
+// Keep in sync with duplicate definition in tqcommonstyle.cpp
class TQStyleControlElementDataPrivate {
public:
bool isTQPushButton;
diff --git a/src/styles/qt_styles.pri b/src/styles/qt_styles.pri
index 812690724..b0daa8513 100644
--- a/src/styles/qt_styles.pri
+++ b/src/styles/qt_styles.pri
@@ -5,10 +5,10 @@ styles {
HEADERS +=$$STYLES_H/tqstylefactory.h \
$$STYLES_P/tqstyleinterface_p.h \
$$STYLES_H/tqstyleplugin.h \
- $$STYLES_H/ntqcommonstyle.h
+ $$STYLES_H/tqcommonstyle.h
SOURCES +=$$STYLES_CPP/tqstylefactory.cpp \
$$STYLES_CPP/tqstyleplugin.cpp \
- $$STYLES_CPP/qcommonstyle.cpp
+ $$STYLES_CPP/tqcommonstyle.cpp
contains( styles, all ) {
styles += mac cde motifplus sgi platinum compact interlace windows motif
@@ -44,8 +44,8 @@ styles {
else:DEFINES += TQT_NO_STYLE_AQUA
contains( styles, cde ) {
- HEADERS +=$$STYLES_H/ntqcdestyle.h
- SOURCES +=$$STYLES_CPP/qcdestyle.cpp
+ HEADERS +=$$STYLES_H/tqcdestyle.h
+ SOURCES +=$$STYLES_CPP/tqcdestyle.cpp
!contains( styles, motif ) {
message( cde requires motif )
@@ -55,8 +55,8 @@ styles {
else:DEFINES += TQT_NO_STYLE_CDE
contains( styles, motifplus ) {
- HEADERS +=$$STYLES_H/ntqmotifplusstyle.h
- SOURCES +=$$STYLES_CPP/qmotifplusstyle.cpp
+ HEADERS +=$$STYLES_H/tqmotifplusstyle.h
+ SOURCES +=$$STYLES_CPP/tqmotifplusstyle.cpp
!contains( styles, motif ) {
message( motifplus requires motif )
styles += motif
@@ -65,8 +65,8 @@ styles {
else:DEFINES += TQT_NO_STYLE_MOTIFPLUS
contains( styles, interlace ) {
- HEADERS +=$$STYLES_H/ntqinterlacestyle.h
- SOURCES +=$$STYLES_CPP/qinterlacestyle.cpp
+ HEADERS +=$$STYLES_H/tqinterlacestyle.h
+ SOURCES +=$$STYLES_CPP/tqinterlacestyle.cpp
!contains( styles, windows ) {
message( interlace requires windows )
styles += windows
@@ -75,8 +75,8 @@ styles {
else:DEFINES += TQT_NO_STYLE_INTERLACE
contains( styles, platinum ) {
- HEADERS +=$$STYLES_H/ntqplatinumstyle.h
- SOURCES +=$$STYLES_CPP/qplatinumstyle.cpp
+ HEADERS +=$$STYLES_H/tqplatinumstyle.h
+ SOURCES +=$$STYLES_CPP/tqplatinumstyle.cpp
!contains( styles, windows ) {
message( platinum requires windows )
styles += windows
@@ -85,8 +85,8 @@ styles {
else:DEFINES += TQT_NO_STYLE_PLATINUM
contains( styles, windowsxp ) {
- HEADERS +=$$STYLES_H/qwindowsxpstyle.h
- SOURCES +=$$STYLES_CPP/qwindowsxpstyle.cpp
+ HEADERS +=$$STYLES_H/tqwindowsxpstyle.h
+ SOURCES +=$$STYLES_CPP/tqwindowsxpstyle.cpp
!contains( styles, windowsxp ) {
message( windowsxp requires windows )
styles += windows
@@ -95,8 +95,8 @@ styles {
else:DEFINES += TQT_NO_STYLE_WINDOWSXP
contains( styles, sgi ) {
- HEADERS +=$$STYLES_H/ntqsgistyle.h
- SOURCES +=$$STYLES_CPP/qsgistyle.cpp
+ HEADERS +=$$STYLES_H/tqsgistyle.h
+ SOURCES +=$$STYLES_CPP/tqsgistyle.cpp
!contains( styles, motif ) {
message( sgi requires motif )
styles += motif
@@ -105,8 +105,8 @@ styles {
else:DEFINES += TQT_NO_STYLE_SGI
contains( styles, compact ) {
- HEADERS +=$$STYLES_H/ntqcompactstyle.h
- SOURCES +=$$STYLES_CPP/qcompactstyle.cpp
+ HEADERS +=$$STYLES_H/tqcompactstyle.h
+ SOURCES +=$$STYLES_CPP/tqcompactstyle.cpp
!contains( styles, windows ) {
message( compact requires windows )
styles += windows
@@ -127,14 +127,14 @@ styles {
else:DEFINES += TQT_NO_STYLE_POCKETPC
contains( styles, windows ) {
- HEADERS +=$$STYLES_H/ntqwindowsstyle.h
- SOURCES +=$$STYLES_CPP/qwindowsstyle.cpp
+ HEADERS +=$$STYLES_H/tqwindowsstyle.h
+ SOURCES +=$$STYLES_CPP/tqwindowsstyle.cpp
}
else:DEFINES += TQT_NO_STYLE_WINDOWS
contains( styles, motif ) {
- HEADERS +=$$STYLES_H/ntqmotifstyle.h
- SOURCES +=$$STYLES_CPP/qmotifstyle.cpp
+ HEADERS +=$$STYLES_H/tqmotifstyle.h
+ SOURCES +=$$STYLES_CPP/tqmotifstyle.cpp
}
else:DEFINES += TQT_NO_STYLE_MOTIF
}
diff --git a/src/styles/qcdestyle.cpp b/src/styles/tqcdestyle.cpp
index 27388d3f6..3c5321386 100644
--- a/src/styles/qcdestyle.cpp
+++ b/src/styles/tqcdestyle.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqcdestyle.h"
+#include "tqcdestyle.h"
#if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN)
@@ -48,7 +48,7 @@
#include <limits.h>
/*!
- \class TQCDEStyle ntqcdestyle.h
+ \class TQCDEStyle tqcdestyle.h
\brief The TQCDEStyle class provides a CDE look and feel.
\ingroup appearance
diff --git a/src/styles/ntqcdestyle.h b/src/styles/tqcdestyle.h
index a0f02be28..4b526c8ea 100644
--- a/src/styles/ntqcdestyle.h
+++ b/src/styles/tqcdestyle.h
@@ -43,7 +43,7 @@
#define TQCDESTYLE_H
#ifndef QT_H
-#include "ntqmotifstyle.h"
+#include "tqmotifstyle.h"
#endif // QT_H
#if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN)
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/tqcommonstyle.cpp
index da39e602c..81a3ace92 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/tqcommonstyle.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqcommonstyle.h"
+#include "tqcommonstyle.h"
#ifndef TQT_NO_STYLE
@@ -75,7 +75,7 @@
#include <tqtoolbox.h>
/*!
- \class TQCommonStyle ntqcommonstyle.h
+ \class TQCommonStyle tqcommonstyle.h
\brief The TQCommonStyle class encapsulates the common Look and Feel of a GUI.
\ingroup appearance
diff --git a/src/styles/ntqcommonstyle.h b/src/styles/tqcommonstyle.h
index 705177d71..705177d71 100644
--- a/src/styles/ntqcommonstyle.h
+++ b/src/styles/tqcommonstyle.h
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/tqcompactstyle.cpp
index f2e9b1fc7..b4c510229 100644
--- a/src/styles/qcompactstyle.cpp
+++ b/src/styles/tqcompactstyle.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqcompactstyle.h"
+#include "tqcompactstyle.h"
#if !defined(TQT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
diff --git a/src/styles/ntqcompactstyle.h b/src/styles/tqcompactstyle.h
index b022002c5..a8b93f092 100644
--- a/src/styles/ntqcompactstyle.h
+++ b/src/styles/tqcompactstyle.h
@@ -42,7 +42,7 @@
#define TQCOMPACTSTYLE_H
#ifndef QT_H
-#include "ntqwindowsstyle.h"
+#include "tqwindowsstyle.h"
#endif // QT_H
#if !defined(TQT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
diff --git a/src/styles/qinterlacestyle.cpp b/src/styles/tqinterlacestyle.cpp
index 11bc57366..c0a84c7ae 100644
--- a/src/styles/qinterlacestyle.cpp
+++ b/src/styles/tqinterlacestyle.cpp
@@ -40,7 +40,7 @@
#if 0 // ###### not ported to new API yet
-#include "ntqinterlacestyle.h"
+#include "tqinterlacestyle.h"
#if !defined(TQT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
@@ -59,7 +59,7 @@
#include <limits.h>
/*!
- \class TQInterlaceStyle ntqinterlacestyle.h
+ \class TQInterlaceStyle tqinterlacestyle.h
\brief The TQInterlaceStyle class provides a Look and Feel suitable for interlaced displays.
\ingroup appearance
diff --git a/src/styles/ntqinterlacestyle.h b/src/styles/tqinterlacestyle.h
index c2d22bf8e..8c1982712 100644
--- a/src/styles/ntqinterlacestyle.h
+++ b/src/styles/tqinterlacestyle.h
@@ -43,7 +43,7 @@
#define TQINTERLACESTYLE_H
#ifndef QT_H
-#include "ntqmotifstyle.h"
+#include "tqmotifstyle.h"
#endif // QT_H
#if !defined(TQT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/tqmotifplusstyle.cpp
index 3e4a63010..eec496cda 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/tqmotifplusstyle.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqmotifplusstyle.h"
+#include "tqmotifplusstyle.h"
#if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
@@ -131,7 +131,7 @@ static void drawMotifPlusShade(TQPainter *p,
/*!
- \class TQMotifPlusStyle ntqmotifplusstyle.h
+ \class TQMotifPlusStyle tqmotifplusstyle.h
\brief The TQMotifPlusStyle class provides a more sophisticated Motif-ish look and feel.
\ingroup appearance
diff --git a/src/styles/ntqmotifplusstyle.h b/src/styles/tqmotifplusstyle.h
index bb590fc9d..049609e9a 100644
--- a/src/styles/ntqmotifplusstyle.h
+++ b/src/styles/tqmotifplusstyle.h
@@ -43,7 +43,7 @@
#ifndef QT_H
-#include "ntqmotifstyle.h"
+#include "tqmotifstyle.h"
#endif // QT_H
#if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/tqmotifstyle.cpp
index 5447295e6..990b339a4 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/tqmotifstyle.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqmotifstyle.h"
+#include "tqmotifstyle.h"
#if !defined(TQT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
@@ -77,7 +77,7 @@ static const int motifCheckMarkSpace = 12;
/*!
- \class TQMotifStyle ntqmotifstyle.h
+ \class TQMotifStyle tqmotifstyle.h
\brief The TQMotifStyle class provides Motif look and feel.
\ingroup appearance
diff --git a/src/styles/ntqmotifstyle.h b/src/styles/tqmotifstyle.h
index b2501e483..3b8aac02f 100644
--- a/src/styles/ntqmotifstyle.h
+++ b/src/styles/tqmotifstyle.h
@@ -42,7 +42,7 @@
#define TQMOTIFSTYLE_H
#ifndef QT_H
-#include "ntqcommonstyle.h"
+#include "tqcommonstyle.h"
#endif // QT_H
#if !defined(TQT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
diff --git a/src/styles/qplatinumstyle.cpp b/src/styles/tqplatinumstyle.cpp
index 721a480a7..28d90cb94 100644
--- a/src/styles/qplatinumstyle.cpp
+++ b/src/styles/tqplatinumstyle.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqplatinumstyle.h"
+#include "tqplatinumstyle.h"
#if !defined(TQT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
@@ -54,7 +54,7 @@
#include <limits.h>
/*!
- \class TQPlatinumStyle ntqplatinumstyle.h
+ \class TQPlatinumStyle tqplatinumstyle.h
\brief The TQPlatinumStyle class provides Mac/Platinum look and feel.
\ingroup appearance
diff --git a/src/styles/ntqplatinumstyle.h b/src/styles/tqplatinumstyle.h
index 54d0a94dd..74e319f9f 100644
--- a/src/styles/ntqplatinumstyle.h
+++ b/src/styles/tqplatinumstyle.h
@@ -42,7 +42,7 @@
#define TQPLATINUMSTYLE_H
#ifndef QT_H
-#include "ntqwindowsstyle.h"
+#include "tqwindowsstyle.h"
#endif // QT_H
#if !defined(TQT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
diff --git a/src/styles/qsgistyle.cpp b/src/styles/tqsgistyle.cpp
index ba510e9cb..43e2f7db2 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/tqsgistyle.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqsgistyle.h"
+#include "tqsgistyle.h"
#if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN)
@@ -97,7 +97,7 @@ public:
};
/*!
- \class TQSGIStyle ntqsgistyle.h
+ \class TQSGIStyle tqsgistyle.h
\brief The TQSGIStyle class provides SGI/Irix look and feel.
\ingroup appearance
diff --git a/src/styles/ntqsgistyle.h b/src/styles/tqsgistyle.h
index df0b5b47b..d09ad4cf4 100644
--- a/src/styles/ntqsgistyle.h
+++ b/src/styles/tqsgistyle.h
@@ -42,7 +42,7 @@
#define TQSGISTYLE_H
#ifndef QT_H
-#include "ntqmotifstyle.h"
+#include "tqmotifstyle.h"
#include "ntqguardedptr.h"
#include "tqwidget.h"
#endif // QT_H
diff --git a/src/styles/tqstylefactory.cpp b/src/styles/tqstylefactory.cpp
index d87794f9a..f31c8e0f0 100644
--- a/src/styles/tqstylefactory.cpp
+++ b/src/styles/tqstylefactory.cpp
@@ -44,15 +44,15 @@
#ifndef TQT_NO_STYLE
#include "ntqapplication.h"
-#include "ntqwindowsstyle.h"
-#include "ntqmotifstyle.h"
-#include "ntqcdestyle.h"
-#include "ntqmotifplusstyle.h"
-#include "ntqplatinumstyle.h"
-#include "ntqsgistyle.h"
-#include "ntqcompactstyle.h"
+#include "tqwindowsstyle.h"
+#include "tqmotifstyle.h"
+#include "tqcdestyle.h"
+#include "tqmotifplusstyle.h"
+#include "tqplatinumstyle.h"
+#include "tqsgistyle.h"
+#include "tqcompactstyle.h"
#ifndef TQT_NO_STYLE_WINDOWSXP
-#include "qwindowsxpstyle.h"
+#include "tqwindowsxpstyle.h"
#endif
#ifndef TQT_NO_STYLE_AQUA
#include "qaquastyle.h"
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/tqwindowsstyle.cpp
index 1c87c1e9b..844ff294a 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/tqwindowsstyle.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqwindowsstyle.h"
+#include "tqwindowsstyle.h"
#if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
@@ -148,7 +148,7 @@ bool TQWindowsStyle::Private::objectEventHandler( const TQStyleControlElementDat
}
/*!
- \class TQWindowsStyle ntqwindowsstyle.h
+ \class TQWindowsStyle tqwindowsstyle.h
\brief The TQWindowsStyle class provides a Microsoft Windows-like look and feel.
\ingroup appearance
diff --git a/src/styles/ntqwindowsstyle.h b/src/styles/tqwindowsstyle.h
index d7df8b98d..268ae7850 100644
--- a/src/styles/ntqwindowsstyle.h
+++ b/src/styles/tqwindowsstyle.h
@@ -42,7 +42,7 @@
#define TQWINDOWSSTYLE_H
#ifndef QT_H
-#include "ntqcommonstyle.h"
+#include "tqcommonstyle.h"
#endif // QT_H
#if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)