Rename more widget nt* related files to equivalent tq*

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

76 files changed, 143 insertions, 140 deletions

diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index b972d872d..f1bce7bea 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -46,19 +46,19 @@
 #include <tqeventloop.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <ntqmessagebox.h>
 #include <tqpixmap.h>
-#include <ntqprogressbar.h>
+#include <tqprogressbar.h>
 #include <tqptrlist.h>
 #include <tqptrstack.h>
 #include <tqpushbutton.h>
 #include <tqregexp.h>
 #include <tqsettings.h>
 #include <tqstatusbar.h>
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqtextbrowser.h>
 #include <tqtextstream.h>
 #include <tqtimer.h>
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index 0144943d6..f04417ee3 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -39,8 +39,8 @@
 #include "helpwindow.h"
 #include "docuparser.h"
 
-#include <ntqlistbox.h>
-#include <ntqlistview.h>
+#include <tqlistbox.h>
+#include <tqlistview.h>
 #include <tqmap.h>
 #include <tqstringlist.h>
 #include <ntqvalidator.h>
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index 20c9ceea1..16089d7f5 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -33,7 +33,7 @@
 
 #include "config.h"
 
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqfileinfo.h>
 #include <ntqaccel.h>
 #include <tqobjectlist.h>
diff --git a/tools/assistant/settingsdialogimpl.cpp b/tools/assistant/settingsdialogimpl.cpp
index 2be9b31bd..e06dea5a7 100644
--- a/tools/assistant/settingsdialogimpl.cpp
+++ b/tools/assistant/settingsdialogimpl.cpp
@@ -43,14 +43,14 @@
 #include <tqfiledialog.h>
 #include <tqfileinfo.h>
 #include <tqlineedit.h>
-#include <ntqlistbox.h>
-#include <ntqlistview.h>
+#include <tqlistbox.h>
+#include <tqlistview.h>
 #include <ntqmessagebox.h>
 #include <tqptrstack.h>
 #include <tqsettings.h>
 #include <tqtimer.h>
 #include <tqtoolbutton.h>
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqmap.h>
 
 
diff --git a/tools/assistant/settingsdialogimpl.h b/tools/assistant/settingsdialogimpl.h
index 18377e89f..1be8812f7 100644
--- a/tools/assistant/settingsdialogimpl.h
+++ b/tools/assistant/settingsdialogimpl.h
@@ -38,7 +38,7 @@
 
 #include <tqstringlist.h>
 #include <tqptrlist.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 
 class SettingsDialog : public SettingsDialogBase
 {
diff --git a/tools/assistant/topicchooserimpl.cpp b/tools/assistant/topicchooserimpl.cpp
index d81427a9c..d48005dc5 100644
--- a/tools/assistant/topicchooserimpl.cpp
+++ b/tools/assistant/topicchooserimpl.cpp
@@ -34,7 +34,7 @@
 #include "topicchooserimpl.h"
 
 #include <tqlabel.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqpushbutton.h>
 
 TopicChooser::TopicChooser( TQWidget *parent, const TQStringList &lnkNames,
diff --git a/tools/designer/designer/actioneditorimpl.cpp b/tools/designer/designer/actioneditorimpl.cpp
index f89813961..9fcea1da8 100644
--- a/tools/designer/designer/actioneditorimpl.cpp
+++ b/tools/designer/designer/actioneditorimpl.cpp
@@ -44,7 +44,7 @@
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 #include <tqpopupmenu.h>
diff --git a/tools/designer/designer/actionlistview.cpp b/tools/designer/designer/actionlistview.cpp
index 62366a774..e1552a6fd 100644
--- a/tools/designer/designer/actionlistview.cpp
+++ b/tools/designer/designer/actionlistview.cpp
@@ -33,7 +33,7 @@
 
 #include "actiondnd.h"
 #include "actionlistview.h"
-#include <ntqheader.h>
+#include <tqheader.h>
 
 ActionListView::ActionListView( TQWidget *parent, const char *name )
     : TQListView( parent, name )
diff --git a/tools/designer/designer/actionlistview.h b/tools/designer/designer/actionlistview.h
index 59f769ab4..1febacea8 100644
--- a/tools/designer/designer/actionlistview.h
+++ b/tools/designer/designer/actionlistview.h
@@ -34,7 +34,7 @@
 #ifndef ACTIONLISTVIEW_H
 #define ACTIONLISTVIEW_H
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include "actiondnd.h"
 
 class ActionItem : public TQListViewItem
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index 0520e1e87..4d149453d 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -52,14 +52,14 @@
 #include <ntqapplication.h>
 #include <ntqlayout.h>
 #include <ntqmessagebox.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqiconview.h>
 #include <tqtextedit.h>
 #include <tqptrstack.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <ntqsplitter.h>
 #ifndef TQT_NO_TABLE
-#include <ntqtable.h>
+#include <tqtable.h>
 #endif
 #include <tqaction.h>
 
diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h
index 8948bfcbd..b9a8a79ca 100644
--- a/tools/designer/designer/command.h
+++ b/tools/designer/designer/command.h
@@ -42,7 +42,7 @@
 #include <tqvaluelist.h>
 #include <ntqvariant.h>
 #include <tqobject.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <tqptrlist.h>
 #include <tqmap.h>
 #include <tqiconset.h>
diff --git a/tools/designer/designer/configtoolboxdialog.ui.h b/tools/designer/designer/configtoolboxdialog.ui.h
index 8a46e0d22..0fdf5cd68 100644
--- a/tools/designer/designer/configtoolboxdialog.ui.h
+++ b/tools/designer/designer/configtoolboxdialog.ui.h
@@ -34,7 +34,7 @@
 #include "mainwindow.h"
 #include "widgetaction.h"
 #include "listviewdnd.h"
-#include <ntqlistview.h>
+#include <tqlistview.h>
 
 void ConfigToolboxDialog::init()
 {
diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp
index 234049595..f787faff9 100644
--- a/tools/designer/designer/connectionitems.cpp
+++ b/tools/designer/designer/connectionitems.cpp
@@ -41,7 +41,7 @@
 #include <tqcombobox.h>
 #include <ntqmetaobject.h>
 #include <tqcombobox.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqaction.h>
 #include <tqdatabrowser.h>
 
diff --git a/tools/designer/designer/connectionitems.h b/tools/designer/designer/connectionitems.h
index e3db9790a..73c70b1f7 100644
--- a/tools/designer/designer/connectionitems.h
+++ b/tools/designer/designer/connectionitems.h
@@ -36,7 +36,7 @@
 
 class FormWindow;
 
-#include <ntqtable.h>
+#include <tqtable.h>
 
 class SenderItem;
 class ReceiverItem;
diff --git a/tools/designer/designer/connectiontable.h b/tools/designer/designer/connectiontable.h
index 9e5564475..83991fea9 100644
--- a/tools/designer/designer/connectiontable.h
+++ b/tools/designer/designer/connectiontable.h
@@ -34,7 +34,7 @@
 #ifndef CONNECTIONTABLE_H
 #define CONNECTIONTABLE_H
 
-#include <ntqtable.h>
+#include <tqtable.h>
 
 class ConnectionTable : public TQTable
 {
diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp
index a2fe0a13e..01f1cc17d 100644
--- a/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -40,7 +40,7 @@
 #include "widgetfactory.h"
 #include "widgetdatabase.h"
 
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
@@ -51,7 +51,7 @@
 #include <ntqmessagebox.h>
 #include <tqtimer.h>
 #include <ntqapplication.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqdom.h>
diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp
index 69d860d70..03acb323a 100644
--- a/tools/designer/designer/dbconnectionsimpl.cpp
+++ b/tools/designer/designer/dbconnectionsimpl.cpp
@@ -36,7 +36,7 @@
 #include <ntqgroupbox.h>
 #include <ntqlayout.h>
 #include "project.h"
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqlineedit.h>
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index 49a463505..62dce7889 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -14,12 +14,12 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqdialog.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
 #include <tqlineedit.h>
-#include <ntqlistbox.h>
-#include <ntqlistview.h>
+#include <tqlistbox.h>
+#include <tqlistview.h>
 #include <tqmap.h>
 #include <ntqmessagebox.h>
 #include <ntqmetaobject.h>
diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp
index 213f24378..e6cd98563 100644
--- a/tools/designer/designer/designerappiface.cpp
+++ b/tools/designer/designer/designerappiface.cpp
@@ -43,7 +43,7 @@
 #include "outputwindow.h"
 #include "../shared/widgetdatabase.h"
 #include <ntqvariant.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <tqtextedit.h>
 #include <tqstatusbar.h>
 #include "pixmapcollection.h"
diff --git a/tools/designer/designer/editfunctionsimpl.cpp b/tools/designer/designer/editfunctionsimpl.cpp
index 840f98f93..274b12d3c 100644
--- a/tools/designer/designer/editfunctionsimpl.cpp
+++ b/tools/designer/designer/editfunctionsimpl.cpp
@@ -39,7 +39,7 @@
 #include "hierarchyview.h"
 #include "project.h"
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
@@ -48,7 +48,7 @@
 #include <ntqlayout.h>
 #include <tqlabel.h>
 #include <ntqgroupbox.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqcheckbox.h>
 
 EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
diff --git a/tools/designer/designer/formsettingsimpl.cpp b/tools/designer/designer/formsettingsimpl.cpp
index 30b7b2223..05a9098b0 100644
--- a/tools/designer/designer/formsettingsimpl.cpp
+++ b/tools/designer/designer/formsettingsimpl.cpp
@@ -39,7 +39,7 @@
 #include "mainwindow.h"
 #include "project.h"
 
-#include <ntqmultilineedit.h>
+#include <tqmultilineedit.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 #include <tqradiobutton.h>
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index 5cb494074..1b23158b9 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -51,12 +51,12 @@
 
 #include <tqpalette.h>
 #include <tqobjectlist.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqpopupmenu.h>
-#include <ntqtabwidget.h>
-#include <ntqwizard.h>
+#include <tqtabwidget.h>
+#include <tqwizard.h>
 #include <tqwidgetstack.h>
-#include <ntqtabbar.h>
+#include <tqtabbar.h>
 #include <ntqfeatures.h>
 #include <ntqapplication.h>
 #include <tqtimer.h>
diff --git a/tools/designer/designer/hierarchyview.h b/tools/designer/designer/hierarchyview.h
index a7d88fd4b..77656d7f0 100644
--- a/tools/designer/designer/hierarchyview.h
+++ b/tools/designer/designer/hierarchyview.h
@@ -35,8 +35,8 @@
 #define HIRARCHYVIEW_H
 
 #include <ntqvariant.h>
-#include <ntqlistview.h>
-#include <ntqtabwidget.h>
+#include <tqlistview.h>
+#include <tqtabwidget.h>
 #include <ntqguardedptr.h>
 #include <private/qcom_p.h>
 #include "../interfaces/classbrowserinterface.h"
diff --git a/tools/designer/designer/listboxdnd.cpp b/tools/designer/designer/listboxdnd.cpp
index 076927557..4267683e7 100644
--- a/tools/designer/designer/listboxdnd.cpp
+++ b/tools/designer/designer/listboxdnd.cpp
@@ -33,7 +33,7 @@
 
 #include "listboxdnd.h"
 #include <tqwidget.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqpainter.h>
 #include <tqdragobject.h>
 #include <tqvaluelist.h>
diff --git a/tools/designer/designer/listboxdnd.h b/tools/designer/designer/listboxdnd.h
index 745d899e4..e5d72e995 100644
--- a/tools/designer/designer/listboxdnd.h
+++ b/tools/designer/designer/listboxdnd.h
@@ -35,7 +35,7 @@
 #define LISTBOXDND_H
 
 #include <tqptrlist.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include "listdnd.h"
 
 typedef TQPtrList<TQListBoxItem> ListBoxItemList;
diff --git a/tools/designer/designer/listboxeditorimpl.cpp b/tools/designer/designer/listboxeditorimpl.cpp
index ec7fa9129..7d685f6c0 100644
--- a/tools/designer/designer/listboxeditorimpl.cpp
+++ b/tools/designer/designer/listboxeditorimpl.cpp
@@ -41,7 +41,7 @@
 
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 
diff --git a/tools/designer/designer/listboxrename.cpp b/tools/designer/designer/listboxrename.cpp
index 44eb05cc7..02594892a 100644
--- a/tools/designer/designer/listboxrename.cpp
+++ b/tools/designer/designer/listboxrename.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqlineedit.h>
 #include <tqtimer.h>
 #include "listboxrename.h"
diff --git a/tools/designer/designer/listboxrename.h b/tools/designer/designer/listboxrename.h
index c653f88b0..5cc00ecf6 100644
--- a/tools/designer/designer/listboxrename.h
+++ b/tools/designer/designer/listboxrename.h
@@ -35,7 +35,7 @@
 #define LISTBOXRENAME_H
 
 #include <tqobject.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 
 class TQLineEdit;
 
diff --git a/tools/designer/designer/listeditor.ui.h b/tools/designer/designer/listeditor.ui.h
index 3092706d5..a7ee27961 100644
--- a/tools/designer/designer/listeditor.ui.h
+++ b/tools/designer/designer/listeditor.ui.h
@@ -6,7 +6,7 @@
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
 
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <ntqapplication.h>
 
 void ListEditor::init()
diff --git a/tools/designer/designer/listviewdnd.cpp b/tools/designer/designer/listviewdnd.cpp
index 72877e440..329fc195f 100644
--- a/tools/designer/designer/listviewdnd.cpp
+++ b/tools/designer/designer/listviewdnd.cpp
@@ -33,7 +33,7 @@
 
 #include "listviewdnd.h"
 #include <tqwidget.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqpainter.h>
 #include <tqdragobject.h>
 #include <tqvaluelist.h>
diff --git a/tools/designer/designer/listviewdnd.h b/tools/designer/designer/listviewdnd.h
index 2f79f1adb..1252fd05d 100644
--- a/tools/designer/designer/listviewdnd.h
+++ b/tools/designer/designer/listviewdnd.h
@@ -35,7 +35,7 @@
 #define LISTVIEWDND_H
 
 #include <tqptrlist.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include "listdnd.h"
 
 class TQWidget;
diff --git a/tools/designer/designer/listvieweditorimpl.cpp b/tools/designer/designer/listvieweditorimpl.cpp
index 51a271401..f20f310d2 100644
--- a/tools/designer/designer/listvieweditorimpl.cpp
+++ b/tools/designer/designer/listvieweditorimpl.cpp
@@ -40,13 +40,13 @@
 #include "listboxdnd.h"
 #include "listboxrename.h"
 
-#include <ntqlistview.h>
-#include <ntqheader.h>
-#include <ntqlistbox.h>
+#include <tqlistview.h>
+#include <tqheader.h>
+#include <tqlistbox.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqspinbox.h>
 #include <tqpushbutton.h>
 #include <tqptrstack.h>
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 428443f05..f91ca5d58 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -105,9 +105,9 @@
 #include <tqfile.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
-#include <ntqwizard.h>
+#include <tqwizard.h>
 #include <tqtimer.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <ntqdockwindow.h>
 #include <tqstylefactory.h>
 #include <ntqvbox.h>
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index 16a185bdf..bf1851568 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -46,7 +46,7 @@
 #include <tqworkspace.h>
 #include <ntqmessagebox.h>
 #include <tqstatusbar.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqclipboard.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp
index 8c5569094..54d71b745 100644
--- a/tools/designer/designer/outputwindow.cpp
+++ b/tools/designer/designer/outputwindow.cpp
@@ -36,10 +36,10 @@
 #include "metadatabase.h"
 #include "mainwindow.h"
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <tqtextedit.h>
 #include <ntqapplication.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <tqpainter.h>
diff --git a/tools/designer/designer/outputwindow.h b/tools/designer/designer/outputwindow.h
index 7625a43cd..0212c9324 100644
--- a/tools/designer/designer/outputwindow.h
+++ b/tools/designer/designer/outputwindow.h
@@ -34,10 +34,10 @@
 #ifndef OUTPUTWINDOW_H
 #define OUTPUTWINDOW_H
 
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 
 struct DesignerOutputDock;
 class TQTextEdit;
diff --git a/tools/designer/designer/paletteeditoradvancedimpl.cpp b/tools/designer/designer/paletteeditoradvancedimpl.cpp
index 4884c73f8..4a82b0eb0 100644
--- a/tools/designer/designer/paletteeditoradvancedimpl.cpp
+++ b/tools/designer/designer/paletteeditoradvancedimpl.cpp
@@ -40,7 +40,7 @@
 #include <tqcombobox.h>
 #include <ntqapplication.h>
 #include <tqpushbutton.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqpainter.h>
 #include <ntqgroupbox.h>
 
diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp
index 215a2f391..fd50e89ce 100644
--- a/tools/designer/designer/projectsettingsimpl.cpp
+++ b/tools/designer/designer/projectsettingsimpl.cpp
@@ -47,7 +47,7 @@
 #include <tqfiledialog.h>
 #include <tqcombobox.h>
 #include <tqobjectlist.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 7a32cd344..d388dd1c1 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -54,7 +54,7 @@
 #include <tqpainter.h>
 #include <tqpalette.h>
 #include <ntqapplication.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqlineedit.h>
 #include <tqstrlist.h>
 #include <ntqmetaobject.h>
@@ -65,7 +65,7 @@
 #include <tqspinbox.h>
 #include <tqevent.h>
 #include <tqobjectlist.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqfontdatabase.h>
 #include <tqcolor.h>
 #include <tqcolordialog.h>
@@ -85,7 +85,7 @@
 #include <tqdatetimeedit.h>
 #include <ntqassistantclient.h>
 #include <ntqdrawutil.h>
-#include <ntqmultilineedit.h> // FIXME: obsolete
+#include <tqmultilineedit.h> // FIXME: obsolete
 #include <ntqsplitter.h>
 #include <tqdatatable.h>
 #include <tqtextview.h>
diff --git a/tools/designer/designer/propertyeditor.h b/tools/designer/designer/propertyeditor.h
index 9740f0593..23b5cb2f4 100644
--- a/tools/designer/designer/propertyeditor.h
+++ b/tools/designer/designer/propertyeditor.h
@@ -36,10 +36,10 @@
 
 #include <ntqfeatures.h>
 #include <ntqvariant.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <tqptrlist.h>
 #include <ntqguardedptr.h>
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <ntqmodules.h>
 #include <tqptrlist.h>
 #include <ntqlayout.h>
diff --git a/tools/designer/designer/qcompletionedit.cpp b/tools/designer/designer/qcompletionedit.cpp
index 312ee731b..f2fdfc0f7 100644
--- a/tools/designer/designer/qcompletionedit.cpp
+++ b/tools/designer/designer/qcompletionedit.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "qcompletionedit.h"
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqsizegrip.h>
 #include <ntqapplication.h>
 #include <ntqvbox.h>
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 02a39753a..eba4cbb0b 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -58,31 +58,31 @@
 #include <tqdom.h>
 #include <ntqfeatures.h>
 #include <tqfile.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqiconview.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
-#include <ntqlistbox.h>
-#include <ntqlistview.h>
+#include <tqlistbox.h>
+#include <tqlistview.h>
 #include <tqmenudata.h>
 #include <ntqmessagebox.h>
 #include <ntqmetaobject.h>
 #include <tqobject.h>
 #include <tqobjectlist.h>
-#include <ntqtabbar.h>
+#include <tqtabbar.h>
 #ifndef TQT_NO_TABLE
-#include <ntqtable.h>
+#include <tqtable.h>
 #include <tqdatatable.h>
 #endif
-#include <ntqtabwidget.h>
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqwidget.h>
 #include <tqwidgetstack.h>
-#include <ntqwizard.h>
+#include <tqwizard.h>
 #include <tqworkspace.h>
 #include <tqworkspace.h>
 #include <ntqsplitter.h>
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index 4bd471363..b54fa16ee 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -5,7 +5,7 @@
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqfiledialog.h>
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqpoint.h>
 #include <tqobjectlist.h>
 #include <tqpushbutton.h>
diff --git a/tools/designer/designer/startdialogimpl.h b/tools/designer/designer/startdialogimpl.h
index e1800ff76..516945707 100644
--- a/tools/designer/designer/startdialogimpl.h
+++ b/tools/designer/designer/startdialogimpl.h
@@ -35,7 +35,7 @@
 #define STARTDIALOGIMPL_H
 
 #include <tqiconview.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqfiledialog.h>
diff --git a/tools/designer/designer/styledbutton.h b/tools/designer/designer/styledbutton.h
index 5bc1d9782..d57cd6984 100644
--- a/tools/designer/designer/styledbutton.h
+++ b/tools/designer/designer/styledbutton.h
@@ -34,7 +34,7 @@
 #ifndef STYLEDBUTTON_H
 #define STYLEDBUTTON_H
 
-#include <ntqbutton.h>
+#include <tqbutton.h>
 #include <tqpixmap.h>
 
 class TQColor;
diff --git a/tools/designer/designer/tableeditor.ui b/tools/designer/designer/tableeditor.ui
index 17e63f2ae..9be2501e8 100644
--- a/tools/designer/designer/tableeditor.ui
+++ b/tools/designer/designer/tableeditor.ui
@@ -801,7 +801,7 @@
     <tabstop>buttonHelp</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">ntqtable.h</include>
+    <include location="global" impldecl="in implementation">tqtable.h</include>
 </includes>
 <slots>
     <slot access="protected">init()</slot>
diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp
index d1149670e..7c5388bee 100644
--- a/tools/designer/designer/tableeditorimpl.cpp
+++ b/tools/designer/designer/tableeditorimpl.cpp
@@ -33,19 +33,19 @@
 
 #include "tableeditorimpl.h"
 #ifndef TQT_NO_TABLE
-#include <ntqtable.h>
+#include <tqtable.h>
 #endif
 #include "formwindow.h"
 #include <tqlabel.h>
 #include <tqcombobox.h>
-#include <ntqheader.h>
-#include <ntqlistbox.h>
+#include <tqheader.h>
+#include <tqlistbox.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include "pixmapchooser.h"
 #include "command.h"
 #include <tqvaluelist.h>
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqdatatable.h>
 #include "project.h"
 #include "metadatabase.h"
diff --git a/tools/designer/designer/variabledialogimpl.cpp b/tools/designer/designer/variabledialogimpl.cpp
index 017767313..976f7da14 100644
--- a/tools/designer/designer/variabledialogimpl.cpp
+++ b/tools/designer/designer/variabledialogimpl.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <ntqgroupbox.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 45fb9a901..b585198eb 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -58,7 +58,7 @@
 #include <ntqgroupbox.h>
 #include <tqiconview.h>
 #ifndef TQT_NO_TABLE
-#include <ntqtable.h>
+#include <tqtable.h>
 #endif
 #ifndef TQT_NO_SQL
 #include <tqdatatable.h>
@@ -66,26 +66,26 @@
 #include <tqdatetimeedit.h>
 #include <tqlineedit.h>
 #include <tqspinbox.h>
-#include <ntqmultilineedit.h>
+#include <tqmultilineedit.h>
 #include <tqtextedit.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
 #include <tqwidgetstack.h>
 #include <tqcombobox.h>
-#include <ntqtabbar.h>
-#include <ntqlistbox.h>
-#include <ntqlistview.h>
+#include <tqtabbar.h>
+#include <tqlistbox.h>
+#include <tqlistview.h>
 #include <tqobjectlist.h>
 #include <tqlcdnumber.h>
 #include <tqslider.h>
 #include <tqdial.h>
-#include <ntqprogressbar.h>
+#include <tqprogressbar.h>
 #include <tqtextview.h>
 #include <tqtextbrowser.h>
-#include <ntqframe.h>
+#include <tqframe.h>
 #include <ntqmetaobject.h>
 #include <tqwidgetstack.h>
-#include <ntqwizard.h>
+#include <tqwizard.h>
 #include <tqvaluelist.h>
 #include <tqtimer.h>
 #include <tqscrollbar.h>
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 4256a7f0e..96e1d5644 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -38,20 +38,20 @@
 #include <tqiconset.h>
 #include <tqstring.h>
 #include <tqintdict.h>
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqpixmap.h>
 #include <tqsize.h>
 #include <tqpainter.h>
 #include <tqevent.h>
 #include <tqobjectlist.h>
 #include <tqlabel.h>
-#include <ntqwizard.h>
+#include <tqwizard.h>
 #include <tqptrdict.h>
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
-#include <ntqbuttongroup.h>
+#include <tqbuttongroup.h>
 #include <tqwidgetstack.h>
 #include <ntqguardedptr.h>
 #include <tqtoolbox.h>
diff --git a/tools/designer/designer/wizardeditorimpl.cpp b/tools/designer/designer/wizardeditorimpl.cpp
index 0450c76e5..a0c75ca3c 100644
--- a/tools/designer/designer/wizardeditorimpl.cpp
+++ b/tools/designer/designer/wizardeditorimpl.cpp
@@ -38,8 +38,8 @@
 #include "listboxdnd.h"
 #include "listboxrename.h"
 
-#include <ntqwizard.h>
-#include <ntqlistbox.h>
+#include <tqwizard.h>
+#include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <ntqinputdialog.h>
 
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index ffe52975d..0c501495d 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -43,7 +43,7 @@
 #include "sourceeditor.h"
 #include "propertyeditor.h"
 
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqdragobject.h>
 #include <tqfileinfo.h>
 #include <ntqapplication.h>
diff --git a/tools/designer/designer/workspace.h b/tools/designer/designer/workspace.h
index 4f5bea132..6bea36b6d 100644
--- a/tools/designer/designer/workspace.h
+++ b/tools/designer/designer/workspace.h
@@ -34,7 +34,7 @@
 #ifndef WORKSPACE_H
 #define WORKSPACE_H
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
 
 class FormWindow;
 class TQResizeEvent;
diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp
index 5589bac6c..6d3d78f8e 100644
--- a/tools/designer/editor/arghintwidget.cpp
+++ b/tools/designer/editor/arghintwidget.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "arghintwidget.h"
-#include <ntqbutton.h>
+#include <tqbutton.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
 #include <tqpainter.h>
diff --git a/tools/designer/editor/arghintwidget.h b/tools/designer/editor/arghintwidget.h
index 5de4a129f..9f0c69a05 100644
--- a/tools/designer/editor/arghintwidget.h
+++ b/tools/designer/editor/arghintwidget.h
@@ -34,7 +34,7 @@
 #ifndef ARGHINTWIDGET_H
 #define ARGHINTWIDGET_H
 
-#include <ntqframe.h>
+#include <tqframe.h>
 
 class TQLabel;
 class ArrowButton;
diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp
index 1eee65d64..9f6469c2b 100644
--- a/tools/designer/editor/completion.cpp
+++ b/tools/designer/editor/completion.cpp
@@ -34,7 +34,7 @@
 #include "completion.h"
 #include "paragdata.h"
 #include "editor.h"
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <ntqvbox.h>
 #include <tqmap.h>
 #include <private/qrichtext_p.h>
diff --git a/tools/designer/examples/credit/creditformbase.cpp b/tools/designer/examples/credit/creditformbase.cpp
index 51957cedb..d79e3e989 100644
--- a/tools/designer/examples/credit/creditformbase.cpp
+++ b/tools/designer/examples/credit/creditformbase.cpp
@@ -9,7 +9,7 @@
 #include "creditformbase.h"
 
 #include <ntqvariant.h>   // first for gcc 2.7.2
-#include <ntqbuttongroup.h>
+#include <tqbuttongroup.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
index 82b41e77a..879e39d1b 100644
--- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
@@ -36,7 +36,7 @@
 #include <designerinterface.h>
 #include "mainfilesettings.h"
 #include <tqlineedit.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 
 SourceTemplateInterfaceImpl::SourceTemplateInterfaceImpl()
 {
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index 753249e55..2d4087729 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -36,7 +36,7 @@
 
 #include "dlg2ui.h"
 #include <tqfile.h>
-#include <ntqframe.h>
+#include <tqframe.h>
 #include <ntqmessagebox.h>
 #include <tqregexp.h>
 #include <tqtextstream.h>
diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp
index b9b54b0b0..49027ba4a 100644
--- a/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tools/designer/plugins/glade/glade2ui.cpp
@@ -39,7 +39,7 @@
 #include <ntqapplication.h>
 #include <tqfile.h>
 #include <tqimage.h>
-#include <ntqprogressdialog.h>
+#include <tqprogressdialog.h>
 #include <ntqmessagebox.h>
 #include <tqrect.h>
 #include <tqregexp.h>
@@ -1195,9 +1195,9 @@ void Glade2Ui::emitGtkNotebookChildWidgets(
     }
 }
 
-void Glade2Ui::emitTQListViewColumns( const TQDomElement& qlistview )
+void Glade2Ui::emitTQListViewColumns( const TQDomElement& tqlistview )
 {
-    TQDomNode n = qlistview.firstChild();
+    TQDomNode n = tqlistview.firstChild();
     while ( !n.isNull() ) {
 	TQString tagName = n.toElement().tagName();
 	if ( tagName == TQString("widget") ) {
diff --git a/tools/designer/plugins/glade/glade2ui.h b/tools/designer/plugins/glade/glade2ui.h
index 1d28803e3..936a0ab5b 100644
--- a/tools/designer/plugins/glade/glade2ui.h
+++ b/tools/designer/plugins/glade/glade2ui.h
@@ -122,7 +122,7 @@ private:
 				   const TQStringList& items );
     void emitGtkNotebookChildWidgets(
 	    const TQValueList<TQDomElement>& childWidgets );
-    void emitTQListViewColumns( const TQDomElement& qlistview );
+    void emitTQListViewColumns( const TQDomElement& tqlistview );
     void emitGtkScrolledWindowChildWidgets(
 	    const TQValueList<TQDomElement>& childWidgets,
 	    const TQString& qtClass );
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 6f8fce263..3e87b48dc 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -33,7 +33,7 @@
 
 #include "sqlformwizardimpl.h"
 
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqwidget.h>
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
@@ -43,8 +43,8 @@
 #include <ntqlayout.h>
 #include <tqregexp.h>
 #include <tqpushbutton.h>
-#include <ntqmultilineedit.h>
-#include <ntqlistview.h>
+#include <tqmultilineedit.h>
+#include <tqlistview.h>
 #include <ntqfeatures.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index 356a88a1a..42976f657 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -64,17 +64,20 @@ static bool was_in_setup = FALSE;
 // It will be removed afterwards
 static TQString converted_widgets[] =
 {
+    "TQButton", "TQButtonGroup",
     "TQCheckBox", "TQColorDialog", "TQComboBox",
     "TQDateTimeEdit", "TQDesktopWidget", "TQDial", "TQDialog",
-    "TQFileDialog",
+    "TQFileDialog", "TQFrame",
+    "TQGrid", "TQGridView",
+    "TQHeader",
     "TQIconView",
-    "TQLabel", "TQLCDNumber", "TQLineEdit",
-    "TQMainWindow", "TQMenuBar",
-    "TQPopupMenu", "TQPushButton",
+    "TQLabel", "TQLCDNumber", "TQLineEdit", "TQListBox", "TQListView", 
+    "TQMainWindow", "TQMenuBar", "TQMultiLineEdit",
+    "TQPopupMenu", "TQProgressBar", "TQProgressDialog", "TQPushButton",
     "TQRadioButton",
     "TQScrollBar", "TQScrollView", "TQSizeGrip", "TQSlider", "TQSpinBox", "TQStatusBar",
-    "TQTextBrowser", "TQTextEdit", "TQTextView", "TQToolBar", "TQToolBox", "TQToolButton", "TQToolTip",
-    "TQWidget", "TQWidgetStack", "TQWorkspace"
+    "TQTabBar", "TQTabDialog", "TQTabWidget", "TQTable", "TQTextBrowser", "TQTextEdit", "TQTextView", "TQToolBar", "TQToolBox", "TQToolButton", "TQToolTip",
+    "TQWidget", "TQWidgetStack", "TQWizard", "TQWorkspace"
 };
 size_t converted_widgets_size = sizeof(converted_widgets) / sizeof(TQString);
 
@@ -424,7 +427,7 @@ void WidgetDatabase::setupDataBase( int id )
     r->name = "Line";
     r->group = widgetGroup( "Display" );
     r->toolTip = "Line";
-    r->includeFile = "ntqframe.h";
+    r->includeFile = "tqframe.h";
     r->whatsThis = "The Line widget provides horizontal and vertical lines.";
 
     append( r );
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index 143d9a02a..a9c950cc6 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -808,7 +808,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 		continue;
 	    }
 	    if (( name.mid( 1 ) == "ListView" ) || ( name.mid( 2 ) == "ListView" ))
-		globalIncludes += "ntqheader.h";
+		globalIncludes += "tqheader.h";
 	    if ( name != objClass ) {
 		int wid = WidgetDatabase::idFromClassName( name );
 		TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( name );
diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index 6bfe35607..6d018f628 100644
--- a/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -64,30 +64,30 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <ntqgroupbox.h>
-#include <ntqbuttongroup.h>
+#include <tqbuttongroup.h>
 #include <tqiconview.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #ifndef TQT_NO_TABLE
-#include <ntqtable.h>
+#include <tqtable.h>
 #endif
-#include <ntqlistbox.h>
-#include <ntqlistview.h>
+#include <tqlistbox.h>
+#include <tqlistview.h>
 #include <tqlineedit.h>
 #include <tqspinbox.h>
-#include <ntqmultilineedit.h>
+#include <tqmultilineedit.h>
 #include <tqlabel.h>
 #include <tqwidget.h>
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqcombobox.h>
 #include <tqdialog.h>
-#include <ntqwizard.h>
+#include <tqwizard.h>
 #include <tqlcdnumber.h>
-#include <ntqprogressbar.h>
+#include <tqprogressbar.h>
 #include <tqtextview.h>
 #include <tqtextbrowser.h>
 #include <tqdial.h>
 #include <tqslider.h>
-#include <ntqframe.h>
+#include <tqframe.h>
 #include <tqwidgetstack.h>
 #include <tqtoolbox.h>
 #include <tqtextedit.h>
@@ -101,7 +101,7 @@
 #include <tqdatetimeedit.h>
 #include <ntqvbox.h>
 #include <ntqhbox.h>
-#include <ntqgrid.h>
+#include <tqgrid.h>
 
 #include <stdlib.h>
 
diff --git a/tools/linguist/linguist/listviews.h b/tools/linguist/linguist/listviews.h
index 877960114..49177d061 100644
--- a/tools/linguist/linguist/listviews.h
+++ b/tools/linguist/linguist/listviews.h
@@ -39,7 +39,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqregexp.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 
 class LVI : public TQListViewItem
 {
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index 16bab1075..54a5b5f9a 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -55,7 +55,7 @@
 #include <tqwhatsthis.h>
 #include <ntqvbox.h>
 #include <tqmainwindow.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqregexp.h>
 #include <ntqdockarea.h>
 #include <ntqdockwindow.h>
diff --git a/tools/linguist/linguist/phraselv.cpp b/tools/linguist/linguist/phraselv.cpp
index 61cfa3a63..6e93ea4ca 100644
--- a/tools/linguist/linguist/phraselv.cpp
+++ b/tools/linguist/linguist/phraselv.cpp
@@ -41,7 +41,7 @@
 
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 
 class WhatPhrase : public TQWhatsThis
 {
diff --git a/tools/linguist/linguist/phraselv.h b/tools/linguist/linguist/phraselv.h
index e2e7ee19b..4d0ed8ca9 100644
--- a/tools/linguist/linguist/phraselv.h
+++ b/tools/linguist/linguist/phraselv.h
@@ -36,7 +36,7 @@
 
 #include "phrase.h"
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
 
 class TQWhatsThis;
 
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index 6de1b47d9..38b40f866 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -56,7 +56,7 @@
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <tqfileinfo.h>
-#include <ntqheader.h>
+#include <tqheader.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
 #include <tqmenubar.h>
diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h
index 71864c6fb..13c0b64e4 100644
--- a/tools/linguist/linguist/trwindow.h
+++ b/tools/linguist/linguist/trwindow.h
@@ -44,7 +44,7 @@
 #include <tqprinter.h>
 #include <tqstringlist.h>
 #include <tqpixmap.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 
 class TQAction;
 class TQDialog;
diff --git a/tools/linguist/tutorial/tt2/arrowpad.h b/tools/linguist/tutorial/tt2/arrowpad.h
index e0d304922..13c061d5d 100644
--- a/tools/linguist/tutorial/tt2/arrowpad.h
+++ b/tools/linguist/tutorial/tt2/arrowpad.h
@@ -7,7 +7,7 @@
 #ifndef ARROWPAD_H
 #define ARROWPAD_H
 
-#include <ntqgrid.h>
+#include <tqgrid.h>
 
 class ArrowPad : public TQGrid
 {
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index f01802bec..65fcaa4d2 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -35,7 +35,7 @@
 #include <ntqapplication.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include <ntqhbox.h>
 #include <tqlabel.h>
 #include <ntqmessagebox.h>
diff --git a/tools/qtconfig/colorbutton.h b/tools/qtconfig/colorbutton.h
index 9b1351f65..612302822 100644
--- a/tools/qtconfig/colorbutton.h
+++ b/tools/qtconfig/colorbutton.h
@@ -34,7 +34,7 @@
 #ifndef COLORBUTTON_H
 #define COLORBUTTON_H
 
-#include <ntqbutton.h>
+#include <tqbutton.h>
 
 
 class ColorButton : public TQButton
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 4e3ab416b..d0203e9ec 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -44,7 +44,7 @@
 #include <tqobjectlist.h>
 #include <tqfontdatabase.h>
 #include <tqlineedit.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
 #include <tqfiledialog.h>
diff --git a/tools/qtconfig/paletteeditoradvanced.cpp b/tools/qtconfig/paletteeditoradvanced.cpp
index 959017cce..92c3048cb 100644
--- a/tools/qtconfig/paletteeditoradvanced.cpp
+++ b/tools/qtconfig/paletteeditoradvanced.cpp
@@ -38,7 +38,7 @@
 #include <tqcombobox.h>
 #include <ntqapplication.h>
 #include <tqpushbutton.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqpainter.h>
 #include <ntqgroupbox.h>