Rename text class nt* related files to equivalent tq*

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

42 files changed, 54 insertions, 53 deletions

diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index bc866eab0..073727cf3 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -47,7 +47,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <ntqheader.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlineedit.h>
 #include <ntqmessagebox.h>
 #include <tqpixmap.h>
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index a2e3b4019..8c1977309 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -577,7 +577,7 @@
     <include location="global" impldecl="in implementation">ntqaccel.h</include>
     <include location="global" impldecl="in implementation">ntqcombobox.h</include>
     <include location="global" impldecl="in implementation">tqpaintdevicemetrics.h</include>
-    <include location="global" impldecl="in implementation">ntqsimplerichtext.h</include>
+    <include location="global" impldecl="in implementation">tqsimplerichtext.h</include>
     <include location="global" impldecl="in implementation">tqfileinfo.h</include>
     <include location="global" impldecl="in implementation">tqtextstream.h</include>
     <include location="global" impldecl="in implementation">ntqdockwindow.h</include>
diff --git a/tools/assistant/topicchooserimpl.cpp b/tools/assistant/topicchooserimpl.cpp
index 736aa4845..a0ff04826 100644
--- a/tools/assistant/topicchooserimpl.cpp
+++ b/tools/assistant/topicchooserimpl.cpp
@@ -33,7 +33,7 @@
 
 #include "topicchooserimpl.h"
 
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlistbox.h>
 #include <ntqpushbutton.h>
 
diff --git a/tools/designer/designer/actioneditorimpl.cpp b/tools/designer/designer/actioneditorimpl.cpp
index ee1c0f1c6..938b8f25e 100644
--- a/tools/designer/designer/actioneditorimpl.cpp
+++ b/tools/designer/designer/actioneditorimpl.cpp
@@ -42,7 +42,7 @@
 
 #include <tqaction.h>
 #include <ntqlineedit.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <ntqlistview.h>
 #include <ntqcheckbox.h>
diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp
index fa88543ed..296000d9a 100644
--- a/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -45,7 +45,7 @@
 #include <ntqlineedit.h>
 #include <ntqcombobox.h>
 #include <ntqspinbox.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqmessagebox.h>
 #include <tqfiledialog.h>
 #include <ntqmessagebox.h>
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index e2544b926..0be6a87ac 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -15,7 +15,7 @@
 #include <ntqcombobox.h>
 #include <ntqdialog.h>
 #include <ntqheader.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlayout.h>
 #include <ntqlineedit.h>
 #include <ntqlistbox.h>
@@ -31,7 +31,7 @@
 #include <tqstring.h>
 #include <tqtooltip.h>
 #include <ntqvariant.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <tqwidget.h>
 
 #include "command.h"
diff --git a/tools/designer/designer/editfunctionsimpl.cpp b/tools/designer/designer/editfunctionsimpl.cpp
index 437dec8c2..dbdbe133b 100644
--- a/tools/designer/designer/editfunctionsimpl.cpp
+++ b/tools/designer/designer/editfunctionsimpl.cpp
@@ -46,7 +46,7 @@
 #include <tqstrlist.h>
 #include <ntqmessagebox.h>
 #include <ntqlayout.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqgroupbox.h>
 #include <ntqheader.h>
 #include <ntqcheckbox.h>
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index 1e023fda0..4b8fb1d2f 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -54,7 +54,7 @@
 #include <ntqevent.h>
 #include <tqpainter.h>
 #include <tqpen.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqobjectlist.h>
 #include <tqtimer.h>
 #include <ntqapplication.h>
@@ -67,7 +67,7 @@
 #include <tqpopupmenu.h>
 #include <tqsizegrip.h>
 #include <ntqpushbutton.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <ntqmetaobject.h>
 #include <tqtooltip.h>
 #include <ntqfeatures.h>
diff --git a/tools/designer/designer/iconvieweditorimpl.cpp b/tools/designer/designer/iconvieweditorimpl.cpp
index 7f45cda5e..34bbf1bdb 100644
--- a/tools/designer/designer/iconvieweditorimpl.cpp
+++ b/tools/designer/designer/iconvieweditorimpl.cpp
@@ -37,7 +37,7 @@
 #include "pixmapchooser.h"
 
 #include <ntqlineedit.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqiconview.h>
 #include <ntqpushbutton.h>
 #include <ntqcheckbox.h>
diff --git a/tools/designer/designer/listboxeditorimpl.cpp b/tools/designer/designer/listboxeditorimpl.cpp
index e1bfb45a8..907648d1d 100644
--- a/tools/designer/designer/listboxeditorimpl.cpp
+++ b/tools/designer/designer/listboxeditorimpl.cpp
@@ -40,7 +40,7 @@
 #include "listboxrename.h"
 
 #include <ntqlineedit.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlistbox.h>
 #include <ntqpushbutton.h>
 #include <ntqcheckbox.h>
diff --git a/tools/designer/designer/listvieweditorimpl.cpp b/tools/designer/designer/listvieweditorimpl.cpp
index 9bce2ffaf..6d2e98235 100644
--- a/tools/designer/designer/listvieweditorimpl.cpp
+++ b/tools/designer/designer/listvieweditorimpl.cpp
@@ -45,7 +45,7 @@
 #include <ntqlistbox.h>
 #include <ntqlineedit.h>
 #include <ntqcheckbox.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqtabwidget.h>
 #include <ntqspinbox.h>
 #include <ntqpushbutton.h>
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index a8ff8b6fb..3c188d6c6 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -100,11 +100,11 @@
 #include <tqbuffer.h>
 #include <tqdir.h>
 #include <tqstyle.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqstatusbar.h>
 #include <tqfile.h>
 #include <ntqcheckbox.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <ntqwizard.h>
 #include <tqtimer.h>
 #include <ntqlistbox.h>
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index ec13ffca7..1699b4725 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 #include <tqaction.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 #include <ntqlineedit.h>
diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp
index f050bdab6..b1d237eef 100644
--- a/tools/designer/designer/newformimpl.cpp
+++ b/tools/designer/designer/newformimpl.cpp
@@ -45,7 +45,7 @@
 #include "sourcefile.h"
 
 #include <tqiconview.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
 #include <ntqpushbutton.h>
diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp
index 169a5c9cb..1ded61d8b 100644
--- a/tools/designer/designer/pixmapchooser.cpp
+++ b/tools/designer/designer/pixmapchooser.cpp
@@ -47,7 +47,7 @@
 #include <ntqapplication.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlineedit.h>
 #include <ntqpushbutton.h>
 #include <tqiconview.h>
diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp
index 2699421ed..27554c196 100644
--- a/tools/designer/designer/projectsettingsimpl.cpp
+++ b/tools/designer/designer/projectsettingsimpl.cpp
@@ -49,7 +49,7 @@
 #include <tqobjectlist.h>
 #include <ntqheader.h>
 #include <ntqpushbutton.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 
 /*
  *  Constructs a ProjectSettings which is a child of 'parent', with the
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 30525df70..c38b86dab 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -69,12 +69,12 @@
 #include <tqfontdatabase.h>
 #include <tqcolor.h>
 #include <tqcolordialog.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlayout.h>
 #include <tqsizepolicy.h>
 #include <tqbitmap.h>
 #include <tqtooltip.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <ntqaccel.h>
 #include <tqworkspace.h>
 #include <tqtimer.h>
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index b1cd5d1bb..b1974e311 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -60,7 +60,7 @@
 #include <tqfile.h>
 #include <ntqheader.h>
 #include <tqiconview.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlayout.h>
 #include <ntqlistbox.h>
 #include <ntqlistview.h>
@@ -79,7 +79,7 @@
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 #include <tqtooltip.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <tqwidget.h>
 #include <tqwidgetstack.h>
 #include <ntqwizard.h>
diff --git a/tools/designer/designer/sizehandle.cpp b/tools/designer/designer/sizehandle.cpp
index 7cb3749b0..60d36cfd8 100644
--- a/tools/designer/designer/sizehandle.cpp
+++ b/tools/designer/designer/sizehandle.cpp
@@ -39,7 +39,7 @@
 
 #include <tqwidget.h>
 #include <ntqapplication.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 
 SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
     : TQWidget( parent )
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index 1d618a3d0..b27131ae6 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -3,7 +3,7 @@
 #include <tqptrlist.h>
 #include <tqiconview.h>
 #include <ntqcombobox.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqfiledialog.h>
 #include <ntqtabwidget.h>
 #include <tqpoint.h>
diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp
index 543da3c9a..fdee54823 100644
--- a/tools/designer/designer/styledbutton.cpp
+++ b/tools/designer/designer/styledbutton.cpp
@@ -37,7 +37,7 @@
 #include "pixmapchooser.h"
 #include <tqcolordialog.h>
 #include <tqpalette.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp
index 329dd667a..38d043f96 100644
--- a/tools/designer/designer/tableeditorimpl.cpp
+++ b/tools/designer/designer/tableeditorimpl.cpp
@@ -36,7 +36,7 @@
 #include <ntqtable.h>
 #endif
 #include "formwindow.h"
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqcombobox.h>
 #include <ntqheader.h>
 #include <ntqlistbox.h>
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 9fb3e33dd..edc24274b 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -68,7 +68,7 @@
 #include <ntqspinbox.h>
 #include <ntqmultilineedit.h>
 #include <tqtextedit.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlayout.h>
 #include <tqwidgetstack.h>
 #include <ntqcombobox.h>
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 6e5b45370..93cece6c2 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -44,7 +44,7 @@
 #include <tqpainter.h>
 #include <ntqevent.h>
 #include <tqobjectlist.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqwizard.h>
 #include <tqptrdict.h>
 #include <ntqpushbutton.h>
diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp
index c8f643ba1..5589bac6c 100644
--- a/tools/designer/editor/arghintwidget.cpp
+++ b/tools/designer/editor/arghintwidget.cpp
@@ -33,7 +33,7 @@
 
 #include "arghintwidget.h"
 #include <ntqbutton.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlayout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
diff --git a/tools/designer/editor/viewmanager.cpp b/tools/designer/editor/viewmanager.cpp
index f4f3e8b7e..521e202a6 100644
--- a/tools/designer/editor/viewmanager.cpp
+++ b/tools/designer/editor/viewmanager.cpp
@@ -38,7 +38,7 @@
 #include <private/qrichtext_p.h>
 #include "paragdata.h"
 #include <tqobjectlist.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqtimer.h>
 
 ViewManager::ViewManager( TQWidget *parent, const char *name )
diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui
index 199c9bf0e..f76e39e1b 100644
--- a/tools/designer/examples/colortool/mainform.ui
+++ b/tools/designer/examples/colortool/mainform.ui
@@ -527,7 +527,7 @@
     <include location="local" impldecl="in implementation">tqstatusbar.h</include>
     <include location="local" impldecl="in implementation">ntqmessagebox.h</include>
     <include location="local" impldecl="in implementation">tqclipboard.h</include>
-    <include location="local" impldecl="in implementation">ntqlabel.h</include>
+    <include location="local" impldecl="in implementation">tqlabel.h</include>
     <include location="local" impldecl="in implementation">ntqlineedit.h</include>
     <include location="local" impldecl="in implementation">optionsform.h</include>
     <include location="local" impldecl="in implementation">mainform.ui.h</include>
diff --git a/tools/designer/examples/credit/creditformbase.cpp b/tools/designer/examples/credit/creditformbase.cpp
index 788ccf6a4..7ea445897 100644
--- a/tools/designer/examples/credit/creditformbase.cpp
+++ b/tools/designer/examples/credit/creditformbase.cpp
@@ -17,7 +17,7 @@
 #include <tqdragobject.h>
 #include <ntqlayout.h>
 #include <tqtooltip.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include "creditformbase.ui.h"
 #include <tqimage.h>
 #include <tqpixmap.h>
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index f9ebb15b2..ac721699c 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -38,7 +38,7 @@
 #include <ntqcheckbox.h>
 #include <ntqlineedit.h>
 
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqgroupbox.h>
 #include <ntqlayout.h>
 #include <tqregexp.h>
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index e69f004d2..f96b6e549 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -68,6 +68,7 @@ static TQString converted_widgets[] =
     "TQDateTimeEdit",
     "TQFileDialog",
     "TQIconView",
+    "TQLabel",
     "TQMainWindow", "TQMenuBar",
     "TQPopupMenu",
     "TQStatusBar", "TQSizeGrip",
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index fd4755c78..143d9a02a 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -828,7 +828,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 
     out << "#include <ntqlayout.h>" << endl;
     out << "#include <tqtooltip.h>" << endl;
-    out << "#include <ntqwhatsthis.h>" << endl;
+    out << "#include <tqwhatsthis.h>" << endl;
     if ( objClass == "TQMainWindow" ) {
 	out << "#include <tqaction.h>" << endl;
 	out << "#include <tqmenubar.h>" << endl;
diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index 00234331a..03c0046cf 100644
--- a/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -46,7 +46,7 @@
 #include <uib.h>
 #include <ntqapplication.h>
 #include <tqtooltip.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <tqobjectlist.h>
 #include <private/qpluginmanager_p.h>
 #include <tqmime.h>
@@ -75,7 +75,7 @@
 #include <ntqlineedit.h>
 #include <ntqspinbox.h>
 #include <ntqmultilineedit.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqwidget.h>
 #include <ntqtabwidget.h>
 #include <ntqcombobox.h>
diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf
index 95e9be5fc..8e2f77732 100644
--- a/tools/linguist/book/linguist-programmer.leaf
+++ b/tools/linguist/book/linguist-programmer.leaf
@@ -246,13 +246,13 @@ QApplication::translate() function directly:
 \code
     void some_global_function( LoginWidget *logwid )
     {
-        QLabel *label = new QLabel(
+        TQLabel *label = new TQLabel(
                 LoginWidget::tr("Password:"), logwid );
     }
 
     void same_global_function( LoginWidget *logwid )
     {
-        QLabel *label = new QLabel(
+        TQLabel *label = new TQLabel(
                 tqApp->translate("LoginWidget", "Password:"),
                 logwid );
     }
@@ -1059,7 +1059,7 @@ We'll now prepare release 1.1 of Troll Print. Start your favorite text
 editor and follow these steps:
 
 \list
-\i Uncomment the two lines that create a \l QLabel with the text
+\i Uncomment the two lines that create a \l TQLabel with the text
      "\<b\>TROLL PRINT\</b\>" in \c printpanel.cpp.
 \i Word-tidying: Replace "2-sided" by "Two-sided" in \c printpanel.cpp.
 \i Replace "1.0" with "1.1" everywhere it occurs in \c mainwindow.cpp.
diff --git a/tools/linguist/linguist/finddialog.cpp b/tools/linguist/linguist/finddialog.cpp
index 3978b974c..26663bf3d 100644
--- a/tools/linguist/linguist/finddialog.cpp
+++ b/tools/linguist/linguist/finddialog.cpp
@@ -40,11 +40,11 @@
 #include "finddialog.h"
 
 #include <ntqcheckbox.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlayout.h>
 #include <ntqlineedit.h>
 #include <ntqpushbutton.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 
 FindDialog::FindDialog( bool replace, TQWidget *parent, const char *name,
 			bool modal )
diff --git a/tools/linguist/linguist/main.cpp b/tools/linguist/linguist/main.cpp
index cea49d599..7b4bd14e4 100644
--- a/tools/linguist/linguist/main.cpp
+++ b/tools/linguist/linguist/main.cpp
@@ -34,7 +34,7 @@
 #include "trwindow.h"
 
 #include <ntqapplication.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <tqpixmap.h>
 #include <tqtimer.h>
 #include <tqtextcodec.h>
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index 0e422f269..292fbc153 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -45,14 +45,14 @@
 #include <ntqapplication.h>
 #include <ntqcheckbox.h>
 #include <tqclipboard.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlayout.h>
 #include <tqtextedit.h>
 #include <tqpalette.h>
 #include <ntqpushbutton.h>
 #include <tqstring.h>
 #include <tqtextview.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <ntqvbox.h>
 #include <tqmainwindow.h>
 #include <ntqheader.h>
diff --git a/tools/linguist/linguist/phrasebookbox.cpp b/tools/linguist/linguist/phrasebookbox.cpp
index cefac1b34..90ebdd950 100644
--- a/tools/linguist/linguist/phrasebookbox.cpp
+++ b/tools/linguist/linguist/phrasebookbox.cpp
@@ -41,12 +41,12 @@
 #include "phraselv.h"
 
 #include <ntqapplication.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlayout.h>
 #include <ntqlineedit.h>
 #include <ntqmessagebox.h>
 #include <ntqpushbutton.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 
 PhraseBookBox::PhraseBookBox( const TQString& filename,
 			      const PhraseBook& phraseBook, TQWidget *parent,
diff --git a/tools/linguist/linguist/phraselv.cpp b/tools/linguist/linguist/phraselv.cpp
index 62e1d1180..61cfa3a63 100644
--- a/tools/linguist/linguist/phraselv.cpp
+++ b/tools/linguist/linguist/phraselv.cpp
@@ -40,7 +40,7 @@
 #include "phraselv.h"
 
 #include <tqregexp.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <ntqheader.h>
 
 class WhatPhrase : public TQWhatsThis
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index 38d46ea14..6de1b47d9 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -57,7 +57,7 @@
 #include <tqfiledialog.h>
 #include <tqfileinfo.h>
 #include <ntqheader.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqlayout.h>
 #include <tqmenubar.h>
 #include <ntqmessagebox.h>
@@ -66,7 +66,7 @@
 #include <tqsettings.h>
 #include <tqstatusbar.h>
 #include <tqtoolbar.h>
-#include <ntqwhatsthis.h>
+#include <tqwhatsthis.h>
 #include <tqprocess.h>
 #include <ntqassistantclient.h>
 
diff --git a/tools/linguist/tutorial/tt3/printpanel.cpp b/tools/linguist/tutorial/tt3/printpanel.cpp
index 183a6f5b9..3f8f6eda4 100644
--- a/tools/linguist/tutorial/tt3/printpanel.cpp
+++ b/tools/linguist/tutorial/tt3/printpanel.cpp
@@ -6,7 +6,7 @@
 
 #include "printpanel.h"
 
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqradiobutton.h>
 #include <ntqhbuttongroup.h>
 
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index 47f565f21..f01802bec 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -37,7 +37,7 @@
 #include <tqtextstream.h>
 #include <ntqlistview.h>
 #include <ntqhbox.h>
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqmessagebox.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 3b98c4d6e..da33fbd0b 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -36,7 +36,7 @@
 #include "previewframe.h"
 #include "paletteeditoradvanced.h"
 
-#include <ntqlabel.h>
+#include <tqlabel.h>
 #include <ntqapplication.h>
 #include <ntqcombobox.h>
 #include <tqstylefactory.h>