summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/config.cpp2
-rw-r--r--tools/assistant/docuparser.cpp2
-rw-r--r--tools/assistant/docuparser.h2
-rw-r--r--tools/assistant/index.h2
-rw-r--r--tools/assistant/lib/ntqassistantclient.h2
-rw-r--r--tools/assistant/mainwindow.ui.h2
-rw-r--r--tools/assistant/profile.cpp2
-rw-r--r--tools/designer/app/main.cpp2
-rw-r--r--tools/designer/designer/actiondnd.cpp2
-rw-r--r--tools/designer/designer/actioneditorimpl.cpp2
-rw-r--r--tools/designer/designer/command.h2
-rw-r--r--tools/designer/designer/connectionitems.cpp2
-rw-r--r--tools/designer/designer/customwidgeteditorimpl.cpp2
-rw-r--r--tools/designer/designer/customwidgeteditorimpl.h2
-rw-r--r--tools/designer/designer/database.cpp8
-rw-r--r--tools/designer/designer/database.h6
-rw-r--r--tools/designer/designer/database2.h6
-rw-r--r--tools/designer/designer/dbconnectionimpl.cpp2
-rw-r--r--tools/designer/designer/dbconnectionsimpl.cpp2
-rw-r--r--tools/designer/designer/designer_pch.h2
-rw-r--r--tools/designer/designer/formfile.h2
-rw-r--r--tools/designer/designer/formwindow.cpp2
-rw-r--r--tools/designer/designer/hierarchyview.cpp2
-rw-r--r--tools/designer/designer/layout.h2
-rw-r--r--tools/designer/designer/listboxrename.h2
-rw-r--r--tools/designer/designer/listdnd.h2
-rw-r--r--tools/designer/designer/mainwindow.h2
-rw-r--r--tools/designer/designer/metadatabase.cpp4
-rw-r--r--tools/designer/designer/popupmenueditor.cpp2
-rw-r--r--tools/designer/designer/previewwidgetimpl.cpp2
-rw-r--r--tools/designer/designer/project.cpp10
-rw-r--r--tools/designer/designer/project.h2
-rw-r--r--tools/designer/designer/projectsettingsimpl.cpp2
-rw-r--r--tools/designer/designer/propertyeditor.cpp6
-rw-r--r--tools/designer/designer/propertyobject.h2
-rw-r--r--tools/designer/designer/resource.cpp8
-rw-r--r--tools/designer/designer/sourcefile.h2
-rw-r--r--tools/designer/designer/startdialogimpl.cpp2
-rw-r--r--tools/designer/designer/tableeditorimpl.cpp2
-rw-r--r--tools/designer/designer/timestamp.h2
-rw-r--r--tools/designer/designer/widgetfactory.cpp6
-rw-r--r--tools/designer/designer/widgetfactory.h2
-rw-r--r--tools/designer/designer/workspace.cpp2
-rw-r--r--tools/designer/editor/browser.h2
-rw-r--r--tools/designer/editor/completion.h2
-rw-r--r--tools/designer/editor/viewmanager.cpp2
-rw-r--r--tools/designer/examples/book/book1/main.cpp2
-rw-r--r--tools/designer/examples/book/book2/main.cpp2
-rw-r--r--tools/designer/examples/book/book3/main.cpp2
-rw-r--r--tools/designer/examples/book/book4/main.cpp2
-rw-r--r--tools/designer/examples/book/book5/book.ui2
-rw-r--r--tools/designer/examples/book/book5/main.cpp2
-rw-r--r--tools/designer/examples/book/book6/book.ui4
-rw-r--r--tools/designer/examples/book/book6/editbook.ui2
-rw-r--r--tools/designer/examples/book/book6/main.cpp2
-rw-r--r--tools/designer/examples/book/book7/book.ui4
-rw-r--r--tools/designer/examples/book/book7/editbook.ui2
-rw-r--r--tools/designer/examples/book/book7/main.cpp2
-rw-r--r--tools/designer/examples/book/book8/book.ui4
-rw-r--r--tools/designer/examples/book/book8/editbook.ui2
-rw-r--r--tools/designer/examples/book/book8/main.cpp2
-rw-r--r--tools/designer/examples/book/connection.cpp2
-rw-r--r--tools/designer/examples/opengl/main.cpp2
-rw-r--r--tools/designer/examples/receiver2/receiver.h2
-rw-r--r--tools/designer/interfaces/classbrowserinterface.h2
-rw-r--r--tools/designer/interfaces/designerinterface.h2
-rw-r--r--tools/designer/plugins/cppeditor/cppcompletion.cpp4
-rw-r--r--tools/designer/plugins/cppeditor/editorinterfaceimpl.h2
-rw-r--r--tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp2
-rw-r--r--tools/designer/plugins/dlg/dlg2ui.h2
-rw-r--r--tools/designer/plugins/glade/glade2ui.h2
-rw-r--r--tools/designer/plugins/rc/rc2ui.cpp2
-rw-r--r--tools/designer/plugins/wizards/sqlformwizardimpl.cpp12
-rw-r--r--tools/designer/shared/domtool.cpp2
-rw-r--r--tools/designer/shared/parser.cpp2
-rw-r--r--tools/designer/shared/ui2uib.cpp4
-rw-r--r--tools/designer/shared/widgetdatabase.cpp6
-rw-r--r--tools/designer/uic/form.cpp8
-rw-r--r--tools/designer/uic/uic.h2
-rw-r--r--tools/designer/uilib/qwidgetfactory.cpp10
-rw-r--r--tools/linguist/linguist/phrase.cpp2
-rw-r--r--tools/linguist/lupdate/fetchtr.cpp2
-rw-r--r--tools/linguist/shared/metatranslator.cpp2
-rw-r--r--tools/msg2tqm/msg2tqm.cpp2
-rw-r--r--tools/qtconfig/mainwindow.cpp2
-rw-r--r--tools/qtconfig/previewwidget.cpp2
86 files changed, 124 insertions, 124 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp
index 4bdc7f38..1f396f90 100644
--- a/tools/assistant/config.cpp
+++ b/tools/assistant/config.cpp
@@ -40,7 +40,7 @@
#include <ntqfile.h>
#include <ntqfileinfo.h>
#include <ntqsettings.h>
-#include <ntqxml.h>
+#include <tqxml.h>
static Config *static_configuration = 0;
diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp
index c819b766..f288e432 100644
--- a/tools/assistant/docuparser.cpp
+++ b/tools/assistant/docuparser.cpp
@@ -39,7 +39,7 @@
#include <ntqfileinfo.h>
#include <ntqregexp.h>
#include <ntqstring.h>
-#include <ntqxml.h>
+#include <tqxml.h>
TQDataStream &operator>>( TQDataStream &s, ContentItem &ci )
{
diff --git a/tools/assistant/docuparser.h b/tools/assistant/docuparser.h
index bb8fd322..f120f05b 100644
--- a/tools/assistant/docuparser.h
+++ b/tools/assistant/docuparser.h
@@ -34,7 +34,7 @@
#ifndef DOCUPARSER_H
#define DOCUPARSER_H
-#include <ntqxml.h>
+#include <tqxml.h>
#include <ntqptrlist.h>
#include <ntqmap.h>
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index b8a42173..4e96b8de 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -37,7 +37,7 @@
#include <ntqstringlist.h>
#include <ntqdict.h>
#include <ntqdatastream.h>
-#include <ntqobject.h>
+#include <tqobject.h>
struct Document {
Document( int d, int f ) : docNumber( d ), frequency( f ) {}
diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index c3856e06..17796431 100644
--- a/tools/assistant/lib/ntqassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -34,7 +34,7 @@
#ifndef TQASSISTANTCLIENT_H
#define TQASSISTANTCLIENT_H
-#include <ntqobject.h>
+#include <tqobject.h>
class TQSocket;
class TQProcess;
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index 480ba728..ba245931 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -36,7 +36,7 @@
#include <ntqtabwidget.h>
#include <ntqfileinfo.h>
#include <ntqaccel.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqtimer.h>
#include <ntqdragobject.h>
#include <ntqfontinfo.h>
diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp
index d7634646..12a787b3 100644
--- a/tools/assistant/profile.cpp
+++ b/tools/assistant/profile.cpp
@@ -31,7 +31,7 @@
**
**********************************************************************/
#include "profile.h"
-#include <ntqxml.h>
+#include <tqxml.h>
#include <ntqtextcodec.h>
#include <ntqfileinfo.h>
#include <ntqregexp.h>
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index 6d7a90c4..3a980ad7 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -44,7 +44,7 @@
#include "designerapp.h"
#include <ntqtextstream.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqsettings.h>
#include <ntqsplashscreen.h>
#include <ntqdir.h>
diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index 841ab00d..ba791d06 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -49,7 +49,7 @@
#include <ntqmainwindow.h>
#include <ntqmenudata.h>
#include <ntqmessagebox.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqpainter.h>
#include <ntqstyle.h>
#include <ntqtimer.h>
diff --git a/tools/designer/designer/actioneditorimpl.cpp b/tools/designer/designer/actioneditorimpl.cpp
index 46d5bd4f..84f48392 100644
--- a/tools/designer/designer/actioneditorimpl.cpp
+++ b/tools/designer/designer/actioneditorimpl.cpp
@@ -48,7 +48,7 @@
#include <ntqcheckbox.h>
#include <ntqpushbutton.h>
#include <ntqpopupmenu.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl )
: ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ),
diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h
index 12d51800..ce3ab98f 100644
--- a/tools/designer/designer/command.h
+++ b/tools/designer/designer/command.h
@@ -41,7 +41,7 @@
#include <ntqrect.h>
#include <ntqvaluelist.h>
#include <ntqvariant.h>
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqlistview.h>
#include <ntqptrlist.h>
#include <ntqmap.h>
diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp
index 0c44135a..d570660f 100644
--- a/tools/designer/designer/connectionitems.cpp
+++ b/tools/designer/designer/connectionitems.cpp
@@ -43,7 +43,7 @@
#include <ntqcombobox.h>
#include <ntqlistbox.h>
#include <ntqaction.h>
-#include <ntqdatabrowser.h>
+#include <tqdatabrowser.h>
static const char* const ignore_slots[] = {
"destroyed()",
diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp
index 13524966..e3726e1d 100644
--- a/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -54,7 +54,7 @@
#include <ntqlistview.h>
#include <ntqfile.h>
#include <ntqtextstream.h>
-#include <ntqdom.h>
+#include <tqdom.h>
#include <ntqtextcodec.h>
#include <ntqcheckbox.h>
diff --git a/tools/designer/designer/customwidgeteditorimpl.h b/tools/designer/designer/customwidgeteditorimpl.h
index 49f28027..b5efa95a 100644
--- a/tools/designer/designer/customwidgeteditorimpl.h
+++ b/tools/designer/designer/customwidgeteditorimpl.h
@@ -38,7 +38,7 @@
#include "metadatabase.h"
#include <ntqmap.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
class TQTimer;
class TQListBoxItem;
diff --git a/tools/designer/designer/database.cpp b/tools/designer/designer/database.cpp
index 602e9c23..3c1c8a2c 100644
--- a/tools/designer/designer/database.cpp
+++ b/tools/designer/designer/database.cpp
@@ -44,10 +44,10 @@
#include "mainwindow.h"
#endif
-#include <ntqsqldatabase.h>
-#include <ntqsqlform.h>
-#include <ntqsqlcursor.h>
-#include <ntqsqlrecord.h>
+#include <tqsqldatabase.h>
+#include <tqsqlform.h>
+#include <tqsqlcursor.h>
+#include <tqsqlrecord.h>
DatabaseSupport::DatabaseSupport()
{
diff --git a/tools/designer/designer/database.h b/tools/designer/designer/database.h
index 31e0a1eb..bfb7e1e7 100644
--- a/tools/designer/designer/database.h
+++ b/tools/designer/designer/database.h
@@ -37,9 +37,9 @@
#include "ntqfeatures.h"
#ifndef TQT_NO_SQL
-#include <ntqdataview.h>
-#include <ntqdatabrowser.h>
-#include <ntqsqlcursor.h>
+#include <tqdataview.h>
+#include <tqdatabrowser.h>
+#include <tqsqlcursor.h>
#include <ntqstring.h>
class TQSqlDatabase;
diff --git a/tools/designer/designer/database2.h b/tools/designer/designer/database2.h
index 41a636b4..4bd1215e 100644
--- a/tools/designer/designer/database2.h
+++ b/tools/designer/designer/database2.h
@@ -37,9 +37,9 @@
#include "ntqfeatures.h"
#ifndef TQT_NO_SQL
-#include <ntqdataview.h>
-#include <ntqdatabrowser.h>
-#include <ntqsqlcursor.h>
+#include <tqdataview.h>
+#include <tqdatabrowser.h>
+#include <tqsqlcursor.h>
#include <ntqstring.h>
class TQSqlDatabase;
diff --git a/tools/designer/designer/dbconnectionimpl.cpp b/tools/designer/designer/dbconnectionimpl.cpp
index fd9cf4eb..c14ded90 100644
--- a/tools/designer/designer/dbconnectionimpl.cpp
+++ b/tools/designer/designer/dbconnectionimpl.cpp
@@ -40,7 +40,7 @@
#include <ntqspinbox.h>
#include <ntqlineedit.h>
#include <ntqlayout.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent,
const char* name, bool modal, WFlags fl )
diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp
index 29c216cd..8aaf4521 100644
--- a/tools/designer/designer/dbconnectionsimpl.cpp
+++ b/tools/designer/designer/dbconnectionsimpl.cpp
@@ -41,7 +41,7 @@
#include <ntqspinbox.h>
#include <ntqlineedit.h>
#include <ntqpushbutton.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include <ntqmessagebox.h>
#include <ntqapplication.h>
#include "mainwindow.h"
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index 5cc5fd48..b2eefc7c 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -23,7 +23,7 @@
#include <ntqmap.h>
#include <ntqmessagebox.h>
#include <ntqmetaobject.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqpainter.h>
#include <ntqpixmap.h>
#include <ntqpushbutton.h>
diff --git a/tools/designer/designer/formfile.h b/tools/designer/designer/formfile.h
index d0dbe537..388bac97 100644
--- a/tools/designer/designer/formfile.h
+++ b/tools/designer/designer/formfile.h
@@ -34,7 +34,7 @@
#ifndef FORMFILE_H
#define FORMFILE_H
-#include <ntqobject.h>
+#include <tqobject.h>
#include "timestamp.h"
#include "metadatabase.h"
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index caf9d003..3b1d169c 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -55,7 +55,7 @@
#include <ntqpainter.h>
#include <ntqpen.h>
#include <ntqlabel.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqtimer.h>
#include <ntqapplication.h>
#include <ntqlayout.h>
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index 4e5c1127..6570b797 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -50,7 +50,7 @@
#include "menubareditor.h"
#include <ntqpalette.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqheader.h>
#include <ntqpopupmenu.h>
#include <ntqtabwidget.h>
diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h
index 129e1f1f..09c52402 100644
--- a/tools/designer/designer/layout.h
+++ b/tools/designer/designer/layout.h
@@ -37,7 +37,7 @@
#include <ntqwidget.h>
#include <ntqmap.h>
#include <ntqguardedptr.h>
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqlayout.h>
#include <ntqmap.h>
#include <ntqwidgetlist.h>
diff --git a/tools/designer/designer/listboxrename.h b/tools/designer/designer/listboxrename.h
index 8606dea4..c653f88b 100644
--- a/tools/designer/designer/listboxrename.h
+++ b/tools/designer/designer/listboxrename.h
@@ -34,7 +34,7 @@
#ifndef LISTBOXRENAME_H
#define LISTBOXRENAME_H
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqlistbox.h>
class TQLineEdit;
diff --git a/tools/designer/designer/listdnd.h b/tools/designer/designer/listdnd.h
index df93f5cc..c3e414a0 100644
--- a/tools/designer/designer/listdnd.h
+++ b/tools/designer/designer/listdnd.h
@@ -34,7 +34,7 @@
#ifndef LISTDND_H
#define LISTDND_H
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqscrollview.h>
class ListDnd : public TQObject
diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h
index 45722b37..43bbfbc9 100644
--- a/tools/designer/designer/mainwindow.h
+++ b/tools/designer/designer/mainwindow.h
@@ -51,7 +51,7 @@
#include <ntqmap.h>
#include <ntqguardedptr.h>
#include <private/qpluginmanager_p.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
class TQToolBox;
class PropertyEditor;
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index bdfd5cb9..6d6937fb 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -42,10 +42,10 @@
#include "mainwindow.h"
#include <ntqapplication.h>
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqlayout.h>
#include <ntqptrdict.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqstrlist.h>
#include <ntqmetaobject.h>
#include <ntqwidgetlist.h>
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index f0903e00..72152162 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -36,7 +36,7 @@
#include <ntqdatastream.h>
#include <ntqdragobject.h>
#include <ntqlineedit.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqpainter.h>
#include <ntqpopupmenu.h>
#include <ntqrect.h>
diff --git a/tools/designer/designer/previewwidgetimpl.cpp b/tools/designer/designer/previewwidgetimpl.cpp
index aa75de70..39e011c8 100644
--- a/tools/designer/designer/previewwidgetimpl.cpp
+++ b/tools/designer/designer/previewwidgetimpl.cpp
@@ -31,7 +31,7 @@
**
**********************************************************************/
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "previewwidgetimpl.h"
PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index 024d9a18..bfce2297 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -46,19 +46,19 @@
#include <ntqfile.h>
#include <ntqtextstream.h>
#include <ntqurl.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqfeatures.h>
#include <ntqtextcodec.h>
-#include <ntqdom.h>
+#include <tqdom.h>
#include <ntqmessagebox.h>
#include <ntqapplication.h>
#include "mainwindow.h"
#include <ntqworkspace.h>
#ifndef TQT_NO_SQL
-#include <ntqsqldatabase.h>
-#include <ntqsqlrecord.h>
-#include <ntqdatatable.h>
+#include <tqsqldatabase.h>
+#include <tqsqlrecord.h>
+#include <tqdatatable.h>
#endif
#include <stdlib.h>
diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h
index f5c6f148..ed0989d1 100644
--- a/tools/designer/designer/project.h
+++ b/tools/designer/designer/project.h
@@ -44,7 +44,7 @@
#include "../interfaces/projectsettingsiface.h"
#include "sourcefile.h"
#include "formfile.h"
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqptrdict.h>
#include "formfile.h"
diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp
index 19f6fede..d7663801 100644
--- a/tools/designer/designer/projectsettingsimpl.cpp
+++ b/tools/designer/designer/projectsettingsimpl.cpp
@@ -46,7 +46,7 @@
#include <ntqcheckbox.h>
#include <ntqfiledialog.h>
#include <ntqcombobox.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqheader.h>
#include <ntqpushbutton.h>
#include <ntqlabel.h>
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 78bb88b7..2c414d9a 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -64,7 +64,7 @@
#include <ntqfontdialog.h>
#include <ntqspinbox.h>
#include <ntqevent.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqlistbox.h>
#include <ntqfontdatabase.h>
#include <ntqcolor.h>
@@ -79,7 +79,7 @@
#include <ntqworkspace.h>
#include <ntqtimer.h>
#include <ntqdragobject.h>
-#include <ntqdom.h>
+#include <tqdom.h>
#include <ntqprocess.h>
#include <ntqstyle.h>
#include <ntqdatetimeedit.h>
@@ -87,7 +87,7 @@
#include <ntqdrawutil.h>
#include <ntqmultilineedit.h> // FIXME: obsolete
#include <ntqsplitter.h>
-#include <ntqdatatable.h>
+#include <tqdatatable.h>
#include <ntqtextview.h>
#include <limits.h>
diff --git a/tools/designer/designer/propertyobject.h b/tools/designer/designer/propertyobject.h
index 51c9db31..7aee8a15 100644
--- a/tools/designer/designer/propertyobject.h
+++ b/tools/designer/designer/propertyobject.h
@@ -1,7 +1,7 @@
#ifndef PROPERTYOBJECT_H
#define PROPERTYOBJECT_H
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqwidgetlist.h>
#include <ntqcursor.h>
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index f683d3ec..41ea252e 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -55,7 +55,7 @@
#include <ntqbuffer.h>
#include <ntqcombobox.h>
#include <ntqdatetime.h>
-#include <ntqdom.h>
+#include <tqdom.h>
#include <ntqfeatures.h>
#include <ntqfile.h>
#include <ntqheader.h>
@@ -67,12 +67,12 @@
#include <ntqmenudata.h>
#include <ntqmessagebox.h>
#include <ntqmetaobject.h>
-#include <ntqobject.h>
-#include <ntqobjectlist.h>
+#include <tqobject.h>
+#include <tqobjectlist.h>
#include <ntqtabbar.h>
#ifndef TQT_NO_TABLE
#include <ntqtable.h>
-#include <ntqdatatable.h>
+#include <tqdatatable.h>
#endif
#include <ntqtabwidget.h>
#include <ntqtabwidget.h>
diff --git a/tools/designer/designer/sourcefile.h b/tools/designer/designer/sourcefile.h
index b659efaa..3eee5d42 100644
--- a/tools/designer/designer/sourcefile.h
+++ b/tools/designer/designer/sourcefile.h
@@ -34,7 +34,7 @@
#ifndef SOURCEFILE_H
#define SOURCEFILE_H
-#include <ntqobject.h>
+#include <tqobject.h>
#include "timestamp.h"
struct DesignerSourceFile;
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index 0b5200fd..8040a4aa 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -7,7 +7,7 @@
#include <ntqfiledialog.h>
#include <ntqtabwidget.h>
#include <ntqpoint.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqpushbutton.h>
#include <ntqlayout.h>
#include <ntqfileinfo.h>
diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp
index 2a82127f..e60ce612 100644
--- a/tools/designer/designer/tableeditorimpl.cpp
+++ b/tools/designer/designer/tableeditorimpl.cpp
@@ -46,7 +46,7 @@
#include "command.h"
#include <ntqvaluelist.h>
#include <ntqtabwidget.h>
-#include <ntqdatatable.h>
+#include <tqdatatable.h>
#include "project.h"
#include "metadatabase.h"
#include "mainwindow.h"
diff --git a/tools/designer/designer/timestamp.h b/tools/designer/designer/timestamp.h
index bdb88d80..f63e687b 100644
--- a/tools/designer/designer/timestamp.h
+++ b/tools/designer/designer/timestamp.h
@@ -34,7 +34,7 @@
#ifndef TIMESTAMP_H
#define TIMESTAMP_H
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqdatetime.h>
#include <ntqtimer.h>
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 7a2e4586..72b05d75 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -61,7 +61,7 @@
#include <ntqtable.h>
#endif
#ifndef TQT_NO_SQL
-#include <ntqdatatable.h>
+#include <tqdatatable.h>
#endif
#include <ntqdatetimeedit.h>
#include <ntqlineedit.h>
@@ -75,7 +75,7 @@
#include <ntqtabbar.h>
#include <ntqlistbox.h>
#include <ntqlistview.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqlcdnumber.h>
#include <ntqslider.h>
#include <ntqdial.h>
@@ -101,7 +101,7 @@
#define NO_STATIC_COLORS
#include <globaldefs.h>
-#include <ntqobject.h>
+#include <tqobject.h>
FormWindow *find_formwindow( TQWidget *w )
{
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index c49066b4..84aee803 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -43,7 +43,7 @@
#include <ntqsize.h>
#include <ntqpainter.h>
#include <ntqevent.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqlabel.h>
#include <ntqwizard.h>
#include <ntqptrdict.h>
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index be050bce..fa02c86c 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -49,7 +49,7 @@
#include <ntqapplication.h>
#include <ntqpainter.h>
#include <ntqpen.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqworkspace.h>
#include <ntqpopupmenu.h>
#include <ntqtextstream.h>
diff --git a/tools/designer/editor/browser.h b/tools/designer/editor/browser.h
index ac8ada28..f8d53c2e 100644
--- a/tools/designer/editor/browser.h
+++ b/tools/designer/editor/browser.h
@@ -34,7 +34,7 @@
#ifndef BROWSER_H
#define BROWSER_H
-#include <ntqobject.h>
+#include <tqobject.h>
class Editor;
class TQTextCursor;
diff --git a/tools/designer/editor/completion.h b/tools/designer/editor/completion.h
index cb46fed8..4b1b9d03 100644
--- a/tools/designer/editor/completion.h
+++ b/tools/designer/editor/completion.h
@@ -36,7 +36,7 @@
#include <ntqstring.h>
#include <ntqstringlist.h>
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqmap.h>
class TQTextDocument;
diff --git a/tools/designer/editor/viewmanager.cpp b/tools/designer/editor/viewmanager.cpp
index e3627bf5..989192d9 100644
--- a/tools/designer/editor/viewmanager.cpp
+++ b/tools/designer/editor/viewmanager.cpp
@@ -37,7 +37,7 @@
#include <ntqlayout.h>
#include <private/qrichtext_p.h>
#include "paragdata.h"
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqlabel.h>
#include <ntqtimer.h>
diff --git a/tools/designer/examples/book/book1/main.cpp b/tools/designer/examples/book/book1/main.cpp
index b3ebdad0..e101e271 100644
--- a/tools/designer/examples/book/book1/main.cpp
+++ b/tools/designer/examples/book/book1/main.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <ntqapplication.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include "book.h"
#include "../connection.h"
diff --git a/tools/designer/examples/book/book2/main.cpp b/tools/designer/examples/book/book2/main.cpp
index b3ebdad0..e101e271 100644
--- a/tools/designer/examples/book/book2/main.cpp
+++ b/tools/designer/examples/book/book2/main.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <ntqapplication.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include "book.h"
#include "../connection.h"
diff --git a/tools/designer/examples/book/book3/main.cpp b/tools/designer/examples/book/book3/main.cpp
index ea512571..db0977fb 100644
--- a/tools/designer/examples/book/book3/main.cpp
+++ b/tools/designer/examples/book/book3/main.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <ntqapplication.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include "book.h"
#include "../connection.h"
diff --git a/tools/designer/examples/book/book4/main.cpp b/tools/designer/examples/book/book4/main.cpp
index 1abe5a9a..234e8e7f 100644
--- a/tools/designer/examples/book/book4/main.cpp
+++ b/tools/designer/examples/book/book4/main.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <ntqapplication.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include "book.h"
#include "../connection.h"
diff --git a/tools/designer/examples/book/book5/book.ui b/tools/designer/examples/book/book5/book.ui
index ce056dab..63f3b696 100644
--- a/tools/designer/examples/book/book5/book.ui
+++ b/tools/designer/examples/book/book5/book.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>BookForm</class>
-<include location="local" impldecl="in declaration">ntqdatabrowser.h</include>
+<include location="local" impldecl="in declaration">tqdatabrowser.h</include>
<include location="local" impldecl="in declaration">editbook.h</include>
<include location="local" implDecl="in declaration">book.ui.h</include>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/tools/designer/examples/book/book5/main.cpp b/tools/designer/examples/book/book5/main.cpp
index b3ebdad0..e101e271 100644
--- a/tools/designer/examples/book/book5/main.cpp
+++ b/tools/designer/examples/book/book5/main.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <ntqapplication.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include "book.h"
#include "../connection.h"
diff --git a/tools/designer/examples/book/book6/book.ui b/tools/designer/examples/book/book6/book.ui
index 8adbb2bb..3581befb 100644
--- a/tools/designer/examples/book/book6/book.ui
+++ b/tools/designer/examples/book/book6/book.ui
@@ -1,8 +1,8 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>BookForm</class>
-<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
+<include location="global" impldecl="in declaration">tqsqlrecord.h</include>
<include location="local" impldecl="in declaration">editbook.h</include>
-<include location="global" impldecl="in declaration">ntqdatabrowser.h</include>
+<include location="global" impldecl="in declaration">tqdatabrowser.h</include>
<include location="local" implDecl="in declaration">book.ui.h</include>
<layoutdefaults spacing="6" margin="11"/>
<widget class="TQDialog">
diff --git a/tools/designer/examples/book/book6/editbook.ui b/tools/designer/examples/book/book6/editbook.ui
index b9162872..c09fc244 100644
--- a/tools/designer/examples/book/book6/editbook.ui
+++ b/tools/designer/examples/book/book6/editbook.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>EditBookForm</class>
-<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
+<include location="global" impldecl="in declaration">tqsqlrecord.h</include>
<include location="local" implDecl="in declaration">editbook.ui.h</include>
<forward>class TQSqlRecord;</forward>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/tools/designer/examples/book/book6/main.cpp b/tools/designer/examples/book/book6/main.cpp
index b3ebdad0..e101e271 100644
--- a/tools/designer/examples/book/book6/main.cpp
+++ b/tools/designer/examples/book/book6/main.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <ntqapplication.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include "book.h"
#include "../connection.h"
diff --git a/tools/designer/examples/book/book7/book.ui b/tools/designer/examples/book/book7/book.ui
index 4a03ee6d..d44537a8 100644
--- a/tools/designer/examples/book/book7/book.ui
+++ b/tools/designer/examples/book/book7/book.ui
@@ -1,8 +1,8 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>BookForm</class>
-<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
+<include location="global" impldecl="in declaration">tqsqlrecord.h</include>
<include location="local" impldecl="in declaration">editbook.h</include>
-<include location="global" impldecl="in declaration">ntqdatabrowser.h</include>
+<include location="global" impldecl="in declaration">tqdatabrowser.h</include>
<include location="local" implDecl="in declaration">book.ui.h</include>
<layoutdefaults spacing="6" margin="11"/>
<widget class="TQDialog">
diff --git a/tools/designer/examples/book/book7/editbook.ui b/tools/designer/examples/book/book7/editbook.ui
index 635d82fe..12f60a9e 100644
--- a/tools/designer/examples/book/book7/editbook.ui
+++ b/tools/designer/examples/book/book7/editbook.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>EditBookForm</class>
-<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
+<include location="global" impldecl="in declaration">tqsqlrecord.h</include>
<include location="local" implDecl="in declaration">editbook.ui.h</include>
<forward>class TQSqlRecord;</forward>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/tools/designer/examples/book/book7/main.cpp b/tools/designer/examples/book/book7/main.cpp
index b3ebdad0..e101e271 100644
--- a/tools/designer/examples/book/book7/main.cpp
+++ b/tools/designer/examples/book/book7/main.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <ntqapplication.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include "book.h"
#include "../connection.h"
diff --git a/tools/designer/examples/book/book8/book.ui b/tools/designer/examples/book/book8/book.ui
index 4a03ee6d..d44537a8 100644
--- a/tools/designer/examples/book/book8/book.ui
+++ b/tools/designer/examples/book/book8/book.ui
@@ -1,8 +1,8 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>BookForm</class>
-<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
+<include location="global" impldecl="in declaration">tqsqlrecord.h</include>
<include location="local" impldecl="in declaration">editbook.h</include>
-<include location="global" impldecl="in declaration">ntqdatabrowser.h</include>
+<include location="global" impldecl="in declaration">tqdatabrowser.h</include>
<include location="local" implDecl="in declaration">book.ui.h</include>
<layoutdefaults spacing="6" margin="11"/>
<widget class="TQDialog">
diff --git a/tools/designer/examples/book/book8/editbook.ui b/tools/designer/examples/book/book8/editbook.ui
index 901f65de..e8119a2d 100644
--- a/tools/designer/examples/book/book8/editbook.ui
+++ b/tools/designer/examples/book/book8/editbook.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>EditBookForm</class>
-<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
+<include location="global" impldecl="in declaration">tqsqlrecord.h</include>
<include location="local" implDecl="in declaration">editbook.ui.h</include>
<forward>class TQSqlRecord;</forward>
<variable>TQMap&lt;TQString,int&gt; authorMap;</variable>
diff --git a/tools/designer/examples/book/book8/main.cpp b/tools/designer/examples/book/book8/main.cpp
index b3ebdad0..e101e271 100644
--- a/tools/designer/examples/book/book8/main.cpp
+++ b/tools/designer/examples/book/book8/main.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <ntqapplication.h>
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include "book.h"
#include "../connection.h"
diff --git a/tools/designer/examples/book/connection.cpp b/tools/designer/examples/book/connection.cpp
index d9b0df31..ff56e15d 100644
--- a/tools/designer/examples/book/connection.cpp
+++ b/tools/designer/examples/book/connection.cpp
@@ -6,7 +6,7 @@
** program may be used, distributed and modified without limitation.
**
*****************************************************************************/
-#include <ntqsqldatabase.h>
+#include <tqsqldatabase.h>
#include "connection.h"
bool createConnections()
diff --git a/tools/designer/examples/opengl/main.cpp b/tools/designer/examples/opengl/main.cpp
index 81a4b4ef..c30e3630 100644
--- a/tools/designer/examples/opengl/main.cpp
+++ b/tools/designer/examples/opengl/main.cpp
@@ -34,7 +34,7 @@
#include <widgetinterface.h>
-#include <ntqobjectcleanuphandler.h>
+#include <tqobjectcleanuphandler.h>
#include <ntqpixmap.h>
#include "glwidget.h"
diff --git a/tools/designer/examples/receiver2/receiver.h b/tools/designer/examples/receiver2/receiver.h
index 773f47ec..685da7e3 100644
--- a/tools/designer/examples/receiver2/receiver.h
+++ b/tools/designer/examples/receiver2/receiver.h
@@ -1,4 +1,4 @@
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqdialog.h>
class Receiver : public TQObject
diff --git a/tools/designer/interfaces/classbrowserinterface.h b/tools/designer/interfaces/classbrowserinterface.h
index 2762a329..2b95e067 100644
--- a/tools/designer/interfaces/classbrowserinterface.h
+++ b/tools/designer/interfaces/classbrowserinterface.h
@@ -48,7 +48,7 @@
//
#include <private/qcom_p.h>
-#include <ntqobject.h>
+#include <tqobject.h>
class TQListView;
// {4ede3c32-ae96-4b7a-9e38-9f1d93592391}
diff --git a/tools/designer/interfaces/designerinterface.h b/tools/designer/interfaces/designerinterface.h
index 31b750e9..b98ff4d9 100644
--- a/tools/designer/interfaces/designerinterface.h
+++ b/tools/designer/interfaces/designerinterface.h
@@ -53,7 +53,7 @@
#include <ntqmap.h>
#include <ntqstringlist.h>
#include <ntqwidgetlist.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
struct DesignerProject;
struct DesignerDatabase;
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tools/designer/plugins/cppeditor/cppcompletion.cpp
index a5643b91..ede83151 100644
--- a/tools/designer/plugins/cppeditor/cppcompletion.cpp
+++ b/tools/designer/plugins/cppeditor/cppcompletion.cpp
@@ -33,9 +33,9 @@
**********************************************************************/
#include "cppcompletion.h"
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqmetaobject.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqregexp.h>
CppEditorCompletion::CppEditorCompletion( Editor *e )
diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
index d1270141..7b347237 100644
--- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
+++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
@@ -36,7 +36,7 @@
#define EDITORINTERFACEIMPL_H
#include <editorinterface.h>
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqguardedptr.h>
class TQTimer;
diff --git a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
index 1fbd63e0..aba6008c 100644
--- a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
@@ -33,7 +33,7 @@
**********************************************************************/
#include "languageinterfaceimpl.h"
-#include <ntqobject.h>
+#include <tqobject.h>
#include <designerinterface.h>
#include <ntqfile.h>
#include "yyreg.h"
diff --git a/tools/designer/plugins/dlg/dlg2ui.h b/tools/designer/plugins/dlg/dlg2ui.h
index 73150f77..e06ade62 100644
--- a/tools/designer/plugins/dlg/dlg2ui.h
+++ b/tools/designer/plugins/dlg/dlg2ui.h
@@ -35,7 +35,7 @@
#ifndef DLG2UI_H
#define DLG2UI_H
-#include <ntqdom.h>
+#include <tqdom.h>
#include <ntqmap.h>
#include <ntqstring.h>
#include <ntqvariant.h>
diff --git a/tools/designer/plugins/glade/glade2ui.h b/tools/designer/plugins/glade/glade2ui.h
index c0caf428..e8c46caf 100644
--- a/tools/designer/plugins/glade/glade2ui.h
+++ b/tools/designer/plugins/glade/glade2ui.h
@@ -35,7 +35,7 @@
#ifndef GLADE2UI_H
#define GLADE2UI_H
-#include <ntqdom.h>
+#include <tqdom.h>
#include <ntqmap.h>
#include <ntqstring.h>
#include <ntqvariant.h>
diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp
index 3189dde0..c43bb65f 100644
--- a/tools/designer/plugins/rc/rc2ui.cpp
+++ b/tools/designer/plugins/rc/rc2ui.cpp
@@ -846,7 +846,7 @@ bool RC2UI::makeStringTable()
*out << "#define STRINGTABLE_H" << endl;
*out << endl;
*out << "#include <ntqstring.h>" << endl;
- *out << "#include <ntqobject.h>" << endl;
+ *out << "#include <tqobject.h>" << endl;
*out << endl;
TQString ID;
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index adb283a7..62e003cd 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -51,12 +51,12 @@
#include <limits.h>
#ifndef TQT_NO_SQL
-#include <ntqdatatable.h>
-#include <ntqdatabrowser.h>
-#include <ntqdataview.h>
-#include <ntqsqleditorfactory.h>
-#include <ntqsqlindex.h>
-#include <ntqsqlcursor.h>
+#include <tqdatatable.h>
+#include <tqdatabrowser.h>
+#include <tqdataview.h>
+#include <tqsqleditorfactory.h>
+#include <tqsqlindex.h>
+#include <tqsqlcursor.h>
#endif
SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w,
diff --git a/tools/designer/shared/domtool.cpp b/tools/designer/shared/domtool.cpp
index 499ee562..a9c5d95c 100644
--- a/tools/designer/shared/domtool.cpp
+++ b/tools/designer/shared/domtool.cpp
@@ -40,7 +40,7 @@
#include <ntqrect.h>
#include <ntqsize.h>
#include <ntqfont.h>
-#include <ntqdom.h>
+#include <tqdom.h>
/*!
\class DomTool domtool.h
diff --git a/tools/designer/shared/parser.cpp b/tools/designer/shared/parser.cpp
index f0624d7d..d001d8bd 100644
--- a/tools/designer/shared/parser.cpp
+++ b/tools/designer/shared/parser.cpp
@@ -32,7 +32,7 @@
**********************************************************************/
#include "parser.h"
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqstringlist.h>
class NormalizeObject : public TQObject
diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp
index fa3085e5..dd941069 100644
--- a/tools/designer/shared/ui2uib.cpp
+++ b/tools/designer/shared/ui2uib.cpp
@@ -39,10 +39,10 @@
#include <ntqcolor.h>
#include <ntqcursor.h>
#include <ntqdatetime.h>
-#include <ntqdom.h>
+#include <tqdom.h>
#include <ntqfile.h>
#include <ntqfont.h>
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqrect.h>
#include <ntqsizepolicy.h>
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index baa3c1be..6cbc34ac 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -263,7 +263,7 @@ void WidgetDatabase::setupDataBase( int id )
#if !defined(TQT_NO_SQL)
r = new WidgetDatabaseRecord;
r->iconSet = "designer_datatable.png";
- r->includeFile = "ntqdatatable.h";
+ r->includeFile = "tqdatatable.h";
r->name = "TQDataTable";
r->group = widgetGroup( "Database" );
r->toolTip = "Data Table";
@@ -552,7 +552,7 @@ void WidgetDatabase::setupDataBase( int id )
r = new WidgetDatabaseRecord;
r->iconSet = "";
r->name = "TQDataBrowser";
- r->includeFile = "ntqdatabrowser.h";
+ r->includeFile = "tqdatabrowser.h";
r->group = widgetGroup( "Database" );
r->toolTip = "Data Browser";
r->iconSet = "designer_databrowser.png";
@@ -563,7 +563,7 @@ void WidgetDatabase::setupDataBase( int id )
r = new WidgetDatabaseRecord;
r->iconSet = "";
r->name = "TQDataView";
- r->includeFile = "ntqdataview.h";
+ r->includeFile = "tqdataview.h";
r->group = widgetGroup( "Database" );
r->toolTip = "Data View";
r->iconSet = "designer_dataview.png";
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index 42ee08cb..4706675e 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -753,9 +753,9 @@ void Uic::createFormImpl( const TQDomElement &e )
registerDatabases( e );
dbConnections = unique( dbConnections );
if ( dbConnections.count() )
- globalIncludes += "ntqsqldatabase.h";
+ globalIncludes += "tqsqldatabase.h";
if ( dbCursors.count() )
- globalIncludes += "ntqsqlcursor.h";
+ globalIncludes += "tqsqlcursor.h";
bool dbForm = FALSE;
if ( dbForms[ "(default)" ].count() )
dbForm = TRUE;
@@ -769,8 +769,8 @@ void Uic::createFormImpl( const TQDomElement &e )
}
}
if ( dbForm || subDbForms ) {
- globalIncludes += "ntqsqlform.h";
- globalIncludes += "ntqsqlrecord.h";
+ globalIncludes += "tqsqlform.h";
+ globalIncludes += "tqsqlrecord.h";
}
// do the local includes afterwards, since global includes have priority on clashes
diff --git a/tools/designer/uic/uic.h b/tools/designer/uic/uic.h
index f7e62f6e..e0face7f 100644
--- a/tools/designer/uic/uic.h
+++ b/tools/designer/uic/uic.h
@@ -33,7 +33,7 @@
#ifndef UIC_H
#define UIC_H
-#include <ntqdom.h>
+#include <tqdom.h>
#include <ntqstring.h>
#include <ntqstringlist.h>
#include <ntqmap.h>
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index 428385d5..1108655b 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/qwidgetfactory.cpp
@@ -38,7 +38,7 @@
#include <ntqfeatures.h>
#include "../designer/database2.h"
-#include <ntqdom.h>
+#include <tqdom.h>
#include <ntqdir.h>
#include <ntqlayout.h>
#include <ntqmetaobject.h>
@@ -47,15 +47,15 @@
#include <ntqapplication.h>
#include <ntqtooltip.h>
#include <ntqwhatsthis.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <private/qpluginmanager_p.h>
#include <ntqmime.h>
#include <ntqdragobject.h>
#ifndef TQT_NO_SQL
-#include <ntqsqlrecord.h>
-#include <ntqsqldatabase.h>
-#include <ntqdatatable.h>
+#include <tqsqlrecord.h>
+#include <tqsqldatabase.h>
+#include <tqdatatable.h>
#endif
// include all TQt widgets we support
diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp
index 0a93e89b..604187f3 100644
--- a/tools/linguist/linguist/phrase.cpp
+++ b/tools/linguist/linguist/phrase.cpp
@@ -39,7 +39,7 @@
#include <ntqmessagebox.h>
#include <ntqregexp.h>
#include <ntqtextstream.h>
-#include <ntqxml.h>
+#include <tqxml.h>
static TQString protect( const TQString& str )
{
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index c5ed953b..150073f4 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -38,7 +38,7 @@
#include <ntqstring.h>
#include <ntqtextstream.h>
#include <ntqvaluestack.h>
-#include <ntqxml.h>
+#include <tqxml.h>
#include <ctype.h>
#include <errno.h>
diff --git a/tools/linguist/shared/metatranslator.cpp b/tools/linguist/shared/metatranslator.cpp
index 3ea91f2c..73e435d0 100644
--- a/tools/linguist/shared/metatranslator.cpp
+++ b/tools/linguist/shared/metatranslator.cpp
@@ -39,7 +39,7 @@
#include <ntqmessagebox.h>
#include <ntqtextcodec.h>
#include <ntqtextstream.h>
-#include <ntqxml.h>
+#include <tqxml.h>
static bool encodingIsUtf8( const TQXmlAttributes& atts )
{
diff --git a/tools/msg2tqm/msg2tqm.cpp b/tools/msg2tqm/msg2tqm.cpp
index 1f9688a6..07c2ff46 100644
--- a/tools/msg2tqm/msg2tqm.cpp
+++ b/tools/msg2tqm/msg2tqm.cpp
@@ -210,7 +210,7 @@ void translate( const TQString& filename, const TQString& qmfile )
}
-// workaround for BCC problem, ntqtranslator.h includes ntqwindowdefs.h via ntqobject.h, see NEEDS_QMAIN
+// workaround for BCC problem, ntqtranslator.h includes ntqwindowdefs.h via tqobject.h, see NEEDS_QMAIN
#if defined(main)
#undef main
#endif
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 9a1d0044..14edb1ef 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -41,7 +41,7 @@
#include <ntqcombobox.h>
#include <ntqstylefactory.h>
#include <ntqinputcontextfactory.h>
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
#include <ntqfontdatabase.h>
#include <ntqlineedit.h>
#include <ntqlistbox.h>
diff --git a/tools/qtconfig/previewwidget.cpp b/tools/qtconfig/previewwidget.cpp
index 1bb32b1d..e3433763 100644
--- a/tools/qtconfig/previewwidget.cpp
+++ b/tools/qtconfig/previewwidget.cpp
@@ -33,7 +33,7 @@
#include "previewwidget.h"
-#include <ntqobjectlist.h>
+#include <tqobjectlist.h>
PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
: PreviewWidgetBase( parent, name )