Rename remaining ntq[d-h]* related files to equivalent tq*

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

24 files changed, 32 insertions, 32 deletions

diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index f805d525b..9c4cd2a75 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -63,7 +63,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tqurl.h>
-#include <ntqvalidator.h>
+#include <tqvalidator.h>
 
 #include <stdlib.h>
 #include <limits.h>
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index f04417ee3..ca3680d88 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -43,7 +43,7 @@
 #include <tqlistview.h>
 #include <tqmap.h>
 #include <tqstringlist.h>
-#include <ntqvalidator.h>
+#include <tqvalidator.h>
 #include <tqpopupmenu.h>
 #include <tqdict.h>
 #include <tqpopupmenu.h>
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index 703c8afc5..b6fcc94db 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -580,7 +580,7 @@
     <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>
+    <include location="global" impldecl="in implementation">tqdockwindow.h</include>
     <include location="global" impldecl="in implementation">stdlib.h</include>
     <include location="global" impldecl="in implementation">tqmime.h</include>
     <include location="local" impldecl="in implementation">helpwindow.h</include>
diff --git a/tools/designer/designer/asciivalidator.h b/tools/designer/designer/asciivalidator.h
index ee6aca398..9201fc9c0 100644
--- a/tools/designer/designer/asciivalidator.h
+++ b/tools/designer/designer/asciivalidator.h
@@ -35,7 +35,7 @@
 #define ASCIIVALIDATOR_H
 
 
-#include <ntqvalidator.h>
+#include <tqvalidator.h>
 
 
 class AsciiValidator: public TQValidator
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index ad9733816..5987e2d58 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -46,7 +46,7 @@
 #include "menubareditor.h"
 #include "popupmenueditor.h"
 
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include <tqwidget.h>
 #include <ntqmetaobject.h>
 #include <ntqapplication.h>
diff --git a/tools/designer/designer/database.h b/tools/designer/designer/database.h
index 0ab766e39..2e61c0ab9 100644
--- a/tools/designer/designer/database.h
+++ b/tools/designer/designer/database.h
@@ -34,7 +34,7 @@
 #ifndef DATABASE_H
 #define DATABASE_H
 
-#include "ntqfeatures.h"
+#include "tqfeatures.h"
 
 #ifndef TQT_NO_SQL
 #include <tqdataview.h>
diff --git a/tools/designer/designer/database2.h b/tools/designer/designer/database2.h
index 3126d5991..df91b3e63 100644
--- a/tools/designer/designer/database2.h
+++ b/tools/designer/designer/database2.h
@@ -34,7 +34,7 @@
 #ifndef DATABASE2_H
 #define DATABASE2_H
 
-#include "ntqfeatures.h"
+#include "tqfeatures.h"
 
 #ifndef TQT_NO_SQL
 #include <tqdataview.h>
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index 164930178..0e54d49aa 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -70,7 +70,7 @@
 #include <tqwhatsthis.h>
 #include <ntqmetaobject.h>
 #include <tqtooltip.h>
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include <tqaccel.h>
 #include <tqpixmapcache.h>
 #include <tqbitmap.h>
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index 4a16d5a95..786386f5f 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -57,7 +57,7 @@
 #include <tqwizard.h>
 #include <tqwidgetstack.h>
 #include <tqtabbar.h>
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include <ntqapplication.h>
 #include <tqtimer.h>
 #include "../interfaces/languageinterface.h"
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index eddcc648c..86de7ba6a 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -89,7 +89,7 @@
 
 #include <ntqinputdialog.h>
 #include <tqtoolbar.h>
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include <ntqmetaobject.h>
 #include <tqaction.h>
 #include <tqpixmap.h>
@@ -108,7 +108,7 @@
 #include <tqwizard.h>
 #include <tqtimer.h>
 #include <tqlistbox.h>
-#include <ntqdockwindow.h>
+#include <tqdockwindow.h>
 #include <tqstylefactory.h>
 #include <tqvbox.h>
 #include <tqprocess.h>
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index d56876f17..af12adc3b 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -47,7 +47,7 @@
 #include <tqtextstream.h>
 #include <tqurl.h>
 #include <tqobjectlist.h>
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include <tqtextcodec.h>
 #include <tqdom.h>
 #include <ntqmessagebox.h>
diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h
index a5aa95b04..80bdb505a 100644
--- a/tools/designer/designer/project.h
+++ b/tools/designer/designer/project.h
@@ -34,7 +34,7 @@
 #ifndef PROJECT_H
 #define PROJECT_H
 
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 34c332a57..3775c82f8 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -84,7 +84,7 @@
 #include <tqstyle.h>
 #include <tqdatetimeedit.h>
 #include <tqassistantclient.h>
-#include <ntqdrawutil.h>
+#include <tqdrawutil.h>
 #include <tqmultilineedit.h> // FIXME: obsolete
 #include <ntqsplitter.h>
 #include <tqdatatable.h>
diff --git a/tools/designer/designer/propertyeditor.h b/tools/designer/designer/propertyeditor.h
index 8ef82f3ab..dedcf2cce 100644
--- a/tools/designer/designer/propertyeditor.h
+++ b/tools/designer/designer/propertyeditor.h
@@ -34,7 +34,7 @@
 #ifndef PROPERTYEDITOR_H
 #define PROPERTYEDITOR_H
 
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include <ntqvariant.h>
 #include <tqlistview.h>
 #include <tqptrlist.h>
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 889e362b5..397ea0618 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -56,7 +56,7 @@
 #include <tqcombobox.h>
 #include <tqdatetime.h>
 #include <tqdom.h>
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include <tqfile.h>
 #include <tqheader.h>
 #include <tqiconview.h>
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 64f08f0bd..5cb6fc6af 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -52,7 +52,7 @@
 #include "menubareditor.h"
 #include "popupmenueditor.h"
 
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 
 #include <tqpixmap.h>
 #include <tqgroupbox.h>
diff --git a/tools/designer/examples/metric/metric.ui.h b/tools/designer/examples/metric/metric.ui.h
index 7277a1f68..465a044c2 100644
--- a/tools/designer/examples/metric/metric.ui.h
+++ b/tools/designer/examples/metric/metric.ui.h
@@ -7,7 +7,7 @@
 ** place of a destructor.
 *****************************************************************************/
 
-#include <ntqvalidator.h>
+#include <tqvalidator.h>
 
 void ConversionForm::init()
 {
diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp
index 1f5613b3a..b8cda6e1e 100644
--- a/tools/designer/plugins/wizards/main.cpp
+++ b/tools/designer/plugins/wizards/main.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include <designerinterface.h>
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include <tqwidget.h>
 #include <templatewizardiface.h>
 #ifndef TQT_NO_SQL
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 92ae66301..fe7e5c4a8 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -45,7 +45,7 @@
 #include <tqpushbutton.h>
 #include <tqmultilineedit.h>
 #include <tqlistview.h>
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 #include <limits.h>
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index a5478a832..823f715b7 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -42,7 +42,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqcleanuphandler.h>
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 
 #include <stdlib.h>
 
@@ -66,7 +66,7 @@ static TQString converted_widgets[] =
 {
     "TQButton", "TQButtonGroup",
     "TQCheckBox", "TQColorDialog", "TQComboBox",
-    "TQDateTimeEdit", "TQDesktopWidget", "TQDial", "TQDialog",
+    "TQDateTimeEdit", "TQDesktopWidget", "TQDial", "TQDialog", "TQDockArea", "TQDockWindow",
     "TQFileDialog", "TQFrame",
     "TQGrid", "TQGridView", "TQGroupBox",
     "TQHBox", "TQHButtonGroup", "TQHeader", "TQHGroupBox",
diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index bcc567775..0d765e781 100644
--- a/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -36,7 +36,7 @@
 #include "../interfaces/languageinterface.h"
 #include "../interfaces/widgetinterface.h"
 
-#include <ntqfeatures.h>
+#include <tqfeatures.h>
 #include "../designer/database2.h"
 #include <tqdom.h>
 #include <tqdir.h>
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index 8c333d911..4de407bc8 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -57,8 +57,8 @@
 #include <tqmainwindow.h>
 #include <tqheader.h>
 #include <tqregexp.h>
-#include <ntqdockarea.h>
-#include <ntqdockwindow.h>
+#include <tqdockarea.h>
+#include <tqdockwindow.h>
 #include <tqscrollview.h>
 #include <tqfont.h>
 #include <tqaccel.h>
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index abe16ea99..28e87bf9e 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -51,8 +51,8 @@
 #include <ntqapplication.h>
 #include <tqbitmap.h>
 #include <tqdict.h>
-#include <ntqdockarea.h>
-#include <ntqdockwindow.h>
+#include <tqdockarea.h>
+#include <tqdockwindow.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <tqfileinfo.h>
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index 11252c85f..52fe4407f 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -582,7 +582,7 @@ void Main::loadConfig(const TQString& filename)
 	    if ( i )
 		i->setDefined(TRUE);
 	    else
-		tqDebug("The item %s is not used by ntqfeatures.h", token[1].latin1());
+		tqDebug("The item %s is not used by tqfeatures.h", token[1].latin1());
 	}
     } while (!s.atEnd());
 }
@@ -713,18 +713,18 @@ int main(int argc, char** argv)
     TQApplication app(argc,argv);
     Main m;
     TQString qtdir = getenv("TQTDIR");
-    TQString qfeatures = qtdir + "/src/tools/qfeatures.txt";
-    //TQString qfeatures = qtdir + "/include/ntqfeatures.h";
+    TQString tqfeatures = qtdir + "/src/tools/tqfeatures.txt";
+    //TQString tqfeatures = qtdir + "/include/tqfeatures.h";
     TQString qconfig = qtdir + "/include/ntqconfig.h";
     for (int i=1; i<argc; i++) {
 	TQString arg = argv[i];
 	if ( arg == "-f" && i+i<argc ) {
-	    qfeatures = argv[++i];
+	    tqfeatures = argv[++i];
 	} else {
 	    qconfig = argv[i];
 	}
     }
-    m.loadFeatures(qfeatures);
+    m.loadFeatures(tqfeatures);
     m.loadConfig(qconfig);
     m.resize(m.sizeHint()+TQSize(500,300));
     app.setMainWidget(&m);