diff options
Diffstat (limited to 'tools/designer')
32 files changed, 40 insertions, 39 deletions
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp index 3a980ad75..17ed552bc 100644 --- a/tools/designer/app/main.cpp +++ b/tools/designer/app/main.cpp @@ -43,7 +43,7 @@ #include "designerapp.h" -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <tqobjectlist.h> #include <ntqsettings.h> #include <ntqsplashscreen.h> diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp index 51bb600a6..fd33209b1 100644 --- a/tools/designer/designer/command.cpp +++ b/tools/designer/designer/command.cpp @@ -54,7 +54,7 @@ #include <ntqmessagebox.h> #include <ntqlistbox.h> #include <ntqiconview.h> -#include <ntqtextedit.h> +#include <tqtextedit.h> #include <tqptrstack.h> #include <ntqheader.h> #include <ntqsplitter.h> diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp index e3726e1d6..3d3196f82 100644 --- a/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/tools/designer/designer/customwidgeteditorimpl.cpp @@ -53,9 +53,9 @@ #include <ntqapplication.h> #include <ntqlistview.h> #include <ntqfile.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <tqdom.h> -#include <ntqtextcodec.h> +#include <tqtextcodec.h> #include <ntqcheckbox.h> CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw ) diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp index c6ac96c70..b808f323f 100644 --- a/tools/designer/designer/designerappiface.cpp +++ b/tools/designer/designer/designerappiface.cpp @@ -44,7 +44,7 @@ #include "../shared/widgetdatabase.h" #include <ntqvariant.h> #include <ntqlistview.h> -#include <ntqtextedit.h> +#include <tqtextedit.h> #include <ntqstatusbar.h> #include "pixmapcollection.h" #include "hierarchyview.h" diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 18a4579f2..6da309848 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -116,7 +116,7 @@ #include <ntqaccel.h> #include <ntqtooltip.h> #include <ntqsizegrip.h> -#include <ntqtextview.h> +#include <tqtextview.h> #include <ntqassistantclient.h> #include <stdlib.h> diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index d7699dca6..52b6e7a06 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -52,7 +52,7 @@ #include <ntqspinbox.h> #include <ntqinputdialog.h> #include <ntqdatetimeedit.h> -#include <ntqtextedit.h> +#include <tqtextedit.h> #include "defs.h" #include "project.h" diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp index 9203f7f80..90e32d33e 100644 --- a/tools/designer/designer/metadatabase.cpp +++ b/tools/designer/designer/metadatabase.cpp @@ -55,7 +55,7 @@ #include <ntqdatetime.h> #include <ntqfile.h> #include <ntqfileinfo.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <stdlib.h> diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp index 709ebd596..4e6013f61 100644 --- a/tools/designer/designer/multilineeditorimpl.cpp +++ b/tools/designer/designer/multilineeditorimpl.cpp @@ -39,7 +39,7 @@ #include "syntaxhighlighter_html.h" #include "widgetfactory.h" -#include <ntqtextedit.h> +#include <tqtextedit.h> #include <./private/qrichtext_p.h> #include <ntqpushbutton.h> #include <ntqlayout.h> diff --git a/tools/designer/designer/multilineeditorimpl.h b/tools/designer/designer/multilineeditorimpl.h index 11c7233c7..30b875ba4 100644 --- a/tools/designer/designer/multilineeditorimpl.h +++ b/tools/designer/designer/multilineeditorimpl.h @@ -35,7 +35,7 @@ #define MULTILINEEDITORIMPL_H #include <ntqaction.h> -#include <ntqtextedit.h> +#include <tqtextedit.h> #include <private/qrichtext_p.h> #include "multilineeditor.h" diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp index 89c0b0553..4dc59ab4e 100644 --- a/tools/designer/designer/outputwindow.cpp +++ b/tools/designer/designer/outputwindow.cpp @@ -37,7 +37,7 @@ #include "mainwindow.h" #include <ntqlistview.h> -#include <ntqtextedit.h> +#include <tqtextedit.h> #include <ntqapplication.h> #include <ntqheader.h> #include <stdlib.h> diff --git a/tools/designer/designer/pixmapcollection.cpp b/tools/designer/designer/pixmapcollection.cpp index 0a94c591d..22405ce19 100644 --- a/tools/designer/designer/pixmapcollection.cpp +++ b/tools/designer/designer/pixmapcollection.cpp @@ -37,7 +37,7 @@ #include <ntqmime.h> #include <ntqdir.h> #include <ntqfileinfo.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <tqimage.h> PixmapCollection::PixmapCollection( Project *pro ) diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp index a21ac2059..d567b79ee 100644 --- a/tools/designer/designer/project.cpp +++ b/tools/designer/designer/project.cpp @@ -44,11 +44,11 @@ #include "outputwindow.h" #include <ntqfile.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <ntqurl.h> #include <tqobjectlist.h> #include <ntqfeatures.h> -#include <ntqtextcodec.h> +#include <tqtextcodec.h> #include <tqdom.h> #include <ntqmessagebox.h> #include <ntqapplication.h> diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp index d76638013..0a4a724db 100644 --- a/tools/designer/designer/projectsettingsimpl.cpp +++ b/tools/designer/designer/projectsettingsimpl.cpp @@ -42,7 +42,7 @@ #include "workspace.h" #include <ntqlineedit.h> -#include <ntqtextedit.h> +#include <tqtextedit.h> #include <ntqcheckbox.h> #include <ntqfiledialog.h> #include <ntqcombobox.h> diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index 85b2b2ec9..436d6a75d 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -88,7 +88,7 @@ #include <ntqmultilineedit.h> // FIXME: obsolete #include <ntqsplitter.h> #include <tqdatatable.h> -#include <ntqtextview.h> +#include <tqtextview.h> #include <limits.h> diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index 1d0d3d2bc..9655ee4eb 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -76,8 +76,8 @@ #endif #include <ntqtabwidget.h> #include <ntqtabwidget.h> -#include <ntqtextcodec.h> -#include <ntqtextstream.h> +#include <tqtextcodec.h> +#include <tqtextstream.h> #include <ntqtooltip.h> #include <ntqwhatsthis.h> #include <tqwidget.h> diff --git a/tools/designer/designer/resource.h b/tools/designer/designer/resource.h index a8580dae9..ff88271e7 100644 --- a/tools/designer/designer/resource.h +++ b/tools/designer/designer/resource.h @@ -35,7 +35,7 @@ #define RESOURCE_H #include <tqstring.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <ntqvariant.h> #include <tqvaluelist.h> #include <tqimage.h> diff --git a/tools/designer/designer/sourceeditor.cpp b/tools/designer/designer/sourceeditor.cpp index 32df118bf..06ec283b7 100644 --- a/tools/designer/designer/sourceeditor.cpp +++ b/tools/designer/designer/sourceeditor.cpp @@ -43,7 +43,7 @@ #include "sourcefile.h" #include "hierarchyview.h" #include <ntqmessagebox.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ) : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) diff --git a/tools/designer/designer/sourcefile.cpp b/tools/designer/designer/sourcefile.cpp index bdb6299d8..200a06a84 100644 --- a/tools/designer/designer/sourcefile.cpp +++ b/tools/designer/designer/sourcefile.cpp @@ -33,7 +33,7 @@ #include "sourcefile.h" #include <ntqfile.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include "designerappiface.h" #include "sourceeditor.h" #include "metadatabase.h" diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp index d5ef3df8a..30f10c096 100644 --- a/tools/designer/designer/widgetfactory.cpp +++ b/tools/designer/designer/widgetfactory.cpp @@ -67,7 +67,7 @@ #include <ntqlineedit.h> #include <ntqspinbox.h> #include <ntqmultilineedit.h> -#include <ntqtextedit.h> +#include <tqtextedit.h> #include <ntqlabel.h> #include <ntqlayout.h> #include <tqwidgetstack.h> @@ -80,8 +80,8 @@ #include <ntqslider.h> #include <ntqdial.h> #include <ntqprogressbar.h> -#include <ntqtextview.h> -#include <ntqtextbrowser.h> +#include <tqtextview.h> +#include <tqtextbrowser.h> #include <ntqframe.h> #include <ntqmetaobject.h> #include <tqwidgetstack.h> diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp index fa02c86c9..209dbba6c 100644 --- a/tools/designer/designer/workspace.cpp +++ b/tools/designer/designer/workspace.cpp @@ -52,7 +52,7 @@ #include <tqobjectlist.h> #include <ntqworkspace.h> #include <ntqpopupmenu.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include "qcompletionedit.h" WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) diff --git a/tools/designer/editor/editor.h b/tools/designer/editor/editor.h index 060394312..0be972de1 100644 --- a/tools/designer/editor/editor.h +++ b/tools/designer/editor/editor.h @@ -34,7 +34,7 @@ #ifndef EDITOR_H #define EDITOR_H -#include <ntqtextedit.h> +#include <tqtextedit.h> struct Config; class ParenMatcher; diff --git a/tools/designer/editor/parenmatcher.cpp b/tools/designer/editor/parenmatcher.cpp index ddc4b8838..9f72a65d6 100644 --- a/tools/designer/editor/parenmatcher.cpp +++ b/tools/designer/editor/parenmatcher.cpp @@ -34,7 +34,7 @@ #include "parenmatcher.h" #include "paragdata.h" -#include "ntqtextedit.h" +#include "tqtextedit.h" #include <private/qrichtext_p.h> #include <ntqapplication.h> diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp index d8498dc3a..4851c572a 100644 --- a/tools/designer/editor/yyindent.cpp +++ b/tools/designer/editor/yyindent.cpp @@ -1107,7 +1107,7 @@ int indentForBottomLine( const TQStringList& program, TQChar typedIn ) */ #include <ntqfile.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <errno.h> diff --git a/tools/designer/examples/addressbook/addressbook.ui.h b/tools/designer/examples/addressbook/addressbook.ui.h index 93f3d50e5..2edd9f2b0 100644 --- a/tools/designer/examples/addressbook/addressbook.ui.h +++ b/tools/designer/examples/addressbook/addressbook.ui.h @@ -9,7 +9,7 @@ #include "addressdetails.h" #include "search.h" #include <ntqfile.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <ntqfiledialog.h> #include <ntqapplication.h> diff --git a/tools/designer/examples/richedit/richedit.ui b/tools/designer/examples/richedit/richedit.ui index 83b2381d1..7f166440b 100644 --- a/tools/designer/examples/richedit/richedit.ui +++ b/tools/designer/examples/richedit/richedit.ui @@ -5,7 +5,7 @@ <include location="global" impldecl="in implementation">ntqmessagebox.h</include> <include location="global" impldecl="in implementation">ntqapplication.h</include> <include location="global" impldecl="in implementation">ntqfiledialog.h</include> -<include location="global" impldecl="in implementation">ntqtextstream.h</include> +<include location="global" impldecl="in implementation">tqtextstream.h</include> <include location="local" implDecl="in declaration">richedit.ui.h</include> <variable>TQString fileName;</variable> <pixmapinproject/> diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp index a89934659..2f6a6b1b4 100644 --- a/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tools/designer/plugins/dlg/dlg2ui.cpp @@ -39,7 +39,7 @@ #include <ntqframe.h> #include <ntqmessagebox.h> #include <ntqregexp.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> /* Possible improvements: diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h index ff7d19552..7ae909df1 100644 --- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h +++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h @@ -35,7 +35,7 @@ #ifndef KDEVDLG2UI_H #define KDEVDLG2UI_H -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <ntqfile.h> #include <tqstringlist.h> diff --git a/tools/designer/plugins/rc/rc2ui.h b/tools/designer/plugins/rc/rc2ui.h index 87a6fb98f..df2d13616 100644 --- a/tools/designer/plugins/rc/rc2ui.h +++ b/tools/designer/plugins/rc/rc2ui.h @@ -35,7 +35,7 @@ #ifndef RC2UI_H #define RC2UI_H -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <ntqfile.h> #include <tqstringlist.h> diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp index 5435526f9..a7585d895 100644 --- a/tools/designer/shared/widgetdatabase.cpp +++ b/tools/designer/shared/widgetdatabase.cpp @@ -40,7 +40,7 @@ #include <tqstrlist.h> #include <ntqdict.h> #include <ntqfile.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <ntqcleanuphandler.h> #include <ntqfeatures.h> @@ -64,6 +64,7 @@ static bool was_in_setup = FALSE; // It will be removed afterwards static TQString converted_widgets[] = { + "TQTextBrowser", "TQTextEdit", "TQTextView", "TQWidget", "TQWidgetStack", }; size_t converted_widgets_size = sizeof(converted_widgets) / sizeof(TQString); diff --git a/tools/designer/tools/tqtcreatecw/main.cpp b/tools/designer/tools/tqtcreatecw/main.cpp index aef6cea62..d2fba00fa 100644 --- a/tools/designer/tools/tqtcreatecw/main.cpp +++ b/tools/designer/tools/tqtcreatecw/main.cpp @@ -32,7 +32,7 @@ **********************************************************************/ #include <ntqfile.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <tqvaluelist.h> #include <tqstrlist.h> #include <ntqmetaobject.h> diff --git a/tools/designer/uic/uic.h b/tools/designer/uic/uic.h index 81aaa74a0..93fdad2cc 100644 --- a/tools/designer/uic/uic.h +++ b/tools/designer/uic/uic.h @@ -37,7 +37,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqmap.h> -#include <ntqtextstream.h> +#include <tqtextstream.h> #include <ntqpalette.h> #include <ntqvariant.h> diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp index e8e6c33a6..420bdc8c5 100644 --- a/tools/designer/uilib/tqwidgetfactory.cpp +++ b/tools/designer/uilib/tqwidgetfactory.cpp @@ -83,14 +83,14 @@ #include <ntqwizard.h> #include <ntqlcdnumber.h> #include <ntqprogressbar.h> -#include <ntqtextview.h> -#include <ntqtextbrowser.h> +#include <tqtextview.h> +#include <tqtextbrowser.h> #include <ntqdial.h> #include <ntqslider.h> #include <ntqframe.h> #include <tqwidgetstack.h> #include <ntqtoolbox.h> -#include <ntqtextedit.h> +#include <tqtextedit.h> #include <ntqscrollbar.h> #include <ntqmainwindow.h> #include <ntqsplitter.h> |