From 87d29563e3ccdeb7fea0197e262e667ef323ff9c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 7 Jul 2024 14:56:09 +0900 Subject: Rename utility class nt* related files to equivalent tq* Signed-off-by: Michele Calgaro --- tools/designer/designer/actiondnd.cpp | 2 +- tools/designer/designer/formwindow.cpp | 2 +- tools/designer/designer/layout.cpp | 2 +- tools/designer/designer/menubareditor.cpp | 2 +- tools/designer/designer/metadatabase.cpp | 2 +- tools/designer/designer/orderindicator.cpp | 2 +- tools/designer/designer/popupmenueditor.cpp | 2 +- tools/designer/designer/propertyeditor.cpp | 2 +- tools/designer/designer/sizehandle.h | 2 +- tools/designer/designer/sourceeditor.cpp | 2 +- tools/designer/designer/widgetfactory.h | 2 +- tools/designer/editor/cindent.cpp | 2 +- tools/designer/editor/completion.cpp | 2 +- tools/designer/editor/yyindent.cpp | 2 +- tools/designer/examples/colortool/mainform.ui | 2 +- tools/designer/interfaces/preferenceinterface.h | 2 +- tools/designer/interfaces/projectsettingsiface.h | 2 +- tools/designer/plugins/cppeditor/cppcompletion.cpp | 2 +- tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp | 2 +- tools/designer/plugins/cppeditor/yyreg.cpp | 4 ++-- tools/designer/plugins/dlg/dlg2ui.cpp | 6 +++--- tools/designer/plugins/glade/glade2ui.cpp | 2 +- tools/designer/plugins/wizards/mainwindowwizard.ui | 2 +- tools/designer/plugins/wizards/sqlformwizardimpl.cpp | 2 +- tools/designer/shared/widgetdatabase.cpp | 2 +- tools/designer/uic/embed.cpp | 2 +- tools/designer/uic/form.cpp | 2 +- tools/designer/uic/object.cpp | 2 +- tools/designer/uic/subclassing.cpp | 2 +- tools/designer/uic/uic.cpp | 2 +- 30 files changed, 33 insertions(+), 33 deletions(-) (limited to 'tools/designer') diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp index f7f770161..153dd0e63 100644 --- a/tools/designer/designer/actiondnd.cpp +++ b/tools/designer/designer/actiondnd.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp index e20958f44..185e9d2e6 100644 --- a/tools/designer/designer/formwindow.cpp +++ b/tools/designer/designer/formwindow.cpp @@ -73,7 +73,7 @@ #include #include #include -#include +#include #include // FormWindow should be able to work to some limited degree diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp index 33ff5778d..da5013067 100644 --- a/tools/designer/designer/layout.cpp +++ b/tools/designer/designer/layout.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp index 62aa21611..b9f70f512 100644 --- a/tools/designer/designer/menubareditor.cpp +++ b/tools/designer/designer/menubareditor.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp index bd19799a5..edab8df30 100644 --- a/tools/designer/designer/metadatabase.cpp +++ b/tools/designer/designer/metadatabase.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tools/designer/designer/orderindicator.cpp b/tools/designer/designer/orderindicator.cpp index 7a886991e..6baf60a71 100644 --- a/tools/designer/designer/orderindicator.cpp +++ b/tools/designer/designer/orderindicator.cpp @@ -37,7 +37,7 @@ #include "formwindow.h" #include -#include +#include #include OrderIndicator::OrderIndicator( int i, TQWidget* w, FormWindow *fw ) diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp index 4a87e1a63..e238a84e8 100644 --- a/tools/designer/designer/popupmenueditor.cpp +++ b/tools/designer/designer/popupmenueditor.cpp @@ -32,7 +32,7 @@ **********************************************************************/ #include -#include +#include #include #include #include diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index 8ae84142b..5ad88ab31 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tools/designer/designer/sizehandle.h b/tools/designer/designer/sizehandle.h index 8760afc71..39fc6d053 100644 --- a/tools/designer/designer/sizehandle.h +++ b/tools/designer/designer/sizehandle.h @@ -35,7 +35,7 @@ #define SIZEHANDLE_H #include -#include +#include #include class TQMouseEvent; diff --git a/tools/designer/designer/sourceeditor.cpp b/tools/designer/designer/sourceeditor.cpp index 06ec283b7..e876be9ab 100644 --- a/tools/designer/designer/sourceeditor.cpp +++ b/tools/designer/designer/sourceeditor.cpp @@ -38,7 +38,7 @@ #include "project.h" #include "mainwindow.h" #include "../interfaces/languageinterface.h" -#include +#include #include "project.h" #include "sourcefile.h" #include "hierarchyview.h" diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h index c676b0915..23d409f91 100644 --- a/tools/designer/designer/widgetfactory.h +++ b/tools/designer/designer/widgetfactory.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tools/designer/editor/cindent.cpp b/tools/designer/editor/cindent.cpp index d30be4600..ef4f74820 100644 --- a/tools/designer/editor/cindent.cpp +++ b/tools/designer/editor/cindent.cpp @@ -32,7 +32,7 @@ **********************************************************************/ #include "cindent.h" -#include "ntqregexp.h" +#include "tqregexp.h" extern int indentForBottomLine( const TQStringList& program, TQChar typedIn ); extern void setTabSize( int s ); diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp index 48b6b3b65..1eee65d64 100644 --- a/tools/designer/editor/completion.cpp +++ b/tools/designer/editor/completion.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "arghintwidget.h" #include #include diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp index 4851c572a..7b43cb7f2 100644 --- a/tools/designer/editor/yyindent.cpp +++ b/tools/designer/editor/yyindent.cpp @@ -70,7 +70,7 @@ string literals are removed beforehand. */ -#include +#include /* qmake ignore TQ_OBJECT */ diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui index d3cf14c2f..b4a4f4ed9 100644 --- a/tools/designer/examples/colortool/mainform.ui +++ b/tools/designer/examples/colortool/mainform.ui @@ -517,7 +517,7 @@ ntqcheckbox.h colornameform.h ntqcolordialog.h - ntqregexp.h + tqregexp.h ntqfile.h ntqfiledialog.h ntqapplication.h diff --git a/tools/designer/interfaces/preferenceinterface.h b/tools/designer/interfaces/preferenceinterface.h index 24c631881..222a054ec 100644 --- a/tools/designer/interfaces/preferenceinterface.h +++ b/tools/designer/interfaces/preferenceinterface.h @@ -49,7 +49,7 @@ #include #include -#include +#include // {5c168ee7-4bee-469f-9995-6afdb04ce5a2} #ifndef IID_Preference diff --git a/tools/designer/interfaces/projectsettingsiface.h b/tools/designer/interfaces/projectsettingsiface.h index d3b10181d..c6f6a2c22 100644 --- a/tools/designer/interfaces/projectsettingsiface.h +++ b/tools/designer/interfaces/projectsettingsiface.h @@ -49,7 +49,7 @@ #include #include -#include +#include // {d332785d-17fb-4894-84fe-50dbd0ad9512} #ifndef IID_ProjectSettings diff --git a/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tools/designer/plugins/cppeditor/cppcompletion.cpp index ede83151c..4f4cd52ea 100644 --- a/tools/designer/plugins/cppeditor/cppcompletion.cpp +++ b/tools/designer/plugins/cppeditor/cppcompletion.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include CppEditorCompletion::CppEditorCompletion( Editor *e ) : EditorCompletion( e ) diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp index d5dbc2bc5..36a116768 100644 --- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp +++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp @@ -38,7 +38,7 @@ #include "tqstringlist.h" #include "tqmap.h" #include "ntqapplication.h" -#include "ntqregexp.h" +#include "tqregexp.h" const char * const SyntaxHighlighter_CPP::keywords[] = { // C++ keywords diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp index 1f06a02e7..1c93db0a9 100644 --- a/tools/designer/plugins/cppeditor/yyreg.cpp +++ b/tools/designer/plugins/cppeditor/yyreg.cpp @@ -32,7 +32,7 @@ ** **********************************************************************/ -#include +#include #include #include @@ -48,7 +48,7 @@ you might want to read other simpler parsers written in the same style: - $(TQTDIR)/src/tools/qregexp.cpp + $(TQTDIR)/src/tools/tqregexp.cpp $(TQTDIR)/tools/inspector/cppparser.cpp You might also want to read Section 2 in the Dragon Book. diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp index bb18507c5..1babf6814 100644 --- a/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tools/designer/plugins/dlg/dlg2ui.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include /* @@ -870,7 +870,7 @@ bool Dlg2Ui::checkTagName( const TQDomElement& e, const TQString& tagName ) TQString Dlg2Ui::normalizeType( const TQString& type ) { TQString t = type; - if ( t.isEmpty() || t == TQString("enum") || t == TQString( "qcstring" ) || + if ( t.isEmpty() || t == TQString("enum") || t == TQString( "tqcstring" ) || t == TQString("set") ) t = TQString( "tqstring" ); return t; @@ -894,7 +894,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName, return TQVariant( isTrue(getTextValue(e)) ); } else if ( type == TQString("double") ) { return getTextValue( e ).toDouble(); - } else if ( type == TQString("qcstring") ) { + } else if ( type == TQString("tqcstring") ) { return getTextValue( e ).latin1(); } else if ( type == TQString("enum") || type == TQString("tqstring") || type == TQString("set") ) { diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp index d9de3f14f..7fee77e0b 100644 --- a/tools/designer/plugins/glade/glade2ui.cpp +++ b/tools/designer/plugins/glade/glade2ui.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui b/tools/designer/plugins/wizards/mainwindowwizard.ui index 5f0fb9eb8..3406b4ca6 100644 --- a/tools/designer/plugins/wizards/mainwindowwizard.ui +++ b/tools/designer/plugins/wizards/mainwindowwizard.ui @@ -36,7 +36,7 @@ tqiconset.h tqaction.h ntqpixmap.h -ntqdict.h +tqdict.h mainwindowwizard.ui.h struct DesignerFormWindow; struct DesignerInterface; diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index 4c17cc823..f9ebb15b2 100644 --- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp index 5648f5631..ac5fbe6b9 100644 --- a/tools/designer/shared/widgetdatabase.cpp +++ b/tools/designer/shared/widgetdatabase.cpp @@ -38,7 +38,7 @@ #define NO_STATIC_COLORS #include #include -#include +#include #include #include #include diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp index cbdc7e828..4cb531409 100644 --- a/tools/designer/uic/embed.cpp +++ b/tools/designer/uic/embed.cpp @@ -137,7 +137,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima out << "\n"; out << "#include \n"; - out << "#include \n"; + out << "#include \n"; out << "#include \n"; out << "#include \n"; out << "\n"; diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp index 5a24be097..7dbd4be3a 100644 --- a/tools/designer/uic/form.cpp +++ b/tools/designer/uic/form.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #define NO_STATIC_COLORS #include diff --git a/tools/designer/uic/object.cpp b/tools/designer/uic/object.cpp index fbd052c0f..cd3cfbe8a 100644 --- a/tools/designer/uic/object.cpp +++ b/tools/designer/uic/object.cpp @@ -34,7 +34,7 @@ #include "uic.h" #include "parser.h" #include "domtool.h" -#include +#include #include #include #define NO_STATIC_COLORS diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp index 97794b0c6..8f15973f2 100644 --- a/tools/designer/uic/subclassing.cpp +++ b/tools/designer/uic/subclassing.cpp @@ -40,7 +40,7 @@ #include #define NO_STATIC_COLORS #include -#include +#include #include #include diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp index 4566b031f..36db825b8 100644 --- a/tools/designer/uic/uic.cpp +++ b/tools/designer/uic/uic.cpp @@ -40,7 +40,7 @@ #include #define NO_STATIC_COLORS #include -#include +#include #include #include -- cgit v1.2.1