From ea318d1431c89e647598c510c4245c6571aa5f46 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 26 Jan 2012 23:32:43 -0600
Subject: Update to latest tqt3 automated conversion

---
 tools/designer/plugins/cppeditor/cppbrowser.cpp    |  6 ++--
 tools/designer/plugins/cppeditor/cppcompletion.cpp |  8 ++---
 tools/designer/plugins/cppeditor/cppcompletion.h   |  2 +-
 tools/designer/plugins/cppeditor/cppeditor.cpp     |  6 ++--
 .../plugins/cppeditor/editorinterfaceimpl.cpp      |  4 +--
 .../plugins/cppeditor/editorinterfaceimpl.h        |  4 +--
 .../plugins/cppeditor/languageinterfaceimpl.cpp    |  6 ++--
 .../cppeditor/sourcetemplateinterfaceimpl.cpp      |  6 ++--
 .../plugins/cppeditor/syntaxhighliter_cpp.cpp      | 10 +++---
 tools/designer/plugins/cppeditor/yyreg.cpp         |  2 +-
 tools/designer/plugins/cppeditor/yyreg.h           |  4 +--
 tools/designer/plugins/dlg/dlg2ui.cpp              | 10 +++---
 tools/designer/plugins/dlg/dlg2ui.h                |  8 ++---
 tools/designer/plugins/dlg/main.cpp                |  2 +-
 tools/designer/plugins/glade/glade2ui.cpp          | 16 ++++-----
 tools/designer/plugins/glade/glade2ui.h            |  8 ++---
 tools/designer/plugins/glade/main.cpp              |  2 +-
 tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp      |  6 ++--
 tools/designer/plugins/kdevdlg/kdevdlg2ui.h        |  6 ++--
 tools/designer/plugins/kdevdlg/main.cpp            |  6 ++--
 tools/designer/plugins/rc/main.cpp                 |  2 +-
 tools/designer/plugins/rc/rc2ui.cpp                |  6 ++--
 tools/designer/plugins/rc/rc2ui.h                  |  6 ++--
 tools/designer/plugins/wizards/main.cpp            |  6 ++--
 tools/designer/plugins/wizards/mainwindowwizard.ui |  8 ++---
 .../designer/plugins/wizards/sqlformwizardimpl.cpp | 42 +++++++++++-----------
 tools/designer/plugins/wizards/sqlformwizardimpl.h |  2 +-
 27 files changed, 97 insertions(+), 97 deletions(-)

(limited to 'tools/designer/plugins')

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
 {
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index c30833412..da0cd5002 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -35,11 +35,11 @@
 **********************************************************************/
 
 #include "dlg2ui.h"
-#include <qfile.h>
-#include <qframe.h>
-#include <qmessagebox.h>
-#include <qregexp.h>
-#include <qtextstream.h>
+#include <ntqfile.h>
+#include <ntqframe.h>
+#include <ntqmessagebox.h>
+#include <ntqregexp.h>
+#include <ntqtextstream.h>
 
 /*
   Possible improvements:
diff --git a/tools/designer/plugins/dlg/dlg2ui.h b/tools/designer/plugins/dlg/dlg2ui.h
index 9b4abc9c2..2aaf5672a 100644
--- a/tools/designer/plugins/dlg/dlg2ui.h
+++ b/tools/designer/plugins/dlg/dlg2ui.h
@@ -35,10 +35,10 @@
 #ifndef DLG2UI_H
 #define DLG2UI_H
 
-#include <qdom.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qvariant.h>
+#include <ntqdom.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqvariant.h>
 
 typedef TQMap<TQString, TQString> AttributeMap;
 
diff --git a/tools/designer/plugins/dlg/main.cpp b/tools/designer/plugins/dlg/main.cpp
index 9709d187e..37d54c539 100644
--- a/tools/designer/plugins/dlg/main.cpp
+++ b/tools/designer/plugins/dlg/main.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include <filterinterface.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 #include "dlg2ui.h"
 
diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp
index 74613b02b..626b30934 100644
--- a/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tools/designer/plugins/glade/glade2ui.cpp
@@ -36,14 +36,14 @@
 
 #include "glade2ui.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qimage.h>
-#include <qprogressdialog.h>
-#include <qmessagebox.h>
-#include <qrect.h>
-#include <qregexp.h>
-#include <qsizepolicy.h>
+#include <ntqapplication.h>
+#include <ntqfile.h>
+#include <ntqimage.h>
+#include <ntqprogressdialog.h>
+#include <ntqmessagebox.h>
+#include <ntqrect.h>
+#include <ntqregexp.h>
+#include <ntqsizepolicy.h>
 
 #include <ctype.h>
 
diff --git a/tools/designer/plugins/glade/glade2ui.h b/tools/designer/plugins/glade/glade2ui.h
index 87d4d3221..c0caf428d 100644
--- a/tools/designer/plugins/glade/glade2ui.h
+++ b/tools/designer/plugins/glade/glade2ui.h
@@ -35,10 +35,10 @@
 #ifndef GLADE2UI_H
 #define GLADE2UI_H
 
-#include <qdom.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qvariant.h>
+#include <ntqdom.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqvariant.h>
 
 typedef TQMap<TQString, TQString> AttributeMap;
 
diff --git a/tools/designer/plugins/glade/main.cpp b/tools/designer/plugins/glade/main.cpp
index 06f7942eb..1913fd36a 100644
--- a/tools/designer/plugins/glade/main.cpp
+++ b/tools/designer/plugins/glade/main.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include <filterinterface.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 #include "glade2ui.h"
 
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
index 5e84d89b8..a5a46fe79 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
@@ -33,9 +33,9 @@
 **********************************************************************/
 
 #include "kdevdlg2ui.h"
-#include <qdir.h>
-#include <qstring.h>
-#include <qptrstack.h>
+#include <ntqdir.h>
+#include <ntqstring.h>
+#include <ntqptrstack.h>
 
 /// some little helpers ///
 
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
index 1861479c4..5f2b6d3bc 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
@@ -35,9 +35,9 @@
 #ifndef KDEVDLG2UI_H
 #define KDEVDLG2UI_H
 
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qstringlist.h>
+#include <ntqtextstream.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
 
 class KDEVDLG2UI
 {
diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp
index a80db4230..1e7c34663 100644
--- a/tools/designer/plugins/kdevdlg/main.cpp
+++ b/tools/designer/plugins/kdevdlg/main.cpp
@@ -34,9 +34,9 @@
 
 #include <filterinterface.h>
 
-#include <qapplication.h>
-#include <qstring.h>
-#include <qdir.h>
+#include <ntqapplication.h>
+#include <ntqstring.h>
+#include <ntqdir.h>
 
 #include "kdevdlg2ui.h"
 
diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp
index 30b3253ce..7d899743e 100644
--- a/tools/designer/plugins/rc/main.cpp
+++ b/tools/designer/plugins/rc/main.cpp
@@ -34,7 +34,7 @@
 
 #include <filterinterface.h>
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 #include "rc2ui.h"
 
diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp
index 28b2ffc8a..f88f9d431 100644
--- a/tools/designer/plugins/rc/rc2ui.cpp
+++ b/tools/designer/plugins/rc/rc2ui.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include "rc2ui.h"
-#include <qdir.h>
+#include <ntqdir.h>
 
 /// some little helpers ///
 
@@ -845,8 +845,8 @@ bool RC2UI::makeStringTable()
 	*out << "#ifndef STRINGTABLE_H" << endl;
 	*out << "#define STRINGTABLE_H" << endl;
 	*out << endl;
-	*out << "#include <qstring.h>" << endl;
-	*out << "#include <qobject.h>" << endl;
+	*out << "#include <ntqstring.h>" << endl;
+	*out << "#include <ntqobject.h>" << endl;
 	*out << endl;
 
 	TQString ID;
diff --git a/tools/designer/plugins/rc/rc2ui.h b/tools/designer/plugins/rc/rc2ui.h
index cbac8ef0e..68829211b 100644
--- a/tools/designer/plugins/rc/rc2ui.h
+++ b/tools/designer/plugins/rc/rc2ui.h
@@ -35,9 +35,9 @@
 #ifndef RC2UI_H
 #define RC2UI_H
 
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qstringlist.h>
+#include <ntqtextstream.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
 
 class RC2UI
 {
diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp
index 55ba9c7a7..b3400acc4 100644
--- a/tools/designer/plugins/wizards/main.cpp
+++ b/tools/designer/plugins/wizards/main.cpp
@@ -32,14 +32,14 @@
 **********************************************************************/
 
 #include <designerinterface.h>
-#include <qfeatures.h>
-#include <qwidget.h>
+#include <ntqfeatures.h>
+#include <ntqwidget.h>
 #include <templatewizardiface.h>
 #ifndef QT_NO_SQL
 #include "sqlformwizardimpl.h"
 #endif
 #include "mainwindowwizard.h"
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 class StandardTemplateWizardInterface : public TemplateWizardInterface, public TQLibraryInterface
 {
diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui b/tools/designer/plugins/wizards/mainwindowwizard.ui
index 9e45f36df..2382b5f1c 100644
--- a/tools/designer/plugins/wizards/mainwindowwizard.ui
+++ b/tools/designer/plugins/wizards/mainwindowwizard.ui
@@ -33,10 +33,10 @@
 **
 *********************************************************************</comment>
 <include location="global" impldecl="in implementation">designerinterface.h</include>
-<include location="global" impldecl="in implementation">qiconset.h</include>
-<include location="global" impldecl="in implementation">qaction.h</include>
-<include location="global" impldecl="in implementation">qpixmap.h</include>
-<include location="global" impldecl="in implementation">qdict.h</include>
+<include location="global" impldecl="in implementation">ntqiconset.h</include>
+<include location="global" impldecl="in implementation">ntqaction.h</include>
+<include location="global" impldecl="in implementation">ntqpixmap.h</include>
+<include location="global" impldecl="in implementation">ntqdict.h</include>
 <include location="local" implDecl="in declaration">mainwindowwizard.ui.h</include>
 <forward>struct DesignerFormWindow;</forward>
 <forward>struct DesignerInterface;</forward>
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 627abd5ef..580780de4 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -33,30 +33,30 @@
 
 #include "sqlformwizardimpl.h"
 
-#include <qlistbox.h>
-#include <qwidget.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qregexp.h>
-#include <qpushbutton.h>
-#include <qmultilineedit.h>
-#include <qlistview.h>
-#include <qfeatures.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
+#include <ntqlistbox.h>
+#include <ntqwidget.h>
+#include <ntqcheckbox.h>
+#include <ntqlineedit.h>
+
+#include <ntqlabel.h>
+#include <ntqgroupbox.h>
+#include <ntqlayout.h>
+#include <ntqregexp.h>
+#include <ntqpushbutton.h>
+#include <ntqmultilineedit.h>
+#include <ntqlistview.h>
+#include <ntqfeatures.h>
+#include <ntqradiobutton.h>
+#include <ntqspinbox.h>
 #include <limits.h>
 
 #ifndef QT_NO_SQL
-#include <qdatatable.h>
-#include <qdatabrowser.h>
-#include <qdataview.h>
-#include <qsqleditorfactory.h>
-#include <qsqlindex.h>
-#include <qsqlcursor.h>
+#include <ntqdatatable.h>
+#include <ntqdatabrowser.h>
+#include <ntqdataview.h>
+#include <ntqsqleditorfactory.h>
+#include <ntqsqlindex.h>
+#include <ntqsqlcursor.h>
 #endif
 
 SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w,
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.h b/tools/designer/plugins/wizards/sqlformwizardimpl.h
index 815d186f1..be3602d79 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.h
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.h
@@ -37,7 +37,7 @@
 #include "sqlformwizard.h"
 #include <templatewizardiface.h>
 #include <designerinterface.h>
-#include <qvaluelist.h>
+#include <ntqvaluelist.h>
 
 class SqlFormWizard : public SqlFormWizardBase
 {
-- 
cgit v1.2.1