diff options
Diffstat (limited to 'tools')
71 files changed, 160 insertions, 157 deletions
diff --git a/tools/assistant/finddialog.ui b/tools/assistant/finddialog.ui index ed4bf64d0..7d7f5f48d 100644 --- a/tools/assistant/finddialog.ui +++ b/tools/assistant/finddialog.ui @@ -248,7 +248,7 @@ <tabstop>PushButton2</tabstop> </tabstops> <includes> - <include location="global" impldecl="in implementation">ntqstatusbar.h</include> + <include location="global" impldecl="in implementation">tqstatusbar.h</include> <include location="global" impldecl="in implementation">tqtextbrowser.h</include> <include location="local" impldecl="in implementation">mainwindow.h</include> <include location="local" impldecl="in implementation">tabbedbrowser.h</include> diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index 2e5877807..18c188f78 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -57,7 +57,7 @@ #include <ntqpushbutton.h> #include <ntqregexp.h> #include <ntqsettings.h> -#include <ntqstatusbar.h> +#include <tqstatusbar.h> #include <ntqtabwidget.h> #include <tqtextbrowser.h> #include <tqtextstream.h> diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h index c980ac493..678f5b428 100644 --- a/tools/assistant/helpdialogimpl.h +++ b/tools/assistant/helpdialogimpl.h @@ -44,9 +44,9 @@ #include <tqmap.h> #include <tqstringlist.h> #include <ntqvalidator.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <ntqdict.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> class TQProgressBar; class MainWindow; diff --git a/tools/assistant/helpwindow.cpp b/tools/assistant/helpwindow.cpp index 349f8a4dc..fc013ac15 100644 --- a/tools/assistant/helpwindow.cpp +++ b/tools/assistant/helpwindow.cpp @@ -44,8 +44,8 @@ #include <ntqdir.h> #include <ntqfile.h> #include <ntqprocess.h> -#include <ntqpopupmenu.h> -#include <ntqaction.h> +#include <tqpopupmenu.h> +#include <tqaction.h> #include <ntqfileinfo.h> #include <ntqevent.h> #include <tqtextstream.h> diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui index 0542663de..23af98301 100644 --- a/tools/assistant/mainwindow.ui +++ b/tools/assistant/mainwindow.ui @@ -570,7 +570,7 @@ </connection> </connections> <includes> - <include location="global" impldecl="in implementation">ntqtoolbutton.h</include> + <include location="global" impldecl="in implementation">tqtoolbutton.h</include> <include location="local" impldecl="in implementation">settingsdialogimpl.h</include> <include location="global" impldecl="in implementation">ntqmessagebox.h</include> <include location="global" impldecl="in implementation">ntqfontdatabase.h</include> @@ -591,7 +591,7 @@ <include location="global" impldecl="in implementation">ntqprinter.h</include> <include location="global" impldecl="in implementation">ntqpainter.h</include> <include location="global" impldecl="in implementation">ntqurl.h</include> - <include location="global" impldecl="in implementation">ntqstatusbar.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">ntqsettings.h</include> <include location="global" impldecl="in implementation">ntqcheckbox.h</include> diff --git a/tools/assistant/settingsdialogimpl.cpp b/tools/assistant/settingsdialogimpl.cpp index 6a2484b95..87e3b9d8d 100644 --- a/tools/assistant/settingsdialogimpl.cpp +++ b/tools/assistant/settingsdialogimpl.cpp @@ -49,7 +49,7 @@ #include <tqptrstack.h> #include <ntqsettings.h> #include <tqtimer.h> -#include <ntqtoolbutton.h> +#include <tqtoolbutton.h> #include <ntqtabwidget.h> #include <tqmap.h> diff --git a/tools/assistant/tabbedbrowser.ui.h b/tools/assistant/tabbedbrowser.ui.h index ed9cccb53..ddd9dc5e1 100644 --- a/tools/assistant/tabbedbrowser.ui.h +++ b/tools/assistant/tabbedbrowser.ui.h @@ -8,7 +8,7 @@ *****************************************************************************/ #include <ntqfileinfo.h> -#include <ntqtoolbutton.h> +#include <tqtoolbutton.h> #include <ntqpixmap.h> #include <tqiconset.h> #include <tqstyle.h> diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp index b564eaf55..15b1b467e 100644 --- a/tools/designer/designer/actiondnd.cpp +++ b/tools/designer/designer/actiondnd.cpp @@ -40,14 +40,14 @@ #include "widgetfactory.h" #include "hierarchyview.h" -#include <ntqaction.h> +#include <tqaction.h> #include <ntqapplication.h> #include <ntqbitmap.h> #include <ntqdragobject.h> #include <ntqinputdialog.h> #include <ntqlayout.h> -#include <ntqmainwindow.h> -#include <ntqmenudata.h> +#include <tqmainwindow.h> +#include <tqmenudata.h> #include <ntqmessagebox.h> #include <tqobjectlist.h> #include <ntqpainter.h> diff --git a/tools/designer/designer/actiondnd.h b/tools/designer/designer/actiondnd.h index 9f03b2f4e..7746082ee 100644 --- a/tools/designer/designer/actiondnd.h +++ b/tools/designer/designer/actiondnd.h @@ -34,14 +34,14 @@ #ifndef ACTIONDND_H #define ACTIONDND_H -#include <ntqaction.h> +#include <tqaction.h> #include <ntqdragobject.h> #include <tqmap.h> -#include <ntqmenubar.h> +#include <tqmenubar.h> #include <ntqpixmap.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <tqptrlist.h> -#include <ntqtoolbar.h> +#include <tqtoolbar.h> #include <ntqguardedptr.h> #include "../shared/widgetdatabase.h" diff --git a/tools/designer/designer/actioneditorimpl.cpp b/tools/designer/designer/actioneditorimpl.cpp index 84f483923..ee1c0f1c6 100644 --- a/tools/designer/designer/actioneditorimpl.cpp +++ b/tools/designer/designer/actioneditorimpl.cpp @@ -40,14 +40,14 @@ #include "hierarchyview.h" #include "formfile.h" -#include <ntqaction.h> +#include <tqaction.h> #include <ntqlineedit.h> #include <ntqlabel.h> -#include <ntqtoolbutton.h> +#include <tqtoolbutton.h> #include <ntqlistview.h> #include <ntqcheckbox.h> #include <ntqpushbutton.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <tqobjectlist.h> ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp index 8708ccb9f..0520e1e87 100644 --- a/tools/designer/designer/command.cpp +++ b/tools/designer/designer/command.cpp @@ -61,7 +61,7 @@ #ifndef TQT_NO_TABLE #include <ntqtable.h> #endif -#include <ntqaction.h> +#include <tqaction.h> CommandHistory::CommandHistory( int s ) : current( -1 ), steps( s ), savedAt( -1 ) diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp index d570660fb..558e6fefc 100644 --- a/tools/designer/designer/connectionitems.cpp +++ b/tools/designer/designer/connectionitems.cpp @@ -42,7 +42,7 @@ #include <ntqmetaobject.h> #include <ntqcombobox.h> #include <ntqlistbox.h> -#include <ntqaction.h> +#include <tqaction.h> #include <tqdatabrowser.h> static const char* const ignore_slots[] = { diff --git a/tools/designer/designer/defs.h b/tools/designer/designer/defs.h index bcb93727c..b6560d11c 100644 --- a/tools/designer/designer/defs.h +++ b/tools/designer/designer/defs.h @@ -34,7 +34,7 @@ #ifndef DEFS_H #define DEFS_H -#include <ntqsizepolicy.h> +#include <tqsizepolicy.h> #include <tqstring.h> #define POINTER_TOOL 32000 diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h index 1b59b2ebd..07edd9b32 100644 --- a/tools/designer/designer/designer_pch.h +++ b/tools/designer/designer/designer_pch.h @@ -9,7 +9,7 @@ #if defined __cplusplus #include <private/qucomextra_p.h> -#include <ntqaction.h> +#include <tqaction.h> #include <ntqapplication.h> #include <ntqcheckbox.h> #include <ntqcombobox.h> @@ -29,7 +29,7 @@ #include <ntqpushbutton.h> #include <ntqspinbox.h> #include <tqstring.h> -#include <ntqtooltip.h> +#include <tqtooltip.h> #include <ntqvariant.h> #include <ntqwhatsthis.h> #include <tqwidget.h> diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp index b808f323f..213f24378 100644 --- a/tools/designer/designer/designerappiface.cpp +++ b/tools/designer/designer/designerappiface.cpp @@ -31,8 +31,8 @@ ** **********************************************************************/ -#include <ntqmenubar.h> -#include <ntqpopupmenu.h> +#include <tqmenubar.h> +#include <tqpopupmenu.h> #include "designerappiface.h" #include "mainwindow.h" #include "project.h" @@ -45,7 +45,7 @@ #include <ntqvariant.h> #include <ntqlistview.h> #include <tqtextedit.h> -#include <ntqstatusbar.h> +#include <tqstatusbar.h> #include "pixmapcollection.h" #include "hierarchyview.h" #include <stdlib.h> diff --git a/tools/designer/designer/formfile.cpp b/tools/designer/designer/formfile.cpp index de82ebc72..feadfe7e7 100644 --- a/tools/designer/designer/formfile.cpp +++ b/tools/designer/designer/formfile.cpp @@ -43,9 +43,9 @@ #include "workspace.h" #include <ntqmessagebox.h> #include <ntqfile.h> -#include <ntqstatusbar.h> +#include <tqstatusbar.h> #include "propertyeditor.h" -#include <ntqworkspace.h> +#include <tqworkspace.h> #include <stdlib.h> #include "designerappiface.h" #include <ntqapplication.h> diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp index 601da8197..e20958f44 100644 --- a/tools/designer/designer/formwindow.cpp +++ b/tools/designer/designer/formwindow.cpp @@ -60,16 +60,16 @@ #include <ntqapplication.h> #include <ntqlayout.h> #include <ntqspinbox.h> -#include <ntqstatusbar.h> +#include <tqstatusbar.h> #include <ntqapplication.h> #include <ntqpalette.h> #include <ntqmessagebox.h> -#include <ntqpopupmenu.h> -#include <ntqsizegrip.h> +#include <tqpopupmenu.h> +#include <tqsizegrip.h> #include <ntqpushbutton.h> #include <ntqwhatsthis.h> #include <ntqmetaobject.h> -#include <ntqtooltip.h> +#include <tqtooltip.h> #include <ntqfeatures.h> #include <ntqaccel.h> #include <ntqpixmapcache.h> diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp index a05e9d9d1..00b13f32b 100644 --- a/tools/designer/designer/hierarchyview.cpp +++ b/tools/designer/designer/hierarchyview.cpp @@ -52,7 +52,7 @@ #include <ntqpalette.h> #include <tqobjectlist.h> #include <ntqheader.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <ntqtabwidget.h> #include <ntqwizard.h> #include <tqwidgetstack.h> @@ -61,7 +61,7 @@ #include <ntqapplication.h> #include <tqtimer.h> #include "../interfaces/languageinterface.h" -#include <ntqworkspace.h> +#include <tqworkspace.h> #include <ntqaccel.h> #include <ntqmessagebox.h> diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp index 6e95c6cca..33ff5778d 100644 --- a/tools/designer/designer/layout.cpp +++ b/tools/designer/designer/layout.cpp @@ -43,7 +43,7 @@ #include <ntqbitmap.h> #include <ntqsplitter.h> #include <tqvaluevector.h> -#include <ntqmainwindow.h> +#include <tqmainwindow.h> bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &p2 ) { diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 66ce5b570..69d59513d 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -59,7 +59,7 @@ #include "qcompletionedit.h" #include "sourcefile.h" #include "orderindicator.h" -#include <ntqtoolbox.h> +#include <tqtoolbox.h> #include "widgetaction.h" #include "propertyobject.h" #include "popupmenueditor.h" @@ -88,12 +88,12 @@ #include "gotolinedialog.h" #include <ntqinputdialog.h> -#include <ntqtoolbar.h> +#include <tqtoolbar.h> #include <ntqfeatures.h> #include <ntqmetaobject.h> -#include <ntqaction.h> +#include <tqaction.h> #include <ntqpixmap.h> -#include <ntqworkspace.h> +#include <tqworkspace.h> #include <ntqfiledialog.h> #include <ntqclipboard.h> #include <ntqmessagebox.h> @@ -101,7 +101,7 @@ #include <ntqdir.h> #include <tqstyle.h> #include <ntqlabel.h> -#include <ntqstatusbar.h> +#include <tqstatusbar.h> #include <ntqfile.h> #include <ntqcheckbox.h> #include <ntqwhatsthis.h> @@ -114,8 +114,8 @@ #include <ntqprocess.h> #include <ntqsettings.h> #include <ntqaccel.h> -#include <ntqtooltip.h> -#include <ntqsizegrip.h> +#include <tqtooltip.h> +#include <tqsizegrip.h> #include <tqtextview.h> #include <ntqassistantclient.h> #include <stdlib.h> @@ -768,10 +768,10 @@ void MainWindow::helpContents() } else if ( cp == "layoutSpacing" ) { source = propertyDocumentation[ "TQLayout/spacing" ]; } else if ( cp == "toolTip" ) { - source = "ntqtooltip.html#details"; + source = "tqtooltip.html#details"; } else if ( mo && qstrcmp( mo->className(), "Spacer" ) == 0 ) { if ( cp != "name" ) - source = "ntqsizepolicy.html#SizeType"; + source = "tqsizepolicy.html#SizeType"; else source = propertyDocumentation[ "TQObject/name" ]; } else { diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h index 32d356f46..c7efb63c1 100644 --- a/tools/designer/designer/mainwindow.h +++ b/tools/designer/designer/mainwindow.h @@ -46,8 +46,8 @@ #include "../interfaces/sourcetemplateiface.h" #include "sourceeditor.h" -#include <ntqaction.h> -#include <ntqmainwindow.h> +#include <tqaction.h> +#include <tqmainwindow.h> #include <tqmap.h> #include <ntqguardedptr.h> #include <private/qpluginmanager_p.h> @@ -75,7 +75,7 @@ class FormFile; class TQAssistantClient; #if defined(TQ_FULL_TEMPLATE_INSTANTIATION) -#include <ntqtoolbar.h> +#include <tqtoolbar.h> #else class TQToolBar; #endif diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index 6c2137ffe..00606810f 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -34,18 +34,18 @@ #include "mainwindow.h" #include <stdlib.h> -#include <ntqaction.h> +#include <tqaction.h> #include <ntqwhatsthis.h> -#include <ntqpopupmenu.h> -#include <ntqmenubar.h> +#include <tqpopupmenu.h> +#include <tqmenubar.h> #include <ntqlineedit.h> -#include <ntqtooltip.h> +#include <tqtooltip.h> #include <ntqapplication.h> #include <ntqsignalmapper.h> #include <tqstylefactory.h> -#include <ntqworkspace.h> +#include <tqworkspace.h> #include <ntqmessagebox.h> -#include <ntqstatusbar.h> +#include <tqstatusbar.h> #include <ntqlistbox.h> #include <ntqclipboard.h> #include <ntqcombobox.h> @@ -79,7 +79,7 @@ #include "dbconnectionimpl.h" #endif #include "widgetaction.h" -#include <ntqtoolbox.h> +#include <tqtoolbox.h> #include "startdialogimpl.h" #include "designerappiface.h" #include "connectiondialog.h" diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp index d65891f94..15cfe3b1e 100644 --- a/tools/designer/designer/menubareditor.cpp +++ b/tools/designer/designer/menubareditor.cpp @@ -31,12 +31,12 @@ ** **********************************************************************/ -#include <ntqaction.h> +#include <tqaction.h> #include <ntqapplication.h> #include <ntqbitmap.h> #include <ntqdragobject.h> #include <ntqlineedit.h> -#include <ntqmainwindow.h> +#include <tqmainwindow.h> #include <ntqpainter.h> #include <tqstyle.h> #include "command.h" diff --git a/tools/designer/designer/menubareditor.h b/tools/designer/designer/menubareditor.h index ccb90574b..ef8d7b3bb 100644 --- a/tools/designer/designer/menubareditor.h +++ b/tools/designer/designer/menubareditor.h @@ -34,7 +34,7 @@ #ifndef MENUBAREDITOR_H #define MENUBAREDITOR_H -#include <ntqmenubar.h> +#include <tqmenubar.h> #include <tqptrlist.h> class PopupMenuEditor; diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp index cba693ca7..bd19799a5 100644 --- a/tools/designer/designer/metadatabase.cpp +++ b/tools/designer/designer/metadatabase.cpp @@ -49,7 +49,7 @@ #include <tqstrlist.h> #include <ntqmetaobject.h> #include <tqwidgetlist.h> -#include <ntqmainwindow.h> +#include <tqmainwindow.h> #include <ntqregexp.h> #include <private/qpluginmanager_p.h> #include <tqdatetime.h> diff --git a/tools/designer/designer/metadatabase.h b/tools/designer/designer/metadatabase.h index ab7a682ea..5848f3de2 100644 --- a/tools/designer/designer/metadatabase.h +++ b/tools/designer/designer/metadatabase.h @@ -39,8 +39,8 @@ #include <tqstringlist.h> #include <tqmap.h> #include <tqptrlist.h> -#include <ntqsizepolicy.h> -#include <ntqsize.h> +#include <tqsizepolicy.h> +#include <tqsize.h> #include <tqwidgetlist.h> #include <ntqcursor.h> diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp index 4e6013f61..a75fdcbc9 100644 --- a/tools/designer/designer/multilineeditorimpl.cpp +++ b/tools/designer/designer/multilineeditorimpl.cpp @@ -43,9 +43,9 @@ #include <./private/qrichtext_p.h> #include <ntqpushbutton.h> #include <ntqlayout.h> -#include <ntqtoolbutton.h> +#include <tqtoolbutton.h> #include <ntqapplication.h> -#include <ntqaction.h> +#include <tqaction.h> #include <ntqmetaobject.h> ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar, diff --git a/tools/designer/designer/multilineeditorimpl.h b/tools/designer/designer/multilineeditorimpl.h index 30b875ba4..22075a995 100644 --- a/tools/designer/designer/multilineeditorimpl.h +++ b/tools/designer/designer/multilineeditorimpl.h @@ -34,7 +34,7 @@ #ifndef MULTILINEEDITORIMPL_H #define MULTILINEEDITORIMPL_H -#include <ntqaction.h> +#include <tqaction.h> #include <tqtextedit.h> #include <private/qrichtext_p.h> #include "multilineeditor.h" diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp index f2c9eacf1..837dabc83 100644 --- a/tools/designer/designer/newformimpl.cpp +++ b/tools/designer/designer/newformimpl.cpp @@ -51,7 +51,7 @@ #include <ntqpushbutton.h> #include <stdlib.h> #include <ntqcombobox.h> -#include <ntqworkspace.h> +#include <tqworkspace.h> #include <ntqmessagebox.h> static int forms = 0; diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp index 050e37c46..711b71ff3 100644 --- a/tools/designer/designer/popupmenueditor.cpp +++ b/tools/designer/designer/popupmenueditor.cpp @@ -38,9 +38,9 @@ #include <ntqlineedit.h> #include <tqobjectlist.h> #include <ntqpainter.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <ntqrect.h> -#include <ntqsize.h> +#include <tqsize.h> #include <tqstyle.h> #include <tqtimer.h> #include "actiondnd.h" diff --git a/tools/designer/designer/popupmenueditor.h b/tools/designer/designer/popupmenueditor.h index b60a22c3c..f3ba89811 100644 --- a/tools/designer/designer/popupmenueditor.h +++ b/tools/designer/designer/popupmenueditor.h @@ -36,7 +36,7 @@ #include <tqwidget.h> #include <tqptrlist.h> -#include <ntqaction.h> +#include <tqaction.h> class PopupMenuEditor; class TQMenuItem; @@ -102,7 +102,7 @@ class FormWindow; class MainWindow; class TQLineEdit; -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> class PopupMenuEditor : public TQWidget { diff --git a/tools/designer/designer/previewframe.h b/tools/designer/designer/previewframe.h index 67fabbf52..017e5cb00 100644 --- a/tools/designer/designer/previewframe.h +++ b/tools/designer/designer/previewframe.h @@ -35,7 +35,7 @@ #define PREVIEWFRAME_H #include <ntqvbox.h> -#include <ntqworkspace.h> +#include <tqworkspace.h> #include "previewwidgetimpl.h" diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp index d567b79ee..2c6fa89d4 100644 --- a/tools/designer/designer/project.cpp +++ b/tools/designer/designer/project.cpp @@ -53,7 +53,7 @@ #include <ntqmessagebox.h> #include <ntqapplication.h> #include "mainwindow.h" -#include <ntqworkspace.h> +#include <tqworkspace.h> #ifndef TQT_NO_SQL #include <tqsqldatabase.h> diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index eb5eddd09..3cb0d285e 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -71,12 +71,12 @@ #include <ntqcolordialog.h> #include <ntqlabel.h> #include <ntqlayout.h> -#include <ntqsizepolicy.h> +#include <tqsizepolicy.h> #include <ntqbitmap.h> -#include <ntqtooltip.h> +#include <tqtooltip.h> #include <ntqwhatsthis.h> #include <ntqaccel.h> -#include <ntqworkspace.h> +#include <tqworkspace.h> #include <tqtimer.h> #include <ntqdragobject.h> #include <tqdom.h> diff --git a/tools/designer/designer/qcompletionedit.cpp b/tools/designer/designer/qcompletionedit.cpp index 79cdae62c..312ee731b 100644 --- a/tools/designer/designer/qcompletionedit.cpp +++ b/tools/designer/designer/qcompletionedit.cpp @@ -33,7 +33,7 @@ #include "qcompletionedit.h" #include <ntqlistbox.h> -#include <ntqsizegrip.h> +#include <tqsizegrip.h> #include <ntqapplication.h> #include <ntqvbox.h> diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index 129246e30..d6f35a06b 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -64,7 +64,7 @@ #include <ntqlayout.h> #include <ntqlistbox.h> #include <ntqlistview.h> -#include <ntqmenudata.h> +#include <tqmenudata.h> #include <ntqmessagebox.h> #include <ntqmetaobject.h> #include <tqobject.h> @@ -78,13 +78,13 @@ #include <ntqtabwidget.h> #include <tqtextcodec.h> #include <tqtextstream.h> -#include <ntqtooltip.h> +#include <tqtooltip.h> #include <ntqwhatsthis.h> #include <tqwidget.h> #include <tqwidgetstack.h> #include <ntqwizard.h> -#include <ntqworkspace.h> -#include <ntqworkspace.h> +#include <tqworkspace.h> +#include <tqworkspace.h> #include <ntqsplitter.h> #include <private/qucom_p.h> diff --git a/tools/designer/designer/widgetaction.cpp b/tools/designer/designer/widgetaction.cpp index 62a4f7e4b..b9fe944da 100644 --- a/tools/designer/designer/widgetaction.cpp +++ b/tools/designer/designer/widgetaction.cpp @@ -33,7 +33,7 @@ #include "widgetaction.h" #include <tqwidget.h> -#include <ntqtoolbutton.h> +#include <tqtoolbutton.h> #include "mainwindow.h" #include <tqstylefactory.h> #include <tqstyle.h> diff --git a/tools/designer/designer/widgetaction.h b/tools/designer/designer/widgetaction.h index 40017de8e..250d1a823 100644 --- a/tools/designer/designer/widgetaction.h +++ b/tools/designer/designer/widgetaction.h @@ -34,7 +34,7 @@ #ifndef WIDGETACTION_H #define WIDGETACTION_H -#include <ntqaction.h> +#include <tqaction.h> class WidgetAction : public TQAction { diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp index c7cac1826..1caeea8d4 100644 --- a/tools/designer/designer/widgetfactory.cpp +++ b/tools/designer/designer/widgetfactory.cpp @@ -89,12 +89,12 @@ #include <tqvaluelist.h> #include <tqtimer.h> #include <ntqscrollbar.h> -#include <ntqmainwindow.h> -#include <ntqmenubar.h> +#include <tqmainwindow.h> +#include <tqmenubar.h> #include <ntqapplication.h> #include <ntqsplitter.h> -#include <ntqtoolbox.h> -#include <ntqsizegrip.h> +#include <tqtoolbox.h> +#include <tqsizegrip.h> #ifndef TQT_NO_SQL #include "database.h" #endif diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h index e4bba6709..c676b0915 100644 --- a/tools/designer/designer/widgetfactory.h +++ b/tools/designer/designer/widgetfactory.h @@ -40,7 +40,7 @@ #include <ntqintdict.h> #include <ntqtabwidget.h> #include <ntqpixmap.h> -#include <ntqsize.h> +#include <tqsize.h> #include <ntqpainter.h> #include <ntqevent.h> #include <tqobjectlist.h> @@ -48,13 +48,13 @@ #include <ntqwizard.h> #include <tqptrdict.h> #include <ntqpushbutton.h> -#include <ntqtoolbutton.h> +#include <tqtoolbutton.h> #include <ntqcheckbox.h> #include <ntqradiobutton.h> #include <ntqbuttongroup.h> #include <tqwidgetstack.h> #include <ntqguardedptr.h> -#include <ntqtoolbox.h> +#include <tqtoolbox.h> #include "metadatabase.h" #include "tqwidgetfactory.h" diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp index 209dbba6c..bc108900a 100644 --- a/tools/designer/designer/workspace.cpp +++ b/tools/designer/designer/workspace.cpp @@ -50,8 +50,8 @@ #include <ntqpainter.h> #include <ntqpen.h> #include <tqobjectlist.h> -#include <ntqworkspace.h> -#include <ntqpopupmenu.h> +#include <tqworkspace.h> +#include <tqpopupmenu.h> #include <tqtextstream.h> #include "qcompletionedit.h" diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp index 09dba0536..48b6b3b65 100644 --- a/tools/designer/editor/completion.cpp +++ b/tools/designer/editor/completion.cpp @@ -41,7 +41,7 @@ #include <ntqapplication.h> #include <ntqregexp.h> #include "arghintwidget.h" -#include <ntqsizegrip.h> +#include <tqsizegrip.h> #include <tqtimer.h> static TQColor getColor( const TQString &type ) diff --git a/tools/designer/editor/editor.cpp b/tools/designer/editor/editor.cpp index 58b5ed90d..69af84ac2 100644 --- a/tools/designer/editor/editor.cpp +++ b/tools/designer/editor/editor.cpp @@ -37,7 +37,7 @@ #include <private/qrichtext_p.h> #include "conf.h" #include <ntqapplication.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <ntqaccel.h> Editor::Editor( const TQString &fn, TQWidget *parent, const char *name ) diff --git a/tools/designer/editor/markerwidget.cpp b/tools/designer/editor/markerwidget.cpp index 69e68817f..962449805 100644 --- a/tools/designer/editor/markerwidget.cpp +++ b/tools/designer/editor/markerwidget.cpp @@ -36,7 +36,7 @@ #include <private/qrichtext_p.h> #include "editor.h" #include <ntqpainter.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include "paragdata.h" static const char * error_xpm[] = { diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui index 9319ffbed..d3cf14c2f 100644 --- a/tools/designer/examples/colortool/mainform.ui +++ b/tools/designer/examples/colortool/mainform.ui @@ -524,7 +524,7 @@ <include location="local" impldecl="in implementation">ntqcolor.h</include> <include location="local" impldecl="in implementation">tqstring.h</include> <include location="local" impldecl="in implementation">ntqpainter.h</include> - <include location="local" impldecl="in implementation">ntqstatusbar.h</include> + <include location="local" impldecl="in implementation">tqstatusbar.h</include> <include location="local" impldecl="in implementation">ntqmessagebox.h</include> <include location="local" impldecl="in implementation">ntqclipboard.h</include> <include location="local" impldecl="in implementation">ntqlabel.h</include> diff --git a/tools/designer/examples/credit/creditformbase.cpp b/tools/designer/examples/credit/creditformbase.cpp index e1ac4c506..96b265e54 100644 --- a/tools/designer/examples/credit/creditformbase.cpp +++ b/tools/designer/examples/credit/creditformbase.cpp @@ -16,7 +16,7 @@ #include <ntqmime.h> #include <ntqdragobject.h> #include <ntqlayout.h> -#include <ntqtooltip.h> +#include <tqtooltip.h> #include <ntqwhatsthis.h> #include "creditformbase.ui.h" #include <tqimage.h> diff --git a/tools/designer/plugins/cppeditor/cppbrowser.cpp b/tools/designer/plugins/cppeditor/cppbrowser.cpp index 8d03931b7..0d2044a40 100644 --- a/tools/designer/plugins/cppeditor/cppbrowser.cpp +++ b/tools/designer/plugins/cppeditor/cppbrowser.cpp @@ -35,8 +35,8 @@ #include "cppbrowser.h" #include <private/qrichtext_p.h> #include <ntqprocess.h> -#include <ntqmainwindow.h> -#include <ntqstatusbar.h> +#include <tqmainwindow.h> +#include <tqstatusbar.h> #include <editor.h> CppEditorBrowser::CppEditorBrowser( Editor *e ) diff --git a/tools/designer/plugins/cppeditor/cppeditor.cpp b/tools/designer/plugins/cppeditor/cppeditor.cpp index 8b567ab20..d06bdf388 100644 --- a/tools/designer/plugins/cppeditor/cppeditor.cpp +++ b/tools/designer/plugins/cppeditor/cppeditor.cpp @@ -39,7 +39,7 @@ #include "cppbrowser.h" #include <parenmatcher.h> #include <ntqsettings.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <ntqinputdialog.h> #include <designerinterface.h> diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp index 2f6a6b1b4..bb18507c5 100644 --- a/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tools/designer/plugins/dlg/dlg2ui.cpp @@ -109,8 +109,8 @@ static const struct { { "DlgWidget", "FocusPolicy", "focusPolicy", "enum" }, { "DlgWidget", "Font", "font", "qfont" }, { "DlgWidget", "FontPropagation", 0, 0 }, - { "DlgWidget", "MaximumSize", "maximumSize", "qsize" }, - { "DlgWidget", "MinimumSize", "minimumSize", "qsize" }, + { "DlgWidget", "MaximumSize", "maximumSize", "tqsize" }, + { "DlgWidget", "MinimumSize", "minimumSize", "tqsize" }, { "DlgWidget", "Name", 0, 0 }, { "DlgWidget", "Palette", "palette", "qpalette" }, { "DlgWidget", "PalettePropagation", 0, 0 }, @@ -573,7 +573,7 @@ void Dlg2Ui::emitSpacer( int spacing, int stretch ) TQString("Spacer%1").arg(uniqueSpacer++).latin1() ); emitProperty( TQString("orientation"), orientationStr, TQString("enum") ); if ( spacing > 0 ) - emitProperty( TQString("sizeHint"), sizeHint, TQString("qsize") ); + emitProperty( TQString("sizeHint"), sizeHint, TQString("tqsize") ); emitProperty( TQString("sizeType"), sizeType, TQString("enum") ); emitClosing( TQString("spacer") ); } @@ -902,7 +902,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName, } else { TQDomNodeList children = e.childNodes(); - if ( type == TQString("qsize") ) { + if ( type == TQString("tqsize") ) { int width = getValue( children, TQString("Width"), TQString("integer") ).toInt(); int height = getValue( children, TQString("Height"), @@ -1373,12 +1373,12 @@ void Dlg2Ui::matchWidgetLayoutCommon( const TQDomElement& widgetLayoutCommon ) #if 1 TQPoint initialPos = getValue( children, TQString("InitialPos"), TQString("qpoint") ).toPoint(); - TQSize size = getValue( children, TQString("Size"), TQString("qsize") ) + TQSize size = getValue( children, TQString("Size"), TQString("tqsize") ) .toSize(); #endif - TQSize minSize = getValue( children, TQString("MinSize"), TQString("qsize") ) + TQSize minSize = getValue( children, TQString("MinSize"), TQString("tqsize") ) .toSize(); - TQSize maxSize = getValue( children, TQString("MaxSize"), TQString("qsize") ) + TQSize maxSize = getValue( children, TQString("MaxSize"), TQString("tqsize") ) .toSize(); #if 1 diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp index cd7d7f7e0..d9de3f14f 100644 --- a/tools/designer/plugins/glade/glade2ui.cpp +++ b/tools/designer/plugins/glade/glade2ui.cpp @@ -43,7 +43,7 @@ #include <ntqmessagebox.h> #include <ntqrect.h> #include <ntqregexp.h> -#include <ntqsizepolicy.h> +#include <tqsizepolicy.h> #include <ctype.h> diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui b/tools/designer/plugins/wizards/mainwindowwizard.ui index f8688e861..5f0fb9eb8 100644 --- a/tools/designer/plugins/wizards/mainwindowwizard.ui +++ b/tools/designer/plugins/wizards/mainwindowwizard.ui @@ -34,7 +34,7 @@ *********************************************************************</comment> <include location="global" impldecl="in implementation">designerinterface.h</include> <include location="global" impldecl="in implementation">tqiconset.h</include> -<include location="global" impldecl="in implementation">ntqaction.h</include> +<include location="global" impldecl="in implementation">tqaction.h</include> <include location="global" impldecl="in implementation">ntqpixmap.h</include> <include location="global" impldecl="in implementation">ntqdict.h</include> <include location="local" implDecl="in declaration">mainwindowwizard.ui.h</include> diff --git a/tools/designer/shared/domtool.cpp b/tools/designer/shared/domtool.cpp index dce35751d..62d0b70df 100644 --- a/tools/designer/shared/domtool.cpp +++ b/tools/designer/shared/domtool.cpp @@ -33,12 +33,12 @@ #include "domtool.h" -#include <ntqsizepolicy.h> +#include <tqsizepolicy.h> #include <ntqcolor.h> #include <ntqcursor.h> #include <tqdatetime.h> #include <ntqrect.h> -#include <ntqsize.h> +#include <tqsize.h> #include <ntqfont.h> #include <tqdom.h> diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp index 6d20635d3..e310576f0 100644 --- a/tools/designer/shared/ui2uib.cpp +++ b/tools/designer/shared/ui2uib.cpp @@ -44,7 +44,7 @@ #include <ntqfont.h> #include <tqobject.h> #include <ntqrect.h> -#include <ntqsizepolicy.h> +#include <tqsizepolicy.h> /* The .uib file format is the binary counterpart of the .ui file diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp index fce3e83de..5648f5631 100644 --- a/tools/designer/shared/widgetdatabase.cpp +++ b/tools/designer/shared/widgetdatabase.cpp @@ -65,9 +65,12 @@ static bool was_in_setup = FALSE; static TQString converted_widgets[] = { "TQDateTimeEdit", - "TQIconView", - "TQTextBrowser", "TQTextEdit", "TQTextView", - "TQWidget", "TQWidgetStack", + "TQIconView", + "TQMainWindow", "TQMenuBar", + "TQPopupMenu", + "TQStatusBar", "TQSizeGrip", + "TQTextBrowser", "TQTextEdit", "TQTextView", "TQToolBar", "TQToolBox", "TQToolButton", "TQToolTip", + "TQWidget", "TQWidgetStack", "TQWorkspace" }; size_t converted_widgets_size = sizeof(converted_widgets) / sizeof(TQString); @@ -526,7 +529,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; r->name = "TQMainWindow"; - r->includeFile = "ntqmainwindow.h"; + r->includeFile = "tqmainwindow.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -535,7 +538,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; r->name = "TQDesignerAction"; - r->includeFile = "ntqaction.h"; + r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; @@ -544,7 +547,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; r->name = "TQDesignerActionGroup"; - r->includeFile = "ntqaction.h"; + r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp index 003aa33ff..5a24be097 100644 --- a/tools/designer/uic/form.cpp +++ b/tools/designer/uic/form.cpp @@ -827,13 +827,13 @@ void Uic::createFormImpl( const TQDomElement &e ) } out << "#include <ntqlayout.h>" << endl; - out << "#include <ntqtooltip.h>" << endl; + out << "#include <tqtooltip.h>" << endl; out << "#include <ntqwhatsthis.h>" << endl; if ( objClass == "TQMainWindow" ) { - out << "#include <ntqaction.h>" << endl; - out << "#include <ntqmenubar.h>" << endl; - out << "#include <ntqpopupmenu.h>" << endl; - out << "#include <ntqtoolbar.h>" << endl; + out << "#include <tqaction.h>" << endl; + out << "#include <tqmenubar.h>" << endl; + out << "#include <tqpopupmenu.h>" << endl; + out << "#include <tqtoolbar.h>" << endl; } // find out what images are required diff --git a/tools/designer/uic/object.cpp b/tools/designer/uic/object.cpp index 2aa95fd33..fbd052c0f 100644 --- a/tools/designer/uic/object.cpp +++ b/tools/designer/uic/object.cpp @@ -35,7 +35,7 @@ #include "parser.h" #include "domtool.h" #include <ntqregexp.h> -#include <ntqsizepolicy.h> +#include <tqsizepolicy.h> #include <tqstringlist.h> #define NO_STATIC_COLORS #include <globaldefs.h> diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp index 3c4796408..c075a481f 100644 --- a/tools/designer/uilib/tqwidgetfactory.cpp +++ b/tools/designer/uilib/tqwidgetfactory.cpp @@ -45,7 +45,7 @@ #include <domtool.h> #include <uib.h> #include <ntqapplication.h> -#include <ntqtooltip.h> +#include <tqtooltip.h> #include <ntqwhatsthis.h> #include <tqobjectlist.h> #include <private/qpluginmanager_p.h> @@ -60,7 +60,7 @@ // include all TQt widgets we support #include <ntqpushbutton.h> -#include <ntqtoolbutton.h> +#include <tqtoolbutton.h> #include <ntqcheckbox.h> #include <ntqradiobutton.h> #include <ntqgroupbox.h> @@ -89,15 +89,15 @@ #include <ntqslider.h> #include <ntqframe.h> #include <tqwidgetstack.h> -#include <ntqtoolbox.h> +#include <tqtoolbox.h> #include <tqtextedit.h> #include <ntqscrollbar.h> -#include <ntqmainwindow.h> +#include <tqmainwindow.h> #include <ntqsplitter.h> -#include <ntqaction.h> -#include <ntqpopupmenu.h> -#include <ntqmenubar.h> -#include <ntqpopupmenu.h> +#include <tqaction.h> +#include <tqpopupmenu.h> +#include <tqmenubar.h> +#include <tqpopupmenu.h> #include <tqdatetimeedit.h> #include <ntqvbox.h> #include <ntqhbox.h> diff --git a/tools/designer/uilib/tqwidgetfactory.h b/tools/designer/uilib/tqwidgetfactory.h index 97cbd8534..c2fd359e8 100644 --- a/tools/designer/uilib/tqwidgetfactory.h +++ b/tools/designer/uilib/tqwidgetfactory.h @@ -41,7 +41,7 @@ #include <ntqpixmap.h> #include <tqvaluelist.h> #include <tqmap.h> -#include <ntqaction.h> +#include <tqaction.h> #endif // QT_H class TQDomDocument; diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf index eff9422cb..95e9be5fc 100644 --- a/tools/linguist/book/linguist-programmer.leaf +++ b/tools/linguist/book/linguist-programmer.leaf @@ -542,7 +542,7 @@ This example is a slightly more involved and introduces a key \i \c arrowpad.h contains the definition of \c ArrowPad, a custom widget; \i \c arrowpad.cpp contains the implementation of \c ArrowPad; \i \c mainwindow.h contains the definition of \c MainWindow, a subclass of - \l QMainWindow + \l TQMainWindow \i \c mainwindow.cpp contains the implementation of \c MainWindow; \i \c main.cpp contains main(). \endlist @@ -627,8 +627,8 @@ user-visible text. \index MainWindow!in Translation Tutorial \quotefile tt2/mainwindow.h -\skipto QMainWindow -\printline QMainWindow +\skipto TQMainWindow +\printline TQMainWindow \printuntil TQ_OBJECT In the \e {Tutorial 2 Screenshot, English version}, above, the whole diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp index d68dfa09b..cd12369f7 100644 --- a/tools/linguist/linguist/msgedit.cpp +++ b/tools/linguist/linguist/msgedit.cpp @@ -54,7 +54,7 @@ #include <tqtextview.h> #include <ntqwhatsthis.h> #include <ntqvbox.h> -#include <ntqmainwindow.h> +#include <tqmainwindow.h> #include <ntqheader.h> #include <ntqregexp.h> #include <ntqdockarea.h> diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h index b1d29bc9c..a64440efa 100644 --- a/tools/linguist/linguist/msgedit.h +++ b/tools/linguist/linguist/msgedit.h @@ -46,7 +46,7 @@ #include <ntqscrollview.h> #include <ntqpixmap.h> #include <ntqbitmap.h> -#include <ntqtooltip.h> +#include <tqtooltip.h> class TQAccel; class TQDockArea; diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp index 7b3ce9880..8ff22afe7 100644 --- a/tools/linguist/linguist/trwindow.cpp +++ b/tools/linguist/linguist/trwindow.cpp @@ -47,7 +47,7 @@ #include "statistics.h" #include <ntqaccel.h> -#include <ntqaction.h> +#include <tqaction.h> #include <ntqapplication.h> #include <ntqbitmap.h> #include <ntqdict.h> @@ -59,13 +59,13 @@ #include <ntqheader.h> #include <ntqlabel.h> #include <ntqlayout.h> -#include <ntqmenubar.h> +#include <tqmenubar.h> #include <ntqmessagebox.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <ntqregexp.h> #include <ntqsettings.h> -#include <ntqstatusbar.h> -#include <ntqtoolbar.h> +#include <tqstatusbar.h> +#include <tqtoolbar.h> #include <ntqwhatsthis.h> #include <ntqprocess.h> #include <ntqassistantclient.h> diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h index 7c81ed15a..89a4edb28 100644 --- a/tools/linguist/linguist/trwindow.h +++ b/tools/linguist/linguist/trwindow.h @@ -38,7 +38,7 @@ #include <metatranslator.h> -#include <ntqmainwindow.h> +#include <tqmainwindow.h> #include <tqptrlist.h> #include <ntqdict.h> #include <ntqprinter.h> diff --git a/tools/linguist/tutorial/tt2/mainwindow.cpp b/tools/linguist/tutorial/tt2/mainwindow.cpp index a2507331c..8b5c9dfb0 100644 --- a/tools/linguist/tutorial/tt2/mainwindow.cpp +++ b/tools/linguist/tutorial/tt2/mainwindow.cpp @@ -9,8 +9,8 @@ #include <ntqaccel.h> #include <ntqapplication.h> -#include <ntqmenubar.h> -#include <ntqpopupmenu.h> +#include <tqmenubar.h> +#include <tqpopupmenu.h> MainWindow::MainWindow( TQWidget *parent, const char *name ) : TQMainWindow( parent, name ) diff --git a/tools/linguist/tutorial/tt2/mainwindow.h b/tools/linguist/tutorial/tt2/mainwindow.h index 92ecf61c7..38209c619 100644 --- a/tools/linguist/tutorial/tt2/mainwindow.h +++ b/tools/linguist/tutorial/tt2/mainwindow.h @@ -7,7 +7,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <ntqmainwindow.h> +#include <tqmainwindow.h> class MainWindow : public TQMainWindow { diff --git a/tools/linguist/tutorial/tt3/mainwindow.cpp b/tools/linguist/tutorial/tt3/mainwindow.cpp index 8e4bee5cd..b76430752 100644 --- a/tools/linguist/tutorial/tt3/mainwindow.cpp +++ b/tools/linguist/tutorial/tt3/mainwindow.cpp @@ -9,9 +9,9 @@ #include <ntqaccel.h> #include <ntqapplication.h> -#include <ntqmenubar.h> +#include <tqmenubar.h> #include <ntqmessagebox.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> MainWindow::MainWindow( TQWidget *parent, const char *name ) : TQMainWindow( parent, name ) diff --git a/tools/linguist/tutorial/tt3/mainwindow.h b/tools/linguist/tutorial/tt3/mainwindow.h index 2007658eb..fafd15ed5 100644 --- a/tools/linguist/tutorial/tt3/mainwindow.h +++ b/tools/linguist/tutorial/tt3/mainwindow.h @@ -7,7 +7,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <ntqmainwindow.h> +#include <tqmainwindow.h> class MainWindow : public TQMainWindow { diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp index d246f33e2..e907f3229 100644 --- a/tools/qconfig/main.cpp +++ b/tools/qconfig/main.cpp @@ -39,10 +39,10 @@ #include <ntqhbox.h> #include <ntqlabel.h> #include <ntqmessagebox.h> -#include <ntqpopupmenu.h> -#include <ntqmenubar.h> -#include <ntqtoolbutton.h> -#include <ntqstatusbar.h> +#include <tqpopupmenu.h> +#include <tqmenubar.h> +#include <tqtoolbutton.h> +#include <tqstatusbar.h> #include <ntqsplitter.h> #include <ntqregexp.h> #if defined(Q_OS_WIN32) diff --git a/tools/qconfig/main.h b/tools/qconfig/main.h index 9075157cf..4722b6d2f 100644 --- a/tools/qconfig/main.h +++ b/tools/qconfig/main.h @@ -31,7 +31,7 @@ ** **********************************************************************/ -#include <ntqmainwindow.h> +#include <tqmainwindow.h> #include <tqmap.h> #include <tqstringlist.h> #include <tqtextbrowser.h> diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 429f4fd78..83898c4cd 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -48,8 +48,8 @@ #include <ntqspinbox.h> #include <ntqcheckbox.h> #include <ntqfiledialog.h> -#include <ntqaction.h> -#include <ntqstatusbar.h> +#include <tqaction.h> +#include <tqstatusbar.h> #include <ntqsettings.h> #include <ntqmessagebox.h> #include <tqtextview.h> diff --git a/tools/qtconfig/previewframe.h b/tools/qtconfig/previewframe.h index 8aead5a34..93ec62b4a 100644 --- a/tools/qtconfig/previewframe.h +++ b/tools/qtconfig/previewframe.h @@ -37,7 +37,7 @@ #include "previewwidget.h" #include <ntqvbox.h> -#include <ntqworkspace.h> +#include <tqworkspace.h> class Workspace : public TQWorkspace { |