summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/canvas/tqcanvas.cpp2
-rw-r--r--src/codecs/tqtextcodec.cpp2
-rw-r--r--src/dialogs/qt_dialogs.pri8
-rw-r--r--src/dialogs/tqdialog.cpp4
-rw-r--r--src/dialogs/tqerrormessage.cpp2
-rw-r--r--src/dialogs/tqfiledialog.cpp2
-rw-r--r--src/dialogs/tqmessagebox.cpp (renamed from src/dialogs/qmessagebox.cpp)12
-rw-r--r--src/dialogs/tqmessagebox.h (renamed from src/dialogs/ntqmessagebox.h)2
-rw-r--r--src/dialogs/tqprintdialog.cpp (renamed from src/dialogs/qprintdialog.cpp)6
-rw-r--r--src/dialogs/tqprintdialog.h (renamed from src/dialogs/ntqprintdialog.h)0
-rw-r--r--src/kernel/ntqt.h14
-rw-r--r--src/kernel/ntqwindowdefs.h2
-rw-r--r--src/kernel/qapplication.cpp4
-rw-r--r--src/kernel/qinternal_p.h2
-rw-r--r--src/kernel/qt_gfx.pri4
-rw-r--r--src/kernel/qt_kernel.pri10
-rw-r--r--src/kernel/qt_pch.h2
-rw-r--r--src/kernel/tqaccel.cpp2
-rw-r--r--src/kernel/tqaccessible.cpp2
-rw-r--r--src/kernel/tqcolor.cpp2
-rw-r--r--src/kernel/tqcursor_x11.cpp2
-rw-r--r--src/kernel/tqdrawutil.h2
-rw-r--r--src/kernel/tqevent.h2
-rw-r--r--src/kernel/tqfont.cpp4
-rw-r--r--src/kernel/tqimage.cpp2
-rw-r--r--src/kernel/tqkeycode.h2
-rw-r--r--src/kernel/tqkeysequence.cpp6
-rw-r--r--src/kernel/tqkeysequence.h2
-rw-r--r--src/kernel/tqmetaobject.cpp (renamed from src/kernel/qmetaobject.cpp)10
-rw-r--r--src/kernel/tqmetaobject.h (renamed from src/kernel/ntqmetaobject.h)0
-rw-r--r--src/kernel/tqmngio.cpp (renamed from src/kernel/qmngio.cpp)4
-rw-r--r--src/kernel/tqmngio.h (renamed from src/kernel/ntqmngio.h)0
-rw-r--r--src/kernel/tqnamespace.h (renamed from src/kernel/ntqnamespace.h)0
-rw-r--r--src/kernel/tqobject.cpp4
-rw-r--r--src/kernel/tqobject.h2
-rw-r--r--src/kernel/tqobjectdict.h2
-rw-r--r--src/kernel/tqpixmap.h2
-rw-r--r--src/kernel/tqpolygonscanner.cpp (renamed from src/kernel/qpolygonscanner.cpp)2
-rw-r--r--src/kernel/tqpolygonscanner.h (renamed from src/kernel/ntqpolygonscanner.h)0
-rw-r--r--src/kernel/tqprinter_unix.cpp2
-rw-r--r--src/kernel/tqsignal.cpp2
-rw-r--r--src/kernel/tqsimplerichtext.h2
-rw-r--r--src/kernel/tqsize.h2
-rw-r--r--src/kernel/tqtextengine_p.h2
-rw-r--r--src/kernel/tqtextlayout_p.h2
-rw-r--r--src/kernel/tqttdeintegration_x11.cpp2
-rw-r--r--src/kernel/tqwidget.cpp2
-rw-r--r--src/kernel/tqwidget_x11.cpp2
-rw-r--r--src/moc/moc.y6
-rw-r--r--src/moc/moc_yacc.cpp6
-rw-r--r--src/sql/tqsqlerror.cpp2
-rw-r--r--src/sql/tqsqlmanager_p.cpp2
-rw-r--r--src/sql/tqsqlpropertymap.cpp2
-rw-r--r--src/sql/tqsqlrecord.cpp2
-rw-r--r--src/styles/qt_styles.pri6
-rw-r--r--src/styles/tqcommonstyle.cpp4
-rw-r--r--src/styles/tqinterlacestyle.cpp2
-rw-r--r--src/styles/tqstylefactory.cpp2
-rw-r--r--src/styles/tqwindowsstyle.cpp2
-rw-r--r--src/tools/tqdatetime.h2
-rw-r--r--src/tools/tqfeatures.txt4
-rw-r--r--src/tools/tqlocale.cpp2
-rw-r--r--src/widgets/qeffects_p.h2
-rw-r--r--src/widgets/qt_widgets.pri4
-rw-r--r--src/widgets/tqdatetimeedit.cpp2
-rw-r--r--src/widgets/tqdial.h2
-rw-r--r--src/widgets/tqmenudata.cpp10
-rw-r--r--src/widgets/tqrangecontrol.cpp (renamed from src/widgets/qrangecontrol.cpp)4
-rw-r--r--src/widgets/tqrangecontrol.h (renamed from src/widgets/ntqrangecontrol.h)0
-rw-r--r--src/widgets/tqscrollbar.h2
-rw-r--r--src/widgets/tqslider.h2
-rw-r--r--src/widgets/tqspinbox.h2
-rw-r--r--src/widgets/tqspinwidget.cpp2
-rw-r--r--src/widgets/tqtabbar.cpp2
-rw-r--r--src/widgets/tqtabwidget.cpp2
-rw-r--r--src/widgets/tqtextedit.cpp2
76 files changed, 116 insertions, 116 deletions
diff --git a/src/canvas/tqcanvas.cpp b/src/canvas/tqcanvas.cpp
index 2e0afadb2..2958a50f2 100644
--- a/src/canvas/tqcanvas.cpp
+++ b/src/canvas/tqcanvas.cpp
@@ -45,7 +45,7 @@
#include "tqimage.h"
#include "tqptrdict.h"
#include "tqpainter.h"
-#include "ntqpolygonscanner.h"
+#include "tqpolygonscanner.h"
#include "tqtimer.h"
#include "ntqtl.h"
diff --git a/src/codecs/tqtextcodec.cpp b/src/codecs/tqtextcodec.cpp
index ac22ea7f1..6c495df8f 100644
--- a/src/codecs/tqtextcodec.cpp
+++ b/src/codecs/tqtextcodec.cpp
@@ -51,7 +51,7 @@
#include "tqvaluelist.h"
#include "tqtextcodecfactory.h"
#include "tqutfcodec.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#ifndef TQT_NO_CODECS
#include "tqhebrewcodec.h"
#include "tqtsciicodec.h"
diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri
index 9702afad1..555633b88 100644
--- a/src/dialogs/qt_dialogs.pri
+++ b/src/dialogs/qt_dialogs.pri
@@ -8,7 +8,7 @@ dialogs {
$$DIALOGS_H/tqerrormessage.h \
$$DIALOGS_H/tqfiledialog.h \
$$DIALOGS_H/tqfontdialog.h \
- $$DIALOGS_H/ntqmessagebox.h \
+ $$DIALOGS_H/tqmessagebox.h \
$$DIALOGS_H/tqprogressdialog.h \
$$DIALOGS_H/tqtabdialog.h \
$$DIALOGS_H/tqwizard.h \
@@ -16,15 +16,15 @@ dialogs {
!embedded:mac:SOURCES += $$DIALOGS_CPP/tqfiledialog_mac.cpp $$DIALOGS_CPP/tqcolordialog_mac.cpp
win32:SOURCES += $$DIALOGS_CPP/tqfiledialog_win.cpp
- unix:SOURCES += $$DIALOGS_CPP/qprintdialog.cpp
- unix:HEADERS += $$DIALOGS_H/ntqprintdialog.h
+ unix:SOURCES += $$DIALOGS_CPP/tqprintdialog.cpp
+ unix:HEADERS += $$DIALOGS_H/tqprintdialog.h
SOURCES += $$DIALOGS_CPP/tqcolordialog.cpp \
$$DIALOGS_CPP/tqdialog.cpp \
$$DIALOGS_CPP/tqerrormessage.cpp \
$$DIALOGS_CPP/tqfiledialog.cpp \
$$DIALOGS_CPP/tqfontdialog.cpp \
- $$DIALOGS_CPP/qmessagebox.cpp \
+ $$DIALOGS_CPP/tqmessagebox.cpp \
$$DIALOGS_CPP/tqprogressdialog.cpp \
$$DIALOGS_CPP/tqtabdialog.cpp \
$$DIALOGS_CPP/tqwizard.cpp \
diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp
index 1f620cb6a..42853e00a 100644
--- a/src/dialogs/tqdialog.cpp
+++ b/src/dialogs/tqdialog.cpp
@@ -344,8 +344,8 @@ void TQDialog::hideDefault()
Hides special buttons which are rather shown in the titlebar
on WinCE, to conserve screen space.
*/
-# include "ntqmessagebox.h"
-extern const char * mb_texts[]; // Defined in qmessagebox.cpp
+# include "tqmessagebox.h"
+extern const char * mb_texts[]; // Defined in tqmessagebox.cpp
void TQDialog::hideSpecial()
{
// "OK" buttons are hidden, and (Ok) shown on titlebar
diff --git a/src/dialogs/tqerrormessage.cpp b/src/dialogs/tqerrormessage.cpp
index 2caa09498..f99db2c7a 100644
--- a/src/dialogs/tqerrormessage.cpp
+++ b/src/dialogs/tqerrormessage.cpp
@@ -47,7 +47,7 @@
#include "tqdict.h"
#include "tqlabel.h"
#include "tqlayout.h"
-#include "ntqmessagebox.h"
+#include "tqmessagebox.h"
#include "tqpushbutton.h"
#include "tqstringlist.h"
#include "tqstylesheet.h"
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 77de59b62..9937f69a7 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -75,7 +75,7 @@
#include "tqlistbox.h"
#include "tqlistview.h"
#include "tqmap.h"
-#include "ntqmessagebox.h"
+#include "tqmessagebox.h"
#include "tqmime.h"
#include "tqnetworkprotocol.h"
#include "tqobjectlist.h"
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/tqmessagebox.cpp
index 381a9f4f0..2a7178260 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/tqmessagebox.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqmessagebox.h"
+#include "tqmessagebox.h"
#ifndef TQT_NO_MESSAGEBOX
@@ -70,7 +70,7 @@ public:
setAlignment( AlignAuto|ExpandTabs );
}
};
-#include "qmessagebox.moc"
+#include "tqmessagebox.moc"
@@ -166,21 +166,21 @@ static const char * const qtlogo_xpm[] = {
Severity is
\table
\row
- \i \img qmessagebox-quest.png
+ \i \img tqmessagebox-quest.png
\i Question
\i For message boxes that ask a question as part of normal
operation. Some style guides recommend using Information for this
purpose.
\row
- \i \img qmessagebox-info.png
+ \i \img tqmessagebox-info.png
\i Information
\i For message boxes that are part of normal operation.
\row
- \i \img qmessagebox-warn.png
+ \i \img tqmessagebox-warn.png
\i Warning
\i For message boxes that tell the user about unusual errors.
\row
- \i \img qmessagebox-crit.png
+ \i \img tqmessagebox-crit.png
\i Critical
\i For message boxes that tell the user about critical errors.
\endtable
diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/tqmessagebox.h
index abaf25761..a8b563830 100644
--- a/src/dialogs/ntqmessagebox.h
+++ b/src/dialogs/tqmessagebox.h
@@ -201,7 +201,7 @@ private: // Disabled copy constructor and operator=
* Macro to be used at the beginning of main(), e.g.
*
* #include <ntqapplication.h>
-* #include <ntqmessagebox.h>
+* #include <tqmessagebox.h>
* int main( int argc, char**argv )
* {
* QT_REQUIRE_VERSION( argc, argv, "3.0.5" )
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/tqprintdialog.cpp
index 9096ff9f6..a82ae4ee4 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/tqprintdialog.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqprintdialog.h"
+#include "tqprintdialog.h"
#ifndef TQT_NO_PRINTDIALOG
@@ -830,7 +830,7 @@ static void qpd_cleanup_globaldialog()
}
/*!
- \class TQPrintDialog ntqprintdialog.h
+ \class TQPrintDialog tqprintdialog.h
\brief The TQPrintDialog class provides a dialog for specifying
the printer's configuration.
@@ -855,7 +855,7 @@ static void qpd_cleanup_globaldialog()
and add some custom buttons with addButton() to extend the
functionality of the print dialog.
- <img src="qprintdlg-m.png"><br clear=all>
+ <img src="tqprintdlg-m.png"><br clear=all>
The printer dialog, on a large screen, in Motif style.
*/
diff --git a/src/dialogs/ntqprintdialog.h b/src/dialogs/tqprintdialog.h
index 29824416a..29824416a 100644
--- a/src/dialogs/ntqprintdialog.h
+++ b/src/dialogs/tqprintdialog.h
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 0a1ffc22b..7032b7383 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -21,7 +21,7 @@
#include "tqptrcollection.h"
#include "tqglist.h"
#include "tqobjectdefs.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "tqgarray.h"
#include "tqmemarray.h"
#include "tqcstring.h"
@@ -93,7 +93,7 @@
#include <tqdropsite.h>
#include "tqgplugin.h"
#include <tqgrid.h>
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#include "tqbuttongroup.h"
#include <tqdatetimeedit.h>
#include "tqgvector.h"
@@ -129,8 +129,8 @@
#include "tqbitmap.h"
#include "ntqvariant.h"
#include "tqsignal.h"
-#include <ntqmessagebox.h>
-#include "ntqmetaobject.h"
+#include <tqmessagebox.h>
+#include "tqmetaobject.h"
#include "tqheader.h"
#include <tqmotifplusstyle.h>
#include <tqcdestyle.h>
@@ -157,9 +157,9 @@
#include <tqpngio.h>
#include <tqcursor.h>
#include <tqerrormessage.h>
-#include <ntqpolygonscanner.h>
+#include <tqpolygonscanner.h>
#include "tqpopupmenu.h"
-#include <ntqprintdialog.h>
+#include <tqprintdialog.h>
#include <tqprinter.h>
#include <tqprocess.h>
#include "tqprogressbar.h"
@@ -312,7 +312,7 @@
#ifdef TQ_WS_MAC
#include <qaquastyle.h>
-#include <qmacstyle_mac.h>
+#include <tqmacstyle_mac.h>
#endif // TQ_WS_MAC
#ifdef TQ_WS_WIN
diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h
index 812bf6f6c..166cc0638 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -45,7 +45,7 @@
#ifndef QT_H
#include "tqobjectdefs.h"
#include "tqstring.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#endif // QT_H
// Class forward definitions
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 8f04514cf..8ad7f5a55 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -57,7 +57,7 @@
#include "tqstyle.h"
#include "tqstylefactory.h"
#include "tqfile.h"
-#include "ntqmessagebox.h"
+#include "tqmessagebox.h"
#include "tqdir.h"
#include "tqfileinfo.h"
#ifdef TQ_WS_WIN
@@ -281,7 +281,7 @@
TQApplication. This can be useful if you wish to share code between
a non-GUI server and a GUI client.
- \headerfile ntqnamespace.h
+ \headerfile tqnamespace.h
\headerfile ntqwindowdefs.h
\headerfile tqglobal.h
*/
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 8992497e6..d8c29cc67 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -53,7 +53,7 @@
//
//
#ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "tqrect.h"
#include "tqptrlist.h"
#include "tqcstring.h"
diff --git a/src/kernel/qt_gfx.pri b/src/kernel/qt_gfx.pri
index fadd1277f..a30d86f17 100644
--- a/src/kernel/qt_gfx.pri
+++ b/src/kernel/qt_gfx.pri
@@ -1,8 +1,8 @@
# TQt graphics
#mng support
-HEADERS += $$KERNEL_H/ntqmngio.h
-SOURCES += $$KERNEL_CPP/qmngio.cpp
+HEADERS += $$KERNEL_H/tqmngio.h
+SOURCES += $$KERNEL_CPP/tqmngio.cpp
mng {
system-mng {
win32:LIBS += libmng.lib
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 03904d262..d3e214b06 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -40,10 +40,10 @@ kernel {
$$KERNEL_H/tqlayout.h \
$$KERNEL_P/tqlayoutengine_p.h \
$$KERNEL_H/tqtranslator.h \
- $$KERNEL_H/ntqmetaobject.h \
+ $$KERNEL_H/tqmetaobject.h \
$$KERNEL_H/tqmime.h \
$$KERNEL_H/tqmovie.h \
- $$KERNEL_H/ntqnamespace.h \
+ $$KERNEL_H/tqnamespace.h \
$$KERNEL_H/tqnetworkprotocol.h \
$$KERNEL_H/tqobject.h \
$$KERNEL_H/tqobjectcleanuphandler.h \
@@ -61,7 +61,7 @@ kernel {
$$KERNEL_H/tqpixmapcache.h \
$$KERNEL_H/tqpointarray.h \
$$KERNEL_H/tqpoint.h \
- $$KERNEL_H/ntqpolygonscanner.h \
+ $$KERNEL_H/tqpolygonscanner.h \
$$KERNEL_H/tqprinter.h \
$$KERNEL_H/tqprocess.h \
$$KERNEL_H/tqrect.h \
@@ -221,7 +221,7 @@ kernel {
$$KERNEL_CPP/tqlayout.cpp \
$$KERNEL_CPP/tqlayoutengine.cpp \
$$KERNEL_CPP/tqtranslator.cpp \
- $$KERNEL_CPP/qmetaobject.cpp \
+ $$KERNEL_CPP/tqmetaobject.cpp \
$$KERNEL_CPP/tqmime.cpp \
$$KERNEL_CPP/tqmovie.cpp \
$$KERNEL_CPP/tqnetworkprotocol.cpp \
@@ -235,7 +235,7 @@ kernel {
$$KERNEL_CPP/tqpixmapcache.cpp \
$$KERNEL_CPP/tqpointarray.cpp \
$$KERNEL_CPP/tqpoint.cpp \
- $$KERNEL_CPP/qpolygonscanner.cpp \
+ $$KERNEL_CPP/tqpolygonscanner.cpp \
$$KERNEL_CPP/tqprinter.cpp \
$$KERNEL_CPP/tqprocess.cpp \
$$KERNEL_CPP/tqrect.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 982ea2946..690551eb6 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -29,7 +29,7 @@
#include <tqdatetime.h>
#include <tqglobal.h>
#include <tqimage.h>
-#include <ntqmetaobject.h> // All moc genereated code has this include
+#include <tqmetaobject.h> // All moc genereated code has this include
#include <tqobject.h>
#include <tqpainter.h>
#include <tqpixmap.h>
diff --git a/src/kernel/tqaccel.cpp b/src/kernel/tqaccel.cpp
index 39e0213f0..ef6b665e6 100644
--- a/src/kernel/tqaccel.cpp
+++ b/src/kernel/tqaccel.cpp
@@ -85,7 +85,7 @@
combined with modifiers (\c SHIFT, \c CTRL, \c ALT or \c
UNICODE_ACCEL). For example, \c{CTRL + Key_P} could be a shortcut
for printing a document. The key codes are listed in \c
- ntqnamespace.h. As an alternative, use \c UNICODE_ACCEL with the
+ tqnamespace.h. As an alternative, use \c UNICODE_ACCEL with the
unicode code point of the character. For example, \c{UNICODE_ACCEL
+ 'A'} gives the same accelerator as \c Key_A.
diff --git a/src/kernel/tqaccessible.cpp b/src/kernel/tqaccessible.cpp
index 243c4384c..6cbe717e6 100644
--- a/src/kernel/tqaccessible.cpp
+++ b/src/kernel/tqaccessible.cpp
@@ -41,7 +41,7 @@
#if defined(QT_ACCESSIBILITY_SUPPORT)
#include "tqptrdict.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
#include <private/qpluginmanager_p.h>
#include "ntqapplication.h"
#include <stdlib.h>
diff --git a/src/kernel/tqcolor.cpp b/src/kernel/tqcolor.cpp
index 59f726694..142fb408a 100644
--- a/src/kernel/tqcolor.cpp
+++ b/src/kernel/tqcolor.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "tqcolor.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "tqdatastream.h"
#include <stdio.h>
diff --git a/src/kernel/tqcursor_x11.cpp b/src/kernel/tqcursor_x11.cpp
index fd2aea158..9facf093c 100644
--- a/src/kernel/tqcursor_x11.cpp
+++ b/src/kernel/tqcursor_x11.cpp
@@ -43,7 +43,7 @@
#include "tqimage.h"
#include "ntqapplication.h"
#include "tqdatastream.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "qt_x11_p.h"
#include <X11/cursorfont.h>
diff --git a/src/kernel/tqdrawutil.h b/src/kernel/tqdrawutil.h
index d8e2703d2..113d6095f 100644
--- a/src/kernel/tqdrawutil.h
+++ b/src/kernel/tqdrawutil.h
@@ -42,7 +42,7 @@
#define TQDRAWUTIL_H
#ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "tqstring.h" // char*->TQString conversion
#endif // QT_H
diff --git a/src/kernel/tqevent.h b/src/kernel/tqevent.h
index f05fc2c94..fc229f9ab 100644
--- a/src/kernel/tqevent.h
+++ b/src/kernel/tqevent.h
@@ -44,7 +44,7 @@
#ifndef QT_H
#include "ntqwindowdefs.h"
#include "tqregion.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "tqmime.h"
#include "tqpair.h"
#endif // QT_H
diff --git a/src/kernel/tqfont.cpp b/src/kernel/tqfont.cpp
index fa050a234..a3e21c655 100644
--- a/src/kernel/tqfont.cpp
+++ b/src/kernel/tqfont.cpp
@@ -2435,7 +2435,7 @@ TQRect TQFontMetrics::boundingRect( TQChar ch ) const
If several of the horizontal or several of the vertical alignment
flags are set, the resulting alignment is undefined.
- These flags are defined in \c ntqnamespace.h.
+ These flags are defined in \c tqnamespace.h.
If \c ExpandTabs is set in \a flgs, then: if \a tabarray is
non-null, it specifies a 0-terminated sequence of pixel-positions
@@ -2497,7 +2497,7 @@ TQRect TQFontMetrics::boundingRect( int x, int y, int w, int h, int flgs,
\i \c WordBreak breaks the text to fit the rectangle.
\endlist
- These flags are defined in \c ntqnamespace.h.
+ These flags are defined in \c tqnamespace.h.
If \c ExpandTabs is set in \a flgs, then: if \a tabarray is
non-null, it specifies a 0-terminated sequence of pixel-positions
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index b71804321..0a2995ede 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -47,7 +47,7 @@
#include "tqptrlist.h"
#include "tqasyncimageio.h"
#include "tqpngio.h"
-#include "ntqmngio.h"
+#include "tqmngio.h"
#include "tqjpegio.h"
#include "tqmap.h"
#include <private/qpluginmanager_p.h>
diff --git a/src/kernel/tqkeycode.h b/src/kernel/tqkeycode.h
index bca9305ba..45aec20b6 100644
--- a/src/kernel/tqkeycode.h
+++ b/src/kernel/tqkeycode.h
@@ -42,7 +42,7 @@
#define TQKEYCODE_H
#ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#endif // QT_H
// all key codes are now in the TQt namespace class
diff --git a/src/kernel/tqkeysequence.cpp b/src/kernel/tqkeysequence.cpp
index 94ba5cf53..88ea36bd5 100644
--- a/src/kernel/tqkeysequence.cpp
+++ b/src/kernel/tqkeysequence.cpp
@@ -67,7 +67,7 @@
optionally combined with modifiers, e.g. \c SHIFT, \c CTRL, \c
ALT, \c META, or \c UNICODE_ACCEL. For example, \c{CTRL + Key_P}
might be a sequence used as a shortcut for printing a document.
- The key codes are listed in \c{ntqnamespace.h}. As an alternative,
+ The key codes are listed in \c{tqnamespace.h}. As an alternative,
use \c UNICODE_ACCEL with the unicode code point of the character.
For example, \c{UNICODE_ACCEL + 'A'} gives the same key sequence
as \c Key_A.
@@ -246,7 +246,7 @@ TQKeySequence::TQKeySequence( const TQString& key )
/*!
Constructs a key sequence that has a single \a key.
- The key codes are listed in \c{ntqnamespace.h} and can be
+ The key codes are listed in \c{tqnamespace.h} and can be
combined with modifiers, e.g. with \c SHIFT, \c CTRL, \c
ALT, \c META or \c UNICODE_ACCEL.
*/
@@ -261,7 +261,7 @@ TQKeySequence::TQKeySequence( int key )
Constructs a key sequence with up to 4 keys \a k1, \a k2,
\a k3 and \a k4.
- The key codes are listed in \c{ntqnamespace.h} and can be
+ The key codes are listed in \c{tqnamespace.h} and can be
combined with modifiers, e.g. with \c SHIFT, \c CTRL, \c
ALT, \c META or \c UNICODE_ACCEL.
*/
diff --git a/src/kernel/tqkeysequence.h b/src/kernel/tqkeysequence.h
index e4800839d..d4965fd5c 100644
--- a/src/kernel/tqkeysequence.h
+++ b/src/kernel/tqkeysequence.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "tqstring.h"
#endif // QT_H
#endif
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/tqmetaobject.cpp
index ae74503c3..06fd7c86f 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/tqmetaobject.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
#include "tqasciidict.h"
#ifdef TQT_THREAD_SUPPORT
@@ -46,7 +46,7 @@
#endif // TQT_THREAD_SUPPORT
/*!
- \class TQMetaData ntqmetaobject.h
+ \class TQMetaData tqmetaobject.h
\reentrant
\brief The TQMetaData class provides information about a member function that is known to the meta object system.
@@ -64,7 +64,7 @@
*/
/*!
- \class TQClassInfo ntqmetaobject.h
+ \class TQClassInfo tqmetaobject.h
\brief The TQClassInfo class provides a struct that stores some basic information about a single class.
@@ -81,7 +81,7 @@
/*!
- \class TQMetaObject ntqmetaobject.h
+ \class TQMetaObject tqmetaobject.h
\brief The TQMetaObject class contains meta information about TQt objects.
\ingroup objectmodel
@@ -845,7 +845,7 @@ bool TQMetaObject::tqt_static_property( TQObject* o, int id, int f, TQVariant* v
/*!
- \class TQMetaProperty ntqmetaobject.h
+ \class TQMetaProperty tqmetaobject.h
\brief The TQMetaProperty class stores meta data about a property.
diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/tqmetaobject.h
index 9db397f47..9db397f47 100644
--- a/src/kernel/ntqmetaobject.h
+++ b/src/kernel/tqmetaobject.h
diff --git a/src/kernel/qmngio.cpp b/src/kernel/tqmngio.cpp
index 3e1678c4e..0f257ae88 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/tqmngio.cpp
@@ -45,7 +45,7 @@
#include "tqimage.h"
#include "tqasyncimageio.h"
#include "tqiodevice.h"
-#include "ntqmngio.h"
+#include "tqmngio.h"
// Define XMD_H prohibits the included headers of libmng.h to typedef INT32.
// This is needed for Borland with STL support, since in that case, INT32 is
@@ -205,7 +205,7 @@ class TQMNGFormatType : public TQImageFormatType
/*
- \class TQMNGFormat ntqmngio.h
+ \class TQMNGFormat tqmngio.h
\brief Incremental image decoder for MNG image format.
\ingroup images
diff --git a/src/kernel/ntqmngio.h b/src/kernel/tqmngio.h
index 530a0aa1d..530a0aa1d 100644
--- a/src/kernel/ntqmngio.h
+++ b/src/kernel/tqmngio.h
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/tqnamespace.h
index f5ec7dd1d..f5ec7dd1d 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/tqnamespace.h
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index 756117fff..cb1dfe7ab 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -44,7 +44,7 @@
#include "tqobjectlist.h"
#include "tqsignalslotimp.h"
#include "tqregexp.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
#include <private/qucom_p.h>
#include "qucomextra_p.h"
#include "tqptrvector.h"
@@ -314,7 +314,7 @@ TQMetaCallEvent::~TQMetaCallEvent()
{ }
/*!
- \class TQt ntqnamespace.h
+ \class TQt tqnamespace.h
\brief The TQt class is a namespace for miscellaneous identifiers
that need to be global-like.
diff --git a/src/kernel/tqobject.h b/src/kernel/tqobject.h
index 3ee1c6c19..eb627831d 100644
--- a/src/kernel/tqobject.h
+++ b/src/kernel/tqobject.h
@@ -47,7 +47,7 @@
#include "tqstring.h"
#include "tqevent.h"
#include "tqmutex.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#endif // QT_H
#include <tqt.h>
diff --git a/src/kernel/tqobjectdict.h b/src/kernel/tqobjectdict.h
index 8ff8c31f4..c51123054 100644
--- a/src/kernel/tqobjectdict.h
+++ b/src/kernel/tqobjectdict.h
@@ -42,7 +42,7 @@
#define TQOBJECTDICT_H
#ifndef QT_H
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
#include "tqasciidict.h"
#endif // QT_H
diff --git a/src/kernel/tqpixmap.h b/src/kernel/tqpixmap.h
index 70609d4a7..1ab6dd0b9 100644
--- a/src/kernel/tqpixmap.h
+++ b/src/kernel/tqpixmap.h
@@ -45,7 +45,7 @@
#include "tqpaintdevice.h"
#include "tqcolor.h" // char*->TQColor conversion
#include "tqstring.h" // char*->TQString conversion
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#endif // QT_H
class TQPixmapPrivate;
diff --git a/src/kernel/qpolygonscanner.cpp b/src/kernel/tqpolygonscanner.cpp
index 44d59e7b8..2df631730 100644
--- a/src/kernel/qpolygonscanner.cpp
+++ b/src/kernel/tqpolygonscanner.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqpolygonscanner.h"
+#include "tqpolygonscanner.h"
#include "tqpointarray.h"
#include <stdlib.h>
diff --git a/src/kernel/ntqpolygonscanner.h b/src/kernel/tqpolygonscanner.h
index 2ab2c8e37..2ab2c8e37 100644
--- a/src/kernel/ntqpolygonscanner.h
+++ b/src/kernel/tqpolygonscanner.h
diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp
index b5ae63926..06eeabbdd 100644
--- a/src/kernel/tqprinter_unix.cpp
+++ b/src/kernel/tqprinter_unix.cpp
@@ -53,7 +53,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
#include "tqpaintdevicemetrics.h"
#include "qpsprinter_p.h"
-#include "ntqprintdialog.h"
+#include "tqprintdialog.h"
#include "ntqapplication.h"
#include "tqprinter_p.h"
diff --git a/src/kernel/tqsignal.cpp b/src/kernel/tqsignal.cpp
index 3be5bb960..073b61949 100644
--- a/src/kernel/tqsignal.cpp
+++ b/src/kernel/tqsignal.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "tqsignal.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
#include "tqguardedptr.h"
/*!
diff --git a/src/kernel/tqsimplerichtext.h b/src/kernel/tqsimplerichtext.h
index 8d3d9ad8b..45ddd6b10 100644
--- a/src/kernel/tqsimplerichtext.h
+++ b/src/kernel/tqsimplerichtext.h
@@ -42,7 +42,7 @@
#define TQSIMPLERICHTEXT_H
#ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "tqstring.h"
#include "tqregion.h"
#endif // QT_H
diff --git a/src/kernel/tqsize.h b/src/kernel/tqsize.h
index 6bfb60865..a49dd25a9 100644
--- a/src/kernel/tqsize.h
+++ b/src/kernel/tqsize.h
@@ -49,7 +49,7 @@ class TQ_EXPORT TQSize
// ### Make TQSize inherit TQt in TQt 4.0
{
public:
- // ### Move this enum to ntqnamespace.h in TQt 4.0
+ // ### Move this enum to tqnamespace.h in TQt 4.0
enum ScaleMode {
ScaleFree,
ScaleMin,
diff --git a/src/kernel/tqtextengine_p.h b/src/kernel/tqtextengine_p.h
index d1a467f2b..d092a3e7d 100644
--- a/src/kernel/tqtextengine_p.h
+++ b/src/kernel/tqtextengine_p.h
@@ -40,7 +40,7 @@
#ifndef QT_H
#include "tqglobal.h"
#include "tqstring.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include <private/tqfontdata_p.h>
#endif // QT_H
diff --git a/src/kernel/tqtextlayout_p.h b/src/kernel/tqtextlayout_p.h
index 58dced19b..a95f28e78 100644
--- a/src/kernel/tqtextlayout_p.h
+++ b/src/kernel/tqtextlayout_p.h
@@ -39,7 +39,7 @@
#ifndef QT_H
#include "tqstring.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "tqrect.h"
#endif // QT_H
diff --git a/src/kernel/tqttdeintegration_x11.cpp b/src/kernel/tqttdeintegration_x11.cpp
index 0b8e794c2..48aeb0dc9 100644
--- a/src/kernel/tqttdeintegration_x11.cpp
+++ b/src/kernel/tqttdeintegration_x11.cpp
@@ -8,7 +8,7 @@
#include <tqfontdialog.h>
#include <tqlibrary.h>
#include <tqregexp.h>
-#include <ntqmessagebox.h>
+#include <tqmessagebox.h>
#include <stdlib.h>
bool TQTDEIntegration::inited = false;
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index 4aa4a09ed..e2e6c44f8 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -54,7 +54,7 @@
#include "tqstylefactory.h"
#include "tqcleanuphandler.h"
#include "tqstyle.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
#include "tqguardedptr.h"
#if defined(TQT_THREAD_SUPPORT)
#include "tqthread.h"
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index b7136818f..cc16871a7 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -40,7 +40,7 @@
#include "ntqapplication.h"
#include "qapplication_p.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#include "tqpaintdevicemetrics.h"
#include "tqpainter.h"
#include "tqbitmap.h"
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 1691c5805..a393aa868 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -646,10 +646,10 @@ int tmpYYStart; // Used to store the lexers current mode
int tmpYYStart2; // Used to store the lexers current mode
// (if tmpYYStart is already used)
-// if the format revision changes, you MUST change it in ntqmetaobject.h too
+// if the format revision changes, you MUST change it in tqmetaobject.h too
const int formatRevision = 26; // moc output format revision
-// if the flags change, you HAVE to change it in ntqmetaobject.h too
+// if the flags change, you HAVE to change it in tqmetaobject.h too
enum Flags {
Invalid = 0x00000000,
Readable = 0x00000001,
@@ -2904,7 +2904,7 @@ void generateClass() // generate C++ source code for a class
g->includeFiles.next();
}
}
- fprintf( out, "#include <%sntqmetaobject.h>\n", (const char*)g->qtPath );
+ fprintf( out, "#include <%stqmetaobject.h>\n", (const char*)g->qtPath );
fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath );
fprintf( out, "#include <%sprivate/qucomextra_p.h>\n", (const char*)g->qtPath );
fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision );
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index dcf19ab2a..ae23163da 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -659,10 +659,10 @@ int tmpYYStart; // Used to store the lexers current mode
int tmpYYStart2; // Used to store the lexers current mode
// (if tmpYYStart is already used)
-// if the format revision changes, you MUST change it in ntqmetaobject.h too
+// if the format revision changes, you MUST change it in tqmetaobject.h too
const int formatRevision = 26; // moc output format revision
-// if the flags change, you HAVE to change it in ntqmetaobject.h too
+// if the flags change, you HAVE to change it in tqmetaobject.h too
enum Flags {
Invalid = 0x00000000,
Readable = 0x00000001,
@@ -5779,7 +5779,7 @@ void generateClass() // generate C++ source code for a class
g->includeFiles.next();
}
}
- fprintf( out, "#include <%sntqmetaobject.h>\n", (const char*)g->qtPath );
+ fprintf( out, "#include <%stqmetaobject.h>\n", (const char*)g->qtPath );
fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath );
fprintf( out, "#include <%sprivate/qucomextra_p.h>\n", (const char*)g->qtPath );
fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision );
diff --git a/src/sql/tqsqlerror.cpp b/src/sql/tqsqlerror.cpp
index 1b9f69ca8..55d98202d 100644
--- a/src/sql/tqsqlerror.cpp
+++ b/src/sql/tqsqlerror.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "tqsqlerror.h"
-#include <ntqmessagebox.h>
+#include <tqmessagebox.h>
#ifndef TQT_NO_SQL
diff --git a/src/sql/tqsqlmanager_p.cpp b/src/sql/tqsqlmanager_p.cpp
index 4b9597319..754d572a9 100644
--- a/src/sql/tqsqlmanager_p.cpp
+++ b/src/sql/tqsqlmanager_p.cpp
@@ -48,7 +48,7 @@
#include "tqsqlform.h"
#include "tqsqldriver.h"
#include "tqstring.h"
-#include "ntqmessagebox.h"
+#include "tqmessagebox.h"
#include "tqbitarray.h"
//#define QT_DEBUG_DATAMANAGER
diff --git a/src/sql/tqsqlpropertymap.cpp b/src/sql/tqsqlpropertymap.cpp
index 81a0dd4a5..55a9f6843 100644
--- a/src/sql/tqsqlpropertymap.cpp
+++ b/src/sql/tqsqlpropertymap.cpp
@@ -44,7 +44,7 @@
#include "tqwidget.h"
#include "tqcleanuphandler.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
#include "tqmap.h"
class TQSqlPropertyMapPrivate
diff --git a/src/sql/tqsqlrecord.cpp b/src/sql/tqsqlrecord.cpp
index dd4432aa1..9c567c126 100644
--- a/src/sql/tqsqlrecord.cpp
+++ b/src/sql/tqsqlrecord.cpp
@@ -45,7 +45,7 @@
#include "tqregexp.h"
#include "tqvaluevector.h"
#include "ntqshared.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
class TQSqlRecordPrivate
{
diff --git a/src/styles/qt_styles.pri b/src/styles/qt_styles.pri
index b0daa8513..eedd54754 100644
--- a/src/styles/qt_styles.pri
+++ b/src/styles/qt_styles.pri
@@ -16,9 +16,9 @@ styles {
x11|embedded|!macx-*:styles -= mac
contains( styles, mac ) {
- HEADERS +=$$STYLES_H/qmacstyle_mac.h \
- $$STYLES_H/qmacstylepixmaps_mac_p.h
- SOURCES +=$$STYLES_CPP/qmacstyle_mac.cpp
+ HEADERS +=$$STYLES_H/tqmacstyle_mac.h \
+ $$STYLES_H/tqmacstylepixmaps_mac_p.h
+ SOURCES +=$$STYLES_CPP/tqmacstyle_mac.cpp
HEADERS *= $$STYLES_CPP/qaquastyle_p.h
SOURCES *= $$STYLES_CPP/qaquastyle_p.cpp
diff --git a/src/styles/tqcommonstyle.cpp b/src/styles/tqcommonstyle.cpp
index 6158189d5..287bc5e8b 100644
--- a/src/styles/tqcommonstyle.cpp
+++ b/src/styles/tqcommonstyle.cpp
@@ -59,7 +59,7 @@
#include "tqdockarea.h"
#include "tqheader.h"
#include "tqspinbox.h"
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#include "tqgroupbox.h"
#include "tqslider.h"
#include "tqlistview.h"
@@ -170,7 +170,7 @@ static void tqt_style_control_element_data_null_cleanup() {
TQStyleControlElementData_null =0;
}
-#include <ntqmetaobject.h>
+#include <tqmetaobject.h>
// Keep in sync with duplicate definition in tqobject.cpp
class TQStyleControlElementDataPrivate {
diff --git a/src/styles/tqinterlacestyle.cpp b/src/styles/tqinterlacestyle.cpp
index 8ddd55940..3c86f0638 100644
--- a/src/styles/tqinterlacestyle.cpp
+++ b/src/styles/tqinterlacestyle.cpp
@@ -52,7 +52,7 @@
#include "tqlabel.h"
#include "tqpushbutton.h"
#include "tqwidget.h"
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#include "tqscrollbar.h"
#include "tqlistbox.h"
diff --git a/src/styles/tqstylefactory.cpp b/src/styles/tqstylefactory.cpp
index 7a5706c64..29a3ad5ec 100644
--- a/src/styles/tqstylefactory.cpp
+++ b/src/styles/tqstylefactory.cpp
@@ -64,7 +64,7 @@
#if !defined( TQT_NO_STYLE_MAC ) && defined( TQ_WS_MAC )
TQString p2qstring(const unsigned char *c); //tqglobal.cpp
#include "qt_mac.h"
-#include "qmacstyle_mac.h"
+#include "tqmacstyle_mac.h"
#endif
#include <stdlib.h>
diff --git a/src/styles/tqwindowsstyle.cpp b/src/styles/tqwindowsstyle.cpp
index 284da1617..03fc62dd5 100644
--- a/src/styles/tqwindowsstyle.cpp
+++ b/src/styles/tqwindowsstyle.cpp
@@ -54,7 +54,7 @@
#include "tqcombobox.h"
#include "tqlistbox.h"
#include "tqwidget.h"
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#include "tqscrollbar.h"
#include "tqslider.h"
#include "tqtabwidget.h"
diff --git a/src/tools/tqdatetime.h b/src/tools/tqdatetime.h
index 545f1f56b..874246bf8 100644
--- a/src/tools/tqdatetime.h
+++ b/src/tools/tqdatetime.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "tqstring.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#endif // QT_H
#include <time.h>
diff --git a/src/tools/tqfeatures.txt b/src/tools/tqfeatures.txt
index ef466fd36..d6a05abb4 100644
--- a/src/tools/tqfeatures.txt
+++ b/src/tools/tqfeatures.txt
@@ -988,7 +988,7 @@ SeeAlso: ???
Feature: MESSAGEBOX
Section: Widgets
Requires: DIALOG PUSHBUTTON LABEL
-Name: QMessageBox
+Name: TQMessageBox
SeeAlso: ???
Feature: TABDIALOG
@@ -1018,7 +1018,7 @@ SeeAlso: ???
Feature: PRINTDIALOG
Section: Widgets
Requires: DIALOG LISTVIEW PRINTER COMBOBOX LABEL BUTTONGROUP SPINBOX RADIOBUTTON PUSHBUTTON DIR
-Name: QPrintDialog
+Name: TQPrintDialog
SeeAlso: ???
Feature: PROGRESSDIALOG
diff --git a/src/tools/tqlocale.cpp b/src/tools/tqlocale.cpp
index 57ddcfb3f..77f3cae19 100644
--- a/src/tools/tqlocale.cpp
+++ b/src/tools/tqlocale.cpp
@@ -45,7 +45,7 @@
#include "tqlocale.h"
#include "tqlocale_p.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#ifdef QT_QLOCALE_USES_FCVT
# include <tqmutex.h>
diff --git a/src/widgets/qeffects_p.h b/src/widgets/qeffects_p.h
index d3beb3055..4d9845c01 100644
--- a/src/widgets/qeffects_p.h
+++ b/src/widgets/qeffects_p.h
@@ -56,7 +56,7 @@
//
#ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
#endif // QT_H
#ifndef TQT_NO_EFFECTS
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 93acd0832..4d124e940 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -34,7 +34,7 @@ widgets {
$$WIDGETS_H/tqprogressbar.h \
$$WIDGETS_H/tqpushbutton.h \
$$WIDGETS_H/tqradiobutton.h \
- $$WIDGETS_H/ntqrangecontrol.h \
+ $$WIDGETS_H/tqrangecontrol.h \
$$WIDGETS_H/tqscrollbar.h \
$$WIDGETS_H/tqscrollview.h \
$$WIDGETS_H/tqslider.h \
@@ -96,7 +96,7 @@ widgets {
$$WIDGETS_CPP/tqprogressbar.cpp \
$$WIDGETS_CPP/tqpushbutton.cpp \
$$WIDGETS_CPP/tqradiobutton.cpp \
- $$WIDGETS_CPP/qrangecontrol.cpp \
+ $$WIDGETS_CPP/tqrangecontrol.cpp \
$$WIDGETS_CPP/tqscrollbar.cpp \
$$WIDGETS_CPP/tqscrollview.cpp \
$$WIDGETS_CPP/tqslider.cpp \
diff --git a/src/widgets/tqdatetimeedit.cpp b/src/widgets/tqdatetimeedit.cpp
index 203d310de..6e32d3aaf 100644
--- a/src/widgets/tqdatetimeedit.cpp
+++ b/src/widgets/tqdatetimeedit.cpp
@@ -44,7 +44,7 @@
#include "../kernel/qinternal_p.h"
#include "../kernel/qrichtext_p.h"
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#include "ntqapplication.h"
#include "tqpixmap.h"
#include "ntqapplication.h"
diff --git a/src/widgets/tqdial.h b/src/widgets/tqdial.h
index 7baf98e53..ae3689705 100644
--- a/src/widgets/tqdial.h
+++ b/src/widgets/tqdial.h
@@ -44,7 +44,7 @@
#ifndef QT_H
#include "tqwidget.h"
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#endif // QT_H
#ifndef TQT_NO_DIAL
diff --git a/src/widgets/tqmenudata.cpp b/src/widgets/tqmenudata.cpp
index 5a3872d31..148d79790 100644
--- a/src/widgets/tqmenudata.cpp
+++ b/src/widgets/tqmenudata.cpp
@@ -415,7 +415,7 @@ void TQMenuData::removePopup( TQPopupMenu *popup )
Returns the allocated menu identifier number (\a id if \a id >= 0).
\sa removeItem(), changeItem(), setAccel(), connectItem(), TQAccel,
- ntqnamespace.h
+ tqnamespace.h
*/
int TQMenuData::insertItem( const TQString &text,
@@ -442,7 +442,7 @@ int TQMenuData::insertItem( const TQString &text,
Returns the allocated menu identifier number (\a id if \a id >= 0).
\sa removeItem(), changeItem(), setAccel(), connectItem(), TQAccel,
- ntqnamespace.h
+ tqnamespace.h
*/
int TQMenuData::insertItem( const TQIconSet& icon,
@@ -504,7 +504,7 @@ int TQMenuData::insertItem( const TQPixmap &pixmap,
Returns the allocated menu identifier number (\a id if \a id >= 0).
\sa removeItem(), changeItem(), setAccel(), connectItem(), TQAccel,
- ntqnamespace.h
+ tqnamespace.h
*/
int TQMenuData::insertItem( const TQIconSet& icon,
@@ -864,7 +864,7 @@ void TQMenuData::clear()
item \a id, or 0 if it has no accelerator key or if there is no
such menu item.
- \sa setAccel(), TQAccel, ntqnamespace.h
+ \sa setAccel(), TQAccel, tqnamespace.h
*/
TQKeySequence TQMenuData::accel( int id ) const
@@ -880,7 +880,7 @@ TQKeySequence TQMenuData::accel( int id ) const
An accelerator key consists of a key code and a combination of the
modifiers \c SHIFT, \c CTRL, \c ALT or \c UNICODE_ACCEL (OR'ed or
- added). The header file \c ntqnamespace.h contains a list of key
+ added). The header file \c tqnamespace.h contains a list of key
codes.
Defining an accelerator key produces a text that is added to the
diff --git a/src/widgets/qrangecontrol.cpp b/src/widgets/tqrangecontrol.cpp
index 95056e578..03d9cecd0 100644
--- a/src/widgets/qrangecontrol.cpp
+++ b/src/widgets/tqrangecontrol.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#ifndef TQT_NO_RANGECONTROL
#include "tqglobal.h"
#include <limits.h>
@@ -47,7 +47,7 @@ static bool sumOutOfRange(int current, int add);
/*!
- \class TQRangeControl ntqrangecontrol.h
+ \class TQRangeControl tqrangecontrol.h
\brief The TQRangeControl class provides an integer value within a range.
\ingroup misc
diff --git a/src/widgets/ntqrangecontrol.h b/src/widgets/tqrangecontrol.h
index 39f2e2abc..39f2e2abc 100644
--- a/src/widgets/ntqrangecontrol.h
+++ b/src/widgets/tqrangecontrol.h
diff --git a/src/widgets/tqscrollbar.h b/src/widgets/tqscrollbar.h
index 6a298c96f..d5cc1a502 100644
--- a/src/widgets/tqscrollbar.h
+++ b/src/widgets/tqscrollbar.h
@@ -45,7 +45,7 @@ class TQTimer;
#ifndef QT_H
#include "tqwidget.h"
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#endif // QT_H
#ifndef TQT_NO_SCROLLBAR
diff --git a/src/widgets/tqslider.h b/src/widgets/tqslider.h
index af60245e3..1ce9883ef 100644
--- a/src/widgets/tqslider.h
+++ b/src/widgets/tqslider.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "tqwidget.h"
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#endif // QT_H
#ifndef TQT_NO_SLIDER
diff --git a/src/widgets/tqspinbox.h b/src/widgets/tqspinbox.h
index 345857c74..390c6bbd2 100644
--- a/src/widgets/tqspinbox.h
+++ b/src/widgets/tqspinbox.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "tqwidget.h"
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#endif // QT_H
#ifndef TQT_NO_SPINBOX
diff --git a/src/widgets/tqspinwidget.cpp b/src/widgets/tqspinwidget.cpp
index a66e90d1d..893fa0f0c 100644
--- a/src/widgets/tqspinwidget.cpp
+++ b/src/widgets/tqspinwidget.cpp
@@ -36,7 +36,7 @@
**
**********************************************************************/
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
#ifndef TQT_NO_SPINWIDGET
diff --git a/src/widgets/tqtabbar.cpp b/src/widgets/tqtabbar.cpp
index 140473e6a..7c9ebb2c4 100644
--- a/src/widgets/tqtabbar.cpp
+++ b/src/widgets/tqtabbar.cpp
@@ -53,7 +53,7 @@
#endif
#ifdef TQ_WS_MACX
-#include <qmacstyle_mac.h>
+#include <tqmacstyle_mac.h>
#endif
diff --git a/src/widgets/tqtabwidget.cpp b/src/widgets/tqtabwidget.cpp
index fdf857050..88ec8a06e 100644
--- a/src/widgets/tqtabwidget.cpp
+++ b/src/widgets/tqtabwidget.cpp
@@ -51,7 +51,7 @@
#include "tqtoolbutton.h"
#ifdef Q_OS_MACX
-#include <qmacstyle_mac.h>
+#include <tqmacstyle_mac.h>
#endif
/*!
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 54dc1b2db..2c8bf3ba4 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -72,7 +72,7 @@
#include "tqregexp.h"
#include "tqpopupmenu.h"
#include "tqptrstack.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
#include "tqtextbrowser.h"
#include <private/qucom_p.h>
#include "private/tqsyntaxhighlighter_p.h"