Rename ntqobject*.h and qobject*.cpp to tqobject*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

48 files changed, 52 insertions, 52 deletions

diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index b8a42173..4e96b8de 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -37,7 +37,7 @@
 #include <ntqstringlist.h>
 #include <ntqdict.h>
 #include <ntqdatastream.h>
-#include <ntqobject.h>
+#include <tqobject.h>
 
 struct Document {
     Document( int d, int f ) : docNumber( d ), frequency( f ) {}
diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index c3856e06..17796431 100644
--- a/tools/assistant/lib/ntqassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -34,7 +34,7 @@
 #ifndef TQASSISTANTCLIENT_H
 #define TQASSISTANTCLIENT_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 
 class TQSocket;
 class TQProcess;
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index 480ba728..ba245931 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -36,7 +36,7 @@
 #include <ntqtabwidget.h>
 #include <ntqfileinfo.h>
 #include <ntqaccel.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqtimer.h>
 #include <ntqdragobject.h>
 #include <ntqfontinfo.h>
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index 6d7a90c4..3a980ad7 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -44,7 +44,7 @@
 #include "designerapp.h"
 
 #include <ntqtextstream.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqsettings.h>
 #include <ntqsplashscreen.h>
 #include <ntqdir.h>
diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index 841ab00d..ba791d06 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -49,7 +49,7 @@
 #include <ntqmainwindow.h>
 #include <ntqmenudata.h>
 #include <ntqmessagebox.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqpainter.h>
 #include <ntqstyle.h>
 #include <ntqtimer.h>
diff --git a/tools/designer/designer/actioneditorimpl.cpp b/tools/designer/designer/actioneditorimpl.cpp
index 46d5bd4f..84f48392 100644
--- a/tools/designer/designer/actioneditorimpl.cpp
+++ b/tools/designer/designer/actioneditorimpl.cpp
@@ -48,7 +48,7 @@
 #include <ntqcheckbox.h>
 #include <ntqpushbutton.h>
 #include <ntqpopupmenu.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 
 ActionEditor::ActionEditor( TQWidget* parent,  const char* name, WFlags fl )
     : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ),
diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h
index 12d51800..ce3ab98f 100644
--- a/tools/designer/designer/command.h
+++ b/tools/designer/designer/command.h
@@ -41,7 +41,7 @@
 #include <ntqrect.h>
 #include <ntqvaluelist.h>
 #include <ntqvariant.h>
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqlistview.h>
 #include <ntqptrlist.h>
 #include <ntqmap.h>
diff --git a/tools/designer/designer/customwidgeteditorimpl.h b/tools/designer/designer/customwidgeteditorimpl.h
index 49f28027..b5efa95a 100644
--- a/tools/designer/designer/customwidgeteditorimpl.h
+++ b/tools/designer/designer/customwidgeteditorimpl.h
@@ -38,7 +38,7 @@
 #include "metadatabase.h"
 
 #include <ntqmap.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 
 class TQTimer;
 class TQListBoxItem;
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index 5cc5fd48..b2eefc7c 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -23,7 +23,7 @@
 #include <ntqmap.h>
 #include <ntqmessagebox.h>
 #include <ntqmetaobject.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqpainter.h>
 #include <ntqpixmap.h>
 #include <ntqpushbutton.h>
diff --git a/tools/designer/designer/formfile.h b/tools/designer/designer/formfile.h
index d0dbe537..388bac97 100644
--- a/tools/designer/designer/formfile.h
+++ b/tools/designer/designer/formfile.h
@@ -34,7 +34,7 @@
 #ifndef FORMFILE_H
 #define FORMFILE_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include "timestamp.h"
 #include "metadatabase.h"
 
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index caf9d003..3b1d169c 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -55,7 +55,7 @@
 #include <ntqpainter.h>
 #include <ntqpen.h>
 #include <ntqlabel.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqtimer.h>
 #include <ntqapplication.h>
 #include <ntqlayout.h>
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index 4e5c1127..6570b797 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -50,7 +50,7 @@
 #include "menubareditor.h"
 
 #include <ntqpalette.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqheader.h>
 #include <ntqpopupmenu.h>
 #include <ntqtabwidget.h>
diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h
index 129e1f1f..09c52402 100644
--- a/tools/designer/designer/layout.h
+++ b/tools/designer/designer/layout.h
@@ -37,7 +37,7 @@
 #include <ntqwidget.h>
 #include <ntqmap.h>
 #include <ntqguardedptr.h>
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqlayout.h>
 #include <ntqmap.h>
 #include <ntqwidgetlist.h>
diff --git a/tools/designer/designer/listboxrename.h b/tools/designer/designer/listboxrename.h
index 8606dea4..c653f88b 100644
--- a/tools/designer/designer/listboxrename.h
+++ b/tools/designer/designer/listboxrename.h
@@ -34,7 +34,7 @@
 #ifndef LISTBOXRENAME_H
 #define LISTBOXRENAME_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqlistbox.h>
 
 class TQLineEdit;
diff --git a/tools/designer/designer/listdnd.h b/tools/designer/designer/listdnd.h
index df93f5cc..c3e414a0 100644
--- a/tools/designer/designer/listdnd.h
+++ b/tools/designer/designer/listdnd.h
@@ -34,7 +34,7 @@
 #ifndef LISTDND_H
 #define LISTDND_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqscrollview.h>
 
 class ListDnd : public TQObject
diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h
index 45722b37..43bbfbc9 100644
--- a/tools/designer/designer/mainwindow.h
+++ b/tools/designer/designer/mainwindow.h
@@ -51,7 +51,7 @@
 #include <ntqmap.h>
 #include <ntqguardedptr.h>
 #include <private/qpluginmanager_p.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 
 class TQToolBox;
 class PropertyEditor;
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index bdfd5cb9..6d6937fb 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -42,10 +42,10 @@
 #include "mainwindow.h"
 
 #include <ntqapplication.h>
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqlayout.h>
 #include <ntqptrdict.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqstrlist.h>
 #include <ntqmetaobject.h>
 #include <ntqwidgetlist.h>
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index f0903e00..72152162 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -36,7 +36,7 @@
 #include <ntqdatastream.h>
 #include <ntqdragobject.h>
 #include <ntqlineedit.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqpainter.h>
 #include <ntqpopupmenu.h>
 #include <ntqrect.h>
diff --git a/tools/designer/designer/previewwidgetimpl.cpp b/tools/designer/designer/previewwidgetimpl.cpp
index aa75de70..39e011c8 100644
--- a/tools/designer/designer/previewwidgetimpl.cpp
+++ b/tools/designer/designer/previewwidgetimpl.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
 #include "previewwidgetimpl.h"
 
 PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index 024d9a18..725e1ced 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -46,7 +46,7 @@
 #include <ntqfile.h>
 #include <ntqtextstream.h>
 #include <ntqurl.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqfeatures.h>
 #include <ntqtextcodec.h>
 #include <ntqdom.h>
diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h
index f5c6f148..ed0989d1 100644
--- a/tools/designer/designer/project.h
+++ b/tools/designer/designer/project.h
@@ -44,7 +44,7 @@
 #include "../interfaces/projectsettingsiface.h"
 #include "sourcefile.h"
 #include "formfile.h"
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqptrdict.h>
 #include "formfile.h"
 
diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp
index 19f6fede..d7663801 100644
--- a/tools/designer/designer/projectsettingsimpl.cpp
+++ b/tools/designer/designer/projectsettingsimpl.cpp
@@ -46,7 +46,7 @@
 #include <ntqcheckbox.h>
 #include <ntqfiledialog.h>
 #include <ntqcombobox.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqheader.h>
 #include <ntqpushbutton.h>
 #include <ntqlabel.h>
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 78bb88b7..99dfa254 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -64,7 +64,7 @@
 #include <ntqfontdialog.h>
 #include <ntqspinbox.h>
 #include <ntqevent.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqlistbox.h>
 #include <ntqfontdatabase.h>
 #include <ntqcolor.h>
diff --git a/tools/designer/designer/propertyobject.h b/tools/designer/designer/propertyobject.h
index 51c9db31..7aee8a15 100644
--- a/tools/designer/designer/propertyobject.h
+++ b/tools/designer/designer/propertyobject.h
@@ -1,7 +1,7 @@
 #ifndef PROPERTYOBJECT_H
 #define PROPERTYOBJECT_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqwidgetlist.h>
 #include <ntqcursor.h>
 
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index f683d3ec..99a016e5 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -67,8 +67,8 @@
 #include <ntqmenudata.h>
 #include <ntqmessagebox.h>
 #include <ntqmetaobject.h>
-#include <ntqobject.h>
-#include <ntqobjectlist.h>
+#include <tqobject.h>
+#include <tqobjectlist.h>
 #include <ntqtabbar.h>
 #ifndef TQT_NO_TABLE
 #include <ntqtable.h>
diff --git a/tools/designer/designer/sourcefile.h b/tools/designer/designer/sourcefile.h
index b659efaa..3eee5d42 100644
--- a/tools/designer/designer/sourcefile.h
+++ b/tools/designer/designer/sourcefile.h
@@ -34,7 +34,7 @@
 #ifndef SOURCEFILE_H
 #define SOURCEFILE_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include "timestamp.h"
 
 struct DesignerSourceFile;
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index 0b5200fd..8040a4aa 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -7,7 +7,7 @@
 #include <ntqfiledialog.h>
 #include <ntqtabwidget.h>
 #include <ntqpoint.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqpushbutton.h>
 #include <ntqlayout.h>
 #include <ntqfileinfo.h>
diff --git a/tools/designer/designer/timestamp.h b/tools/designer/designer/timestamp.h
index bdb88d80..f63e687b 100644
--- a/tools/designer/designer/timestamp.h
+++ b/tools/designer/designer/timestamp.h
@@ -34,7 +34,7 @@
 #ifndef TIMESTAMP_H
 #define TIMESTAMP_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqdatetime.h>
 #include <ntqtimer.h>
 
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 7a2e4586..6ad1b02d 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -75,7 +75,7 @@
 #include <ntqtabbar.h>
 #include <ntqlistbox.h>
 #include <ntqlistview.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqlcdnumber.h>
 #include <ntqslider.h>
 #include <ntqdial.h>
@@ -101,7 +101,7 @@
 
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqobject.h>
+#include <tqobject.h>
 
 FormWindow *find_formwindow( TQWidget *w )
 {
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index c49066b4..84aee803 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -43,7 +43,7 @@
 #include <ntqsize.h>
 #include <ntqpainter.h>
 #include <ntqevent.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqlabel.h>
 #include <ntqwizard.h>
 #include <ntqptrdict.h>
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index be050bce..fa02c86c 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -49,7 +49,7 @@
 #include <ntqapplication.h>
 #include <ntqpainter.h>
 #include <ntqpen.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqworkspace.h>
 #include <ntqpopupmenu.h>
 #include <ntqtextstream.h>
diff --git a/tools/designer/editor/browser.h b/tools/designer/editor/browser.h
index ac8ada28..f8d53c2e 100644
--- a/tools/designer/editor/browser.h
+++ b/tools/designer/editor/browser.h
@@ -34,7 +34,7 @@
 #ifndef BROWSER_H
 #define BROWSER_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 
 class Editor;
 class TQTextCursor;
diff --git a/tools/designer/editor/completion.h b/tools/designer/editor/completion.h
index cb46fed8..4b1b9d03 100644
--- a/tools/designer/editor/completion.h
+++ b/tools/designer/editor/completion.h
@@ -36,7 +36,7 @@
 
 #include <ntqstring.h>
 #include <ntqstringlist.h>
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqmap.h>
 
 class TQTextDocument;
diff --git a/tools/designer/editor/viewmanager.cpp b/tools/designer/editor/viewmanager.cpp
index e3627bf5..989192d9 100644
--- a/tools/designer/editor/viewmanager.cpp
+++ b/tools/designer/editor/viewmanager.cpp
@@ -37,7 +37,7 @@
 #include <ntqlayout.h>
 #include <private/qrichtext_p.h>
 #include "paragdata.h"
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqlabel.h>
 #include <ntqtimer.h>
 
diff --git a/tools/designer/examples/opengl/main.cpp b/tools/designer/examples/opengl/main.cpp
index 81a4b4ef..c30e3630 100644
--- a/tools/designer/examples/opengl/main.cpp
+++ b/tools/designer/examples/opengl/main.cpp
@@ -34,7 +34,7 @@
 
 #include <widgetinterface.h>
 
-#include <ntqobjectcleanuphandler.h>
+#include <tqobjectcleanuphandler.h>
 #include <ntqpixmap.h>
 
 #include "glwidget.h"
diff --git a/tools/designer/examples/receiver2/receiver.h b/tools/designer/examples/receiver2/receiver.h
index 773f47ec..685da7e3 100644
--- a/tools/designer/examples/receiver2/receiver.h
+++ b/tools/designer/examples/receiver2/receiver.h
@@ -1,4 +1,4 @@
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqdialog.h>
 
 class Receiver : public TQObject
diff --git a/tools/designer/interfaces/classbrowserinterface.h b/tools/designer/interfaces/classbrowserinterface.h
index 2762a329..2b95e067 100644
--- a/tools/designer/interfaces/classbrowserinterface.h
+++ b/tools/designer/interfaces/classbrowserinterface.h
@@ -48,7 +48,7 @@
 //
 
 #include <private/qcom_p.h>
-#include <ntqobject.h>
+#include <tqobject.h>
 class TQListView;
 
 // {4ede3c32-ae96-4b7a-9e38-9f1d93592391}
diff --git a/tools/designer/interfaces/designerinterface.h b/tools/designer/interfaces/designerinterface.h
index 31b750e9..b98ff4d9 100644
--- a/tools/designer/interfaces/designerinterface.h
+++ b/tools/designer/interfaces/designerinterface.h
@@ -53,7 +53,7 @@
 #include <ntqmap.h>
 #include <ntqstringlist.h>
 #include <ntqwidgetlist.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 
 struct DesignerProject;
 struct DesignerDatabase;
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tools/designer/plugins/cppeditor/cppcompletion.cpp
index a5643b91..ede83151 100644
--- a/tools/designer/plugins/cppeditor/cppcompletion.cpp
+++ b/tools/designer/plugins/cppeditor/cppcompletion.cpp
@@ -33,9 +33,9 @@
 **********************************************************************/
 
 #include "cppcompletion.h"
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqmetaobject.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqregexp.h>
 
 CppEditorCompletion::CppEditorCompletion( Editor *e )
diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
index d1270141..7b347237 100644
--- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
+++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
@@ -36,7 +36,7 @@
 #define EDITORINTERFACEIMPL_H
 
 #include <editorinterface.h>
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqguardedptr.h>
 
 class TQTimer;
diff --git a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
index 1fbd63e0..aba6008c 100644
--- a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include "languageinterfaceimpl.h"
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <designerinterface.h>
 #include <ntqfile.h>
 #include "yyreg.h"
diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp
index 3189dde0..c43bb65f 100644
--- a/tools/designer/plugins/rc/rc2ui.cpp
+++ b/tools/designer/plugins/rc/rc2ui.cpp
@@ -846,7 +846,7 @@ bool RC2UI::makeStringTable()
 	*out << "#define STRINGTABLE_H" << endl;
 	*out << endl;
 	*out << "#include <ntqstring.h>" << endl;
-	*out << "#include <ntqobject.h>" << endl;
+	*out << "#include <tqobject.h>" << endl;
 	*out << endl;
 
 	TQString ID;
diff --git a/tools/designer/shared/parser.cpp b/tools/designer/shared/parser.cpp
index f0624d7d..d001d8bd 100644
--- a/tools/designer/shared/parser.cpp
+++ b/tools/designer/shared/parser.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "parser.h"
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqstringlist.h>
 
 class NormalizeObject : public TQObject
diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp
index fa3085e5..9aae425c 100644
--- a/tools/designer/shared/ui2uib.cpp
+++ b/tools/designer/shared/ui2uib.cpp
@@ -42,7 +42,7 @@
 #include <ntqdom.h>
 #include <ntqfile.h>
 #include <ntqfont.h>
-#include <ntqobject.h>
+#include <tqobject.h>
 #include <ntqrect.h>
 #include <ntqsizepolicy.h>
 
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index 428385d5..78600c58 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/qwidgetfactory.cpp
@@ -47,7 +47,7 @@
 #include <ntqapplication.h>
 #include <ntqtooltip.h>
 #include <ntqwhatsthis.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <private/qpluginmanager_p.h>
 #include <ntqmime.h>
 #include <ntqdragobject.h>
diff --git a/tools/msg2tqm/msg2tqm.cpp b/tools/msg2tqm/msg2tqm.cpp
index 1f9688a6..07c2ff46 100644
--- a/tools/msg2tqm/msg2tqm.cpp
+++ b/tools/msg2tqm/msg2tqm.cpp
@@ -210,7 +210,7 @@ void translate( const TQString& filename, const TQString& qmfile )
 }
 
 
-// workaround for BCC problem, ntqtranslator.h includes ntqwindowdefs.h via ntqobject.h, see NEEDS_QMAIN
+// workaround for BCC problem, ntqtranslator.h includes ntqwindowdefs.h via tqobject.h, see NEEDS_QMAIN
 #if defined(main)
 #undef main
 #endif
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 9a1d0044..14edb1ef 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -41,7 +41,7 @@
 #include <ntqcombobox.h>
 #include <ntqstylefactory.h>
 #include <ntqinputcontextfactory.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 #include <ntqfontdatabase.h>
 #include <ntqlineedit.h>
 #include <ntqlistbox.h>
diff --git a/tools/qtconfig/previewwidget.cpp b/tools/qtconfig/previewwidget.cpp
index 1bb32b1d..e3433763 100644
--- a/tools/qtconfig/previewwidget.cpp
+++ b/tools/qtconfig/previewwidget.cpp
@@ -33,7 +33,7 @@
 
 #include "previewwidget.h"
 
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
 
 PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
     : PreviewWidgetBase( parent, name )