Rename ntqwidget* related files to equivalent tqwidget*

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

39 files changed, 60 insertions, 45 deletions

diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index df24e8dfd..8eb22fb34 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -47,7 +47,7 @@
 #include "popupmenueditor.h"
 
 #include <ntqfeatures.h>
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqmetaobject.h>
 #include <ntqapplication.h>
 #include <ntqlayout.h>
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index b2eefc7c0..7e30608f7 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -32,7 +32,7 @@
 #include <ntqtooltip.h>
 #include <ntqvariant.h>
 #include <ntqwhatsthis.h>
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 #include "command.h"
 #include "formwindow.h"
diff --git a/tools/designer/designer/formwindow.h b/tools/designer/designer/formwindow.h
index 12f27998f..f736a8395 100644
--- a/tools/designer/designer/formwindow.h
+++ b/tools/designer/designer/formwindow.h
@@ -39,10 +39,10 @@
 #include "sizehandle.h"
 #include "actiondnd.h"
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqptrdict.h>
 #include <ntqpixmap.h>
-#include <ntqwidgetlist.h>
+#include <tqwidgetlist.h>
 #include <ntqmap.h>
 
 class TQPaintEvent;
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index 6570b7979..3c04b6664 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -55,7 +55,7 @@
 #include <ntqpopupmenu.h>
 #include <ntqtabwidget.h>
 #include <ntqwizard.h>
-#include <ntqwidgetstack.h>
+#include <tqwidgetstack.h>
 #include <ntqtabbar.h>
 #include <ntqfeatures.h>
 #include <ntqapplication.h>
diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h
index 09c524025..919226cd8 100644
--- a/tools/designer/designer/layout.h
+++ b/tools/designer/designer/layout.h
@@ -34,13 +34,13 @@
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqmap.h>
 #include <ntqguardedptr.h>
 #include <tqobject.h>
 #include <ntqlayout.h>
 #include <ntqmap.h>
-#include <ntqwidgetlist.h>
+#include <tqwidgetlist.h>
 
 class FormWindow;
 class TQPaintEvent;
diff --git a/tools/designer/designer/listboxdnd.cpp b/tools/designer/designer/listboxdnd.cpp
index f4bf73051..2f368b758 100644
--- a/tools/designer/designer/listboxdnd.cpp
+++ b/tools/designer/designer/listboxdnd.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "listboxdnd.h"
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqheader.h>
 #include <ntqpainter.h>
 #include <ntqdragobject.h>
diff --git a/tools/designer/designer/listdnd.cpp b/tools/designer/designer/listdnd.cpp
index 137237ad7..8a7fb0d4b 100644
--- a/tools/designer/designer/listdnd.cpp
+++ b/tools/designer/designer/listdnd.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "listdnd.h"
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqpainter.h>
 
 ListDnd::ListDnd( TQScrollView * eventSource, const char * name )
diff --git a/tools/designer/designer/listviewdnd.cpp b/tools/designer/designer/listviewdnd.cpp
index a7b831d15..8061f7f35 100644
--- a/tools/designer/designer/listviewdnd.cpp
+++ b/tools/designer/designer/listviewdnd.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "listviewdnd.h"
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqheader.h>
 #include <ntqpainter.h>
 #include <ntqdragobject.h>
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index ba2dfb9e4..18a4579f2 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -54,7 +54,7 @@
 #include "actiondnd.h"
 #include "project.h"
 #include "projectsettingsimpl.h"
-#include "ntqwidgetfactory.h"
+#include "tqwidgetfactory.h"
 #include "pixmapcollection.h"
 #include "qcompletionedit.h"
 #include "sourcefile.h"
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index 6d6937fb8..1f0b9782c 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -48,7 +48,7 @@
 #include <tqobjectlist.h>
 #include <ntqstrlist.h>
 #include <ntqmetaobject.h>
-#include <ntqwidgetlist.h>
+#include <tqwidgetlist.h>
 #include <ntqmainwindow.h>
 #include <ntqregexp.h>
 #include <private/qpluginmanager_p.h>
diff --git a/tools/designer/designer/metadatabase.h b/tools/designer/designer/metadatabase.h
index 21711c51d..94009edec 100644
--- a/tools/designer/designer/metadatabase.h
+++ b/tools/designer/designer/metadatabase.h
@@ -41,7 +41,7 @@
 #include <ntqptrlist.h>
 #include <ntqsizepolicy.h>
 #include <ntqsize.h>
-#include <ntqwidgetlist.h>
+#include <tqwidgetlist.h>
 #include <ntqcursor.h>
 
 #include "pixmapchooser.h"
diff --git a/tools/designer/designer/orderindicator.h b/tools/designer/designer/orderindicator.h
index 1e7c88829..9d61f1290 100644
--- a/tools/designer/designer/orderindicator.h
+++ b/tools/designer/designer/orderindicator.h
@@ -34,7 +34,7 @@
 #ifndef ORDERINDICATOR_H
 #define ORDERINDICATOR_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 class FormWindow;
 
diff --git a/tools/designer/designer/popupmenueditor.h b/tools/designer/designer/popupmenueditor.h
index 8143b9fa7..306629ba3 100644
--- a/tools/designer/designer/popupmenueditor.h
+++ b/tools/designer/designer/popupmenueditor.h
@@ -34,7 +34,7 @@
 #ifndef POPUPMENUEDITOR_H
 #define POPUPMENUEDITOR_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqptrlist.h>
 #include <ntqaction.h>
 
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index bfce2297d..a21ac2059 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -40,7 +40,7 @@
 #include "dbconnectionimpl.h"
 #endif
 #include "resource.h"
-#include <ntqwidgetfactory.h>
+#include <tqwidgetfactory.h>
 #include "outputwindow.h"
 
 #include <ntqfile.h>
diff --git a/tools/designer/designer/propertyobject.h b/tools/designer/designer/propertyobject.h
index 7aee8a15f..5e97697c2 100644
--- a/tools/designer/designer/propertyobject.h
+++ b/tools/designer/designer/propertyobject.h
@@ -2,7 +2,7 @@
 #define PROPERTYOBJECT_H
 
 #include <tqobject.h>
-#include <ntqwidgetlist.h>
+#include <tqwidgetlist.h>
 #include <ntqcursor.h>
 
 class PropertyObject : public TQObject
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 41ea252e1..1d0d3d2bc 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -80,8 +80,8 @@
 #include <ntqtextstream.h>
 #include <ntqtooltip.h>
 #include <ntqwhatsthis.h>
-#include <ntqwidget.h>
-#include <ntqwidgetstack.h>
+#include <tqwidget.h>
+#include <tqwidgetstack.h>
 #include <ntqwizard.h>
 #include <ntqworkspace.h>
 #include <ntqworkspace.h>
diff --git a/tools/designer/designer/sizehandle.cpp b/tools/designer/designer/sizehandle.cpp
index 7d3b1eb14..7cb3749b0 100644
--- a/tools/designer/designer/sizehandle.cpp
+++ b/tools/designer/designer/sizehandle.cpp
@@ -37,7 +37,7 @@
 #include "formwindow.h"
 #include "widgetfactory.h"
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqapplication.h>
 #include <ntqlabel.h>
 
diff --git a/tools/designer/designer/sizehandle.h b/tools/designer/designer/sizehandle.h
index adc1d7810..7027736b7 100644
--- a/tools/designer/designer/sizehandle.h
+++ b/tools/designer/designer/sizehandle.h
@@ -34,7 +34,7 @@
 #ifndef SIZEHANDLE_H
 #define SIZEHANDLE_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqintdict.h>
 #include <ntqptrdict.h>
 
diff --git a/tools/designer/designer/widgetaction.cpp b/tools/designer/designer/widgetaction.cpp
index 694a0857f..300326528 100644
--- a/tools/designer/designer/widgetaction.cpp
+++ b/tools/designer/designer/widgetaction.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "widgetaction.h"
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqtoolbutton.h>
 #include "mainwindow.h"
 #include <ntqstylefactory.h>
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 72b05d758..e4c8b4a81 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -70,7 +70,7 @@
 #include <ntqtextedit.h>
 #include <ntqlabel.h>
 #include <ntqlayout.h>
-#include <ntqwidgetstack.h>
+#include <tqwidgetstack.h>
 #include <ntqcombobox.h>
 #include <ntqtabbar.h>
 #include <ntqlistbox.h>
@@ -84,7 +84,7 @@
 #include <ntqtextbrowser.h>
 #include <ntqframe.h>
 #include <ntqmetaobject.h>
-#include <ntqwidgetstack.h>
+#include <tqwidgetstack.h>
 #include <ntqwizard.h>
 #include <ntqvaluelist.h>
 #include <ntqtimer.h>
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 84aee8034..dc1ee3d29 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -52,12 +52,12 @@
 #include <ntqcheckbox.h>
 #include <ntqradiobutton.h>
 #include <ntqbuttongroup.h>
-#include <ntqwidgetstack.h>
+#include <tqwidgetstack.h>
 #include <ntqguardedptr.h>
 #include <ntqtoolbox.h>
 
 #include "metadatabase.h"
-#include "ntqwidgetfactory.h"
+#include "tqwidgetfactory.h"
 
 class TQWidget;
 class TQLayout;
diff --git a/tools/designer/editor/markerwidget.h b/tools/designer/editor/markerwidget.h
index 67e4e3bc2..b3bfbc233 100644
--- a/tools/designer/editor/markerwidget.h
+++ b/tools/designer/editor/markerwidget.h
@@ -34,7 +34,7 @@
 #ifndef MARKERWIDGET_H
 #define MARKERWIDGET_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqpixmap.h>
 
 class ViewManager;
diff --git a/tools/designer/editor/viewmanager.h b/tools/designer/editor/viewmanager.h
index ea8addc53..2c2d1afc4 100644
--- a/tools/designer/editor/viewmanager.h
+++ b/tools/designer/editor/viewmanager.h
@@ -34,7 +34,7 @@
 #ifndef VIEWMANAGER_H
 #define VIEWMANAGER_H
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqvaluelist.h>
 
 class TQChildEvent;
diff --git a/tools/designer/examples/filechooser/plugin/plugin.h b/tools/designer/examples/filechooser/plugin/plugin.h
index e8252fe76..929cba207 100644
--- a/tools/designer/examples/filechooser/plugin/plugin.h
+++ b/tools/designer/examples/filechooser/plugin/plugin.h
@@ -1,4 +1,4 @@
-#include <ntqwidgetplugin.h>
+#include <tqwidgetplugin.h>
 
 class CustomWidgetPlugin : public TQWidgetPlugin
 {
diff --git a/tools/designer/examples/filechooser/widget/filechooser.h b/tools/designer/examples/filechooser/widget/filechooser.h
index 4210dc24c..7676df15d 100644
--- a/tools/designer/examples/filechooser/widget/filechooser.h
+++ b/tools/designer/examples/filechooser/widget/filechooser.h
@@ -1,8 +1,8 @@
 #ifndef FILECHOOSER_H
 #define FILECHOOSER_H
 
-#include <ntqwidget.h>
-#include <ntqwidgetplugin.h>
+#include <tqwidget.h>
+#include <tqwidgetplugin.h>
 
 class TQLineEdit;
 class TQPushButton;
diff --git a/tools/designer/examples/receiver1/mainform.ui b/tools/designer/examples/receiver1/mainform.ui
index 1ae2c8ed7..71d651be2 100644
--- a/tools/designer/examples/receiver1/mainform.ui
+++ b/tools/designer/examples/receiver1/mainform.ui
@@ -75,7 +75,7 @@
 </connections>
 <includes>
     <include location="global" impldecl="in implementation">ntqspinbox.h</include>
-    <include location="global" impldecl="in implementation">ntqwidgetfactory.h</include>
+    <include location="global" impldecl="in implementation">tqwidgetfactory.h</include>
     <include location="local" impldecl="in implementation">mainform.ui.h</include>
 </includes>
 <slots>
diff --git a/tools/designer/examples/receiver2/mainform.ui b/tools/designer/examples/receiver2/mainform.ui
index 306ca127a..6f27e6dab 100644
--- a/tools/designer/examples/receiver2/mainform.ui
+++ b/tools/designer/examples/receiver2/mainform.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>MainForm</class>
-<include location="global" impldecl="in implementation">ntqwidgetfactory.h</include>
+<include location="global" impldecl="in implementation">tqwidgetfactory.h</include>
 <include location="global" impldecl="in implementation">ntqspinbox.h</include>
 <include location="local" impldecl="in implementation">receiver.h</include>
 <include location="local" implDecl="in declaration">mainform.ui.h</include>
diff --git a/tools/designer/examples/vcr/vcr.h b/tools/designer/examples/vcr/vcr.h
index 1c407d172..f8addbdd9 100644
--- a/tools/designer/examples/vcr/vcr.h
+++ b/tools/designer/examples/vcr/vcr.h
@@ -1,6 +1,6 @@
 #ifndef VCR_H
 #define VCR_H
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 class Vcr : public TQWidget
 {
diff --git a/tools/designer/interfaces/designerinterface.h b/tools/designer/interfaces/designerinterface.h
index b98ff4d9a..c9dabc06c 100644
--- a/tools/designer/interfaces/designerinterface.h
+++ b/tools/designer/interfaces/designerinterface.h
@@ -52,7 +52,7 @@
 #include <ntqstring.h>
 #include <ntqmap.h>
 #include <ntqstringlist.h>
-#include <ntqwidgetlist.h>
+#include <tqwidgetlist.h>
 #include <tqobjectlist.h>
 
 struct DesignerProject;
diff --git a/tools/designer/interfaces/preferenceinterface.h b/tools/designer/interfaces/preferenceinterface.h
index 882ee10cb..24c631881 100644
--- a/tools/designer/interfaces/preferenceinterface.h
+++ b/tools/designer/interfaces/preferenceinterface.h
@@ -48,7 +48,7 @@
 //
 
 #include <private/qcom_p.h>
-#include <ntqwidgetlist.h>
+#include <tqwidgetlist.h>
 #include <ntqcstring.h>
 
 // {5c168ee7-4bee-469f-9995-6afdb04ce5a2}
diff --git a/tools/designer/interfaces/projectsettingsiface.h b/tools/designer/interfaces/projectsettingsiface.h
index 5390c0814..d3b10181d 100644
--- a/tools/designer/interfaces/projectsettingsiface.h
+++ b/tools/designer/interfaces/projectsettingsiface.h
@@ -48,7 +48,7 @@
 //
 
 #include <private/qcom_p.h>
-#include <ntqwidgetlist.h>
+#include <tqwidgetlist.h>
 #include <ntqcstring.h>
 
 // {d332785d-17fb-4894-84fe-50dbd0ad9512}
diff --git a/tools/designer/interfaces/widgetinterface.h b/tools/designer/interfaces/widgetinterface.h
index 66b237803..5bba9257d 100644
--- a/tools/designer/interfaces/widgetinterface.h
+++ b/tools/designer/interfaces/widgetinterface.h
@@ -34,7 +34,7 @@
 #ifndef WIDGETINTERFACE_H
 #define WIDGETINTERFACE_H
 
-#include <private/qwidgetinterface_p.h>
+#include <private/tqwidgetinterface_p.h>
 
 #define WidgetInterface TQWidgetFactoryInterface
 #define IID_Widget IID_QWidgetFactory
diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp
index ed0a36e30..1f5613b3a 100644
--- a/tools/designer/plugins/wizards/main.cpp
+++ b/tools/designer/plugins/wizards/main.cpp
@@ -33,7 +33,7 @@
 
 #include <designerinterface.h>
 #include <ntqfeatures.h>
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <templatewizardiface.h>
 #ifndef TQT_NO_SQL
 #include "sqlformwizardimpl.h"
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 62e003cd3..4c17cc823 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -34,7 +34,7 @@
 #include "sqlformwizardimpl.h"
 
 #include <ntqlistbox.h>
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqcheckbox.h>
 #include <ntqlineedit.h>
 
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index 6cbc34ac0..4a753d3ef 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -60,6 +60,14 @@ static TQPluginManager<WidgetInterface> *widgetPluginManager = 0;
 static bool plugins_set_up = FALSE;
 static bool was_in_setup = FALSE;
 
+// This is temporary code required till the integration of tqtinterface into tqt3 is completed.
+// It will be removed afterwards
+static TQString converted_widgets[] =
+{
+    "TQWidget", "TQWidgetStack",
+};
+size_t converted_widgets_size = sizeof(converted_widgets) / sizeof(TQString);
+
 TQCleanupHandler<TQPluginManager<WidgetInterface> > cleanup_manager;
 
 WidgetDatabaseRecord::WidgetDatabaseRecord()
@@ -721,6 +729,13 @@ TQString WidgetDatabase::includeFile( int id )
 	return TQString::null;
     if ( r->includeFile.isNull() ) {
 	TQString rq = r->name;
+	for (size_t i = 0; i < converted_widgets_size; ++i)
+	{
+	    if (rq == converted_widgets[i])
+	    {
+	        return rq.lower() + ".h";
+	    }
+	}
 	if ( rq[ 0 ] == 'T' && rq[ 1 ] == 'Q')
 	    rq = rq.mid(1);
 	return "nt" + rq.lower() + ".h";
diff --git a/tools/designer/uilib/test/main.cpp b/tools/designer/uilib/test/main.cpp
index f6ccfd757..4637cf604 100644
--- a/tools/designer/uilib/test/main.cpp
+++ b/tools/designer/uilib/test/main.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include <ntqapplication.h>
-#include "../ntqwidgetfactory.h"
+#include "../tqwidgetfactory.h"
 
 int main( int argc, char ** argv )
 {
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index 1108655b2..e8e6c33a6 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include "ntqwidgetfactory.h"
+#include "tqwidgetfactory.h"
 
 #include "../interfaces/languageinterface.h"
 #include "../interfaces/widgetinterface.h"
@@ -76,7 +76,7 @@
 #include <ntqspinbox.h>
 #include <ntqmultilineedit.h>
 #include <ntqlabel.h>
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqtabwidget.h>
 #include <ntqcombobox.h>
 #include <ntqdialog.h>
@@ -88,7 +88,7 @@
 #include <ntqdial.h>
 #include <ntqslider.h>
 #include <ntqframe.h>
-#include <ntqwidgetstack.h>
+#include <tqwidgetstack.h>
 #include <ntqtoolbox.h>
 #include <ntqtextedit.h>
 #include <ntqscrollbar.h>
diff --git a/tools/designer/uilib/ntqwidgetfactory.h b/tools/designer/uilib/tqwidgetfactory.h
index fb54e8ae1..fb54e8ae1 100644
--- a/tools/designer/uilib/ntqwidgetfactory.h
+++ b/tools/designer/uilib/tqwidgetfactory.h
diff --git a/tools/designer/uilib/uilib.pro b/tools/designer/uilib/uilib.pro
index bc1fe2b86..6d8bb4701 100644
--- a/tools/designer/uilib/uilib.pro
+++ b/tools/designer/uilib/uilib.pro
@@ -2,7 +2,7 @@ TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 win32:CONFIG	+= static
 win32:CONFIG	-= dll
-SOURCES		= qwidgetfactory.cpp \
+SOURCES		= tqwidgetfactory.cpp \
 		  ../shared/domtool.cpp \
 		  ../shared/uib.cpp