summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/helpdialogimpl.cpp4
-rw-r--r--tools/assistant/mainwindow.ui6
-rw-r--r--tools/assistant/settingsdialogimpl.cpp6
-rw-r--r--tools/assistant/topicchooserimpl.cpp2
-rw-r--r--tools/designer/designer/actioneditorimpl.cpp6
-rw-r--r--tools/designer/designer/connectionitems.cpp4
-rw-r--r--tools/designer/designer/customwidgeteditorimpl.cpp10
-rw-r--r--tools/designer/designer/dbconnectionimpl.cpp6
-rw-r--r--tools/designer/designer/dbconnectionsimpl.cpp8
-rw-r--r--tools/designer/designer/designer_pch.h12
-rw-r--r--tools/designer/designer/editfunctionsimpl.cpp8
-rw-r--r--tools/designer/designer/finddialog.ui2
-rw-r--r--tools/designer/designer/formsettingsimpl.cpp12
-rw-r--r--tools/designer/designer/formwindow.cpp4
-rw-r--r--tools/designer/designer/iconvieweditorimpl.cpp6
-rw-r--r--tools/designer/designer/listboxeditorimpl.cpp6
-rw-r--r--tools/designer/designer/listboxrename.cpp2
-rw-r--r--tools/designer/designer/listdnd.h2
-rw-r--r--tools/designer/designer/listvieweditorimpl.cpp8
-rw-r--r--tools/designer/designer/mainwindow.cpp2
-rw-r--r--tools/designer/designer/mainwindowactions.cpp6
-rw-r--r--tools/designer/designer/menubareditor.cpp2
-rw-r--r--tools/designer/designer/multilineeditorimpl.cpp2
-rw-r--r--tools/designer/designer/newformimpl.cpp4
-rw-r--r--tools/designer/designer/paletteeditoradvancedimpl.cpp6
-rw-r--r--tools/designer/designer/paletteeditorimpl.cpp6
-rw-r--r--tools/designer/designer/pixmapchooser.cpp4
-rw-r--r--tools/designer/designer/pixmapchooser.h2
-rw-r--r--tools/designer/designer/popupmenueditor.cpp2
-rw-r--r--tools/designer/designer/projectsettingsimpl.cpp8
-rw-r--r--tools/designer/designer/propertyeditor.cpp8
-rw-r--r--tools/designer/designer/propertyeditor.h4
-rw-r--r--tools/designer/designer/qcompletionedit.h2
-rw-r--r--tools/designer/designer/replacedialog.ui2
-rw-r--r--tools/designer/designer/resource.cpp2
-rw-r--r--tools/designer/designer/startdialogimpl.cpp6
-rw-r--r--tools/designer/designer/tableeditorimpl.cpp6
-rw-r--r--tools/designer/designer/variabledialogimpl.cpp4
-rw-r--r--tools/designer/designer/widgetfactory.cpp14
-rw-r--r--tools/designer/designer/widgetfactory.h6
-rw-r--r--tools/designer/designer/wizardeditorimpl.cpp2
-rw-r--r--tools/designer/editor/preferences.ui8
-rw-r--r--tools/designer/examples/colortool/mainform.ui6
-rw-r--r--tools/designer/examples/credit/creditform.cpp4
-rw-r--r--tools/designer/examples/credit/creditformbase.cpp6
-rw-r--r--tools/designer/examples/credit/creditformbase.h2
-rw-r--r--tools/designer/examples/filechooser/widget/filechooser.cpp4
-rw-r--r--tools/designer/examples/receiver1/mainform.ui2
-rw-r--r--tools/designer/examples/receiver2/mainform.ui2
-rw-r--r--tools/designer/examples/receiver2/receiver.cpp4
-rw-r--r--tools/designer/examples/receiver2/receiver.h2
-rw-r--r--tools/designer/examples/sizeaware/sizeaware.h2
-rw-r--r--tools/designer/examples/vcr/vcr.cpp2
-rw-r--r--tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp2
-rw-r--r--tools/designer/plugins/dlg/dlg2ui.cpp4
-rw-r--r--tools/designer/plugins/wizards/sqlformwizardimpl.cpp10
-rw-r--r--tools/designer/shared/widgetdatabase.cpp13
-rw-r--r--tools/designer/uilib/tqwidgetfactory.cpp22
-rw-r--r--tools/linguist/book/linguist-programmer.leaf28
-rw-r--r--tools/linguist/linguist/finddialog.cpp6
-rw-r--r--tools/linguist/linguist/finddialog.h2
-rw-r--r--tools/linguist/linguist/msgedit.cpp6
-rw-r--r--tools/linguist/linguist/msgedit.h2
-rw-r--r--tools/linguist/linguist/phrasebookbox.cpp4
-rw-r--r--tools/linguist/linguist/phrasebookbox.h2
-rw-r--r--tools/linguist/tutorial/tt1/main.cpp2
-rw-r--r--tools/linguist/tutorial/tt2/arrowpad.cpp2
-rw-r--r--tools/linguist/tutorial/tt3/printpanel.cpp2
-rw-r--r--tools/qtconfig/mainwindow.cpp8
-rw-r--r--tools/qtconfig/paletteeditoradvanced.cpp6
70 files changed, 190 insertions, 189 deletions
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index 3da2e1e3e..b972d872d 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -48,13 +48,13 @@
#include <tqfileinfo.h>
#include <ntqheader.h>
#include <tqlabel.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <ntqmessagebox.h>
#include <tqpixmap.h>
#include <ntqprogressbar.h>
#include <tqptrlist.h>
#include <tqptrstack.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <tqregexp.h>
#include <tqsettings.h>
#include <tqstatusbar.h>
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index 8c1977309..81586bd7f 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -575,7 +575,7 @@
<include location="global" impldecl="in implementation">ntqmessagebox.h</include>
<include location="global" impldecl="in implementation">tqfontdatabase.h</include>
<include location="global" impldecl="in implementation">ntqaccel.h</include>
- <include location="global" impldecl="in implementation">ntqcombobox.h</include>
+ <include location="global" impldecl="in implementation">tqcombobox.h</include>
<include location="global" impldecl="in implementation">tqpaintdevicemetrics.h</include>
<include location="global" impldecl="in implementation">tqsimplerichtext.h</include>
<include location="global" impldecl="in implementation">tqfileinfo.h</include>
@@ -592,9 +592,9 @@
<include location="global" impldecl="in implementation">tqpainter.h</include>
<include location="global" impldecl="in implementation">tqurl.h</include>
<include location="global" impldecl="in implementation">tqstatusbar.h</include>
- <include location="global" impldecl="in implementation">ntqlineedit.h</include>
+ <include location="global" impldecl="in implementation">tqlineedit.h</include>
<include location="global" impldecl="in implementation">tqsettings.h</include>
- <include location="global" impldecl="in implementation">ntqcheckbox.h</include>
+ <include location="global" impldecl="in implementation">tqcheckbox.h</include>
<include location="local" impldecl="in implementation">tabbedbrowser.h</include>
<include location="global" impldecl="in declaration">tqptrlist.h</include>
<include location="global" impldecl="in declaration">ntqguardedptr.h</include>
diff --git a/tools/assistant/settingsdialogimpl.cpp b/tools/assistant/settingsdialogimpl.cpp
index 9898f64e6..2be9b31bd 100644
--- a/tools/assistant/settingsdialogimpl.cpp
+++ b/tools/assistant/settingsdialogimpl.cpp
@@ -36,13 +36,13 @@
#include "config.h"
#include <ntqapplication.h>
-#include <ntqpushbutton.h>
-#include <ntqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
#include <tqcolordialog.h>
#include <tqdir.h>
#include <tqfiledialog.h>
#include <tqfileinfo.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <ntqlistbox.h>
#include <ntqlistview.h>
#include <ntqmessagebox.h>
diff --git a/tools/assistant/topicchooserimpl.cpp b/tools/assistant/topicchooserimpl.cpp
index a0ff04826..d81427a9c 100644
--- a/tools/assistant/topicchooserimpl.cpp
+++ b/tools/assistant/topicchooserimpl.cpp
@@ -35,7 +35,7 @@
#include <tqlabel.h>
#include <ntqlistbox.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
TopicChooser::TopicChooser( TQWidget *parent, const TQStringList &lnkNames,
const TQStringList &lnks, const TQString &title )
diff --git a/tools/designer/designer/actioneditorimpl.cpp b/tools/designer/designer/actioneditorimpl.cpp
index 938b8f25e..f89813961 100644
--- a/tools/designer/designer/actioneditorimpl.cpp
+++ b/tools/designer/designer/actioneditorimpl.cpp
@@ -41,12 +41,12 @@
#include "formfile.h"
#include <tqaction.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqlabel.h>
#include <tqtoolbutton.h>
#include <ntqlistview.h>
-#include <ntqcheckbox.h>
-#include <ntqpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
#include <tqpopupmenu.h>
#include <tqobjectlist.h>
diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp
index 65f433a2b..234049595 100644
--- a/tools/designer/designer/connectionitems.cpp
+++ b/tools/designer/designer/connectionitems.cpp
@@ -38,9 +38,9 @@
#include "widgetfactory.h"
#include "project.h"
#include <tqpainter.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
#include <ntqmetaobject.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
#include <ntqlistbox.h>
#include <tqaction.h>
#include <tqdatabrowser.h>
diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp
index 296000d9a..a2fe0a13e 100644
--- a/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -41,10 +41,10 @@
#include "widgetdatabase.h"
#include <ntqlistbox.h>
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
-#include <ntqcombobox.h>
-#include <ntqspinbox.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqspinbox.h>
#include <tqlabel.h>
#include <ntqmessagebox.h>
#include <tqfiledialog.h>
@@ -56,7 +56,7 @@
#include <tqtextstream.h>
#include <tqdom.h>
#include <tqtextcodec.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
: CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw )
diff --git a/tools/designer/designer/dbconnectionimpl.cpp b/tools/designer/designer/dbconnectionimpl.cpp
index c14ded90c..745c56c52 100644
--- a/tools/designer/designer/dbconnectionimpl.cpp
+++ b/tools/designer/designer/dbconnectionimpl.cpp
@@ -36,9 +36,9 @@
#include "project.h"
#include "asciivalidator.h"
#include <ntqgroupbox.h>
-#include <ntqcombobox.h>
-#include <ntqspinbox.h>
-#include <ntqlineedit.h>
+#include <tqcombobox.h>
+#include <tqspinbox.h>
+#include <tqlineedit.h>
#include <ntqlayout.h>
#include <tqsqldatabase.h>
diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp
index c08e9554e..69d860d70 100644
--- a/tools/designer/designer/dbconnectionsimpl.cpp
+++ b/tools/designer/designer/dbconnectionsimpl.cpp
@@ -37,10 +37,10 @@
#include <ntqlayout.h>
#include "project.h"
#include <ntqlistbox.h>
-#include <ntqcombobox.h>
-#include <ntqspinbox.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
+#include <tqcombobox.h>
+#include <tqspinbox.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
#include <tqsqldatabase.h>
#include <ntqmessagebox.h>
#include <ntqapplication.h>
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index 0be6a87ac..49a463505 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -11,13 +11,13 @@
#include <private/qucomextra_p.h>
#include <tqaction.h>
#include <ntqapplication.h>
-#include <ntqcheckbox.h>
-#include <ntqcombobox.h>
-#include <ntqdialog.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqdialog.h>
#include <ntqheader.h>
#include <tqlabel.h>
#include <ntqlayout.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <ntqlistbox.h>
#include <ntqlistview.h>
#include <tqmap.h>
@@ -26,8 +26,8 @@
#include <tqobjectlist.h>
#include <tqpainter.h>
#include <tqpixmap.h>
-#include <ntqpushbutton.h>
-#include <ntqspinbox.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
#include <tqstring.h>
#include <tqtooltip.h>
#include <ntqvariant.h>
diff --git a/tools/designer/designer/editfunctionsimpl.cpp b/tools/designer/designer/editfunctionsimpl.cpp
index dbdbe133b..840f98f93 100644
--- a/tools/designer/designer/editfunctionsimpl.cpp
+++ b/tools/designer/designer/editfunctionsimpl.cpp
@@ -40,16 +40,16 @@
#include "project.h"
#include <ntqlistview.h>
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
-#include <ntqcombobox.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
#include <tqstrlist.h>
#include <ntqmessagebox.h>
#include <ntqlayout.h>
#include <tqlabel.h>
#include <ntqgroupbox.h>
#include <ntqheader.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
: EditFunctionsBase( parent, 0, TRUE ), formWindow( fw )
diff --git a/tools/designer/designer/finddialog.ui b/tools/designer/designer/finddialog.ui
index 73b00ef6f..1b9ce01ad 100644
--- a/tools/designer/designer/finddialog.ui
+++ b/tools/designer/designer/finddialog.ui
@@ -260,7 +260,7 @@
<tabstop>PushButton2</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in implementation">ntqlineedit.h</include>
+ <include location="global" impldecl="in implementation">tqlineedit.h</include>
<include location="local" impldecl="in implementation">../interfaces/editorinterface.h</include>
<include location="local" impldecl="in implementation">finddialog.ui.h</include>
</includes>
diff --git a/tools/designer/designer/formsettingsimpl.cpp b/tools/designer/designer/formsettingsimpl.cpp
index 88ddef415..30b7b2223 100644
--- a/tools/designer/designer/formsettingsimpl.cpp
+++ b/tools/designer/designer/formsettingsimpl.cpp
@@ -40,12 +40,12 @@
#include "project.h"
#include <ntqmultilineedit.h>
-#include <ntqpushbutton.h>
-#include <ntqcombobox.h>
-#include <ntqradiobutton.h>
-#include <ntqlineedit.h>
-#include <ntqspinbox.h>
-#include <ntqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqcombobox.h>
+#include <tqradiobutton.h>
+#include <tqlineedit.h>
+#include <tqspinbox.h>
+#include <tqcheckbox.h>
FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
: FormSettingsBase( parent, 0, TRUE ), formwindow( fw )
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index 2e0c32d94..d02fb6119 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -59,14 +59,14 @@
#include <tqtimer.h>
#include <ntqapplication.h>
#include <ntqlayout.h>
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
#include <tqstatusbar.h>
#include <ntqapplication.h>
#include <tqpalette.h>
#include <ntqmessagebox.h>
#include <tqpopupmenu.h>
#include <tqsizegrip.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <ntqmetaobject.h>
#include <tqtooltip.h>
diff --git a/tools/designer/designer/iconvieweditorimpl.cpp b/tools/designer/designer/iconvieweditorimpl.cpp
index 34bbf1bdb..ebc3cf487 100644
--- a/tools/designer/designer/iconvieweditorimpl.cpp
+++ b/tools/designer/designer/iconvieweditorimpl.cpp
@@ -36,11 +36,11 @@
#include "mainwindow.h"
#include "pixmapchooser.h"
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqlabel.h>
#include <tqiconview.h>
-#include <ntqpushbutton.h>
-#include <ntqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
: IconViewEditorBase( parent, 0, TRUE ), formwindow( fw )
diff --git a/tools/designer/designer/listboxeditorimpl.cpp b/tools/designer/designer/listboxeditorimpl.cpp
index 907648d1d..ec7fa9129 100644
--- a/tools/designer/designer/listboxeditorimpl.cpp
+++ b/tools/designer/designer/listboxeditorimpl.cpp
@@ -39,11 +39,11 @@
#include "listboxdnd.h"
#include "listboxrename.h"
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqlabel.h>
#include <ntqlistbox.h>
-#include <ntqpushbutton.h>
-#include <ntqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
: ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw )
diff --git a/tools/designer/designer/listboxrename.cpp b/tools/designer/designer/listboxrename.cpp
index 2e2bffe95..44eb05cc7 100644
--- a/tools/designer/designer/listboxrename.cpp
+++ b/tools/designer/designer/listboxrename.cpp
@@ -32,7 +32,7 @@
**********************************************************************/
#include <ntqheader.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqtimer.h>
#include "listboxrename.h"
diff --git a/tools/designer/designer/listdnd.h b/tools/designer/designer/listdnd.h
index c3e414a03..a464255c0 100644
--- a/tools/designer/designer/listdnd.h
+++ b/tools/designer/designer/listdnd.h
@@ -35,7 +35,7 @@
#define LISTDND_H
#include <tqobject.h>
-#include <ntqscrollview.h>
+#include <tqscrollview.h>
class ListDnd : public TQObject
{
diff --git a/tools/designer/designer/listvieweditorimpl.cpp b/tools/designer/designer/listvieweditorimpl.cpp
index 6d2e98235..51a271401 100644
--- a/tools/designer/designer/listvieweditorimpl.cpp
+++ b/tools/designer/designer/listvieweditorimpl.cpp
@@ -43,12 +43,12 @@
#include <ntqlistview.h>
#include <ntqheader.h>
#include <ntqlistbox.h>
-#include <ntqlineedit.h>
-#include <ntqcheckbox.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
#include <tqlabel.h>
#include <ntqtabwidget.h>
-#include <ntqspinbox.h>
-#include <ntqpushbutton.h>
+#include <tqspinbox.h>
+#include <tqpushbutton.h>
#include <tqptrstack.h>
ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw )
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 3c188d6c6..428443f05 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -103,7 +103,7 @@
#include <tqlabel.h>
#include <tqstatusbar.h>
#include <tqfile.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
#include <tqwhatsthis.h>
#include <ntqwizard.h>
#include <tqtimer.h>
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index 1699b4725..16a185bdf 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -38,7 +38,7 @@
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
#include <tqmenubar.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqtooltip.h>
#include <ntqapplication.h>
#include <tqsignalmapper.h>
@@ -48,8 +48,8 @@
#include <tqstatusbar.h>
#include <ntqlistbox.h>
#include <tqclipboard.h>
-#include <ntqcombobox.h>
-#include <ntqspinbox.h>
+#include <tqcombobox.h>
+#include <tqspinbox.h>
#include <ntqinputdialog.h>
#include <tqdatetimeedit.h>
#include <tqtextedit.h>
diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp
index 173b18ce0..cc3e22c25 100644
--- a/tools/designer/designer/menubareditor.cpp
+++ b/tools/designer/designer/menubareditor.cpp
@@ -35,7 +35,7 @@
#include <ntqapplication.h>
#include <tqbitmap.h>
#include <tqdragobject.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqmainwindow.h>
#include <tqpainter.h>
#include <tqstyle.h>
diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp
index a75fdcbc9..450f01876 100644
--- a/tools/designer/designer/multilineeditorimpl.cpp
+++ b/tools/designer/designer/multilineeditorimpl.cpp
@@ -41,7 +41,7 @@
#include <tqtextedit.h>
#include <./private/qrichtext_p.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <ntqlayout.h>
#include <tqtoolbutton.h>
#include <ntqapplication.h>
diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp
index b1d237eef..75fd0c0c1 100644
--- a/tools/designer/designer/newformimpl.cpp
+++ b/tools/designer/designer/newformimpl.cpp
@@ -48,9 +48,9 @@
#include <tqlabel.h>
#include <tqfileinfo.h>
#include <tqdir.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <stdlib.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
#include <tqworkspace.h>
#include <ntqmessagebox.h>
diff --git a/tools/designer/designer/paletteeditoradvancedimpl.cpp b/tools/designer/designer/paletteeditoradvancedimpl.cpp
index f776e584d..4884c73f8 100644
--- a/tools/designer/designer/paletteeditoradvancedimpl.cpp
+++ b/tools/designer/designer/paletteeditoradvancedimpl.cpp
@@ -36,10 +36,10 @@
#include "mainwindow.h"
#include "formwindow.h"
-#include <ntqcheckbox.h>
-#include <ntqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
#include <ntqapplication.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <ntqlistbox.h>
#include <tqpainter.h>
#include <ntqgroupbox.h>
diff --git a/tools/designer/designer/paletteeditorimpl.cpp b/tools/designer/designer/paletteeditorimpl.cpp
index c23808f35..0aae0754b 100644
--- a/tools/designer/designer/paletteeditorimpl.cpp
+++ b/tools/designer/designer/paletteeditorimpl.cpp
@@ -38,10 +38,10 @@
#include "mainwindow.h"
#include "formwindow.h"
-#include <ntqcheckbox.h>
-#include <ntqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
#include <ntqapplication.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f )
: PaletteEditorBase( parent, name, modal, f ), formWindow( fw )
diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp
index 1ded61d8b..fdde54aa2 100644
--- a/tools/designer/designer/pixmapchooser.cpp
+++ b/tools/designer/designer/pixmapchooser.cpp
@@ -48,8 +48,8 @@
#include <tqimage.h>
#include <tqpainter.h>
#include <tqlabel.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
#include <tqiconview.h>
#if defined(DESIGNER)
diff --git a/tools/designer/designer/pixmapchooser.h b/tools/designer/designer/pixmapchooser.h
index 46f754506..a8bc94cf2 100644
--- a/tools/designer/designer/pixmapchooser.h
+++ b/tools/designer/designer/pixmapchooser.h
@@ -35,7 +35,7 @@
#define PIXMAPCHOOSER_H
#include <tqfiledialog.h>
-#include <ntqscrollview.h>
+#include <tqscrollview.h>
#include <tqpixmap.h>
#include <tqurl.h>
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index ba43a3633..2aa2c7062 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -35,7 +35,7 @@
#include <tqcstring.h>
#include <tqdatastream.h>
#include <tqdragobject.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqobjectlist.h>
#include <tqpainter.h>
#include <tqpopupmenu.h>
diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp
index 27554c196..215a2f391 100644
--- a/tools/designer/designer/projectsettingsimpl.cpp
+++ b/tools/designer/designer/projectsettingsimpl.cpp
@@ -41,14 +41,14 @@
#include "sourcefile.h"
#include "workspace.h"
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqtextedit.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
#include <tqfiledialog.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
#include <tqobjectlist.h>
#include <ntqheader.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <tqlabel.h>
/*
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index c5df3f06c..7a32cd344 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -55,14 +55,14 @@
#include <tqpalette.h>
#include <ntqapplication.h>
#include <ntqheader.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqstrlist.h>
#include <ntqmetaobject.h>
-#include <ntqcombobox.h>
-#include <ntqpushbutton.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
#include <ntqhbox.h>
#include <tqfontdialog.h>
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
#include <tqevent.h>
#include <tqobjectlist.h>
#include <ntqlistbox.h>
diff --git a/tools/designer/designer/propertyeditor.h b/tools/designer/designer/propertyeditor.h
index ca3b426f4..9740f0593 100644
--- a/tools/designer/designer/propertyeditor.h
+++ b/tools/designer/designer/propertyeditor.h
@@ -43,8 +43,8 @@
#include <ntqmodules.h>
#include <tqptrlist.h>
#include <ntqlayout.h>
-#include <ntqcheckbox.h>
-#include <ntqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
#include "hierarchyview.h"
#include "metadatabase.h"
diff --git a/tools/designer/designer/qcompletionedit.h b/tools/designer/designer/qcompletionedit.h
index 2b35c2412..792f74002 100644
--- a/tools/designer/designer/qcompletionedit.h
+++ b/tools/designer/designer/qcompletionedit.h
@@ -34,7 +34,7 @@
#ifndef TQCOMPLETIONEDIT_H
#define TQCOMPLETIONEDIT_H
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <tqstringlist.h>
class TQListBox;
diff --git a/tools/designer/designer/replacedialog.ui b/tools/designer/designer/replacedialog.ui
index 3cd6e2476..78c12653f 100644
--- a/tools/designer/designer/replacedialog.ui
+++ b/tools/designer/designer/replacedialog.ui
@@ -304,7 +304,7 @@
</tabstops>
<includes>
<include location="local" impldecl="in implementation">../interfaces/editorinterface.h</include>
- <include location="global" impldecl="in implementation">ntqlineedit.h</include>
+ <include location="global" impldecl="in implementation">tqlineedit.h</include>
<include location="local" impldecl="in implementation">replacedialog.ui.h</include>
</includes>
<forwards>
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index b1974e311..02a39753a 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -53,7 +53,7 @@
#include <ntqaccel.h>
#include <ntqapplication.h>
#include <tqbuffer.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
#include <tqdatetime.h>
#include <tqdom.h>
#include <ntqfeatures.h>
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index b27131ae6..4bd471363 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -2,19 +2,19 @@
#include <tqstringlist.h>
#include <tqptrlist.h>
#include <tqiconview.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqfiledialog.h>
#include <ntqtabwidget.h>
#include <tqpoint.h>
#include <tqobjectlist.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <ntqlayout.h>
#include <tqfileinfo.h>
#include <tqmap.h>
#include <tqdatetime.h>
#include <ntqapplication.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
#include <tqurl.h>
#include "mainwindow.h"
diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp
index 38d043f96..d1149670e 100644
--- a/tools/designer/designer/tableeditorimpl.cpp
+++ b/tools/designer/designer/tableeditorimpl.cpp
@@ -37,11 +37,11 @@
#endif
#include "formwindow.h"
#include <tqlabel.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
#include <ntqheader.h>
#include <ntqlistbox.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
#include "pixmapchooser.h"
#include "command.h"
#include <tqvaluelist.h>
diff --git a/tools/designer/designer/variabledialogimpl.cpp b/tools/designer/designer/variabledialogimpl.cpp
index c02dcf691..017767313 100644
--- a/tools/designer/designer/variabledialogimpl.cpp
+++ b/tools/designer/designer/variabledialogimpl.cpp
@@ -33,8 +33,8 @@
#include <ntqlistview.h>
#include <ntqgroupbox.h>
-#include <ntqlineedit.h>
-#include <ntqcombobox.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
#include <ntqmessagebox.h>
#include "metadatabase.h"
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index edc24274b..45fb9a901 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -64,21 +64,21 @@
#include <tqdatatable.h>
#endif
#include <tqdatetimeedit.h>
-#include <ntqlineedit.h>
-#include <ntqspinbox.h>
+#include <tqlineedit.h>
+#include <tqspinbox.h>
#include <ntqmultilineedit.h>
#include <tqtextedit.h>
#include <tqlabel.h>
#include <ntqlayout.h>
#include <tqwidgetstack.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
#include <ntqtabbar.h>
#include <ntqlistbox.h>
#include <ntqlistview.h>
#include <tqobjectlist.h>
-#include <ntqlcdnumber.h>
-#include <ntqslider.h>
-#include <ntqdial.h>
+#include <tqlcdnumber.h>
+#include <tqslider.h>
+#include <tqdial.h>
#include <ntqprogressbar.h>
#include <tqtextview.h>
#include <tqtextbrowser.h>
@@ -88,7 +88,7 @@
#include <ntqwizard.h>
#include <tqvaluelist.h>
#include <tqtimer.h>
-#include <ntqscrollbar.h>
+#include <tqscrollbar.h>
#include <tqmainwindow.h>
#include <tqmenubar.h>
#include <ntqapplication.h>
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 7f913721d..4256a7f0e 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -47,10 +47,10 @@
#include <tqlabel.h>
#include <ntqwizard.h>
#include <tqptrdict.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <tqtoolbutton.h>
-#include <ntqcheckbox.h>
-#include <ntqradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
#include <ntqbuttongroup.h>
#include <tqwidgetstack.h>
#include <ntqguardedptr.h>
diff --git a/tools/designer/designer/wizardeditorimpl.cpp b/tools/designer/designer/wizardeditorimpl.cpp
index a04a33f36..0450c76e5 100644
--- a/tools/designer/designer/wizardeditorimpl.cpp
+++ b/tools/designer/designer/wizardeditorimpl.cpp
@@ -40,7 +40,7 @@
#include <ntqwizard.h>
#include <ntqlistbox.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <ntqinputdialog.h>
WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
diff --git a/tools/designer/editor/preferences.ui b/tools/designer/editor/preferences.ui
index 5627528c8..1612f3415 100644
--- a/tools/designer/editor/preferences.ui
+++ b/tools/designer/editor/preferences.ui
@@ -473,13 +473,13 @@
<include location="global" impldecl="in declaration">tqmap.h</include>
<include location="local" impldecl="in declaration">conf.h</include>
<include location="global" impldecl="in implementation">tqpalette.h</include>
- <include location="global" impldecl="in implementation">ntqlineedit.h</include>
+ <include location="global" impldecl="in implementation">tqlineedit.h</include>
<include location="global" impldecl="in implementation">tqpixmap.h</include>
- <include location="global" impldecl="in implementation">ntqcombobox.h</include>
+ <include location="global" impldecl="in implementation">tqcombobox.h</include>
<include location="global" impldecl="in implementation">tqfontdatabase.h</include>
<include location="local" impldecl="in implementation">editor.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">tqpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tqcheckbox.h</include>
<include location="global" impldecl="in implementation">tqcolordialog.h</include>
<include location="global" impldecl="in implementation">tqsettings.h</include>
<include location="local" impldecl="in implementation">preferences.ui.h</include>
diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui
index f76e39e1b..6a054f59e 100644
--- a/tools/designer/examples/colortool/mainform.ui
+++ b/tools/designer/examples/colortool/mainform.ui
@@ -513,8 +513,8 @@
<includes>
<include location="local" impldecl="in declaration">findform.h</include>
<include location="local" impldecl="in implementation">tqsettings.h</include>
- <include location="local" impldecl="in implementation">ntqradiobutton.h</include>
- <include location="local" impldecl="in implementation">ntqcheckbox.h</include>
+ <include location="local" impldecl="in implementation">tqradiobutton.h</include>
+ <include location="local" impldecl="in implementation">tqcheckbox.h</include>
<include location="local" impldecl="in implementation">colornameform.h</include>
<include location="local" impldecl="in implementation">tqcolordialog.h</include>
<include location="local" impldecl="in implementation">tqregexp.h</include>
@@ -528,7 +528,7 @@
<include location="local" impldecl="in implementation">ntqmessagebox.h</include>
<include location="local" impldecl="in implementation">tqclipboard.h</include>
<include location="local" impldecl="in implementation">tqlabel.h</include>
- <include location="local" impldecl="in implementation">ntqlineedit.h</include>
+ <include location="local" impldecl="in implementation">tqlineedit.h</include>
<include location="local" impldecl="in implementation">optionsform.h</include>
<include location="local" impldecl="in implementation">mainform.ui.h</include>
</includes>
diff --git a/tools/designer/examples/credit/creditform.cpp b/tools/designer/examples/credit/creditform.cpp
index 8bceaa4b2..3a2afa342 100644
--- a/tools/designer/examples/credit/creditform.cpp
+++ b/tools/designer/examples/credit/creditform.cpp
@@ -1,5 +1,5 @@
-#include <ntqradiobutton.h>
-#include <ntqspinbox.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
#include "creditform.h"
CreditForm::CreditForm( TQWidget* parent, const char* name,
diff --git a/tools/designer/examples/credit/creditformbase.cpp b/tools/designer/examples/credit/creditformbase.cpp
index 7ea445897..51957cedb 100644
--- a/tools/designer/examples/credit/creditformbase.cpp
+++ b/tools/designer/examples/credit/creditformbase.cpp
@@ -10,9 +10,9 @@
#include <ntqvariant.h> // first for gcc 2.7.2
#include <ntqbuttongroup.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
-#include <ntqspinbox.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
#include <tqmime.h>
#include <tqdragobject.h>
#include <ntqlayout.h>
diff --git a/tools/designer/examples/credit/creditformbase.h b/tools/designer/examples/credit/creditformbase.h
index 8d8b97c69..e609e2095 100644
--- a/tools/designer/examples/credit/creditformbase.h
+++ b/tools/designer/examples/credit/creditformbase.h
@@ -10,7 +10,7 @@
#define CREDITFORMBASE_H
#include <ntqvariant.h>
-#include <ntqdialog.h>
+#include <tqdialog.h>
class TQVBoxLayout;
class TQHBoxLayout;
class TQGridLayout;
diff --git a/tools/designer/examples/filechooser/widget/filechooser.cpp b/tools/designer/examples/filechooser/widget/filechooser.cpp
index 97ff5d5b2..799772b8d 100644
--- a/tools/designer/examples/filechooser/widget/filechooser.cpp
+++ b/tools/designer/examples/filechooser/widget/filechooser.cpp
@@ -1,6 +1,6 @@
#include "filechooser.h"
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
#include <tqfiledialog.h>
#include <ntqlayout.h>
diff --git a/tools/designer/examples/receiver1/mainform.ui b/tools/designer/examples/receiver1/mainform.ui
index 71d651be2..ff2c230de 100644
--- a/tools/designer/examples/receiver1/mainform.ui
+++ b/tools/designer/examples/receiver1/mainform.ui
@@ -74,7 +74,7 @@
</connection>
</connections>
<includes>
- <include location="global" impldecl="in implementation">ntqspinbox.h</include>
+ <include location="global" impldecl="in implementation">tqspinbox.h</include>
<include location="global" impldecl="in implementation">tqwidgetfactory.h</include>
<include location="local" impldecl="in implementation">mainform.ui.h</include>
</includes>
diff --git a/tools/designer/examples/receiver2/mainform.ui b/tools/designer/examples/receiver2/mainform.ui
index 6f27e6dab..cdcc140d4 100644
--- a/tools/designer/examples/receiver2/mainform.ui
+++ b/tools/designer/examples/receiver2/mainform.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>MainForm</class>
<include location="global" impldecl="in implementation">tqwidgetfactory.h</include>
-<include location="global" impldecl="in implementation">ntqspinbox.h</include>
+<include location="global" impldecl="in implementation">tqspinbox.h</include>
<include location="local" impldecl="in implementation">receiver.h</include>
<include location="local" implDecl="in declaration">mainform.ui.h</include>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/tools/designer/examples/receiver2/receiver.cpp b/tools/designer/examples/receiver2/receiver.cpp
index 41ce98db5..2f6f1153a 100644
--- a/tools/designer/examples/receiver2/receiver.cpp
+++ b/tools/designer/examples/receiver2/receiver.cpp
@@ -1,5 +1,5 @@
-#include <ntqradiobutton.h>
-#include <ntqspinbox.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
#include "receiver.h"
void Receiver::setParent( TQDialog *parent )
diff --git a/tools/designer/examples/receiver2/receiver.h b/tools/designer/examples/receiver2/receiver.h
index 685da7e35..5f8cd0ee7 100644
--- a/tools/designer/examples/receiver2/receiver.h
+++ b/tools/designer/examples/receiver2/receiver.h
@@ -1,5 +1,5 @@
#include <tqobject.h>
-#include <ntqdialog.h>
+#include <tqdialog.h>
class Receiver : public TQObject
{
diff --git a/tools/designer/examples/sizeaware/sizeaware.h b/tools/designer/examples/sizeaware/sizeaware.h
index b939cfe4e..490c3b94a 100644
--- a/tools/designer/examples/sizeaware/sizeaware.h
+++ b/tools/designer/examples/sizeaware/sizeaware.h
@@ -1,6 +1,6 @@
#ifndef SIZEAWARE_H
#define SIZEAWARE_H
-#include <ntqdialog.h>
+#include <tqdialog.h>
class SizeAware : public TQDialog
{
diff --git a/tools/designer/examples/vcr/vcr.cpp b/tools/designer/examples/vcr/vcr.cpp
index d5b36f4d7..c8dff0c32 100644
--- a/tools/designer/examples/vcr/vcr.cpp
+++ b/tools/designer/examples/vcr/vcr.cpp
@@ -1,5 +1,5 @@
#include "vcr.h"
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <ntqlayout.h>
static const char * rewind_xpm[] = {
diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
index fbf6f059d..82b41e77a 100644
--- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
@@ -35,7 +35,7 @@
#include "sourcetemplateinterfaceimpl.h"
#include <designerinterface.h>
#include "mainfilesettings.h"
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <ntqlistbox.h>
SourceTemplateInterfaceImpl::SourceTemplateInterfaceImpl()
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index 8978b88e8..753249e55 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -660,7 +660,7 @@ void Dlg2Ui::emitWidgetBody( const TQDomElement& e, bool layouted )
TQRegExp connex( TQString(
"\\s*\\[(BaseClass|P(?:ublic|rotected))\\]\\s*([0-9A-Z_a-z]+)\\s*"
"-->\\s*([0-9A-Z_a-z]+)\\s*(\\([^()]*\\))\\s*") );
- TQRegExp qdialogSlots( TQString(
+ TQRegExp tqdialogSlots( TQString(
"done\\(\\s*int\\s*\\)|(?:accept|reject)\\(\\s*\\)") );
TQString userClassHeader;
@@ -749,7 +749,7 @@ void Dlg2Ui::emitWidgetBody( const TQDomElement& e, bool layouted )
if ( connex.cap(1) !=
TQString("BaseClass") &&
- !qdialogSlots.exactMatch(c.slot) )
+ !tqdialogSlots.exactMatch(c.slot) )
yySlots.insert( c.slot,
connex.cap(1) );
}
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index ac721699c..6f8fce263 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -35,19 +35,19 @@
#include <ntqlistbox.h>
#include <tqwidget.h>
-#include <ntqcheckbox.h>
-#include <ntqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqlineedit.h>
#include <tqlabel.h>
#include <ntqgroupbox.h>
#include <ntqlayout.h>
#include <tqregexp.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <ntqmultilineedit.h>
#include <ntqlistview.h>
#include <ntqfeatures.h>
-#include <ntqradiobutton.h>
-#include <ntqspinbox.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
#include <limits.h>
#ifndef TQT_NO_SQL
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index 332f16735..356a88a1a 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -64,14 +64,15 @@ static bool was_in_setup = FALSE;
// It will be removed afterwards
static TQString converted_widgets[] =
{
- "TQColorDialog",
- "TQDateTimeEdit", "TQDesktopWidget",
+ "TQCheckBox", "TQColorDialog", "TQComboBox",
+ "TQDateTimeEdit", "TQDesktopWidget", "TQDial", "TQDialog",
"TQFileDialog",
"TQIconView",
- "TQLabel",
+ "TQLabel", "TQLCDNumber", "TQLineEdit",
"TQMainWindow", "TQMenuBar",
- "TQPopupMenu",
- "TQStatusBar", "TQSizeGrip",
+ "TQPopupMenu", "TQPushButton",
+ "TQRadioButton",
+ "TQScrollBar", "TQScrollView", "TQSizeGrip", "TQSlider", "TQSpinBox", "TQStatusBar",
"TQTextBrowser", "TQTextEdit", "TQTextView", "TQToolBar", "TQToolBox", "TQToolButton", "TQToolTip",
"TQWidget", "TQWidgetStack", "TQWorkspace"
};
@@ -559,7 +560,7 @@ void WidgetDatabase::setupDataBase( int id )
r = new WidgetDatabaseRecord;
r->iconSet = "";
r->name = "TQScrollView";
- r->includeFile = "ntqscrollview.h";
+ r->includeFile = "tqscrollview.h";
r->group = widgetGroup( "Temp" );
r->isContainer = TRUE;
diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index 03c0046cf..6bfe35607 100644
--- a/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -59,10 +59,10 @@
#endif
// include all TQt widgets we support
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <tqtoolbutton.h>
-#include <ntqcheckbox.h>
-#include <ntqradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
#include <ntqgroupbox.h>
#include <ntqbuttongroup.h>
#include <tqiconview.h>
@@ -72,26 +72,26 @@
#endif
#include <ntqlistbox.h>
#include <ntqlistview.h>
-#include <ntqlineedit.h>
-#include <ntqspinbox.h>
+#include <tqlineedit.h>
+#include <tqspinbox.h>
#include <ntqmultilineedit.h>
#include <tqlabel.h>
#include <tqwidget.h>
#include <ntqtabwidget.h>
-#include <ntqcombobox.h>
-#include <ntqdialog.h>
+#include <tqcombobox.h>
+#include <tqdialog.h>
#include <ntqwizard.h>
-#include <ntqlcdnumber.h>
+#include <tqlcdnumber.h>
#include <ntqprogressbar.h>
#include <tqtextview.h>
#include <tqtextbrowser.h>
-#include <ntqdial.h>
-#include <ntqslider.h>
+#include <tqdial.h>
+#include <tqslider.h>
#include <ntqframe.h>
#include <tqwidgetstack.h>
#include <tqtoolbox.h>
#include <tqtextedit.h>
-#include <ntqscrollbar.h>
+#include <tqscrollbar.h>
#include <tqmainwindow.h>
#include <ntqsplitter.h>
#include <tqaction.h>
diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf
index 663f5fc40..7fa18a15f 100644
--- a/tools/linguist/book/linguist-programmer.leaf
+++ b/tools/linguist/book/linguist-programmer.leaf
@@ -121,13 +121,13 @@ will fall back to using the original source text.
User-visible strings are marked as translation targets by wrapping them
in a \c tr() call, for example:
\code
- button = new QPushButton( "&Quit", this );
+ button = new TQPushButton( "&Quit", this );
\endcode
would become
\code
- button = new QPushButton( tr("&Quit"), this);
+ button = new TQPushButton( tr("&Quit"), this);
\endcode
\index TQ_OBJECT
@@ -140,7 +140,7 @@ usually called as a member function of a \l TQObject subclass, in
other cases an explicit class name can be supplied, for example:
\code
- QPushButton::tr("&Quit")
+ TQPushButton::tr("&Quit")
\endcode
or
@@ -167,13 +167,13 @@ differ between the two. This is easily achieved using the
two argument form of the \c tr() call, e.g.
\code
- rbc = new QRadioButton( tr("Enabled", "Color frame"), this );
+ rbc = new TQRadioButton( tr("Enabled", "Color frame"), this );
\endcode
and
\code
- rbh = new QRadioButton( tr("Enabled", "Hue frame"), this );
+ rbh = new TQRadioButton( tr("Enabled", "Hue frame"), this );
\endcode
\index Ctrl Key
@@ -374,7 +374,7 @@ translation appears; if not, the source text appears.
All classes that inherit \l TQObject have a \c tr() function. Inside
a member function of a \l TQObject class, we simply write \c tr("Hello
-world!") instead of \c QPushButton::tr("Hello world!") or \c
+world!") instead of \c TQPushButton::tr("Hello world!") or \c
TQObject::tr("Hello world!").
\section3 Running the Application in English
@@ -461,7 +461,7 @@ the current directory, containing this:
\code
<!DOCTYPE TS><TS>
<context>
- <name>QPushButton</name>
+ <name>TQPushButton</name>
<message>
<source>Hello world!</source>
<translation type="unfinished"></translation>
@@ -486,7 +486,7 @@ To start \e {Qt Linguist}, type
linguist tt1_la.ts
\endcode
-You should now see the text "QPushButton" in the top left pane.
+You should now see the text "TQPushButton" in the top left pane.
Double-click it, then click on "Hello world!" and enter "Orbis, te
saluto!" in the \e Translation pane (the middle right of the
window). Don't forget the exclamation mark!
@@ -614,8 +614,8 @@ conflicts.
In \c arrowpad.cpp we implement the \c ArrowPad class.
\quotefile tt2/arrowpad.cpp
-\skipto QPushButton
-\printline QPushButton
+\skipto TQPushButton
+\printline TQPushButton
We call \c ArrowPad::tr() for each button's label since the labels are
user-visible text.
@@ -958,16 +958,16 @@ second argument "two-sided" in the appropriate \c tr() calls to the
first pair of radio buttons:
\code
- but = new QRadioButton( tr("Enabled", "two-sided"), twoSided );
- but = new QRadioButton( tr("Disabled", "two-sided"), twoSided );
+ but = new TQRadioButton( tr("Enabled", "two-sided"), twoSided );
+ but = new TQRadioButton( tr("Disabled", "two-sided"), twoSided );
\endcode
and add the second argument "colors" in the appropriate \c tr() calls
for the second pair of radio buttons:
\code
- but = new QRadioButton( tr("Enabled", "colors"), colors );
- but = new QRadioButton( tr("Disabled", "colors"), colors );
+ but = new TQRadioButton( tr("Enabled", "colors"), colors );
+ but = new TQRadioButton( tr("Disabled", "colors"), colors );
\endcode
\index lupdate
diff --git a/tools/linguist/linguist/finddialog.cpp b/tools/linguist/linguist/finddialog.cpp
index 26663bf3d..8369df80d 100644
--- a/tools/linguist/linguist/finddialog.cpp
+++ b/tools/linguist/linguist/finddialog.cpp
@@ -39,11 +39,11 @@
#include "finddialog.h"
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
#include <tqlabel.h>
#include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
#include <tqwhatsthis.h>
FindDialog::FindDialog( bool replace, TQWidget *parent, const char *name,
diff --git a/tools/linguist/linguist/finddialog.h b/tools/linguist/linguist/finddialog.h
index c2576002e..ae922b84d 100644
--- a/tools/linguist/linguist/finddialog.h
+++ b/tools/linguist/linguist/finddialog.h
@@ -34,7 +34,7 @@
#ifndef FINDDIALOG_H
#define FINDDIALOG_H
-#include <ntqdialog.h>
+#include <tqdialog.h>
class TQCheckBox;
class TQLineEdit;
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index 292fbc153..16bab1075 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -43,13 +43,13 @@
#include "simtexth.h"
#include <ntqapplication.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
#include <tqclipboard.h>
#include <tqlabel.h>
#include <ntqlayout.h>
#include <tqtextedit.h>
#include <tqpalette.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <tqstring.h>
#include <tqtextview.h>
#include <tqwhatsthis.h>
@@ -59,7 +59,7 @@
#include <tqregexp.h>
#include <ntqdockarea.h>
#include <ntqdockwindow.h>
-#include <ntqscrollview.h>
+#include <tqscrollview.h>
#include <tqfont.h>
#include <ntqaccel.h>
#include <private/qrichtext_p.h>
diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h
index 0ca95bcf7..d631a0048 100644
--- a/tools/linguist/linguist/msgedit.h
+++ b/tools/linguist/linguist/msgedit.h
@@ -43,7 +43,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqvaluelist.h>
-#include <ntqscrollview.h>
+#include <tqscrollview.h>
#include <tqpixmap.h>
#include <tqbitmap.h>
#include <tqtooltip.h>
diff --git a/tools/linguist/linguist/phrasebookbox.cpp b/tools/linguist/linguist/phrasebookbox.cpp
index 90ebdd950..a272a35ba 100644
--- a/tools/linguist/linguist/phrasebookbox.cpp
+++ b/tools/linguist/linguist/phrasebookbox.cpp
@@ -43,9 +43,9 @@
#include <ntqapplication.h>
#include <tqlabel.h>
#include <ntqlayout.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <ntqmessagebox.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <tqwhatsthis.h>
PhraseBookBox::PhraseBookBox( const TQString& filename,
diff --git a/tools/linguist/linguist/phrasebookbox.h b/tools/linguist/linguist/phrasebookbox.h
index 64071000a..d09ec3787 100644
--- a/tools/linguist/linguist/phrasebookbox.h
+++ b/tools/linguist/linguist/phrasebookbox.h
@@ -36,7 +36,7 @@
#include "phrase.h"
-#include <ntqdialog.h>
+#include <tqdialog.h>
#include <tqvaluelist.h>
class TQLineEdit;
diff --git a/tools/linguist/tutorial/tt1/main.cpp b/tools/linguist/tutorial/tt1/main.cpp
index 43c6da732..977d18e88 100644
--- a/tools/linguist/tutorial/tt1/main.cpp
+++ b/tools/linguist/tutorial/tt1/main.cpp
@@ -5,7 +5,7 @@
****************************************************************/
#include <ntqapplication.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <tqtranslator.h>
diff --git a/tools/linguist/tutorial/tt2/arrowpad.cpp b/tools/linguist/tutorial/tt2/arrowpad.cpp
index d96f8f596..c25d3817f 100644
--- a/tools/linguist/tutorial/tt2/arrowpad.cpp
+++ b/tools/linguist/tutorial/tt2/arrowpad.cpp
@@ -6,7 +6,7 @@
#include "arrowpad.h"
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
ArrowPad::ArrowPad( TQWidget *parent, const char *name )
: TQGrid( 3, Horizontal, parent, name )
diff --git a/tools/linguist/tutorial/tt3/printpanel.cpp b/tools/linguist/tutorial/tt3/printpanel.cpp
index 3f8f6eda4..ad8bd7ebb 100644
--- a/tools/linguist/tutorial/tt3/printpanel.cpp
+++ b/tools/linguist/tutorial/tt3/printpanel.cpp
@@ -7,7 +7,7 @@
#include "printpanel.h"
#include <tqlabel.h>
-#include <ntqradiobutton.h>
+#include <tqradiobutton.h>
#include <ntqhbuttongroup.h>
PrintPanel::PrintPanel( TQWidget *parent, const char *name )
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index da33fbd0b..4e3ab416b 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -38,15 +38,15 @@
#include <tqlabel.h>
#include <ntqapplication.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
#include <tqstylefactory.h>
#include <ntqinputcontextfactory.h>
#include <tqobjectlist.h>
#include <tqfontdatabase.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
#include <ntqlistbox.h>
-#include <ntqspinbox.h>
-#include <ntqcheckbox.h>
+#include <tqspinbox.h>
+#include <tqcheckbox.h>
#include <tqfiledialog.h>
#include <tqaction.h>
#include <tqstatusbar.h>
diff --git a/tools/qtconfig/paletteeditoradvanced.cpp b/tools/qtconfig/paletteeditoradvanced.cpp
index 2d3829fd9..959017cce 100644
--- a/tools/qtconfig/paletteeditoradvanced.cpp
+++ b/tools/qtconfig/paletteeditoradvanced.cpp
@@ -34,10 +34,10 @@
#include "paletteeditoradvanced.h"
#include "colorbutton.h"
-#include <ntqcheckbox.h>
-#include <ntqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
#include <ntqapplication.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
#include <ntqlistbox.h>
#include <tqpainter.h>
#include <ntqgroupbox.h>