Adapt to latest tqt3 versionHEADmaster

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

15 files changed, 57 insertions, 57 deletions

diff --git a/puic/domtool.cpp b/puic/domtool.cpp
index 6c2809f..90f367f 100644
--- a/puic/domtool.cpp
+++ b/puic/domtool.cpp
@@ -26,14 +26,14 @@
 
 #include "domtool.h"
 
-#include <ntqsizepolicy.h>
-#include <ntqcolor.h>
-#include <ntqcursor.h>
-#include <ntqdatetime.h>
-#include <ntqrect.h>
-#include <ntqsize.h>
-#include <ntqfont.h>
-#include <ntqdom.h>
+#include <tqsizepolicy.h>
+#include <tqcolor.h>
+#include <tqcursor.h>
+#include <tqdatetime.h>
+#include <tqrect.h>
+#include <tqsize.h>
+#include <tqfont.h>
+#include <tqdom.h>
 
 /*!
   \class DomTool domtool.h
diff --git a/puic/domtool.h b/puic/domtool.h
index a7bc157..efa67f0 100644
--- a/puic/domtool.h
+++ b/puic/domtool.h
@@ -27,8 +27,8 @@
 #ifndef DOMTOOL_H
 #define DOMTOOL_H
 
-#include <ntqvariant.h>
-#include <ntqnamespace.h>
+#include <tqvariant.h>
+#include <tqnamespace.h>
 
 class TQDomElement;
 class TQDomDocument;
diff --git a/puic/embed.cpp b/puic/embed.cpp
index 303c671..c3eedcf 100644
--- a/puic/embed.cpp
+++ b/puic/embed.cpp
@@ -30,14 +30,14 @@
 **********************************************************************/
 
 #include "uic.h"
-#include <ntqfile.h>
-#include <ntqimage.h>
-#include <ntqstringlist.h>
-#include <ntqdatetime.h>
-#include <ntqfileinfo.h>
+#include <tqfile.h>
+#include <tqimage.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
+#include <tqfileinfo.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/puic/form.cpp b/puic/form.cpp
index 473eda3..86faa6d 100644
--- a/puic/form.cpp
+++ b/puic/form.cpp
@@ -32,12 +32,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqstringlist.h>
-#include <ntqvaluelist.h>
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
-#include <ntqdir.h>
-#include <ntqregexp.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
+#include <tqregexp.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #if( TQT_VERSION < 0x030101 )
diff --git a/puic/globaldefs.h b/puic/globaldefs.h
index 9901979..45698cd 100644
--- a/puic/globaldefs.h
+++ b/puic/globaldefs.h
@@ -21,7 +21,7 @@
 #ifndef GLOBALDEFS_H
 #define GLOBALDEFS_H
 
-#include <ntqcolor.h>
+#include <tqcolor.h>
 
 #define BOXLAYOUT_DEFAULT_MARGIN 11
 #define BOXLAYOUT_DEFAULT_SPACING 6
diff --git a/puic/main.cpp b/puic/main.cpp
index d6411ee..6c0b25f 100644
--- a/puic/main.cpp
+++ b/puic/main.cpp
@@ -32,9 +32,9 @@
 #include "widgetdatabase.h"
 #include "domtool.h"
 #include <ntqapplication.h>
-#include <ntqfile.h>
-#include <ntqstringlist.h>
-#include <ntqdatetime.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include <stdio.h>
diff --git a/puic/object.cpp b/puic/object.cpp
index 21f532e..ccc4785 100644
--- a/puic/object.cpp
+++ b/puic/object.cpp
@@ -23,9 +23,9 @@
 #include "widgetinterface.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqregexp.h>
-#include <ntqsizepolicy.h>
-#include <ntqstringlist.h>
+#include <tqregexp.h>
+#include <tqsizepolicy.h>
+#include <tqstringlist.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 
diff --git a/puic/parser.cpp b/puic/parser.cpp
index 4d8616b..85446fa 100644
--- a/puic/parser.cpp
+++ b/puic/parser.cpp
@@ -19,8 +19,8 @@
 **********************************************************************/
 
 #include "parser.h"
-#include <ntqobject.h>
-#include <ntqstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
 
 class NormalizeObject : public TQObject
 {
diff --git a/puic/parser.h b/puic/parser.h
index 01ca1ca..5fdbdc2 100644
--- a/puic/parser.h
+++ b/puic/parser.h
@@ -21,7 +21,7 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
 class Parser
 {
diff --git a/puic/subclassing.cpp b/puic/subclassing.cpp
index 7f0e127..fb7329f 100644
--- a/puic/subclassing.cpp
+++ b/puic/subclassing.cpp
@@ -22,12 +22,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqfile.h>
-#include <ntqstringlist.h>
-#include <ntqdatetime.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/puic/uic.cpp b/puic/uic.cpp
index 67ec24b..e50cae5 100644
--- a/puic/uic.cpp
+++ b/puic/uic.cpp
@@ -32,12 +32,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqfile.h>
-#include <ntqstringlist.h>
-#include <ntqdatetime.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/puic/uic.h b/puic/uic.h
index 75b3c1c..bed1455 100644
--- a/puic/uic.h
+++ b/puic/uic.h
@@ -21,13 +21,13 @@
 
 #ifndef UIC_H
 #define UIC_H
-#include <ntqdom.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
-#include <ntqmap.h>
-#include <ntqtextstream.h>
-#include <ntqpalette.h>
-#include <ntqvariant.h>
+#include <tqdom.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
+#include <tqtextstream.h>
+#include <tqpalette.h>
+#include <tqvariant.h>
 
 #ifndef TQ_DUMMY_COMPARISON_OPERATOR
 # warning "Defining TQ_DUMMY_COMPARISON_OPERATOR"
diff --git a/puic/widgetdatabase.cpp b/puic/widgetdatabase.cpp
index d94ebce..284023f 100644
--- a/puic/widgetdatabase.cpp
+++ b/puic/widgetdatabase.cpp
@@ -30,12 +30,12 @@
 #include <ntqapplication.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqstrlist.h>
-#include <ntqdict.h>
-#include <ntqfile.h>
-#include <ntqtextstream.h>
-#include <ntqcleanuphandler.h>
-#include <ntqfeatures.h>
+#include <tqstrlist.h>
+#include <tqdict.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqcleanuphandler.h>
+#include <tqfeatures.h>
 
 #include <stdlib.h>
 
diff --git a/puic/widgetdatabase.h b/puic/widgetdatabase.h
index c671b4f..2db524d 100644
--- a/puic/widgetdatabase.h
+++ b/puic/widgetdatabase.h
@@ -21,10 +21,10 @@
 #ifndef WIDGETDATABASE_H
 #define WIDGETDATABASE_H
 
-#include <ntqiconset.h>
-#include <ntqstring.h>
+#include <tqiconset.h>
+#include <tqstring.h>
 #include "widgetinterface.h" // up here for GCC 2.7.* compatibility
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 
 
 extern TQPluginManager<WidgetInterface> *widgetManager();
diff --git a/puic/widgetinterface.h b/puic/widgetinterface.h
index 50f8e6d..7d32414 100644
--- a/puic/widgetinterface.h
+++ b/puic/widgetinterface.h
@@ -21,7 +21,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