Update to latest tqt3 automated conversion

11 files changed, 29 insertions, 29 deletions

diff --git a/tools/designer/plugins/cppeditor/cppbrowser.cpp b/tools/designer/plugins/cppeditor/cppbrowser.cpp
index 9f9e08591..8d3e68bc1 100644
--- a/tools/designer/plugins/cppeditor/cppbrowser.cpp
+++ b/tools/designer/plugins/cppeditor/cppbrowser.cpp
@@ -34,9 +34,9 @@
 
 #include "cppbrowser.h"
 #include <private/qrichtext_p.h>
-#include <qprocess.h>
-#include <qmainwindow.h>
-#include <qstatusbar.h>
+#include <ntqprocess.h>
+#include <ntqmainwindow.h>
+#include <ntqstatusbar.h>
 #include <editor.h>
 
 CppEditorBrowser::CppEditorBrowser( Editor *e )
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tools/designer/plugins/cppeditor/cppcompletion.cpp
index 947931e86..a5643b918 100644
--- a/tools/designer/plugins/cppeditor/cppcompletion.cpp
+++ b/tools/designer/plugins/cppeditor/cppcompletion.cpp
@@ -33,10 +33,10 @@
 **********************************************************************/
 
 #include "cppcompletion.h"
-#include <qobject.h>
-#include <qmetaobject.h>
-#include <qobjectlist.h>
-#include <qregexp.h>
+#include <ntqobject.h>
+#include <ntqmetaobject.h>
+#include <ntqobjectlist.h>
+#include <ntqregexp.h>
 
 CppEditorCompletion::CppEditorCompletion( Editor *e )
     : EditorCompletion( e )
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.h b/tools/designer/plugins/cppeditor/cppcompletion.h
index 73c0c77cd..965fc8f38 100644
--- a/tools/designer/plugins/cppeditor/cppcompletion.h
+++ b/tools/designer/plugins/cppeditor/cppcompletion.h
@@ -36,7 +36,7 @@
 #define CPPCOMPLETION_H
 
 #include <completion.h>
-#include <qguardedptr.h>
+#include <ntqguardedptr.h>
 
 class CppEditorCompletion : public EditorCompletion
 {
diff --git a/tools/designer/plugins/cppeditor/cppeditor.cpp b/tools/designer/plugins/cppeditor/cppeditor.cpp
index cb4808842..13069230c 100644
--- a/tools/designer/plugins/cppeditor/cppeditor.cpp
+++ b/tools/designer/plugins/cppeditor/cppeditor.cpp
@@ -38,9 +38,9 @@
 #include "cppcompletion.h"
 #include "cppbrowser.h"
 #include <parenmatcher.h>
-#include <qsettings.h>
-#include <qpopupmenu.h>
-#include <qinputdialog.h>
+#include <ntqsettings.h>
+#include <ntqpopupmenu.h>
+#include <ntqinputdialog.h>
 #include <designerinterface.h>
 
 CppEditor::CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i )
diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
index 8e98f9f3c..22e51cf49 100644
--- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
@@ -36,10 +36,10 @@
 #include <viewmanager.h>
 #include "cppeditor.h"
 #include <private/qrichtext_p.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "completion.h"
 #include <designerinterface.h>
-#include <qtimer.h>
+#include <ntqtimer.h>
 
 EditorInterfaceImpl::EditorInterfaceImpl()
     : EditorInterface(), viewManager( 0 ), dIface( 0 )
diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
index 96062d54b..238611c99 100644
--- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
+++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
@@ -36,8 +36,8 @@
 #define EDITORINTERFACEIMPL_H
 
 #include <editorinterface.h>
-#include <qobject.h>
-#include <qguardedptr.h>
+#include <ntqobject.h>
+#include <ntqguardedptr.h>
 
 class TQTimer;
 class ViewManager;
diff --git a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
index 89bda1778..1fbd63e0d 100644
--- a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
@@ -33,11 +33,11 @@
 **********************************************************************/
 
 #include "languageinterfaceimpl.h"
-#include <qobject.h>
+#include <ntqobject.h>
 #include <designerinterface.h>
-#include <qfile.h>
+#include <ntqfile.h>
 #include "yyreg.h"
-#include <qmetaobject.h>
+#include <ntqmetaobject.h>
 
 LanguageInterfaceImpl::LanguageInterfaceImpl( TQUnknownInterface *outer )
     : parent( outer ), ref( 0 )
diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
index 1ff8e9484..a140903f9 100644
--- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
@@ -35,8 +35,8 @@
 #include "sourcetemplateinterfaceimpl.h"
 #include <designerinterface.h>
 #include "mainfilesettings.h"
-#include <qlineedit.h>
-#include <qlistbox.h>
+#include <ntqlineedit.h>
+#include <ntqlistbox.h>
 
 SourceTemplateInterfaceImpl::SourceTemplateInterfaceImpl()
 {
@@ -68,7 +68,7 @@ TQStringList SourceTemplateInterfaceImpl::featureList() const
 static TQString generateMainCppCode( const TQString &formname, const TQString &include )
 {
     TQString code;
-    code += "#include <qapplication.h>\n";
+    code += "#include <ntqapplication.h>\n";
     code += "#include \"" + include + "\"\n";
     code += "\n";
     code += "int main( int argc, char ** argv )\n";
diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
index 5d4441fda..ce30936c0 100644
--- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
+++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
@@ -34,11 +34,11 @@
 
 #include "syntaxhighliter_cpp.h"
 #include "paragdata.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qmap.h"
-#include "qapplication.h"
-#include "qregexp.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqmap.h"
+#include "ntqapplication.h"
+#include "ntqregexp.h"
 
 const char * const SyntaxHighlighter_CPP::keywords[] = {
     // C++ keywords
diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp
index 0d95e409e..4073752bf 100644
--- a/tools/designer/plugins/cppeditor/yyreg.cpp
+++ b/tools/designer/plugins/cppeditor/yyreg.cpp
@@ -32,7 +32,7 @@
 **
 **********************************************************************/
 
-#include <qregexp.h>
+#include <ntqregexp.h>
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/tools/designer/plugins/cppeditor/yyreg.h b/tools/designer/plugins/cppeditor/yyreg.h
index 5d849a0f4..a39eac828 100644
--- a/tools/designer/plugins/cppeditor/yyreg.h
+++ b/tools/designer/plugins/cppeditor/yyreg.h
@@ -35,8 +35,8 @@
 #ifndef YYREG_H
 #define YYREG_H
 
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <ntqstringlist.h>
+#include <ntqvaluelist.h>
 
 class CppFunction
 {