summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/codecs/tqtextcodecfactory.cpp2
-rw-r--r--src/dialogs/qmessagebox.cpp4
-rw-r--r--src/dialogs/tqdialog.cpp4
-rw-r--r--src/dialogs/tqfiledialog.cpp4
-rw-r--r--src/dialogs/tqprogressdialog.cpp4
-rw-r--r--src/dialogs/tqwizard.cpp4
-rw-r--r--src/inputmethod/qinputcontextfactory.cpp2
-rw-r--r--src/kernel/ntqmetaobject.h2
-rw-r--r--src/kernel/ntqnamespace.h2
-rw-r--r--src/kernel/ntqt.h14
-rw-r--r--src/kernel/qapplication.cpp4
-rw-r--r--src/kernel/qapplication_x11.cpp4
-rw-r--r--src/kernel/qdnd_x11.cpp2
-rw-r--r--src/kernel/qinternal.cpp2
-rw-r--r--src/kernel/qkeysequence.cpp2
-rw-r--r--src/kernel/qmngio.cpp4
-rw-r--r--src/kernel/qrichtext.cpp6
-rw-r--r--src/kernel/qt_kernel.pri34
-rw-r--r--src/kernel/qt_pch.h2
-rw-r--r--src/kernel/qvariant.cpp2
-rw-r--r--src/kernel/tqaccel.cpp (renamed from src/kernel/qaccel.cpp)4
-rw-r--r--src/kernel/tqaccel.h (renamed from src/kernel/ntqaccel.h)0
-rw-r--r--src/kernel/tqaccessible.cpp (renamed from src/kernel/qaccessible.cpp)10
-rw-r--r--src/kernel/tqaccessible.h (renamed from src/kernel/ntqaccessible.h)0
-rw-r--r--src/kernel/tqasyncimageio.cpp (renamed from src/kernel/qasyncimageio.cpp)14
-rw-r--r--src/kernel/tqasyncimageio.h (renamed from src/kernel/ntqasyncimageio.h)0
-rw-r--r--src/kernel/tqasyncio.cpp (renamed from src/kernel/qasyncio.cpp)12
-rw-r--r--src/kernel/tqasyncio.h (renamed from src/kernel/ntqasyncio.h)0
-rw-r--r--src/kernel/tqconnection.cpp (renamed from src/kernel/qconnection.cpp)4
-rw-r--r--src/kernel/tqconnection.h (renamed from src/kernel/ntqconnection.h)0
-rw-r--r--src/kernel/tqcursor.cpp (renamed from src/kernel/qcursor.cpp)4
-rw-r--r--src/kernel/tqcursor.h (renamed from src/kernel/ntqcursor.h)0
-rw-r--r--src/kernel/tqcursor_x11.cpp (renamed from src/kernel/qcursor_x11.cpp)2
-rw-r--r--src/kernel/tqevent.cpp2
-rw-r--r--src/kernel/tqfont.cpp2
-rw-r--r--src/kernel/tqfont_x11.cpp2
-rw-r--r--src/kernel/tqfontdatabase.cpp2
-rw-r--r--src/kernel/tqiconset.cpp2
-rw-r--r--src/kernel/tqimage.cpp2
-rw-r--r--src/kernel/tqmime.cpp2
-rw-r--r--src/kernel/tqmovie.cpp4
-rw-r--r--src/kernel/tqpainter.cpp2
-rw-r--r--src/kernel/tqpalette.cpp2
-rw-r--r--src/kernel/tqpixmapcache.cpp2
-rw-r--r--src/kernel/tqpngio.cpp4
-rw-r--r--src/kernel/tqprocess_unix.cpp2
-rw-r--r--src/kernel/tqsignalslotimp.h2
-rw-r--r--src/kernel/tqstylesheet.cpp2
-rw-r--r--src/kernel/tqwidget.cpp6
-rw-r--r--src/kernel/tqwidget_x11.cpp2
-rw-r--r--src/network/tqdns.cpp2
-rw-r--r--src/opengl/tqgl.cpp2
-rw-r--r--src/sql/tqdatatable.cpp2
-rw-r--r--src/sql/tqeditorfactory.cpp2
-rw-r--r--src/sql/tqsqldatabase.cpp2
-rw-r--r--src/sql/tqsqleditorfactory.cpp2
-rw-r--r--src/sql/tqsqlpropertymap.cpp2
-rw-r--r--src/styles/tqwindowsstyle.cpp2
-rw-r--r--src/table/tqtable.cpp2
-rw-r--r--src/tools/qcomlibrary.cpp2
-rw-r--r--src/tools/qt_tools.pri6
-rw-r--r--src/tools/qwinexport.cpp4
-rw-r--r--src/tools/tqcleanuphandler.h (renamed from src/tools/ntqcleanuphandler.h)0
-rw-r--r--src/tools/tqcomponentfactory.cpp (renamed from src/tools/qcomponentfactory.cpp)4
-rw-r--r--src/tools/tqcomponentfactory_p.h (renamed from src/tools/qcomponentfactory_p.h)0
-rw-r--r--src/tools/tqregexp.cpp2
-rw-r--r--src/tools/tqstring.cpp2
-rw-r--r--src/widgets/qdockwindow.cpp2
-rw-r--r--src/widgets/qtitlebar.cpp2
-rw-r--r--src/widgets/tqaction.cpp2
-rw-r--r--src/widgets/tqbutton.cpp4
-rw-r--r--src/widgets/tqcombobox.cpp2
-rw-r--r--src/widgets/tqdial.cpp2
-rw-r--r--src/widgets/tqgroupbox.cpp4
-rw-r--r--src/widgets/tqiconview.cpp4
-rw-r--r--src/widgets/tqlabel.cpp2
-rw-r--r--src/widgets/tqlineedit.cpp2
-rw-r--r--src/widgets/tqlistbox.cpp2
-rw-r--r--src/widgets/tqlistview.cpp6
-rw-r--r--src/widgets/tqmainwindow.cpp2
-rw-r--r--src/widgets/tqmenubar.cpp6
-rw-r--r--src/widgets/tqmultilineedit.cpp2
-rw-r--r--src/widgets/tqpopupmenu.cpp6
-rw-r--r--src/widgets/tqprogressbar.cpp2
-rw-r--r--src/widgets/tqpushbutton.cpp2
-rw-r--r--src/widgets/tqscrollbar.cpp4
-rw-r--r--src/widgets/tqscrollview.cpp2
-rw-r--r--src/widgets/tqslider.cpp2
-rw-r--r--src/widgets/tqspinbox.cpp4
-rw-r--r--src/widgets/tqtabbar.cpp6
-rw-r--r--src/widgets/tqtabwidget.cpp2
-rw-r--r--src/widgets/tqtextbrowser.cpp2
-rw-r--r--src/widgets/tqtextedit.cpp2
-rw-r--r--src/widgets/tqtoolbar.cpp2
-rw-r--r--src/widgets/tqwhatsthis.cpp4
-rw-r--r--src/widgets/tqwhatsthis.h2
-rw-r--r--src/widgets/tqwidgetresizehandler.cpp2
-rw-r--r--src/workspace/tqworkspace.cpp4
98 files changed, 163 insertions, 163 deletions
diff --git a/src/codecs/tqtextcodecfactory.cpp b/src/codecs/tqtextcodecfactory.cpp
index b98155587..9e081c51c 100644
--- a/src/codecs/tqtextcodecfactory.cpp
+++ b/src/codecs/tqtextcodecfactory.cpp
@@ -44,7 +44,7 @@
#ifndef TQT_NO_COMPONENT
#include "ntqapplication.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include <private/qpluginmanager_p.h>
#include "tqtextcodecinterface_p.h"
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index 836470eb4..381a9f4f0 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_MESSAGEBOX
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqlabel.h"
#include "tqpushbutton.h"
#include "tqimage.h"
@@ -50,7 +50,7 @@
#include "tqstyle.h"
#include "tqobjectlist.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#ifdef TQ_WS_X11
diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp
index 1852d6d6a..8b1298728 100644
--- a/src/dialogs/tqdialog.cpp
+++ b/src/dialogs/tqdialog.cpp
@@ -51,9 +51,9 @@
#include "tqsizegrip.h"
#include "tqwhatsthis.h"
#include "tqpopupmenu.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#if defined( Q_OS_TEMP )
#include "qt_windows.h"
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 4ae0469d6..6eb5006a6 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -59,10 +59,10 @@
#include "tqbitmap.h"
#include "tqbuttongroup.h"
#include "tqcheckbox.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqcombobox.h"
#include "tqcstring.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqdragobject.h"
#include "tqfile.h"
#include "tqguardedptr.h"
diff --git a/src/dialogs/tqprogressdialog.cpp b/src/dialogs/tqprogressdialog.cpp
index 5731fd240..c8a164d1f 100644
--- a/src/dialogs/tqprogressdialog.cpp
+++ b/src/dialogs/tqprogressdialog.cpp
@@ -42,14 +42,14 @@
#ifndef TQT_NO_PROGRESSDIALOG
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqpainter.h"
#include "ntqdrawutil.h"
#include "tqdatetime.h"
#include "ntqapplication.h"
#include "tqstyle.h"
#include "tqpushbutton.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqtimer.h"
#include <limits.h>
diff --git a/src/dialogs/tqwizard.cpp b/src/dialogs/tqwizard.cpp
index b7dfa91ce..233857250 100644
--- a/src/dialogs/tqwizard.cpp
+++ b/src/dialogs/tqwizard.cpp
@@ -44,13 +44,13 @@
#include "tqlayout.h"
#include "tqpushbutton.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqlabel.h"
#include "tqwidgetstack.h"
#include "ntqapplication.h"
#include "tqptrlist.h"
#include "tqpainter.h"
-#include "ntqaccel.h"
+#include "tqaccel.h"
/*! \file wizard/wizard.cpp */
/*! \file wizard/wizard.h */
diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp
index 9199f8088..63aff8375 100644
--- a/src/inputmethod/qinputcontextfactory.cpp
+++ b/src/inputmethod/qinputcontextfactory.cpp
@@ -49,7 +49,7 @@
#include <stdlib.h>
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include <private/qpluginmanager_p.h>
#ifndef TQT_NO_COMPONENT
diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/ntqmetaobject.h
index 857b491c5..9db397f47 100644
--- a/src/kernel/ntqmetaobject.h
+++ b/src/kernel/ntqmetaobject.h
@@ -42,7 +42,7 @@
#define TQMETAOBJECT_H
#ifndef QT_H
-#include "ntqconnection.h"
+#include "tqconnection.h"
#include "tqstrlist.h"
#endif // QT_H
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index cace88141..c6bdd1b0d 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -866,7 +866,7 @@ public:
UI_AnimateToolBox
};
- // documented in qcursor.cpp
+ // documented in tqcursor.cpp
enum CursorShape {
ArrowCursor,
UpArrowCursor,
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index e7ee77271..477e2ca68 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -115,7 +115,7 @@
#include <tqjiscodec.h>
#include <tqeucjpcodec.h>
#include <ntqkeycode.h>
-#include <ntqaccel.h>
+#include <tqaccel.h>
#include "tqlabel.h"
#include "tqlayout.h"
#include <tqlcdnumber.h>
@@ -125,7 +125,7 @@
#include "tqscrollview.h"
#include "tqdir.h"
#include "tqwindowsstyle.h"
-#include "ntqconnection.h"
+#include "tqconnection.h"
#include "tqbitmap.h"
#include "ntqvariant.h"
#include "tqsignal.h"
@@ -155,7 +155,7 @@
#include <tqpixmapcache.h>
#include <tqplatinumstyle.h>
#include <tqpngio.h>
-#include <ntqcursor.h>
+#include <tqcursor.h>
#include <ntqerrormessage.h>
#include <ntqpolygonscanner.h>
#include "tqpopupmenu.h"
@@ -165,7 +165,7 @@
#include "tqprogressbar.h"
#include <tqasciicache.h>
#include "tqptrdict.h"
-#include <ntqcleanuphandler.h>
+#include <tqcleanuphandler.h>
#include <tqptrqueue.h>
#include <tqptrstack.h>
#include "tqstylesheet.h"
@@ -236,7 +236,7 @@
#include "tqtoolbar.h"
#include <tqtextview.h>
#include "tqwaitcondition.h"
-#include <ntqasyncio.h>
+#include <tqasyncio.h>
#include <tqfontdatabase.h>
#include <tqmainwindow.h>
#include <tqtoolbox.h>
@@ -249,7 +249,7 @@
#include <tqutfcodec.h>
#include <ntquuid.h>
#include <ntqvalidator.h>
-#include <ntqasyncimageio.h>
+#include <tqasyncimageio.h>
#include <tqvaluestack.h>
#include <tqvaluevector.h>
#include <tqdatatable.h>
@@ -285,7 +285,7 @@
#include "private/tqsqldriverinterface_p.h"
#include "private/tqsqlmanager_p.h"
#include "private/qlock_p.h"
-#include "private/qcomponentfactory_p.h"
+#include "private/tqcomponentfactory_p.h"
#include "private/tqstyleinterface_p.h"
#include "private/qrichtext_p.h"
#include "private/qsvgdevice_p.h"
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 7abbbd56f..6e1926e45 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -46,14 +46,14 @@
#include "tqwidgetlist.h"
#include "tqwidgetintdict.h"
#include "tqptrdict.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqtranslator.h"
#include "tqtextcodec.h"
#include "tqsessionmanager.h"
#include "tqdragobject.h"
#include "tqclipboard.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqstyle.h"
#include "tqstylefactory.h"
#include "tqfile.h"
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index f3252b296..b611778d7 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -64,7 +64,7 @@
#include "ntqapplication.h"
#include "qapplication_p.h"
#include "tqcolor_p.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqwidget.h"
#include "tqwidget_p.h"
#include "tqobjectlist.h"
@@ -446,7 +446,7 @@ int qt_visual_option = -1;
bool qt_cmap_option = FALSE;
TQWidget *qt_button_down = 0; // widget got last button-down
-extern bool tqt_tryAccelEvent( TQWidget*, TQKeyEvent* ); // def in qaccel.cpp
+extern bool tqt_tryAccelEvent( TQWidget*, TQKeyEvent* ); // def in tqaccel.cpp
struct TQScrollInProgress {
static long serial;
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index c35bca0a4..4d4dad5f5 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -51,7 +51,7 @@
#include "tqguardedptr.h"
#include "tqdragobject.h"
#include "tqobjectlist.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqbitmap.h"
#include "tqpainter.h"
diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp
index 82afee051..96297bb8d 100644
--- a/src/kernel/qinternal.cpp
+++ b/src/kernel/qinternal.cpp
@@ -42,7 +42,7 @@
#include "tqwidget.h"
#include "tqpixmap.h"
#include "tqpainter.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
// Modern systems (year 2011) have very large screens in excess of 1000 pixels wide
// Some may even have screens in excess of 4000 pixels wide(!)
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index a1bf49832..8fd7485b8 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_ACCEL
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "ntqshared.h"
#include "tqvaluelist.h"
#ifndef TQT_NO_REGEXP
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index 63e08c830..3e1678c4e 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -43,7 +43,7 @@
#ifndef TQT_NO_IMAGEIO_MNG
#include "tqimage.h"
-#include "ntqasyncimageio.h"
+#include "tqasyncimageio.h"
#include "tqiodevice.h"
#include "ntqmngio.h"
@@ -237,7 +237,7 @@ TODO: decide on this point. gIFg gives disposal types, so it can be done.
*/
/*
- \class TQMNGFormatType ntqasyncimageio.h
+ \class TQMNGFormatType tqasyncimageio.h
\brief Incremental image decoder for MNG image format.
\ingroup images
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index 4da7dc3e6..3e378fb47 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -57,11 +57,11 @@
#include "tqpaintdevicemetrics.h"
#include "tqpainter.h"
#include "ntqdrawutil.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqptrstack.h"
#include "tqptrdict.h"
#include "tqstyle.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqtextengine_p.h"
#include <private/qunicodetables_p.h>
@@ -6695,7 +6695,7 @@ void TQTextImage::adjustToPainter( TQPainter* p )
#if !defined(TQ_WS_X11)
#include <tqbitmap.h>
-#include <ntqcleanuphandler.h>
+#include <tqcleanuphandler.h>
static TQPixmap *qrt_selection = 0;
static TQSingleCleanupHandler<TQPixmap> qrt_cleanup_pixmap;
static void qrt_createSelectionPixmap( const TQColorGroup &cg )
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index fbde927e1..c3b5c4b2d 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -3,19 +3,19 @@
kernel {
KERNEL_P = kernel
HEADERS += \
- $$KERNEL_H/ntqaccel.h \
+ $$KERNEL_H/tqaccel.h \
$$KERNEL_P/qucomextra_p.h \
$$KERNEL_H/ntqapplication.h \
$$KERNEL_P/qapplication_p.h \
- $$KERNEL_H/ntqasyncimageio.h \
- $$KERNEL_H/ntqasyncio.h \
+ $$KERNEL_H/tqasyncimageio.h \
+ $$KERNEL_H/tqasyncio.h \
$$KERNEL_H/tqbitmap.h \
$$KERNEL_H/tqbrush.h \
$$KERNEL_H/tqclipboard.h \
$$KERNEL_H/tqcolor.h \
$$KERNEL_P/tqcolor_p.h \
- $$KERNEL_H/ntqconnection.h \
- $$KERNEL_H/ntqcursor.h \
+ $$KERNEL_H/tqconnection.h \
+ $$KERNEL_H/tqcursor.h \
$$KERNEL_H/tqdesktopwidget.h \
$$KERNEL_H/tqdragobject.h \
$$KERNEL_H/ntqdrawutil.h \
@@ -113,7 +113,7 @@ kernel {
win32:SOURCES += $$KERNEL_CPP/qapplication_win.cpp \
$$KERNEL_CPP/tqclipboard_win.cpp \
$$KERNEL_CPP/tqcolor_win.cpp \
- $$KERNEL_CPP/qcursor_win.cpp \
+ $$KERNEL_CPP/tqcursor_win.cpp \
$$KERNEL_CPP/tqdesktopwidget_win.cpp \
$$KERNEL_CPP/qdnd_win.cpp \
$$KERNEL_CPP/tqeventloop_win.cpp \
@@ -136,7 +136,7 @@ kernel {
SOURCES += $$KERNEL_CPP/qapplication_x11.cpp \
$$KERNEL_CPP/tqclipboard_x11.cpp \
$$KERNEL_CPP/tqcolor_x11.cpp \
- $$KERNEL_CPP/qcursor_x11.cpp \
+ $$KERNEL_CPP/tqcursor_x11.cpp \
$$KERNEL_CPP/qdnd_x11.cpp \
$$KERNEL_CPP/tqdesktopwidget_x11.cpp \
$$KERNEL_CPP/tqfont_x11.cpp \
@@ -166,7 +166,7 @@ kernel {
SOURCES += $$KERNEL_CPP/qapplication_mac.cpp \
$$KERNEL_CPP/tqclipboard_mac.cpp \
$$KERNEL_CPP/tqcolor_mac.cpp \
- $$KERNEL_CPP/qcursor_mac.cpp \
+ $$KERNEL_CPP/tqcursor_mac.cpp \
$$KERNEL_CPP/tqmime_mac.cpp \
$$KERNEL_CPP/qdnd_mac.cpp \
$$KERNEL_CPP/tqdesktopwidget_mac.cpp \
@@ -195,16 +195,16 @@ kernel {
SOURCES += $$KERNEL_CPP/tqabstractlayout.cpp \
$$KERNEL_CPP/qucomextra.cpp \
- $$KERNEL_CPP/qaccel.cpp \
+ $$KERNEL_CPP/tqaccel.cpp \
$$KERNEL_CPP/qapplication.cpp \
- $$KERNEL_CPP/qasyncimageio.cpp \
- $$KERNEL_CPP/qasyncio.cpp \
+ $$KERNEL_CPP/tqasyncimageio.cpp \
+ $$KERNEL_CPP/tqasyncio.cpp \
$$KERNEL_CPP/tqbitmap.cpp \
$$KERNEL_CPP/tqclipboard.cpp \
$$KERNEL_CPP/tqcolor.cpp \
$$KERNEL_CPP/tqcolor_p.cpp \
- $$KERNEL_CPP/qconnection.cpp \
- $$KERNEL_CPP/qcursor.cpp \
+ $$KERNEL_CPP/tqconnection.cpp \
+ $$KERNEL_CPP/tqcursor.cpp \
$$KERNEL_CPP/tqdragobject.cpp \
$$KERNEL_CPP/qdrawutil.cpp \
$$KERNEL_CPP/tqdropsite.cpp \
@@ -270,10 +270,10 @@ kernel {
$$KERNEL_H/tqfontdatabase.h
accessibility {
- HEADERS += $$KERNEL_H/ntqaccessible.h
- SOURCES += $$KERNEL_CPP/qaccessible.cpp
+ HEADERS += $$KERNEL_H/tqaccessible.h
+ SOURCES += $$KERNEL_CPP/tqaccessible.cpp
- !embedded:!x11:mac:SOURCES += $$KERNEL_CPP/qaccessible_mac.cpp
- else:win32:SOURCES += $$KERNEL_CPP/qaccessible_win.cpp
+ !embedded:!x11:mac:SOURCES += $$KERNEL_CPP/tqaccessible_mac.cpp
+ else:win32:SOURCES += $$KERNEL_CPP/tqaccessible_win.cpp
}
}
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 611076c97..982ea2946 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -25,7 +25,7 @@
#include <private/qucomextra_p.h> // All moc genereated code has this include
#include <ntqapplication.h>
#include <tqbitmap.h>
-#include <ntqcursor.h>
+#include <tqcursor.h>
#include <tqdatetime.h>
#include <tqglobal.h>
#include <tqimage.h>
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 884ef1ed5..ac94aea12 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -58,7 +58,7 @@
#include "tqregion.h"
#include "tqpointarray.h"
#include "tqbitmap.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqdatetime.h"
#include "tqsizepolicy.h"
#include "ntqshared.h"
diff --git a/src/kernel/qaccel.cpp b/src/kernel/tqaccel.cpp
index e2f55f01e..c5fcc30e6 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/tqaccel.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqaccel.h"
+#include "tqaccel.h"
#ifndef TQT_NO_ACCEL
@@ -52,7 +52,7 @@
#include "ntqdockwindow.h"
#include "tqsignalslotimp.h"
/*!
- \class TQAccel ntqaccel.h
+ \class TQAccel tqaccel.h
\brief The TQAccel class handles keyboard accelerator and shortcut keys.
\ingroup misc
diff --git a/src/kernel/ntqaccel.h b/src/kernel/tqaccel.h
index 22c2f80e1..22c2f80e1 100644
--- a/src/kernel/ntqaccel.h
+++ b/src/kernel/tqaccel.h
diff --git a/src/kernel/qaccessible.cpp b/src/kernel/tqaccessible.cpp
index d486607ca..243c4384c 100644
--- a/src/kernel/qaccessible.cpp
+++ b/src/kernel/tqaccessible.cpp
@@ -36,7 +36,7 @@
**
**********************************************************************/
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
@@ -47,7 +47,7 @@
#include <stdlib.h>
/*!
- \class TQAccessible ntqaccessible.h
+ \class TQAccessible tqaccessible.h
\brief The TQAccessible class provides enums and static functions
relating to accessibility.
@@ -311,7 +311,7 @@ public slots:
void removeObject(TQObject *object);
};
-#include "qaccessible.moc"
+#include "tqaccessible.moc"
static AccessibleCache *qAccessibleInterface = 0;
static bool cleanupAdded = FALSE;
@@ -422,7 +422,7 @@ bool TQAccessible::isActive()
}
/*!
- \class TQAccessibleInterface ntqaccessible.h
+ \class TQAccessibleInterface tqaccessible.h
\brief The TQAccessibleInterface class defines an interface that exposes information about accessible objects.
\ingroup misc
@@ -633,7 +633,7 @@ bool TQAccessible::isActive()
/*!
- \class TQAccessibleObject ntqaccessible.h
+ \class TQAccessibleObject tqaccessible.h
\brief The TQAccessibleObject class implements parts of the
TQAccessibleInterface for TQObjects.
diff --git a/src/kernel/ntqaccessible.h b/src/kernel/tqaccessible.h
index 25b12077e..25b12077e 100644
--- a/src/kernel/ntqaccessible.h
+++ b/src/kernel/tqaccessible.h
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/tqasyncimageio.cpp
index c89036719..56126b3d8 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/tqasyncimageio.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqasyncimageio.h"
+#include "tqasyncimageio.h"
#ifndef TQT_NO_ASYNC_IMAGE_IO
@@ -52,7 +52,7 @@ extern void tqt_init_image_plugins();
#define Q_TRANSPARENT 0x00ffffff
/*!
- \class TQImageConsumer ntqasyncimageio.h
+ \class TQImageConsumer tqasyncimageio.h
\brief The TQImageConsumer class is an abstraction used by TQImageDecoder.
\ingroup images
@@ -154,7 +154,7 @@ extern void tqt_init_image_plugins();
/*!
- \class TQImageDecoder ntqasyncimageio.h
+ \class TQImageDecoder tqasyncimageio.h
\brief The TQImageDecoder class is an incremental image decoder for all supported image formats.
\ingroup images
@@ -531,7 +531,7 @@ void TQImageDecoder::unregisterDecoderFactory(TQImageFormatType* f)
}
/*!
- \class TQImageFormat ntqasyncimageio.h
+ \class TQImageFormat tqasyncimageio.h
\brief The TQImageFormat class is an incremental image decoder for a specific image format.
\ingroup images
@@ -583,7 +583,7 @@ TQImageFormat::~TQImageFormat()
*/
/*!
- \class TQImageFormatType ntqasyncimageio.h
+ \class TQImageFormatType tqasyncimageio.h
\brief The TQImageFormatType class is a factory that makes TQImageFormat objects.
\ingroup images
@@ -663,7 +663,7 @@ bool qt_builtin_gif_reader()
#if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
/* -- NOTDOC
- \class TQGIFFormat ntqasyncimageio.h
+ \class TQGIFFormat tqasyncimageio.h
\brief Incremental image decoder for GIF image format.
\ingroup images
@@ -702,7 +702,7 @@ TQGIFFormat::~TQGIFFormat()
/* -- NOTDOC
- \class TQGIFFormatType ntqasyncimageio.h
+ \class TQGIFFormatType tqasyncimageio.h
\brief Incremental image decoder for GIF image format.
\ingroup images
diff --git a/src/kernel/ntqasyncimageio.h b/src/kernel/tqasyncimageio.h
index 28d5bd50e..28d5bd50e 100644
--- a/src/kernel/ntqasyncimageio.h
+++ b/src/kernel/tqasyncimageio.h
diff --git a/src/kernel/qasyncio.cpp b/src/kernel/tqasyncio.cpp
index 4d3acff73..c8fe10ce4 100644
--- a/src/kernel/qasyncio.cpp
+++ b/src/kernel/tqasyncio.cpp
@@ -38,14 +38,14 @@
**
**********************************************************************/
-#include "ntqasyncio.h"
+#include "tqasyncio.h"
#include "tqiodevice.h"
#include <stdlib.h>
#ifndef TQT_NO_ASYNC_IO
/*!
- \class TQAsyncIO ntqasyncio.h
+ \class TQAsyncIO tqasyncio.h
\obsolete
\brief The TQAsyncIO class encapsulates I/O asynchronicity.
@@ -86,7 +86,7 @@ void TQAsyncIO::ready()
/*!
- \class TQDataSink ntqasyncio.h
+ \class TQDataSink tqasyncio.h
\obsolete
\brief The TQDataSink class is an asynchronous consumer of data.
@@ -132,7 +132,7 @@ void TQDataSink::maybeReady()
/*!
- \class TQDataSource ntqasyncio.h
+ \class TQDataSource tqasyncio.h
\obsolete
\brief The TQDataSource class is an asynchronous producer of data.
@@ -209,7 +209,7 @@ void TQDataSource::rewind()
}
/*!
- \class TQIODeviceSource ntqasyncio.h
+ \class TQIODeviceSource tqasyncio.h
\obsolete
\brief The TQIODeviceSource class is a TQDataSource that draws data from a TQIODevice.
@@ -297,7 +297,7 @@ void TQIODeviceSource::rewind()
/*!
- \class TQDataPump ntqasyncio.h
+ \class TQDataPump tqasyncio.h
\obsolete
\brief The TQDataPump class moves data from a TQDataSource to a TQDataSink during event processing.
diff --git a/src/kernel/ntqasyncio.h b/src/kernel/tqasyncio.h
index 6c1687e9d..6c1687e9d 100644
--- a/src/kernel/ntqasyncio.h
+++ b/src/kernel/tqasyncio.h
diff --git a/src/kernel/qconnection.cpp b/src/kernel/tqconnection.cpp
index b30a76413..14c7ca41c 100644
--- a/src/kernel/qconnection.cpp
+++ b/src/kernel/tqconnection.cpp
@@ -38,9 +38,9 @@
**
**********************************************************************/
-#include "ntqconnection.h"
+#include "tqconnection.h"
-/*! \class TQConnection ntqconnection.h
+/*! \class TQConnection tqconnection.h
\brief The TQConnection class is an internal class, used in the signal/slot mechanism.
\internal
diff --git a/src/kernel/ntqconnection.h b/src/kernel/tqconnection.h
index 6906184b7..6906184b7 100644
--- a/src/kernel/ntqconnection.h
+++ b/src/kernel/tqconnection.h
diff --git a/src/kernel/qcursor.cpp b/src/kernel/tqcursor.cpp
index 08100ccb7..c29d51311 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/tqcursor.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqcursor.h"
+#include "tqcursor.h"
#ifndef TQT_NO_CURSOR
@@ -48,7 +48,7 @@
/*!
- \class TQCursor ntqcursor.h
+ \class TQCursor tqcursor.h
\brief The TQCursor class provides a mouse cursor with an arbitrary
shape.
diff --git a/src/kernel/ntqcursor.h b/src/kernel/tqcursor.h
index aeb36d2f0..aeb36d2f0 100644
--- a/src/kernel/ntqcursor.h
+++ b/src/kernel/tqcursor.h
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/tqcursor_x11.cpp
index dffa45ce6..fd2aea158 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/tqcursor_x11.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqbitmap.h"
#include "tqimage.h"
#include "ntqapplication.h"
diff --git a/src/kernel/tqevent.cpp b/src/kernel/tqevent.cpp
index 5f4894e92..e8d042b06 100644
--- a/src/kernel/tqevent.cpp
+++ b/src/kernel/tqevent.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "tqevent.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "ntqapplication.h"
diff --git a/src/kernel/tqfont.cpp b/src/kernel/tqfont.cpp
index 1549b1836..fa050a234 100644
--- a/src/kernel/tqfont.cpp
+++ b/src/kernel/tqfont.cpp
@@ -49,7 +49,7 @@
#include "tqcache.h"
#include "tqdatastream.h"
#include "ntqapplication.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqstringlist.h"
#ifdef TQ_WS_MAC
#include "tqpaintdevicemetrics.h"
diff --git a/src/kernel/tqfont_x11.cpp b/src/kernel/tqfont_x11.cpp
index 9acbddd59..a54e13dc2 100644
--- a/src/kernel/tqfont_x11.cpp
+++ b/src/kernel/tqfont_x11.cpp
@@ -46,7 +46,7 @@
#include "tqfont.h"
#include "ntqapplication.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqfontinfo.h"
#include "tqfontdatabase.h"
#include "tqfontmetrics.h"
diff --git a/src/kernel/tqfontdatabase.cpp b/src/kernel/tqfontdatabase.cpp
index 56c1a9ed7..36bcfcfef 100644
--- a/src/kernel/tqfontdatabase.cpp
+++ b/src/kernel/tqfontdatabase.cpp
@@ -48,7 +48,7 @@
#include <private/qunicodetables_p.h>
#include "tqfontengine_p.h"
-#include <ntqcleanuphandler.h>
+#include <tqcleanuphandler.h>
#ifdef TQ_WS_X11
#include <locale.h>
diff --git a/src/kernel/tqiconset.cpp b/src/kernel/tqiconset.cpp
index a327e554f..2a251c2ff 100644
--- a/src/kernel/tqiconset.cpp
+++ b/src/kernel/tqiconset.cpp
@@ -44,7 +44,7 @@
#include "ntqapplication.h"
#include "tqbitmap.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqimage.h"
#include "tqpainter.h"
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index 733bb10d7..6c1d1ffad 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -45,7 +45,7 @@
#include "tqtextstream.h"
#include "tqbuffer.h"
#include "tqptrlist.h"
-#include "ntqasyncimageio.h"
+#include "tqasyncimageio.h"
#include "tqpngio.h"
#include "ntqmngio.h"
#include "ntqjpegio.h"
diff --git a/src/kernel/tqmime.cpp b/src/kernel/tqmime.cpp
index 14e8f8306..d230d88d8 100644
--- a/src/kernel/tqmime.cpp
+++ b/src/kernel/tqmime.cpp
@@ -45,7 +45,7 @@
#include "tqfileinfo.h"
#include "tqdir.h"
#include "tqdragobject.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "ntqapplication.h" // ### for now
#include "tqclipboard.h" // ### for now
diff --git a/src/kernel/tqmovie.cpp b/src/kernel/tqmovie.cpp
index 54743cbd6..1a29a4315 100644
--- a/src/kernel/tqmovie.cpp
+++ b/src/kernel/tqmovie.cpp
@@ -52,8 +52,8 @@
#ifndef TQT_NO_MOVIE
-#include "ntqasyncio.h"
-#include "ntqasyncimageio.h"
+#include "tqasyncio.h"
+#include "tqasyncimageio.h"
#include <stdlib.h>
diff --git a/src/kernel/tqpainter.cpp b/src/kernel/tqpainter.cpp
index 5303d5549..359954168 100644
--- a/src/kernel/tqpainter.cpp
+++ b/src/kernel/tqpainter.cpp
@@ -50,7 +50,7 @@
#include "ntqapplication.h"
#include "qrichtext_p.h"
#include "tqregexp.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include <string.h>
#include "tqtextlayout_p.h"
diff --git a/src/kernel/tqpalette.cpp b/src/kernel/tqpalette.cpp
index 6ae0459d1..fad57ce13 100644
--- a/src/kernel/tqpalette.cpp
+++ b/src/kernel/tqpalette.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_PALETTE
#include "tqdatastream.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
/*****************************************************************************
TQColorGroup member functions
diff --git a/src/kernel/tqpixmapcache.cpp b/src/kernel/tqpixmapcache.cpp
index a61b0aa71..369df0c08 100644
--- a/src/kernel/tqpixmapcache.cpp
+++ b/src/kernel/tqpixmapcache.cpp
@@ -41,7 +41,7 @@
#include "tqpixmapcache.h"
#include "tqcache.h"
#include "tqobject.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
// REVISED: paul
diff --git a/src/kernel/tqpngio.cpp b/src/kernel/tqpngio.cpp
index 16d17eb6f..cf4d5ca60 100644
--- a/src/kernel/tqpngio.cpp
+++ b/src/kernel/tqpngio.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_IMAGEIO_PNG
-#include "ntqasyncimageio.h"
+#include "tqasyncimageio.h"
#include "tqiodevice.h"
#include <png.h>
@@ -999,7 +999,7 @@ class TQPNGFormatType : public TQImageFormatType
*/
/*
- \class TQPNGFormatType ntqasyncimageio.h
+ \class TQPNGFormatType tqasyncimageio.h
\brief The TQPNGFormatType class provides an incremental image decoder
for PNG image format.
diff --git a/src/kernel/tqprocess_unix.cpp b/src/kernel/tqprocess_unix.cpp
index e065de514..c3bb2ba70 100644
--- a/src/kernel/tqprocess_unix.cpp
+++ b/src/kernel/tqprocess_unix.cpp
@@ -54,7 +54,7 @@
#include "tqptrlist.h"
#include "tqsocketnotifier.h"
#include "tqtimer.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqregexp.h"
#include "private/qinternal_p.h"
diff --git a/src/kernel/tqsignalslotimp.h b/src/kernel/tqsignalslotimp.h
index 80c18b5d2..e7e67a280 100644
--- a/src/kernel/tqsignalslotimp.h
+++ b/src/kernel/tqsignalslotimp.h
@@ -42,7 +42,7 @@
#define TQSIGNALSLOTIMP_H
#ifndef QT_H
-#include "ntqconnection.h"
+#include "tqconnection.h"
#include "tqptrlist.h"
#include "tqptrvector.h"
#endif // QT_H
diff --git a/src/kernel/tqstylesheet.cpp b/src/kernel/tqstylesheet.cpp
index 350c813c8..dbc8d4670 100644
--- a/src/kernel/tqstylesheet.cpp
+++ b/src/kernel/tqstylesheet.cpp
@@ -45,7 +45,7 @@
#include "private/qrichtext_p.h"
#include "tqlayout.h"
#include "tqpainter.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include <stdio.h>
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index 1e9a809cb..9fe528f78 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -45,14 +45,14 @@
#include "tqwidgetintdict.h"
#include "tqptrdict.h"
#include "ntqfocusdata.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqpixmap.h"
#include "ntqapplication.h"
#include "qapplication_p.h"
#include "tqbrush.h"
#include "tqlayout.h"
#include "tqstylefactory.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqstyle.h"
#include "ntqmetaobject.h"
#include "tqguardedptr.h"
@@ -60,7 +60,7 @@
#include "tqthread.h"
#endif
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#if defined(TQ_WS_WIN)
#include "qt_windows.h"
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index 85367b133..bccd0110b 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -49,7 +49,7 @@
#include "tqlayout.h"
#include "tqtextcodec.h"
#include "tqdatetime.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "qt_x11_p.h"
#include <stdlib.h>
diff --git a/src/network/tqdns.cpp b/src/network/tqdns.cpp
index 4b215eb1d..8bc081bb5 100644
--- a/src/network/tqdns.cpp
+++ b/src/network/tqdns.cpp
@@ -76,7 +76,7 @@
#include "tqfile.h"
#include "tqtextstream.h"
#include "tqsocketdevice.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include <limits.h>
#ifdef Q_OS_MAC
#include "../3rdparty/dlcompat/dlfcn.h"
diff --git a/src/opengl/tqgl.cpp b/src/opengl/tqgl.cpp
index 1e8edd59a..991d697af 100644
--- a/src/opengl/tqgl.cpp
+++ b/src/opengl/tqgl.cpp
@@ -42,7 +42,7 @@
#include "tqpixmap.h"
#include "tqpaintdevicemetrics.h"
#include "tqimage.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqptrdict.h"
static TQGLFormat* qgl_default_format = 0;
diff --git a/src/sql/tqdatatable.cpp b/src/sql/tqdatatable.cpp
index 2bcad69ff..1e8826d3c 100644
--- a/src/sql/tqdatatable.cpp
+++ b/src/sql/tqdatatable.cpp
@@ -52,7 +52,7 @@
#include "tqvaluelist.h"
#include "tqsqlmanager_p.h"
#include "tqdatetime.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqtimer.h"
//#define QT_DEBUG_DATATABLE
diff --git a/src/sql/tqeditorfactory.cpp b/src/sql/tqeditorfactory.cpp
index 76fa71996..098d850c7 100644
--- a/src/sql/tqeditorfactory.cpp
+++ b/src/sql/tqeditorfactory.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqlabel.h"
#include "tqlineedit.h"
#include "tqspinbox.h"
diff --git a/src/sql/tqsqldatabase.cpp b/src/sql/tqsqldatabase.cpp
index 4a7657248..1f8cfe6c2 100644
--- a/src/sql/tqsqldatabase.cpp
+++ b/src/sql/tqsqldatabase.cpp
@@ -83,7 +83,7 @@
#include <private/tqsqlextension_p.h>
#include "tqobject.h"
#include "tqguardedptr.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqdict.h"
#include <stdlib.h>
diff --git a/src/sql/tqsqleditorfactory.cpp b/src/sql/tqsqleditorfactory.cpp
index 31d9108f2..3598a7cac 100644
--- a/src/sql/tqsqleditorfactory.cpp
+++ b/src/sql/tqsqleditorfactory.cpp
@@ -43,7 +43,7 @@
#ifndef TQT_NO_SQL_EDIT_WIDGETS
#include "tqsqlfield.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqlabel.h"
#include "tqlineedit.h"
#include "tqspinbox.h"
diff --git a/src/sql/tqsqlpropertymap.cpp b/src/sql/tqsqlpropertymap.cpp
index 6e4f2d4cc..81a0dd4a5 100644
--- a/src/sql/tqsqlpropertymap.cpp
+++ b/src/sql/tqsqlpropertymap.cpp
@@ -43,7 +43,7 @@
#ifndef TQT_NO_SQL_FORM
#include "tqwidget.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "ntqmetaobject.h"
#include "tqmap.h"
diff --git a/src/styles/tqwindowsstyle.cpp b/src/styles/tqwindowsstyle.cpp
index 844ff294a..42d07b2b7 100644
--- a/src/styles/tqwindowsstyle.cpp
+++ b/src/styles/tqwindowsstyle.cpp
@@ -61,7 +61,7 @@
#include "tqtabbar.h"
#include "tqlistview.h"
#include "tqbitmap.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "ntqdockwindow.h"
#include "tqobjectlist.h"
#include "tqmenubar.h"
diff --git a/src/table/tqtable.cpp b/src/table/tqtable.cpp
index 002fcc502..8244304cc 100644
--- a/src/table/tqtable.cpp
+++ b/src/table/tqtable.cpp
@@ -50,7 +50,7 @@
#include <tqpainter.h>
#include <tqlineedit.h>
-#include <ntqcursor.h>
+#include <tqcursor.h>
#include <ntqapplication.h>
#include <tqtimer.h>
#include <tqobjectlist.h>
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index 2d95ce54a..5f40bdc9f 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -43,7 +43,7 @@
#include <tqsettings.h>
#include <tqfileinfo.h>
#include <tqdatetime.h>
-#include <ntqcleanuphandler.h>
+#include <tqcleanuphandler.h>
#ifndef NO_ERRNO_H
#include <errno.h>
#endif // NO_ERROR_H
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 8a2ce897f..ba4e5dd79 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -8,8 +8,8 @@ tools {
$$TOOLS_H/tqbitarray.h \
$$TOOLS_H/tqbuffer.h \
$$TOOLS_H/tqcache.h \
- $$TOOLS_H/ntqcleanuphandler.h \
- $$TOOLS_P/qcomponentfactory_p.h \
+ $$TOOLS_H/tqcleanuphandler.h \
+ $$TOOLS_P/tqcomponentfactory_p.h \
$$TOOLS_P/qcomlibrary_p.h \
$$TOOLS_H/tqcstring.h \
$$TOOLS_H/tqdatastream.h \
@@ -107,7 +107,7 @@ tools {
SOURCES += $$TOOLS_CPP/tqbitarray.cpp \
$$TOOLS_CPP/tqbuffer.cpp \
- $$TOOLS_CPP/qcomponentfactory.cpp \
+ $$TOOLS_CPP/tqcomponentfactory.cpp \
$$TOOLS_CPP/qcomlibrary.cpp \
$$TOOLS_CPP/tqcstring.cpp \
$$TOOLS_CPP/tqdatastream.cpp \
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 82d5ebc61..92bda3eb7 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -1,8 +1,8 @@
#define Q_EXPORT_TEMPLATES
#include <tqcanvas.h>
-#include <ntqaccessible.h>
-#include <ntqconnection.h>
+#include <tqaccessible.h>
+#include <tqconnection.h>
#include <tqguardedptr.h>
#include <tqobject.h>
#include <tqpoint.h>
diff --git a/src/tools/ntqcleanuphandler.h b/src/tools/tqcleanuphandler.h
index b6347f7ea..b6347f7ea 100644
--- a/src/tools/ntqcleanuphandler.h
+++ b/src/tools/tqcleanuphandler.h
diff --git a/src/tools/qcomponentfactory.cpp b/src/tools/tqcomponentfactory.cpp
index 0186e7843..6bac4b618 100644
--- a/src/tools/qcomponentfactory.cpp
+++ b/src/tools/tqcomponentfactory.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "qcomponentfactory_p.h"
+#include "tqcomponentfactory_p.h"
#ifndef TQT_NO_COMPONENT
#include "tqsettings.h"
@@ -47,7 +47,7 @@
#include "ntqapplication.h"
/*!
- \class TQComponentFactory qcomponentfactory.h
+ \class TQComponentFactory tqcomponentfactory.h
\brief The TQComponentFactory class provides static functions to create and register components.
\internal
diff --git a/src/tools/qcomponentfactory_p.h b/src/tools/tqcomponentfactory_p.h
index 89399152f..89399152f 100644
--- a/src/tools/qcomponentfactory_p.h
+++ b/src/tools/tqcomponentfactory_p.h
diff --git a/src/tools/tqregexp.cpp b/src/tools/tqregexp.cpp
index 19758f95c..1aed2ca4c 100644
--- a/src/tools/tqregexp.cpp
+++ b/src/tools/tqregexp.cpp
@@ -45,7 +45,7 @@
#include "tqmemarray.h"
#include "tqbitarray.h"
#include "tqcache.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqintdict.h"
#include "tqmap.h"
#include "tqptrvector.h"
diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp
index 546069d48..5247289df 100644
--- a/src/tools/tqstring.cpp
+++ b/src/tools/tqstring.cpp
@@ -75,7 +75,7 @@
#include <sys/mman.h>
#endif
#if !defined( TQT_NO_COMPONENT ) && !defined( QT_LITE_COMPONENT )
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#endif
#if defined(Q_OS_LINUX)
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index bfe89fcda..9886e9ea0 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -54,7 +54,7 @@
#include "tqtimer.h"
#include "tqtooltip.h"
#include "tqguardedptr.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqstyle.h"
#if defined(TQ_WS_MAC9)
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index c97c47320..f0aa7bce8 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -44,7 +44,7 @@
#ifndef TQT_NO_TITLEBAR
-#include <ntqcursor.h>
+#include <tqcursor.h>
#include "ntqapplication.h"
#include "tqstyle.h"
#include "tqdatetime.h"
diff --git a/src/widgets/tqaction.cpp b/src/widgets/tqaction.cpp
index a7e5c0e58..63a7896c5 100644
--- a/src/widgets/tqaction.cpp
+++ b/src/widgets/tqaction.cpp
@@ -43,7 +43,7 @@
#include "tqtoolbar.h"
#include "tqptrlist.h"
#include "tqpopupmenu.h"
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqtoolbutton.h"
#include "tqcombobox.h"
#include "tqtooltip.h"
diff --git a/src/widgets/tqbutton.cpp b/src/widgets/tqbutton.cpp
index d44c5baa0..333ff6270 100644
--- a/src/widgets/tqbutton.cpp
+++ b/src/widgets/tqbutton.cpp
@@ -44,7 +44,7 @@
#include "tqbitmap.h"
#include "tqpainter.h"
#include "tqtimer.h"
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqpixmapcache.h"
#include "ntqapplication.h"
#include "tqpushbutton.h"
@@ -53,7 +53,7 @@
#include "../kernel/qinternal_p.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#define AUTO_REPEAT_DELAY 300
diff --git a/src/widgets/tqcombobox.cpp b/src/widgets/tqcombobox.cpp
index 4d315b848..d431bea96 100644
--- a/src/widgets/tqcombobox.cpp
+++ b/src/widgets/tqcombobox.cpp
@@ -56,7 +56,7 @@
#include "tqstyle.h"
#include <limits.h>
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
/*!
diff --git a/src/widgets/tqdial.cpp b/src/widgets/tqdial.cpp
index 75793b5c1..6c9b4d499 100644
--- a/src/widgets/tqdial.cpp
+++ b/src/widgets/tqdial.cpp
@@ -50,7 +50,7 @@
#include "tqbitmap.h"
#include "tqstyle.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#include <math.h> // sin(), cos(), atan()
diff --git a/src/widgets/tqgroupbox.cpp b/src/widgets/tqgroupbox.cpp
index 54b5dd5cf..4a7c84902 100644
--- a/src/widgets/tqgroupbox.cpp
+++ b/src/widgets/tqgroupbox.cpp
@@ -43,7 +43,7 @@
#include "tqlayout.h"
#include "tqpainter.h"
#include "tqbitmap.h"
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqradiobutton.h"
#include "ntqfocusdata.h"
#include "tqobjectlist.h"
@@ -53,7 +53,7 @@
#include "tqcheckbox.h"
#include "tqbuttongroup.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
/*!
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index e897ccc42..35b144b81 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -57,7 +57,7 @@
#include "tqpen.h"
#include "tqbrush.h"
#include "tqtimer.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "ntqapplication.h"
#include "tqtextedit.h"
#include "tqmemarray.h"
@@ -68,7 +68,7 @@
#include "tqpixmapcache.h"
#include "tqptrdict.h"
#include "tqstringlist.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "private/qrichtext_p.h"
#include "tqstyle.h"
diff --git a/src/widgets/tqlabel.cpp b/src/widgets/tqlabel.cpp
index 7f9d858bb..414e730e5 100644
--- a/src/widgets/tqlabel.cpp
+++ b/src/widgets/tqlabel.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_LABEL
#include "tqpainter.h"
#include "ntqdrawutil.h"
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqmovie.h"
#include "tqimage.h"
#include "tqbitmap.h"
diff --git a/src/widgets/tqlineedit.cpp b/src/widgets/tqlineedit.cpp
index b781b4814..2137a01d4 100644
--- a/src/widgets/tqlineedit.cpp
+++ b/src/widgets/tqlineedit.cpp
@@ -67,7 +67,7 @@
#include <sys/mman.h>
#endif
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#ifndef TQT_NO_ACCEL
diff --git a/src/widgets/tqlistbox.cpp b/src/widgets/tqlistbox.cpp
index fcda9ac5f..e7c90ddcb 100644
--- a/src/widgets/tqlistbox.cpp
+++ b/src/widgets/tqlistbox.cpp
@@ -59,7 +59,7 @@
#include "tqpopupmenu.h"
#include "tqguardedptr.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#include <stdlib.h>
diff --git a/src/widgets/tqlistview.cpp b/src/widgets/tqlistview.cpp
index 104362f9b..084fcf203 100644
--- a/src/widgets/tqlistview.cpp
+++ b/src/widgets/tqlistview.cpp
@@ -43,7 +43,7 @@
#include "tqtimer.h"
#include "tqheader.h"
#include "tqpainter.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqptrstack.h"
#include "tqptrlist.h"
#include "tqstrlist.h"
@@ -53,7 +53,7 @@
#include "tqptrdict.h"
#include "tqptrvector.h"
#include "tqiconset.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "tqpixmapcache.h"
#include "tqpopupmenu.h"
#include "ntqtl.h"
@@ -65,7 +65,7 @@
#include "tqstylesheet.h"
#include "../kernel/qinternal_p.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
const int Unsorted = 16383;
diff --git a/src/widgets/tqmainwindow.cpp b/src/widgets/tqmainwindow.cpp
index c84e7fe65..f301d2085 100644
--- a/src/widgets/tqmainwindow.cpp
+++ b/src/widgets/tqmainwindow.cpp
@@ -48,7 +48,7 @@
#include "ntqapplication.h"
#include "tqptrlist.h"
#include "tqmap.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqpainter.h"
#include "tqmenubar.h"
#include "tqpopupmenu.h"
diff --git a/src/widgets/tqmenubar.cpp b/src/widgets/tqmenubar.cpp
index 6432d432b..192301ad7 100644
--- a/src/widgets/tqmenubar.cpp
+++ b/src/widgets/tqmenubar.cpp
@@ -45,18 +45,18 @@
#ifndef TQT_NO_MENUBAR
#include "tqmenubar.h"
#include "tqpopupmenu.h"
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqpainter.h"
#include "ntqdrawutil.h"
#include "ntqapplication.h"
#include "tqguardedptr.h"
#include "tqlayout.h"
-#include "ntqcleanuphandler.h"
+#include "tqcleanuphandler.h"
#include "../kernel/qinternal_p.h"
#include "tqstyle.h"
#include "tqtimer.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
class TQMenuDataData {
diff --git a/src/widgets/tqmultilineedit.cpp b/src/widgets/tqmultilineedit.cpp
index 8ef23e266..8311291b3 100644
--- a/src/widgets/tqmultilineedit.cpp
+++ b/src/widgets/tqmultilineedit.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_MULTILINEEDIT
#include "tqpainter.h"
#include "tqscrollbar.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqclipboard.h"
#include "tqpixmap.h"
#include "tqregexp.h"
diff --git a/src/widgets/tqpopupmenu.cpp b/src/widgets/tqpopupmenu.cpp
index 8030b23e8..5aba3873a 100644
--- a/src/widgets/tqpopupmenu.cpp
+++ b/src/widgets/tqpopupmenu.cpp
@@ -41,7 +41,7 @@
#include "tqpopupmenu.h"
#ifndef TQT_NO_POPUPMENU
#include "tqmenubar.h"
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqpainter.h"
#include "ntqdrawutil.h"
#include "ntqapplication.h"
@@ -52,12 +52,12 @@
#include "tqobjectlist.h"
#include "tqguardedptr.h"
#include "qeffects_p.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqstyle.h"
#include "tqtimer.h"
#include "tqdatetime.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
//#define ANIMATED_POPUP
diff --git a/src/widgets/tqprogressbar.cpp b/src/widgets/tqprogressbar.cpp
index fb51aa9c3..d3cde6821 100644
--- a/src/widgets/tqprogressbar.cpp
+++ b/src/widgets/tqprogressbar.cpp
@@ -47,7 +47,7 @@
#include "tqwmatrix.h"
#include "../kernel/qinternal_p.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#include <limits.h>
diff --git a/src/widgets/tqpushbutton.cpp b/src/widgets/tqpushbutton.cpp
index 2b329e9d7..22c054e2d 100644
--- a/src/widgets/tqpushbutton.cpp
+++ b/src/widgets/tqpushbutton.cpp
@@ -52,7 +52,7 @@
#include "tqtoolbar.h"
#include "tqstyle.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
/*!
diff --git a/src/widgets/tqscrollbar.cpp b/src/widgets/tqscrollbar.cpp
index 383ce44bd..3f6c683c7 100644
--- a/src/widgets/tqscrollbar.cpp
+++ b/src/widgets/tqscrollbar.cpp
@@ -46,10 +46,10 @@
#include "tqtimer.h"
#include "tqstyle.h"
#ifndef TQT_NO_CURSOR
-#include <ntqcursor.h>
+#include <tqcursor.h>
#endif
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#include <limits.h>
diff --git a/src/widgets/tqscrollview.cpp b/src/widgets/tqscrollview.cpp
index de60cccf3..71fa86123 100644
--- a/src/widgets/tqscrollview.cpp
+++ b/src/widgets/tqscrollview.cpp
@@ -44,7 +44,7 @@
#include "tqobjectlist.h"
#include "tqpainter.h"
#include "tqpixmap.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "ntqfocusdata.h"
#include "tqscrollview.h"
#include "tqptrdict.h"
diff --git a/src/widgets/tqslider.cpp b/src/widgets/tqslider.cpp
index 98d61b68d..ce25334a0 100644
--- a/src/widgets/tqslider.cpp
+++ b/src/widgets/tqslider.cpp
@@ -47,7 +47,7 @@
#include "ntqapplication.h"
#include "tqstyle.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
static const int thresholdTime = 300;
diff --git a/src/widgets/tqspinbox.cpp b/src/widgets/tqspinbox.cpp
index ff336035d..f805b65ba 100644
--- a/src/widgets/tqspinbox.cpp
+++ b/src/widgets/tqspinbox.cpp
@@ -41,7 +41,7 @@
#include "tqspinbox.h"
#ifndef TQT_NO_SPINBOX
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqpushbutton.h"
#include "tqpainter.h"
#include "tqbitmap.h"
@@ -51,7 +51,7 @@
#include "ntqapplication.h"
#include "tqstyle.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
static bool sumOutOfRange(int current, int add)
diff --git a/src/widgets/tqtabbar.cpp b/src/widgets/tqtabbar.cpp
index 3e3f623f7..140473e6a 100644
--- a/src/widgets/tqtabbar.cpp
+++ b/src/widgets/tqtabbar.cpp
@@ -38,7 +38,7 @@
#include "tqtabbar.h"
#ifndef TQT_NO_TABBAR
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqbitmap.h"
#include "tqtoolbutton.h"
#include "tqtooltip.h"
@@ -46,10 +46,10 @@
#include "tqstyle.h"
#include "tqpainter.h"
#include "tqiconset.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "../kernel/qinternal_p.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#ifdef TQ_WS_MACX
diff --git a/src/widgets/tqtabwidget.cpp b/src/widgets/tqtabwidget.cpp
index f5781754f..fdf857050 100644
--- a/src/widgets/tqtabwidget.cpp
+++ b/src/widgets/tqtabwidget.cpp
@@ -45,7 +45,7 @@
#include "ntqapplication.h"
#include "tqwidgetstack.h"
#include "tqbitmap.h"
-#include "ntqaccel.h"
+#include "tqaccel.h"
#include "tqstyle.h"
#include "tqpainter.h"
#include "tqtoolbutton.h"
diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp
index 504209717..69ae10d56 100644
--- a/src/widgets/tqtextbrowser.cpp
+++ b/src/widgets/tqtextbrowser.cpp
@@ -57,7 +57,7 @@
#include "tqsimplerichtext.h"
#include "tqdragobject.h"
#include "tqurl.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
/*!
\class TQTextBrowser tqtextbrowser.h
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 1d5805f6d..135c981cc 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -68,7 +68,7 @@
#include "tqstylesheet.h"
#include "tqdragobject.h"
#include "tqurl.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqregexp.h"
#include "tqpopupmenu.h"
#include "tqptrstack.h"
diff --git a/src/widgets/tqtoolbar.cpp b/src/widgets/tqtoolbar.cpp
index 27c06fb64..a2cfdbf1c 100644
--- a/src/widgets/tqtoolbar.cpp
+++ b/src/widgets/tqtoolbar.cpp
@@ -43,7 +43,7 @@
#include "tqmainwindow.h"
#include "tqtooltip.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqlayout.h"
#include "tqframe.h"
#include "tqobjectlist.h"
diff --git a/src/widgets/tqwhatsthis.cpp b/src/widgets/tqwhatsthis.cpp
index 1328c49ea..242016454 100644
--- a/src/widgets/tqwhatsthis.cpp
+++ b/src/widgets/tqwhatsthis.cpp
@@ -46,13 +46,13 @@
#include "tqptrdict.h"
#include "tqtoolbutton.h"
#include "ntqshared.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqbitmap.h"
#include "tqtooltip.h"
#include "tqsimplerichtext.h"
#include "tqstylesheet.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
#endif
#if defined(TQ_WS_WIN)
#include "qt_windows.h"
diff --git a/src/widgets/tqwhatsthis.h b/src/widgets/tqwhatsthis.h
index 66b4b3c90..6fc2538e5 100644
--- a/src/widgets/tqwhatsthis.h
+++ b/src/widgets/tqwhatsthis.h
@@ -45,7 +45,7 @@
#ifndef TQT_NO_WHATSTHIS
-#include "ntqcursor.h"
+#include "tqcursor.h"
class TQToolButton;
class TQPopupMenu;
diff --git a/src/widgets/tqwidgetresizehandler.cpp b/src/widgets/tqwidgetresizehandler.cpp
index 248d1b3f9..342626e53 100644
--- a/src/widgets/tqwidgetresizehandler.cpp
+++ b/src/widgets/tqwidgetresizehandler.cpp
@@ -43,7 +43,7 @@
#ifndef TQT_NO_RESIZEHANDLER
#include "tqframe.h"
#include "ntqapplication.h"
-#include "ntqcursor.h"
+#include "tqcursor.h"
#include "tqsizegrip.h"
#if defined(TQ_WS_WIN)
#include "qt_windows.h"
diff --git a/src/workspace/tqworkspace.cpp b/src/workspace/tqworkspace.cpp
index 48973398a..5803cd664 100644
--- a/src/workspace/tqworkspace.cpp
+++ b/src/workspace/tqworkspace.cpp
@@ -47,8 +47,8 @@
#include "tqtoolbutton.h"
#include "tqlabel.h"
#include "tqvbox.h"
-#include "ntqaccel.h"
-#include "ntqcursor.h"
+#include "tqaccel.h"
+#include "tqcursor.h"
#include "tqpopupmenu.h"
#include "tqmenubar.h"
#include "tqguardedptr.h"