diff options
Diffstat (limited to 'tools/designer/plugins')
| -rw-r--r-- | tools/designer/plugins/cppeditor/cppcompletion.cpp | 2 | ||||
| -rw-r--r-- | tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp | 2 | ||||
| -rw-r--r-- | tools/designer/plugins/cppeditor/yyreg.cpp | 4 | ||||
| -rw-r--r-- | tools/designer/plugins/dlg/dlg2ui.cpp | 6 | ||||
| -rw-r--r-- | tools/designer/plugins/glade/glade2ui.cpp | 2 | ||||
| -rw-r--r-- | tools/designer/plugins/wizards/mainwindowwizard.ui | 2 | ||||
| -rw-r--r-- | tools/designer/plugins/wizards/sqlformwizardimpl.cpp | 2 |
7 files changed, 10 insertions, 10 deletions
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 <tqobject.h> #include <ntqmetaobject.h> #include <tqobjectlist.h> -#include <ntqregexp.h> +#include <tqregexp.h> 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 <ntqregexp.h> +#include <tqregexp.h> #include <ctype.h> #include <stdio.h> @@ -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 <ntqfile.h> #include <ntqframe.h> #include <ntqmessagebox.h> -#include <ntqregexp.h> +#include <tqregexp.h> #include <tqtextstream.h> /* @@ -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 <ntqprogressdialog.h> #include <ntqmessagebox.h> #include <ntqrect.h> -#include <ntqregexp.h> +#include <tqregexp.h> #include <tqsizepolicy.h> #include <ctype.h> 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 @@ <include location="global" impldecl="in implementation">tqiconset.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="global" impldecl="in implementation">tqdict.h</include> <include location="local" implDecl="in declaration">mainwindowwizard.ui.h</include> <forward>struct DesignerFormWindow;</forward> <forward>struct DesignerInterface;</forward> 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 <ntqlabel.h> #include <ntqgroupbox.h> #include <ntqlayout.h> -#include <ntqregexp.h> +#include <tqregexp.h> #include <ntqpushbutton.h> #include <ntqmultilineedit.h> #include <ntqlistview.h> |