Update to latest tqt3 automated conversion

3 files changed, 65 insertions, 65 deletions

diff --git a/tools/designer/uilib/qwidgetfactory.h b/tools/designer/uilib/ntqwidgetfactory.h
index bd39623e3..4213199cd 100644
--- a/tools/designer/uilib/qwidgetfactory.h
+++ b/tools/designer/uilib/ntqwidgetfactory.h
@@ -35,13 +35,13 @@
 #define TQWIDGETFACTORY_H
 
 #ifndef QT_H
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qvaluelist.h>
-#include <qmap.h>
-#include <qaction.h>
+#include <ntqstring.h>
+#include <ntqptrlist.h>
+#include <ntqimage.h>
+#include <ntqpixmap.h>
+#include <ntqvaluelist.h>
+#include <ntqmap.h>
+#include <ntqaction.h>
 #endif // QT_H
 
 class TQDomDocument;
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index ef143d46f..269f6c355 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/qwidgetfactory.cpp
@@ -31,77 +31,77 @@
 **
 **********************************************************************/
 
-#include "qwidgetfactory.h"
+#include "ntqwidgetfactory.h"
 
 #include "../interfaces/languageinterface.h"
 #include "../interfaces/widgetinterface.h"
 
-#include <qfeatures.h>
+#include <ntqfeatures.h>
 #include "../designer/database2.h"
-#include <qdom.h>
-#include <qdir.h>
-#include <qlayout.h>
-#include <qmetaobject.h>
+#include <ntqdom.h>
+#include <ntqdir.h>
+#include <ntqlayout.h>
+#include <ntqmetaobject.h>
 #include <domtool.h>
 #include <uib.h>
-#include <qapplication.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qobjectlist.h>
+#include <ntqapplication.h>
+#include <ntqtooltip.h>
+#include <ntqwhatsthis.h>
+#include <ntqobjectlist.h>
 #include <private/qpluginmanager_p.h>
-#include <qmime.h>
-#include <qdragobject.h>
+#include <ntqmime.h>
+#include <ntqdragobject.h>
 
 #ifndef QT_NO_SQL
-#include <qsqlrecord.h>
-#include <qsqldatabase.h>
-#include <qdatatable.h>
+#include <ntqsqlrecord.h>
+#include <ntqsqldatabase.h>
+#include <ntqdatatable.h>
 #endif
 
 // include all TQt widgets we support
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qiconview.h>
-#include <qheader.h>
+#include <ntqpushbutton.h>
+#include <ntqtoolbutton.h>
+#include <ntqcheckbox.h>
+#include <ntqradiobutton.h>
+#include <ntqgroupbox.h>
+#include <ntqbuttongroup.h>
+#include <ntqiconview.h>
+#include <ntqheader.h>
 #ifndef QT_NO_TABLE
-#include <qtable.h>
+#include <ntqtable.h>
 #endif
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qmultilineedit.h>
-#include <qlabel.h>
-#include <qwidget.h>
-#include <qtabwidget.h>
-#include <qcombobox.h>
-#include <qdialog.h>
-#include <qwizard.h>
-#include <qlcdnumber.h>
-#include <qprogressbar.h>
-#include <qtextview.h>
-#include <qtextbrowser.h>
-#include <qdial.h>
-#include <qslider.h>
-#include <qframe.h>
-#include <qwidgetstack.h>
-#include <qtoolbox.h>
-#include <qtextedit.h>
-#include <qscrollbar.h>
-#include <qmainwindow.h>
-#include <qsplitter.h>
-#include <qaction.h>
-#include <qpopupmenu.h>
-#include <qmenubar.h>
-#include <qpopupmenu.h>
-#include <qdatetimeedit.h>
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qgrid.h>
+#include <ntqlistbox.h>
+#include <ntqlistview.h>
+#include <ntqlineedit.h>
+#include <ntqspinbox.h>
+#include <ntqmultilineedit.h>
+#include <ntqlabel.h>
+#include <ntqwidget.h>
+#include <ntqtabwidget.h>
+#include <ntqcombobox.h>
+#include <ntqdialog.h>
+#include <ntqwizard.h>
+#include <ntqlcdnumber.h>
+#include <ntqprogressbar.h>
+#include <ntqtextview.h>
+#include <ntqtextbrowser.h>
+#include <ntqdial.h>
+#include <ntqslider.h>
+#include <ntqframe.h>
+#include <ntqwidgetstack.h>
+#include <ntqtoolbox.h>
+#include <ntqtextedit.h>
+#include <ntqscrollbar.h>
+#include <ntqmainwindow.h>
+#include <ntqsplitter.h>
+#include <ntqaction.h>
+#include <ntqpopupmenu.h>
+#include <ntqmenubar.h>
+#include <ntqpopupmenu.h>
+#include <ntqdatetimeedit.h>
+#include <ntqvbox.h>
+#include <ntqhbox.h>
+#include <ntqgrid.h>
 
 #include <stdlib.h>
 
diff --git a/tools/designer/uilib/test/main.cpp b/tools/designer/uilib/test/main.cpp
index 42981ff00..1a8c14a02 100644
--- a/tools/designer/uilib/test/main.cpp
+++ b/tools/designer/uilib/test/main.cpp
@@ -31,8 +31,8 @@
 **
 **********************************************************************/
 
-#include <qapplication.h>
-#include "../qwidgetfactory.h"
+#include <ntqapplication.h>
+#include "../ntqwidgetfactory.h"
 
 int main( int argc, char ** argv )
 {