Update to latest tqt3 automated conversion

18 files changed, 58 insertions, 58 deletions

diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp
index ff5e288e2..e16708d0d 100644
--- a/tools/designer/editor/arghintwidget.cpp
+++ b/tools/designer/editor/arghintwidget.cpp
@@ -32,11 +32,11 @@
 **********************************************************************/
 
 #include "arghintwidget.h"
-#include <qbutton.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <ntqbutton.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqpainter.h>
+#include <ntqpixmap.h>
 
 static const char * left_xpm[] = {
 "16 16 3 1",
diff --git a/tools/designer/editor/arghintwidget.h b/tools/designer/editor/arghintwidget.h
index d75c8738b..09937e3d2 100644
--- a/tools/designer/editor/arghintwidget.h
+++ b/tools/designer/editor/arghintwidget.h
@@ -34,7 +34,7 @@
 #ifndef ARGHINTWIDGET_H
 #define ARGHINTWIDGET_H
 
-#include <qframe.h>
+#include <ntqframe.h>
 
 class TQLabel;
 class ArrowButton;
diff --git a/tools/designer/editor/browser.h b/tools/designer/editor/browser.h
index 9e00af126..a19e2bcca 100644
--- a/tools/designer/editor/browser.h
+++ b/tools/designer/editor/browser.h
@@ -34,7 +34,7 @@
 #ifndef BROWSER_H
 #define BROWSER_H
 
-#include <qobject.h>
+#include <ntqobject.h>
 
 class Editor;
 class TQTextCursor;
diff --git a/tools/designer/editor/cindent.cpp b/tools/designer/editor/cindent.cpp
index 7e31f0f19..d30be4600 100644
--- a/tools/designer/editor/cindent.cpp
+++ b/tools/designer/editor/cindent.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "cindent.h"
-#include "qregexp.h"
+#include "ntqregexp.h"
 
 extern int indentForBottomLine( const TQStringList& program, TQChar typedIn );
 extern void setTabSize( int s );
diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp
index 1a9337821..f0923c554 100644
--- a/tools/designer/editor/completion.cpp
+++ b/tools/designer/editor/completion.cpp
@@ -34,15 +34,15 @@
 #include "completion.h"
 #include "paragdata.h"
 #include "editor.h"
-#include <qlistbox.h>
-#include <qvbox.h>
-#include <qmap.h>
+#include <ntqlistbox.h>
+#include <ntqvbox.h>
+#include <ntqmap.h>
 #include <private/qrichtext_p.h>
-#include <qapplication.h>
-#include <qregexp.h>
+#include <ntqapplication.h>
+#include <ntqregexp.h>
 #include "arghintwidget.h"
-#include <qsizegrip.h>
-#include <qtimer.h>
+#include <ntqsizegrip.h>
+#include <ntqtimer.h>
 
 static TQColor getColor( const TQString &type )
 {
diff --git a/tools/designer/editor/completion.h b/tools/designer/editor/completion.h
index 3b3e4362f..6328315c7 100644
--- a/tools/designer/editor/completion.h
+++ b/tools/designer/editor/completion.h
@@ -34,10 +34,10 @@
 #ifndef COMPLETION_H
 #define COMPLETION_H
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qobject.h>
-#include <qmap.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqobject.h>
+#include <ntqmap.h>
 
 class TQTextDocument;
 class Editor;
diff --git a/tools/designer/editor/conf.cpp b/tools/designer/editor/conf.cpp
index 281bf9f5e..336f44712 100644
--- a/tools/designer/editor/conf.cpp
+++ b/tools/designer/editor/conf.cpp
@@ -32,10 +32,10 @@
 **********************************************************************/
 
 #include "conf.h"
-#include <qapplication.h>
-#include <qfont.h>
-#include <qcolor.h>
-#include <qsettings.h>
+#include <ntqapplication.h>
+#include <ntqfont.h>
+#include <ntqcolor.h>
+#include <ntqsettings.h>
 
 TQMap<TQString, ConfigStyle> Config::defaultStyles()
 {
diff --git a/tools/designer/editor/conf.h b/tools/designer/editor/conf.h
index 6538ca7f1..aad97ddbb 100644
--- a/tools/designer/editor/conf.h
+++ b/tools/designer/editor/conf.h
@@ -34,9 +34,9 @@
 #ifndef CONF_H
 #define CONF_H
 
-#include <qfont.h>
-#include <qcolor.h>
-#include <qmap.h>
+#include <ntqfont.h>
+#include <ntqcolor.h>
+#include <ntqmap.h>
 
 struct ConfigStyle
 {
diff --git a/tools/designer/editor/editor.cpp b/tools/designer/editor/editor.cpp
index 1b1bf15c1..cba812362 100644
--- a/tools/designer/editor/editor.cpp
+++ b/tools/designer/editor/editor.cpp
@@ -33,12 +33,12 @@
 
 #include "editor.h"
 #include "parenmatcher.h"
-#include <qfile.h>
+#include <ntqfile.h>
 #include <private/qrichtext_p.h>
 #include "conf.h"
-#include <qapplication.h>
-#include <qpopupmenu.h>
-#include <qaccel.h>
+#include <ntqapplication.h>
+#include <ntqpopupmenu.h>
+#include <ntqaccel.h>
 
 Editor::Editor( const TQString &fn, TQWidget *parent, const char *name )
     : TQTextEdit( parent, name ), hasError( FALSE )
diff --git a/tools/designer/editor/editor.h b/tools/designer/editor/editor.h
index 64ea702bb..768c5f530 100644
--- a/tools/designer/editor/editor.h
+++ b/tools/designer/editor/editor.h
@@ -34,7 +34,7 @@
 #ifndef EDITOR_H
 #define EDITOR_H
 
-#include <qtextedit.h>
+#include <ntqtextedit.h>
 
 struct Config;
 class ParenMatcher;
diff --git a/tools/designer/editor/markerwidget.cpp b/tools/designer/editor/markerwidget.cpp
index af36882f1..69e68817f 100644
--- a/tools/designer/editor/markerwidget.cpp
+++ b/tools/designer/editor/markerwidget.cpp
@@ -35,8 +35,8 @@
 #include "viewmanager.h"
 #include <private/qrichtext_p.h>
 #include "editor.h"
-#include <qpainter.h>
-#include <qpopupmenu.h>
+#include <ntqpainter.h>
+#include <ntqpopupmenu.h>
 #include "paragdata.h"
 
 static const char * error_xpm[] = {
diff --git a/tools/designer/editor/markerwidget.h b/tools/designer/editor/markerwidget.h
index 7fa5e6748..2ab70a420 100644
--- a/tools/designer/editor/markerwidget.h
+++ b/tools/designer/editor/markerwidget.h
@@ -34,8 +34,8 @@
 #ifndef MARKERWIDGET_H
 #define MARKERWIDGET_H
 
-#include <qwidget.h>
-#include <qpixmap.h>
+#include <ntqwidget.h>
+#include <ntqpixmap.h>
 
 class ViewManager;
 class TQTextParagraph;
diff --git a/tools/designer/editor/parenmatcher.cpp b/tools/designer/editor/parenmatcher.cpp
index b3017be9a..8cd6ffcb9 100644
--- a/tools/designer/editor/parenmatcher.cpp
+++ b/tools/designer/editor/parenmatcher.cpp
@@ -34,9 +34,9 @@
 #include "parenmatcher.h"
 #include "paragdata.h"
 
-#include "qtextedit.h"
+#include "ntqtextedit.h"
 #include <private/qrichtext_p.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 ParenMatcher::ParenMatcher()
 {
diff --git a/tools/designer/editor/parenmatcher.h b/tools/designer/editor/parenmatcher.h
index 3b0710a69..805aca58e 100644
--- a/tools/designer/editor/parenmatcher.h
+++ b/tools/designer/editor/parenmatcher.h
@@ -34,8 +34,8 @@
 #ifndef PARENMATCHER_H
 #define PARENMATCHER_H
 
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <ntqstring.h>
+#include <ntqvaluelist.h>
 
 class TQTextCursor;
 
diff --git a/tools/designer/editor/preferences.ui b/tools/designer/editor/preferences.ui
index e39bb816e..00c56b64e 100644
--- a/tools/designer/editor/preferences.ui
+++ b/tools/designer/editor/preferences.ui
@@ -470,18 +470,18 @@
     <tabstop>checkParenMatching</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">qmap.h</include>
+    <include location="global" impldecl="in declaration">ntqmap.h</include>
     <include location="local" impldecl="in declaration">conf.h</include>
-    <include location="global" impldecl="in implementation">qpalette.h</include>
-    <include location="global" impldecl="in implementation">qlineedit.h</include>
-    <include location="global" impldecl="in implementation">qpixmap.h</include>
-    <include location="global" impldecl="in implementation">qcombobox.h</include>
-    <include location="global" impldecl="in implementation">qfontdatabase.h</include>
+    <include location="global" impldecl="in implementation">ntqpalette.h</include>
+    <include location="global" impldecl="in implementation">ntqlineedit.h</include>
+    <include location="global" impldecl="in implementation">ntqpixmap.h</include>
+    <include location="global" impldecl="in implementation">ntqcombobox.h</include>
+    <include location="global" impldecl="in implementation">ntqfontdatabase.h</include>
     <include location="local" impldecl="in implementation">editor.h</include>
-    <include location="global" impldecl="in implementation">qpushbutton.h</include>
-    <include location="global" impldecl="in implementation">qcheckbox.h</include>
-    <include location="global" impldecl="in implementation">qcolordialog.h</include>
-    <include location="global" impldecl="in implementation">qsettings.h</include>
+    <include location="global" impldecl="in implementation">ntqpushbutton.h</include>
+    <include location="global" impldecl="in implementation">ntqcheckbox.h</include>
+    <include location="global" impldecl="in implementation">ntqcolordialog.h</include>
+    <include location="global" impldecl="in implementation">ntqsettings.h</include>
     <include location="local" impldecl="in implementation">preferences.ui.h</include>
 </includes>
 <variables>
diff --git a/tools/designer/editor/viewmanager.cpp b/tools/designer/editor/viewmanager.cpp
index aed224ed0..def747050 100644
--- a/tools/designer/editor/viewmanager.cpp
+++ b/tools/designer/editor/viewmanager.cpp
@@ -34,12 +34,12 @@
 #include "viewmanager.h"
 #include "editor.h"
 #include "markerwidget.h"
-#include <qlayout.h>
+#include <ntqlayout.h>
 #include <private/qrichtext_p.h>
 #include "paragdata.h"
-#include <qobjectlist.h>
-#include <qlabel.h>
-#include <qtimer.h>
+#include <ntqobjectlist.h>
+#include <ntqlabel.h>
+#include <ntqtimer.h>
 
 ViewManager::ViewManager( TQWidget *parent, const char *name )
     : TQWidget( parent, name ), curView( 0 )
diff --git a/tools/designer/editor/viewmanager.h b/tools/designer/editor/viewmanager.h
index 8198d6c76..46e4839de 100644
--- a/tools/designer/editor/viewmanager.h
+++ b/tools/designer/editor/viewmanager.h
@@ -34,8 +34,8 @@
 #ifndef VIEWMANAGER_H
 #define VIEWMANAGER_H
 
-#include <qwidget.h>
-#include <qvaluelist.h>
+#include <ntqwidget.h>
+#include <ntqvaluelist.h>
 
 class TQChildEvent;
 class MarkerWidget;
diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp
index 1cbaa4bd1..f0014d37b 100644
--- a/tools/designer/editor/yyindent.cpp
+++ b/tools/designer/editor/yyindent.cpp
@@ -70,7 +70,7 @@
   string literals are removed beforehand.
 */
 
-#include <qregexp.h>
+#include <ntqregexp.h>
 
 /* qmake ignore Q_OBJECT */
 
@@ -1106,8 +1106,8 @@ int indentForBottomLine( const TQStringList& program, TQChar typedIn )
   Test driver.
 */
 
-#include <qfile.h>
-#include <qtextstream.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
 
 #include <errno.h>