diff options
Diffstat (limited to 'buildtools/lib')
55 files changed, 363 insertions, 353 deletions
diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp index 2dfc3d84..aee38261 100644 --- a/buildtools/lib/base/kdevbuildtool.cpp +++ b/buildtools/lib/base/kdevbuildtool.cpp @@ -21,8 +21,8 @@ #include <kdevmakefrontend.h> #include <kdevappfrontend.h> -KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name) - :KDevProject(info, parent, name) +KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* tqparent, const char* name) + :KDevProject(info, tqparent, name) { } diff --git a/buildtools/lib/base/kdevbuildtool.h b/buildtools/lib/base/kdevbuildtool.h index ff1abcc0..f1276f4a 100644 --- a/buildtools/lib/base/kdevbuildtool.h +++ b/buildtools/lib/base/kdevbuildtool.h @@ -29,7 +29,7 @@ class KDevAppFrontend; class KDevBuildTool: public KDevProject { public: - KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name); + KDevBuildTool(const KDevPluginInfo* info, TQObject* tqparent, const char* name); /**@return The make frontend.*/ KDevMakeFrontend *makeFrontend(); diff --git a/buildtools/lib/parsers/autotools/autotools.ll b/buildtools/lib/parsers/autotools/autotools.ll index f05f8ff6..d6f2a9bb 100644 --- a/buildtools/lib/parsers/autotools/autotools.ll +++ b/buildtools/lib/parsers/autotools/autotools.ll @@ -98,7 +98,7 @@ rule [\t]+[^\n]* <list>{id_list} { yylval.value = yytext; - yylval.value = yylval.value.mid(0, yylval.value.findRev("\\")); + yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\")); unput('\\'); BEGIN(INITIAL); return (ID_LIST); diff --git a/buildtools/lib/parsers/autotools/autotools.yy b/buildtools/lib/parsers/autotools/autotools.yy index d76cc5fe..350fbd77 100644 --- a/buildtools/lib/parsers/autotools/autotools.yy +++ b/buildtools/lib/parsers/autotools/autotools.yy @@ -89,7 +89,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct parent (scope or function scope). +or function scope are added as childs to their direct tqparent (scope or function scope). */ QValueStack<ProjectAST*> projects; diff --git a/buildtools/lib/parsers/autotools/autotools_lex.cpp b/buildtools/lib/parsers/autotools/autotools_lex.cpp index d5f690b5..e534d74f 100644 --- a/buildtools/lib/parsers/autotools/autotools_lex.cpp +++ b/buildtools/lib/parsers/autotools/autotools_lex.cpp @@ -539,8 +539,8 @@ at the left of the operator in assignments (like "SOURCES" in "SOURCES+=foo.cpp -id_list: those are "value list identifiers" at the right side in assignments (like "foo.cpp goo.cpp" in "SOURCES+=foo.cpp goo.cpp"); -id_args: function arguments recognized as one identifier -(example: ""${QMAKE_FILE} is intended only for Windows!"" -in "!win32-*:!wince-*:error("${QMAKE_FILE} is intended only for Windows!")" statements). +(example: ""${TQMAKE_FILE} is intended only for Windows!"" +in "!win32-*:!wince-*:error("${TQMAKE_FILE} is intended only for Windows!")" statements). . To recognize those identifiers two additional start conditions are used: list and funcargs. @@ -841,7 +841,7 @@ YY_RULE_SETUP #line 99 "autotools.ll" { yylval.value = yytext; - yylval.value = yylval.value.mid(0, yylval.value.findRev("\\")); + yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\")); unput('\\'); BEGIN(INITIAL); return (ID_LIST); diff --git a/buildtools/lib/parsers/autotools/autotools_yacc.cpp b/buildtools/lib/parsers/autotools/autotools_yacc.cpp index 93cdb733..e0b92999 100644 --- a/buildtools/lib/parsers/autotools/autotools_yacc.cpp +++ b/buildtools/lib/parsers/autotools/autotools_yacc.cpp @@ -204,7 +204,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct parent (scope or function scope). +or function scope are added as childs to their direct tqparent (scope or function scope). */ TQValueStack<ProjectAST*> projects; diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index ddcbddc3..f6ac032f 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp @@ -28,7 +28,7 @@ namespace AutoTools { AST::~AST() { - for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { AST *node = *it; delete node; @@ -37,13 +37,13 @@ AST::~AST() void AST::addChildAST(AST *node) { - m_children.append(node); + m_tqchildren.append(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); - it != m_children.constEnd(); ++it) + for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); + it != m_tqchildren.constEnd(); ++it) { if (*it) (*it)->writeBack(buffer); @@ -60,12 +60,12 @@ TQString AST::indentation() bool AST::hasChildren() const { - return !m_children.isEmpty(); + return !m_tqchildren.isEmpty(); } -TQValueList<AST*> AST::children() const +TQValueList<AST*> AST::tqchildren() const { - return m_children; + return m_tqchildren; } //ProjectAST diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index 768e3e07..e690baa4 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.h +++ b/buildtools/lib/parsers/autotools/autotoolsast.h @@ -37,7 +37,7 @@ namespace AutoTools * AST node. * This is the base class. Objects of this type are not created by the parser. * - * Each AST node holds the list of its children which are always deleted in the + * Each AST node holds the list of its tqchildren which are always deleted in the * destructor. This way, it's possible call delete for only root AST node and * others will be deleted automatically. * @@ -85,20 +85,20 @@ public: /** @return The indentation string based on node depth.*/ virtual TQString indentation(); - //! \return true if this AST has children + //! \return true if this AST has tqchildren bool hasChildren() const; /** - * Get the children of this ast + * Get the tqchildren of this ast * \return the list of this ast's childre */ - TQValueList<AST*> children() const; + TQValueList<AST*> tqchildren() const; protected: NodeType m_nodeType; - TQValueList<AST*> m_children; + TQValueList<AST*> m_tqchildren; private: int m_depth; diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.h b/buildtools/lib/parsers/autotools/autotoolsdriver.h index 5f6ac7e7..8e29bec6 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.h +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.h @@ -20,8 +20,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QMAKEQMAKEDRIVER_H -#define QMAKEQMAKEDRIVER_H +#ifndef TQMAKETQMAKEDRIVER_H +#define TQMAKETQMAKEDRIVER_H #include <tqvaluelist.h> #include <kurl.h> @@ -56,12 +56,12 @@ public: static void walkAST(Op &op, const ProjectAST *ast) { // op(ast); - for (TQValueList<QMake::AST*>::const_iterator it = ast->statements.constBegin(); + for (TQValueList<TQMake::AST*>::const_iterator it = ast->statements.constBegin(); it != ast->statements.constEnd(); ++it) { const AST *child = *it; if (child->nodeType() == AST::ProjectAST) - walkAST<Op>(op, static_cast<const QMake::ProjectAST*>(child)); + walkAST<Op>(op, static_cast<const TQMake::ProjectAST*>(child)); else op(child); } diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 0dc8e733..66401c2c 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp @@ -34,8 +34,8 @@ using namespace AutoTools; -Viewer::Viewer(TQWidget *parent, const char *name) - :ViewerBase(parent, name) +Viewer::Viewer(TQWidget *tqparent, const char *name) + :ViewerBase(tqparent, name) { if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { @@ -46,7 +46,7 @@ Viewer::Viewer(TQWidget *parent, const char *name) files->insertItem(str.readLine()); } ast->setSorting(-1); - parentProject.push((TQListViewItem*)0); + tqparentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() @@ -99,12 +99,12 @@ void Viewer::tabWidget2_selected(const TQString& text) void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { TQListViewItem *projectIt; - if (!parentProject.top()) + if (!tqparentProject.top()) projectIt = new TQListViewItem(ast, "Project"); else { if ( projectAST->isConditionalScope() || projectAST->isRule() ) - projectIt = new TQListViewItem(parentProject.top(), globAfter, projectAST->scopedID); + projectIt = new TQListViewItem(tqparentProject.top(), globAfter, projectAST->scopedID); } projectIt->setOpen(true); @@ -128,7 +128,7 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { AutomakeTargetAST* ata = static_cast<AutomakeTargetAST*>(ast); TQListViewItem* item = new TQListViewItem(projectIt, after, - ata->target, TQString::null, ata->deps.join("")); + ata->target, TQString(), ata->deps.join("")); after = item; } break; @@ -145,14 +145,14 @@ void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { ConditionAST* ata = static_cast<ConditionAST*>(ast); TQListViewItem* item = new TQListViewItem(projectIt, after, - ata->type, ata->conditionName, TQString::null ); + ata->type, ata->conditionName, TQString() ); after = item; } case AST::ProjectAST: { ProjectAST *projectAST = static_cast<ProjectAST*>(ast); - parentProject.push(projectIt); + tqparentProject.push(projectIt); processAST(projectAST, after); - parentProject.pop(); } + tqparentProject.pop(); } break; } } diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h index 5ee63c54..c0653020 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.h +++ b/buildtools/lib/parsers/autotools/tests/viewer.h @@ -30,8 +30,9 @@ class TQListViewItem; class Viewer: public ViewerBase { Q_OBJECT + TQ_OBJECT public: - Viewer(TQWidget *parent = 0, const char *name = 0); + Viewer(TQWidget *tqparent = 0, const char *name = 0); void processAST(AutoTools::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: virtual void tabWidget2_selected(const TQString&); @@ -40,7 +41,7 @@ public slots: virtual void addAll_clicked(); private: AutoTools::ProjectAST *projectAST; - TQValueStack<TQListViewItem *> parentProject; + TQValueStack<TQListViewItem *> tqparentProject; }; #endif diff --git a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp index 380767a9..0fc5157b 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp @@ -28,7 +28,7 @@ int main(int argc, char **argv) app.setMainWidget(&viewer); viewer.show(); viewer.resize(800, 600); - //viewer.setWindowState(viewer.windowState() | Qt::WindowMaximized); + //viewer.setWindowState(viewer.windowState() | TQt::WindowMaximized); return app.exec(); } diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui index 7c228299..75ed7559 100644 --- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui +++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ViewerBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ViewerBase</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1" rowspan="4" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="4" colspan="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>source</cstring> </property> @@ -40,7 +40,7 @@ </sizepolicy> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> @@ -52,7 +52,7 @@ <verstretch>2</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -63,7 +63,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Name</string> @@ -103,7 +103,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -114,7 +114,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>writeBack</cstring> </property> @@ -124,22 +124,22 @@ </widget> </vbox> </widget> - <widget class="QLineEdit" row="0" column="0"> + <widget class="TQLineEdit" row="0" column="0"> <property name="name"> <cstring>allLocation</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> </size> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>addAll</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> @@ -149,11 +149,11 @@ <string>Add All From Directory</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>choose</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> @@ -163,7 +163,7 @@ <string>Choose File to Add...</string> </property> </widget> - <widget class="QListBox" row="3" column="0"> + <widget class="TQListBox" row="3" column="0"> <property name="name"> <cstring>files</cstring> </property> @@ -175,7 +175,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>32767</height> @@ -210,11 +210,11 @@ <slot>tabWidget2_selected(const QString&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged(QListBoxItem*)</slot> <slot>tabWidget2_selected(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.hh index 4da36b8a..41ec2015 100644 --- a/buildtools/lib/parsers/qmake/location.hh +++ b/buildtools/lib/parsers/qmake/location.hh @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -34,7 +34,7 @@ /** ** \file location.hh - ** Define the QMake::location class. + ** Define the TQMake::location class. */ #ifndef BISON_LOCATION_HH @@ -44,7 +44,7 @@ # include <string> # include "position.hh" -namespace QMake +namespace TQMake { /// Abstract a location. diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.hh index 704f0df4..63fe2d81 100644 --- a/buildtools/lib/parsers/qmake/position.hh +++ b/buildtools/lib/parsers/qmake/position.hh @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -34,7 +34,7 @@ /** ** \file position.hh - ** Define the QMake::position class. + ** Define the TQMake::position class. */ #ifndef BISON_POSITION_HH @@ -43,7 +43,7 @@ # include <iostream> # include <string> -namespace QMake +namespace TQMake { /// Abstract a position. class position diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy index e11c086d..75d306d0 100644 --- a/buildtools/lib/parsers/qmake/qmake.yy +++ b/buildtools/lib/parsers/qmake/qmake.yy @@ -90,7 +90,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct parent (scope or function scope). +or function scope are added as childs to their direct tqparent (scope or function scope). */ //QValueStack<ProjectAST*> projects; @@ -359,7 +359,7 @@ function_call : ID_SIMPLE LBRACE function_args RBRACE depth++; //qWarning("%s", $<value>1.ascii()); - if ($<value>1.contains("include")) + if ($<value>1.tqcontains("include")) { IncludeAST *includeAST = new IncludeAST(); includeAST->projectName = $<value>3; diff --git a/buildtools/lib/parsers/qmake/qmake_lex.cpp b/buildtools/lib/parsers/qmake/qmake_lex.cpp index 9fe37664..4d74571c 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.cpp +++ b/buildtools/lib/parsers/qmake/qmake_lex.cpp @@ -398,7 +398,7 @@ int yyFlexLexer::yylex() return 0; } -#define YY_DECL int QMake::Lexer::yylex() +#define YY_DECL int TQMake::Lexer::yylex() /* %if-c-only Standard (non-C++) definition */ /* %endif */ @@ -630,7 +630,7 @@ static yyconst flex_int16_t yy_rule_linenum[23] = /** @file qmake.ll -QMake Lexer +TQMake Lexer There are 3 types of identifiers recognized by this lexer: -id_simple: examples of such identifiers are qmake variables and scoped variables @@ -638,8 +638,8 @@ at the left of the operator in assignments (like "SOURCES" in "SOURCES+=foo.cpp -id_list: those are "value list identifiers" at the right side in assignments (like "foo.cpp goo.cpp" in "SOURCES+=foo.cpp goo.cpp"); -id_args: function arguments recognized as one identifier -(example: ""${QMAKE_FILE} is intended only for Windows!"" -in "!win32-*:!wince-*:error("${QMAKE_FILE} is intended only for Windows!")" statements). +(example: ""${TQMAKE_FILE} is intended only for Windows!"" +in "!win32-*:!wince-*:error("${TQMAKE_FILE} is intended only for Windows!")" statements). . To recognize those identifiers two additional start conditions are used: list and funcargs. @@ -1011,7 +1011,7 @@ YY_RULE_SETUP { BEGIN(vallist); mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); - return Parser::token::token::QUOTED_VARIABLE_VALUE; + return Parser::token::token::TQUOTED_VARIABLE_VALUE; } YY_BREAK case 9: @@ -2202,14 +2202,14 @@ void yyfree (void * ptr ) #line 203 "qmake.ll" -namespace QMake +namespace TQMake { Lexer::Lexer( std::istream* argin, std::ostream* argout ) : yyFlexLexer(argin, argout), mylval(0), m_lineEnding(None) { } - int Lexer::yylex( QMake::Parser::semantic_type* yylval ) + int Lexer::yylex( TQMake::Parser::semantic_type* yylval ) { mylval = yylval; return yylex(); @@ -2231,7 +2231,7 @@ namespace QMake } } -int QMakelex( QMake::Parser::semantic_type* yylval, QMake::Lexer* lexer) +int TQMakelex( TQMake::Parser::semantic_type* yylval, TQMake::Lexer* lexer) { return lexer->yylex( yylval ); } diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h index 242cec2a..514631bf 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.h +++ b/buildtools/lib/parsers/qmake/qmake_lex.h @@ -1,4 +1,4 @@ -/* KDevelop QMake Support +/* KDevelop TQMake Support * * Copyright 2007 Andreas Pakulat <apaku@gmx.de> * @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ -#ifndef QMAKE_LEX_H -#define QMAKE_LEX_H +#ifndef TQMAKE_LEX_H +#define TQMAKE_LEX_H #include "qmake_yacc.hpp" #include <iostream> @@ -27,23 +27,23 @@ #include "FlexLexer.h" #endif -namespace QMake +namespace TQMake { class Lexer : public yyFlexLexer { public: enum LineEnding{ None, Unix, MacOS, Windows }; Lexer( std::istream* argin = 0, std::ostream* argout = 0 ); - int yylex( QMake::Parser::semantic_type* yylval ); + int yylex( TQMake::Parser::semantic_type* yylval ); int yylex(); void setLineEndingFromString( const TQString& ); LineEnding lineending(); private: - QMake::Parser::semantic_type* mylval; + TQMake::Parser::semantic_type* mylval; LineEnding m_lineEnding; }; } #endif -// kate: space-indent on; indent-width 4; tab-width: 4; replace-tabs on; auto-insert-doxygen on +// kate: space-indent on; indent-width 4; tab-width: 4; tqreplace-tabs on; auto-insert-doxygen on diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp index 32722979..718cb4f5 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -33,7 +33,7 @@ version 2.2 of Bison. */ // Take the name prefix into account. -#define yylex QMakelex +#define yylex TQMakelex #include "qmake_yacc.hpp" @@ -41,7 +41,7 @@ /* Line 317 of lalr1.cc. */ -#line 45 "qmake_yacc.cpp" +#line 45 "tqmake_yacc.cpp" #ifndef YY_ # if YYENABLE_NLS @@ -100,7 +100,7 @@ do { \ #define YYABORT goto yyabortlab #define YYERROR goto yyerrorlab -namespace QMake +namespace TQMake { #if YYERROR_VERBOSE @@ -144,7 +144,7 @@ namespace QMake #endif /// Build a parser object. - Parser::Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg) + Parser::Parser (TQMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg) : yydebug_ (false), yycdebug_ (&std::cerr), lexer (lexer_yyarg), @@ -679,7 +679,7 @@ namespace QMake depth++; //qWarning("%s", $<value>1.ascii()); - if ((yysemantic_stack_[(4) - (1)].value).contains("include")) + if ((yysemantic_stack_[(4) - (1)].value).tqcontains("include")) { IncludeAST *includeAST = new IncludeAST(); includeAST->projectName = (yysemantic_stack_[(4) - (3)].value); @@ -752,7 +752,7 @@ namespace QMake /* Line 675 of lalr1.cc. */ -#line 756 "qmake_yacc.cpp" +#line 756 "tqmake_yacc.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc); @@ -1089,7 +1089,7 @@ namespace QMake "$end", "error", "$undefined", "ID_SIMPLE", "EQ", "PLUSEQ", "MINUSEQ", "STAREQ", "TILDEEQ", "LBRACE", "RBRACE", "COLON", "NEWLINE", "COMMENT", "CONT", "COMMENT_CONT", "RCURLY", "LCURLY", "ID_ARGS", - "QUOTED_VARIABLE_VALUE", "VARIABLE_VALUE", "LIST_WS", "ENDOFFILE", + "TQUOTED_VARIABLE_VALUE", "VARIABLE_VALUE", "LIST_WS", "ENDOFFILE", "\"else\"", "$accept", "project", "@1", "statements", "statement", "variable_assignment", "possible_value", "multiline_values", "variable_value", "listws", "operator", "scope", "@2", "function_call", @@ -1227,13 +1227,13 @@ namespace QMake const unsigned int Parser::yyuser_token_number_max_ = 278; const Parser::token_number_type Parser::yyundef_token_ = 2; -} // namespace QMake +} // namespace TQMake #line 421 "qmake.yy" -namespace QMake +namespace TQMake { void Parser::error(const location_type& /*l*/, const std::string& m) { diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp index 91583cd3..0b67bb14 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -41,7 +41,7 @@ #include <iostream> #include "stack.hh" -namespace QMake +namespace TQMake { class position; class location; @@ -74,9 +74,9 @@ namespace QMake /** @file qmake.yy -QMake Parser +TQMake Parser -Simple LALR parser which builds the syntax tree (see @ref QMake::AST). +Simple LALR parser which builds the syntax tree (see @ref TQMake::AST). @todo Recognize comments after statements like: SOURCES = foo #regognize me @@ -91,7 +91,7 @@ SOURCES = foo #regognize me #define YYSTYPE_IS_DECLARED -namespace QMake +namespace TQMake { class Lexer; @@ -129,7 +129,7 @@ struct Result { typedef Result YYSTYPE; } -extern int QMakelex( QMake::Result* yylval, QMake::Lexer* lexer ); +extern int TQMakelex( TQMake::Result* yylval, TQMake::Lexer* lexer ); /** The stack to store ProjectAST pointers when a new child @@ -141,7 +141,7 @@ currently on the top in the stack. When a scope or function scope statement is parsed, the child ProjectAST is created and pushed onto the stack. Therefore all statements which belong to the scope -or function scope are added as childs to their direct parent (scope or function scope). +or function scope are added as childs to their direct tqparent (scope or function scope). */ //TQValueStack<ProjectAST*> projects; @@ -202,7 +202,7 @@ do { \ } while (false) #endif -namespace QMake +namespace TQMake { /// A Bison parser. @@ -238,7 +238,7 @@ namespace QMake RCURLY = 271, LCURLY = 272, ID_ARGS = 273, - QUOTED_VARIABLE_VALUE = 274, + TQUOTED_VARIABLE_VALUE = 274, VARIABLE_VALUE = 275, LIST_WS = 276, ENDOFFILE = 277 @@ -249,7 +249,7 @@ namespace QMake typedef token::yytokentype token_type; /// Build a parser object. - Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg); + Parser (TQMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg); virtual ~Parser (); /// Parse. @@ -408,7 +408,7 @@ namespace QMake /* User arguments. */ - QMake::Lexer* lexer; + TQMake::Lexer* lexer; TQValueStack<ProjectAST*>& projects; int depth; }; diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index 91e48d2d..c551abef 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -21,34 +21,34 @@ #include <kdebug.h> -namespace QMake { +namespace TQMake { //AST AST::~AST() { - for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { AST *node = *it; delete node; } - m_children.clear(); + m_tqchildren.clear(); } void AST::addChildAST(AST *node) { - m_children.append(node); + m_tqchildren.append(node); } void AST::removeChildAST(AST *node) { - m_children.remove(node); + m_tqchildren.remove(node); } void AST::writeBack(TQString &buffer) { - for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); - it != m_children.constEnd(); ++it) + for (TQValueList<AST*>::const_iterator it = m_tqchildren.constBegin(); + it != m_tqchildren.constEnd(); ++it) { if (*it) { @@ -70,7 +70,7 @@ TQString AST::indentation() void ProjectAST::writeBack(TQString &buffer) { bool hasActualStatements = false; - for (TQValueList<QMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<TQMake::AST*>::const_iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) { if ((*it)->nodeType() != AST::IncludeAST) { @@ -84,7 +84,7 @@ void ProjectAST::writeBack(TQString &buffer) if( !buffer.endsWith(": ") ) buffer += indentation(); buffer += scopedID; - if( m_children.count() == 1 ) + if( m_tqchildren.count() == 1 ) buffer += " : "; else buffer += " {"; @@ -94,9 +94,9 @@ void ProjectAST::writeBack(TQString &buffer) if( !buffer.endsWith(": ") ) buffer += indentation(); buffer += scopedID + "(" + args + ")"; - if( m_children.count() == 1 && hasActualStatements ) + if( m_tqchildren.count() == 1 && hasActualStatements ) buffer += ": "; - else if( (m_children.count() > 0 && hasActualStatements) ) + else if( (m_tqchildren.count() > 0 && hasActualStatements) ) buffer += "{"; else buffer += ""; @@ -104,10 +104,10 @@ void ProjectAST::writeBack(TQString &buffer) else if( !buffer.endsWith(": ") ) buffer += indentation(); AST::writeBack(buffer); - if (isScope() && m_children.count() > 1 ) + if (isScope() && m_tqchildren.count() > 1 ) buffer += indentation() + "}"; - if (isFunctionScope() && (hasActualStatements) && m_children.count() > 1) + if (isFunctionScope() && (hasActualStatements) && m_tqchildren.count() > 1) buffer += indentation() + "}"; } @@ -165,6 +165,6 @@ void IncludeAST::writeBack(TQString &/*buffer*/) } -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h index 45aedb2e..e2abba70 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.h +++ b/buildtools/lib/parsers/qmake/qmakeast.h @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QMAKEQMAKEAST_H -#define QMAKEQMAKEAST_H +#ifndef TQMAKETQMAKEAST_H +#define TQMAKETQMAKEAST_H #include <tqstringlist.h> @@ -27,13 +27,13 @@ Abstract Syntax Tree (AST) class declarations. */ -namespace QMake { +namespace TQMake { /** AST node. This is the base class. Objects of this type are not created by the parser. -Each AST node holds the list of its children which are always deleted in the +Each AST node holds the list of its tqchildren which are always deleted in the destructor. This way, it's possible call delete for only root AST node and others will be deleted automatically. @@ -79,7 +79,7 @@ public: virtual TQString indentation(); /**The list of child AST nodes.*/ - TQValueList<AST*> m_children; + TQValueList<AST*> m_tqchildren; protected: NodeType m_nodeType; diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp index 1f7e6cb6..b9470bd9 100644 --- a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp +++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "qmakeastvisitor.h" -namespace QMake { +namespace TQMake { void ASTVisitor::processProject(ProjectAST *project) { @@ -29,31 +29,31 @@ void ASTVisitor::processProject(ProjectAST *project) enterScope(project); else if (project->isFunctionScope()) enterFunctionScope(project); - for (TQValueList<QMake::AST*>::const_iterator it = project->m_children.constBegin(); - it != project->m_children.constEnd(); ++it) + for (TQValueList<TQMake::AST*>::const_iterator it = project->m_tqchildren.constBegin(); + it != project->m_tqchildren.constEnd(); ++it) { AST *ast = *it; if (ast == 0) continue; switch (ast->nodeType()) { case AST::AssignmentAST: - processAssignment(static_cast<QMake::AssignmentAST*>(ast)); + processAssignment(static_cast<TQMake::AssignmentAST*>(ast)); break; case AST::NewLineAST: - processNewLine(static_cast<QMake::NewLineAST*>(ast)); + processNewLine(static_cast<TQMake::NewLineAST*>(ast)); break; case AST::CommentAST: - processComment(static_cast<QMake::CommentAST*>(ast)); + processComment(static_cast<TQMake::CommentAST*>(ast)); break; case AST::ProjectAST: - processProject(static_cast<QMake::ProjectAST*>(ast)); + processProject(static_cast<TQMake::ProjectAST*>(ast)); break; case AST::IncludeAST: - processInclude(static_cast<QMake::IncludeAST*>(ast)); + processInclude(static_cast<TQMake::IncludeAST*>(ast)); break; } } diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.h b/buildtools/lib/parsers/qmake/qmakeastvisitor.h index 3db9d14d..6978074c 100644 --- a/buildtools/lib/parsers/qmake/qmakeastvisitor.h +++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.h @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QMAKEQMAKEASTVISITOR_H -#define QMAKEQMAKEASTVISITOR_H +#ifndef TQMAKETQMAKEASTVISITOR_H +#define TQMAKETQMAKEASTVISITOR_H #include "qmakeast.h" -namespace QMake { +namespace TQMake { class ASTVisitor{ public: diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp index e2d93ef8..09256178 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.cpp +++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp @@ -30,7 +30,7 @@ #include "qmake_lex.h" #include "qmake_yacc.hpp" -namespace QMake { +namespace TQMake { int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) { @@ -52,15 +52,15 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) (*ast)->setFileName(fileName); switch( l.lineending() ) { - case QMake::Lexer::Windows: - (*ast)->setLineEnding(QMake::ProjectAST::Windows); + case TQMake::Lexer::Windows: + (*ast)->setLineEnding(TQMake::ProjectAST::Windows); break; - case QMake::Lexer::MacOS: - (*ast)->setLineEnding(QMake::ProjectAST::MacOS); + case TQMake::Lexer::MacOS: + (*ast)->setLineEnding(TQMake::ProjectAST::MacOS); break; - case QMake::Lexer::Unix: + case TQMake::Lexer::Unix: default: - (*ast)->setLineEnding(QMake::ProjectAST::Unix); + (*ast)->setLineEnding(TQMake::ProjectAST::Unix); break; } return ret; @@ -96,15 +96,15 @@ int Driver::parseString( const char* string, ProjectAST **ast, int debug ) (*ast)->setFileName(""); switch( l.lineending() ) { - case QMake::Lexer::Windows: - (*ast)->setLineEnding(QMake::ProjectAST::Windows); + case TQMake::Lexer::Windows: + (*ast)->setLineEnding(TQMake::ProjectAST::Windows); break; - case QMake::Lexer::MacOS: - (*ast)->setLineEnding(QMake::ProjectAST::MacOS); + case TQMake::Lexer::MacOS: + (*ast)->setLineEnding(TQMake::ProjectAST::MacOS); break; - case QMake::Lexer::Unix: + case TQMake::Lexer::Unix: default: - (*ast)->setLineEnding(QMake::ProjectAST::Unix); + (*ast)->setLineEnding(TQMake::ProjectAST::Unix); break; } return ret; diff --git a/buildtools/lib/parsers/qmake/qmakedriver.h b/buildtools/lib/parsers/qmake/qmakedriver.h index 918054fa..ee56f388 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.h +++ b/buildtools/lib/parsers/qmake/qmakedriver.h @@ -17,13 +17,13 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QMAKEQMAKEDRIVER_H -#define QMAKEQMAKEDRIVER_H +#ifndef TQMAKETQMAKEDRIVER_H +#define TQMAKETQMAKEDRIVER_H class TQString; class KURL; -namespace QMake { +namespace TQMake { /** @file qmakedriver.h diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.hh index b81e4a28..07f71922 100644 --- a/buildtools/lib/parsers/qmake/stack.hh +++ b/buildtools/lib/parsers/qmake/stack.hh @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains +/* As a special exception, you may create a larger work that tqcontains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -37,7 +37,7 @@ #include <deque> -namespace QMake +namespace TQMake { template <class T, class S = std::deque<T> > class stack diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp index 6f1d5956..5dd417db 100644 --- a/buildtools/lib/parsers/qmake/tests/runner.cpp +++ b/buildtools/lib/parsers/qmake/tests/runner.cpp @@ -21,8 +21,8 @@ #include <cstdlib> #include <iostream> #include <stdio.h> -#include "qmakedriver.h" -#include "qmakeastvisitor.h" +#include "tqmakedriver.h" +#include "tqmakeastvisitor.h" #include <tqstring.h> @@ -34,92 +34,92 @@ static const KCmdLineOptions options[] = { {"silent", "Enable Parser debug output", 0}, {"!debug", "Disable output of the generated AST", 0}, - {"!+files", "QMake project files", 0} + {"!+files", "TQMake project files", 0} }; -class PrintAST : QMake::ASTVisitor +class PrintAST : TQMake::ASTVisitor { public: - PrintAST() : QMake::ASTVisitor() + PrintAST() : TQMake::ASTVisitor() { indent = 0; } - virtual void processProject( QMake::ProjectAST* p ) + virtual void processProject( TQMake::ProjectAST* p ) { - QMake::ASTVisitor::processProject(p); + TQMake::ASTVisitor::processProject(p); } private: - virtual void enterRealProject( QMake::ProjectAST* p ) + virtual void enterRealProject( TQMake::ProjectAST* p ) { kdDebug(9024) << getIndent() << "--------- Entering Project: " << replaceWs(p->fileName()) << "| LineEnding:" << p->lineEnding() << " --------------" << endl; indent += 4; - QMake::ASTVisitor::enterRealProject(p); + TQMake::ASTVisitor::enterRealProject(p); } - virtual void leaveRealProject( QMake::ProjectAST* p ) + virtual void leaveRealProject( TQMake::ProjectAST* p ) { indent -= 4; kdDebug(9024) << getIndent() << "--------- Leaving Project: " << replaceWs(p->fileName()) << " --------------" << endl; - QMake::ASTVisitor::leaveRealProject(p); + TQMake::ASTVisitor::leaveRealProject(p); } - virtual void enterScope( QMake::ProjectAST* p ) + virtual void enterScope( TQMake::ProjectAST* p ) { kdDebug(9024) << getIndent() << "--------- Entering Scope: " << replaceWs(p->scopedID) << " --------------" << endl; indent += 4; - QMake::ASTVisitor::enterScope(p); + TQMake::ASTVisitor::enterScope(p); } - virtual void leaveScope( QMake::ProjectAST* p ) + virtual void leaveScope( TQMake::ProjectAST* p ) { indent -= 4; kdDebug(9024) << getIndent() << "--------- Leaving Scope: " << replaceWs(p->scopedID) << " --------------" << endl; - QMake::ASTVisitor::leaveScope(p); + TQMake::ASTVisitor::leaveScope(p); } - virtual void enterFunctionScope( QMake::ProjectAST* p ) + virtual void enterFunctionScope( TQMake::ProjectAST* p ) { kdDebug(9024) << getIndent() << "--------- Entering FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl; indent += 4; - QMake::ASTVisitor::enterFunctionScope(p); + TQMake::ASTVisitor::enterFunctionScope(p); } - virtual void leaveFunctionScope( QMake::ProjectAST* p ) + virtual void leaveFunctionScope( TQMake::ProjectAST* p ) { indent -= 4; kdDebug(9024) << getIndent() << "--------- Leaving FunctionScope: " << replaceWs(p->scopedID) << "(" << replaceWs(p->args) << ")"<< " --------------" << endl; - QMake::ASTVisitor::leaveFunctionScope(p); + TQMake::ASTVisitor::leaveFunctionScope(p); } TQString replaceWs(TQString s) { - return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); + return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); } - virtual void processAssignment( QMake::AssignmentAST* a) + virtual void processAssignment( TQMake::AssignmentAST* a) { kdDebug(9024) << getIndent() << "Assignment(" << replaceWs(a->indent) << "):" << replaceWs(a->scopedID) << " " << replaceWs(a->op) << " " << replaceWs(a->values.join("|")) << endl; - QMake::ASTVisitor::processAssignment(a); + TQMake::ASTVisitor::processAssignment(a); } - virtual void processNewLine( QMake::NewLineAST* n) + virtual void processNewLine( TQMake::NewLineAST* n) { kdDebug(9024) << getIndent() << "Newline " << endl; - QMake::ASTVisitor::processNewLine(n); + TQMake::ASTVisitor::processNewLine(n); } - virtual void processComment( QMake::CommentAST* a) + virtual void processComment( TQMake::CommentAST* a) { kdDebug(9024) << getIndent() << "Comment: " << replaceWs(a->comment) << endl; - QMake::ASTVisitor::processComment(a); + TQMake::ASTVisitor::processComment(a); } - virtual void processInclude( QMake::IncludeAST* a) + virtual void processInclude( TQMake::IncludeAST* a) { kdDebug(9024) << getIndent() << "Include: " << replaceWs(a->projectName) << endl; - QMake::ASTVisitor::processInclude(a); + TQMake::ASTVisitor::processInclude(a); } TQString getIndent() @@ -133,7 +133,7 @@ private: }; int main(int argc, char *argv[]) { - KCmdLineArgs::init( argc, argv, "QMake Parser", "qmake-parser", "Parse QMake project files", "1.0.0"); + KCmdLineArgs::init( argc, argv, "TQMake Parser", "qmake-parser", "Parse TQMake project files", "1.0.0"); KCmdLineArgs::addCmdLineOptions(options); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -152,8 +152,8 @@ int main(int argc, char *argv[]) debug = 1; for( int i = 0 ; i < args->count() ; i++ ) { - QMake::ProjectAST *projectAST; - int ret = QMake::Driver::parseFile(args->url(i).path(), &projectAST, debug); + TQMake::ProjectAST *projectAST; + int ret = TQMake::Driver::parseFile(args->url(i).path(), &projectAST, debug); PrintAST pa; if ( ret == 0 ) if ( !silent ) @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) pa.processProject(projectAST); TQString profile; projectAST->writeBack(profile); - kdDebug(9024) << "QMake file written back:\n" << profile << endl; + kdDebug(9024) << "TQMake file written back:\n" << profile << endl; } return ret; } diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp index 4583ab11..6f1e5f25 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp @@ -29,14 +29,14 @@ #include <tqlistview.h> #include <tqtabwidget.h> -#include <qmakeast.h> -#include <qmakedriver.h> -#include <qmakeastvisitor.h> +#include <tqmakeast.h> +#include <tqmakedriver.h> +#include <tqmakeastvisitor.h> -using namespace QMake; +using namespace TQMake; -Viewer::Viewer(TQWidget *parent, const char *name) - :ViewerBase(parent, name), projectAST(0) +Viewer::Viewer(TQWidget *tqparent, const char *name) + :ViewerBase(tqparent, name), projectAST(0) { if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { @@ -47,7 +47,7 @@ Viewer::Viewer(TQWidget *parent, const char *name) files->insertItem(str.readLine()); } ast->setSorting(-1); -// parentProject.push((TQListViewItem*)0); +// tqparentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() @@ -78,7 +78,7 @@ void Viewer::files_currentChanged(TQListBoxItem* item) source->setText(str.read()); f.close(); - int result = QMake::Driver::parseFile(item->text().ascii(), &projectAST, 0); + int result = TQMake::Driver::parseFile(item->text().ascii(), &projectAST, 0); if (projectAST && (result == 0)) { processAST(projectAST); @@ -102,7 +102,7 @@ public: ViewerVisitor(Viewer *v): ASTVisitor() { this->v = v; - parentProject.push((TQListViewItem*)0); + tqparentProject.push((TQListViewItem*)0); } virtual void processProject(ProjectAST *project) @@ -113,39 +113,39 @@ public: virtual void enterRealProject(ProjectAST *project) { TQListViewItem *projectIt; - if (!parentProject.top()) + if (!tqparentProject.top()) { projectIt = new TQListViewItem(v->ast, "Project"); projectIt->setOpen(true); - parentProject.push(projectIt); + tqparentProject.push(projectIt); } ASTVisitor::enterRealProject(project); } virtual void enterScope(ProjectAST *scope) { - TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), scope->scopedID, "scope"); - parentProject.push(projectIt); + TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(), scope->scopedID, "scope"); + tqparentProject.push(projectIt); ASTVisitor::enterScope(scope); } virtual void leaveScope(ProjectAST *scope) { - parentProject.pop(); + tqparentProject.pop(); } virtual void enterFunctionScope(ProjectAST *fscope) { - TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), + TQListViewItem *projectIt = new TQListViewItem(tqparentProject.top(), fscope->scopedID + "(" + fscope->args + ")", "function scope"); - parentProject.push(projectIt); + tqparentProject.push(projectIt); ASTVisitor::enterFunctionScope(fscope); } virtual void leaveFunctionScope(ProjectAST *fscope) { - parentProject.pop(); + tqparentProject.pop(); } virtual void processAssignment(AssignmentAST *assignment) { - TQListViewItem *item = new TQListViewItem(parentProject.top(), + TQListViewItem *item = new TQListViewItem(tqparentProject.top(), assignment->scopedID, assignment->op, assignment->values.join("|"), "assignment"); item->setMultiLinesEnabled(true); @@ -154,26 +154,26 @@ public: } virtual void processNewLine(NewLineAST *newline) { - new TQListViewItem(parentProject.top(), "<newline>"); + new TQListViewItem(tqparentProject.top(), "<newline>"); ASTVisitor::processNewLine(newline); } virtual void processComment(CommentAST *comment) { - new TQListViewItem(parentProject.top(), "<comment>"); + new TQListViewItem(tqparentProject.top(), "<comment>"); ASTVisitor::processComment(comment); } virtual void processInclude(IncludeAST *include) { - new TQListViewItem(parentProject.top(), "<include>", include->projectName); - QMake::ASTVisitor::processInclude(include); + new TQListViewItem(tqparentProject.top(), "<include>", include->projectName); + TQMake::ASTVisitor::processInclude(include); } Viewer *v; - TQValueStack<TQListViewItem *> parentProject; + TQValueStack<TQListViewItem *> tqparentProject; }; -void Viewer::processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter) +void Viewer::processAST(TQMake::ProjectAST *projectAST, TQListViewItem *globAfter) { ViewerVisitor visitor(this); visitor.processProject(projectAST); diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h index bba85b1f..28a7613c 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.h +++ b/buildtools/lib/parsers/qmake/tests/viewer.h @@ -24,7 +24,7 @@ #include "viewerbase.h" -namespace QMake { +namespace TQMake { class ProjectAST; } @@ -32,16 +32,17 @@ class TQListViewItem; class Viewer: public ViewerBase { Q_OBJECT + TQ_OBJECT public: - Viewer(TQWidget *parent = 0, const char *name = 0); - void processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0); + Viewer(TQWidget *tqparent = 0, const char *name = 0); + void processAST(TQMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: virtual void tabWidget2_selected(const TQString&); virtual void files_currentChanged(TQListBoxItem*); virtual void choose_clicked(); virtual void addAll_clicked(); private: - QMake::ProjectAST *projectAST; + TQMake::ProjectAST *projectAST; friend class ViewerVisitor; }; diff --git a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp index c31ea02c..199b106d 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp @@ -27,7 +27,7 @@ int main(int argc, char **argv) Viewer viewer; app.setMainWidget(&viewer); viewer.show(); - viewer.setWindowState(viewer.windowState() | Qt::WindowMaximized); + viewer.setWindowState(viewer.windowState() | TQt::WindowMaximized); return app.exec(); } diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui index 976d4d0f..c37f41bf 100644 --- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui +++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ViewerBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ViewerBase</cstring> </property> @@ -19,37 +19,37 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>splitter5</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>allLocation</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> </size> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addAll</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -59,11 +59,11 @@ <string>Add All From Directory</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>choose</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -73,7 +73,7 @@ <string>Choose File to Add...</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>files</cstring> </property> @@ -85,7 +85,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -97,14 +97,14 @@ </widget> </vbox> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter2</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>source</cstring> </property> @@ -117,7 +117,7 @@ </sizepolicy> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> @@ -129,7 +129,7 @@ <verstretch>2</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -140,7 +140,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Name</string> @@ -191,7 +191,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -202,7 +202,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>writeBack</cstring> </property> @@ -240,11 +240,11 @@ <slot>tabWidget2_selected(const QString&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged( QListBoxItem * )</slot> <slot>tabWidget2_selected( const QString & )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index 89d7f655..333cf78d 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -28,8 +28,8 @@ #include "addenvvardlg.h" -AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) - : TQDialog(parent, name, true) +AddEnvvarDialog::AddEnvvarDialog(TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { setCaption(i18n("Add Environment Variable")); @@ -47,10 +47,10 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - TQVBoxLayout *layout = new TQVBoxLayout(this, 10); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10); TQGridLayout *grid = new TQGridLayout(2, 2); - layout->addLayout(grid); + tqlayout->addLayout(grid); grid->addWidget(varname_label, 0, 0); grid->addWidget(varname_edit, 0, 1); grid->addWidget(value_label, 1, 0); @@ -58,7 +58,7 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) TQFrame *frame = new TQFrame(this); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - layout->addWidget(frame, 0); + tqlayout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); @@ -67,8 +67,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) m_pOk->setDefault(true); connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); - layout->addWidget(buttonbox, 0); + buttonbox->tqlayout(); + tqlayout->addWidget(buttonbox, 0); slotTextChanged(); } diff --git a/buildtools/lib/widgets/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h index 9f072cfb..af2abf54 100644 --- a/buildtools/lib/widgets/addenvvardlg.h +++ b/buildtools/lib/widgets/addenvvardlg.h @@ -27,12 +27,13 @@ class TQPushButton; /** Dialog to add environment variables. */ -class AddEnvvarDialog : public QDialog +class AddEnvvarDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - AddEnvvarDialog( TQWidget *parent=0, const char *name=0 ); + AddEnvvarDialog( TQWidget *tqparent=0, const char *name=0 ); ~AddEnvvarDialog(); TQString varname() const diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index f5a1fa92..d7489a56 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -25,8 +25,8 @@ #include "addfilesdialog.moc" AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, bool modal): - KFileDialog(startDir, filter, parent, name, modal) + TQWidget *tqparent, const char *name, bool modal): + KFileDialog(startDir, filter, tqparent, name, modal) { KConfig *config = kapp->config(); config->setGroup("Add Files Dialog"); @@ -45,8 +45,8 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget): - KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget) + TQWidget *tqparent, const char *name, bool modal, TQComboBox *extraWidget): + KFileDialog(startDir, filter, tqparent, name, modal, extraWidget), m_extraWidget(extraWidget) { KConfig *config = kapp->config(); config->setGroup("Add Files Dialog"); diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h index c66532e5..c81abd23 100644 --- a/buildtools/lib/widgets/addfilesdialog.h +++ b/buildtools/lib/widgets/addfilesdialog.h @@ -34,14 +34,15 @@ with the relative path (e.g. ../../dir/filename) class AddFilesDialog : public KFileDialog { Q_OBJECT + TQ_OBJECT public: enum Mode { Copy, Link, Relative }; AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, bool modal); + TQWidget *tqparent, const char *name, bool modal); AddFilesDialog(const TQString& startDir, const TQString& filter, - TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget); + TQWidget *tqparent, const char *name, bool modal, TQComboBox *extraWidget); virtual ~AddFilesDialog(); diff --git a/buildtools/lib/widgets/environmentdisplaydialog.cpp b/buildtools/lib/widgets/environmentdisplaydialog.cpp index 1a809459..f23d7602 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.cpp +++ b/buildtools/lib/widgets/environmentdisplaydialog.cpp @@ -25,8 +25,8 @@ extern char **environ; -EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* parent, const char* name, bool modal, WFlags fl) -: EnvironmentDisplayDialogBase(parent,name, modal,fl) +EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: EnvironmentDisplayDialogBase(tqparent,name, modal,fl) { TQStringList environment; char ** e = ::environ; diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h index 3458ba78..0e0ce5a3 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.h +++ b/buildtools/lib/widgets/environmentdisplaydialog.h @@ -26,9 +26,10 @@ class EnvironmentDisplayDialog : public EnvironmentDisplayDialogBase { Q_OBJECT + TQ_OBJECT public: - EnvironmentDisplayDialog(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + EnvironmentDisplayDialog(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); }; #endif diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui index 8b41862f..41d8d4e6 100644 --- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui +++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EnvironmentDisplayDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>EnvironmentDisplayDialogBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -59,9 +59,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -77,14 +77,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>321</width> <height>21</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>closeButton</cstring> </property> @@ -104,7 +104,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp index 3c3e448f..2e2be1f3 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.cpp +++ b/buildtools/lib/widgets/environmentvariableswidget.cpp @@ -67,8 +67,8 @@ void EnvironmentVariablesWidget::removeVarClicked() EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent, const char *name) - : EnvironmentVariablesWidgetBase(parent, name), + TQWidget *tqparent, const char *name) + : EnvironmentVariablesWidgetBase(tqparent, name), m_dom(dom), m_configGroup(configGroup) { readEnvironment(dom, configGroup); diff --git a/buildtools/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h index f2c00b52..c70aa81f 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.h +++ b/buildtools/lib/widgets/environmentvariableswidget.h @@ -31,10 +31,11 @@ Environment variables widget. class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase { Q_OBJECT + TQ_OBJECT public: EnvironmentVariablesWidget( TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); ~EnvironmentVariablesWidget(); /// read in a set of environment variables from the DOM document diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui index d16cc613..9c8f9077 100644 --- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui +++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EnvironmentVariablesWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EnvironmentVariablesWidgetBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView" row="0" column="0" rowspan="6" colspan="1"> + <widget class="TQListView" row="0" column="0" rowspan="6" colspan="1"> <column> <property name="text"> <string>Name</string> @@ -63,7 +63,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>removevar_button</cstring> </property> @@ -79,7 +79,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>editvar_button</cstring> </property> @@ -95,7 +95,7 @@ <string>&Edit</string> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>addvar_button</cstring> </property> @@ -121,14 +121,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> </size> </property> </spacer> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>environmentButton</cstring> </property> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>171</height> @@ -189,12 +189,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot>addVarClicked()</slot> <slot>removeVarClicked()</slot> <slot>editVarClicked()</slot> <slot>environmentClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp index 71c44377..7c3a115f 100644 --- a/buildtools/lib/widgets/envvartools.cpp +++ b/buildtools/lib/widgets/envvartools.cpp @@ -23,7 +23,7 @@ TQString EnvVarTools::quote( const TQString & arg ) { TQString res = arg; - res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''")); + res.tqreplace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''")); res.prepend("\""); res.append("\""); return res; diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp index ef901cc8..2058152e 100644 --- a/buildtools/lib/widgets/makeoptionswidget.cpp +++ b/buildtools/lib/widgets/makeoptionswidget.cpp @@ -29,8 +29,8 @@ #include "environmentvariableswidget.h" MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent, const char *name) - : MakeOptionsWidgetBase(parent, name), + TQWidget *tqparent, const char *name) + : MakeOptionsWidgetBase(tqparent, name), m_dom(dom), m_configGroup(configGroup) { env_var_group->setColumnLayout( 1, Qt::Vertical ); diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h index 0cd962c3..14635b49 100644 --- a/buildtools/lib/widgets/makeoptionswidget.h +++ b/buildtools/lib/widgets/makeoptionswidget.h @@ -32,10 +32,11 @@ Make options widget. class MakeOptionsWidget : public MakeOptionsWidgetBase { Q_OBJECT + TQ_OBJECT public: MakeOptionsWidget( TQDomDocument &dom, const TQString &configGroup, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); ~MakeOptionsWidget(); public slots: diff --git a/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui index 4bddebd1..91e77362 100644 --- a/buildtools/lib/widgets/makeoptionswidgetbase.ui +++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MakeOptionsWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>make_options_widget</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>abort_box</cstring> </property> @@ -27,7 +27,7 @@ <string>&Abort on first error</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>dontact_box</cstring> </property> @@ -35,7 +35,7 @@ <string>Onl&y display commands without actually executing them</string> </property> </widget> - <widget class="QGroupBox" row="6" column="0" rowspan="1" colspan="6"> + <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>env_var_group</cstring> </property> @@ -43,7 +43,7 @@ <string>Environment &Variables</string> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>makebin_label</cstring> </property> @@ -59,7 +59,7 @@ <cstring>makebin_edit</cstring> </property> </widget> - <widget class="QSpinBox" row="4" column="4"> + <widget class="TQSpinBox" row="4" column="4"> <property name="name"> <cstring>jobs_box</cstring> </property> @@ -81,7 +81,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="4" column="1" rowspan="1" colspan="3"> + <widget class="TQLabel" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> @@ -122,14 +122,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>runMultiJobs</cstring> </property> @@ -137,7 +137,7 @@ <string>Run more than one &job at a time</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>prio_label</cstring> </property> @@ -145,7 +145,7 @@ <string>Make priority:</string> </property> </widget> - <widget class="QSpinBox" row="2" column="2"> + <widget class="TQSpinBox" row="2" column="2"> <property name="name"> <cstring>prio_box</cstring> </property> @@ -189,6 +189,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/removesubprojectdialog.cpp b/buildtools/lib/widgets/removesubprojectdialog.cpp index 4a41ff88..8de6d45c 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.cpp +++ b/buildtools/lib/widgets/removesubprojectdialog.cpp @@ -20,8 +20,8 @@ #include <tqlabel.h> #include "removesubprojectdialog.h" -RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent, const char* name, bool modal, WFlags fl) - : RemoveSubprojectDlgBase(parent,name, modal,fl) +RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : RemoveSubprojectDlgBase(tqparent,name, modal,fl) { setCaption(caption); removeLabel->setText(question); diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h index 593309fe..49be23b8 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.h +++ b/buildtools/lib/widgets/removesubprojectdialog.h @@ -28,9 +28,10 @@ Subproject removal dialog. class RemoveSubprojectDialog : public RemoveSubprojectDlgBase { Q_OBJECT + TQ_OBJECT public: - RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~RemoveSubprojectDialog(); /*$PUBLIC_FUNCTIONS$*/ bool removeFromDisk(); diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui index cd36b6ff..a89b9107 100644 --- a/buildtools/lib/widgets/removesubprojectdlgbase.ui +++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>RemoveSubprojectDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>RemoveSubprojectDlgBase</cstring> </property> @@ -19,17 +19,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>fileGroupBox</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>140</height> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>removeLabel</cstring> </property> @@ -53,7 +53,7 @@ <string>[REMOVE QUESTION]</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>removeCheckBox</cstring> </property> @@ -61,11 +61,11 @@ <string>Also &remove it from disk</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>noticeLabel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -77,7 +77,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>buttonLayout</cstring> </property> @@ -98,14 +98,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -116,7 +116,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -145,10 +145,10 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot>accept()</slot> <slot>reject()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index 9aecbe17..03c75586 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -39,8 +39,8 @@ RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGroup, - const TQString &buildDirectory, TQWidget *parent, const char *name) - : RunOptionsWidgetBase(parent, name), + const TQString &buildDirectory, TQWidget *tqparent, const char *name) + : RunOptionsWidgetBase(tqparent, name), m_dom(dom), m_configGroup(configGroup) { // Create the "Environment Variables" GUI diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h index 02c38f35..304ce870 100644 --- a/buildtools/lib/widgets/runoptionswidget.h +++ b/buildtools/lib/widgets/runoptionswidget.h @@ -33,12 +33,13 @@ Run options widget. class RunOptionsWidget : public RunOptionsWidgetBase { Q_OBJECT + TQ_OBJECT public: RunOptionsWidget( TQDomDocument &dom, //!< document DOM const TQString &configGroup, //!< configuration group const TQString &buildDirectory, //!< project build directory - TQWidget *parent=0, //!< parent widget + TQWidget *tqparent=0, //!< tqparent widget const char *name=0 //!< widget's name ); ~RunOptionsWidget(); diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 1163484c..3dbb74ca 100644 --- a/buildtools/lib/widgets/runoptionswidgetbase.ui +++ b/buildtools/lib/widgets/runoptionswidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>RunOptionsWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>run_options_widget</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>mainProgramGroupBox</cstring> </property> @@ -44,14 +44,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>notelabel</cstring> </property> <property name="text"> <string>Note: These options override target specific settings.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="whatsThis" stdset="0"> @@ -66,7 +66,7 @@ <string>The command line arguments passed to the main program when run</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>mainprogram_label_2</cstring> </property> @@ -77,7 +77,7 @@ <cstring>mainprogram_edit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mainprogram_label</cstring> </property> @@ -96,7 +96,7 @@ <string>Full path to the executable</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>mainprogram_label_3</cstring> </property> @@ -115,7 +115,7 @@ <string>The command line arguments passed to the main program when debugged</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>mainprogram_label_3_2</cstring> </property> @@ -136,7 +136,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -155,7 +155,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autocompile_box</cstring> </property> @@ -166,7 +166,7 @@ <string>If the program is not up-to-date with the source code, compile it before starting its execution</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autoinstall_box</cstring> </property> @@ -177,7 +177,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autokdesu_box</cstring> </property> @@ -188,7 +188,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>startinterminal_box</cstring> </property> @@ -201,7 +201,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>env_var_group</cstring> </property> @@ -239,11 +239,11 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> </includes> -<slots> +<Q_SLOTS> <slot>mainProgramChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/buildtools/lib/widgets/subclassesdlg.cpp b/buildtools/lib/widgets/subclassesdlg.cpp index 4dde898b..a17f5b20 100644 --- a/buildtools/lib/widgets/subclassesdlg.cpp +++ b/buildtools/lib/widgets/subclassesdlg.cpp @@ -21,8 +21,8 @@ #include "subclassesdlg.h" #include "subclassesdlg.moc" -SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent, const char* name, bool modal, WFlags fl) -: SubclassesDlgBase(parent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir) +SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: SubclassesDlgBase(tqparent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir) { subclass_url->setEnabled(false); diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h index adfdc7d4..0b73e269 100644 --- a/buildtools/lib/widgets/subclassesdlg.h +++ b/buildtools/lib/widgets/subclassesdlg.h @@ -28,9 +28,10 @@ Subclass creation dialog. class SubclassesDlg : public SubclassesDlgBase { Q_OBJECT + TQ_OBJECT public: - SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassesDlg(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui index 026ab2ca..ebe62880 100644 --- a/buildtools/lib/widgets/subclassesdlgbase.ui +++ b/buildtools/lib/widgets/subclassesdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SubclassesDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SubclassesDlgBase</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>add_button</cstring> </property> @@ -33,7 +33,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>remove_button</cstring> </property> @@ -44,7 +44,7 @@ <bool>false</bool> </property> </widget> - <widget class="QListBox" row="1" column="1" rowspan="3" colspan="1"> + <widget class="TQListBox" row="1" column="1" rowspan="3" colspan="1"> <property name="name"> <cstring>subclasses_box</cstring> </property> @@ -53,7 +53,7 @@ <property name="name"> <cstring>subclass_url</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>24</height> @@ -73,14 +73,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -95,16 +95,16 @@ <property name="text"> <string>Related subclass &location:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> <property name="buddy" stdset="0"> <cstring>subclass_url</cstring> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -120,14 +120,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>310</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -141,7 +141,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -192,9 +192,9 @@ </connection> <connection> <sender>subclasses_box</sender> - <signal>clicked(QListBoxItem*)</signal> + <signal>clicked(TQListBoxItem*)</signal> <receiver>SubclassesDlgBase</receiver> - <slot>currentRelationChanged(QListBoxItem*)</slot> + <slot>currentRelationChanged(TQListBoxItem*)</slot> </connection> </connections> <tabstops> @@ -208,14 +208,14 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">changeCurrentURL(const QString &str)</slot> <slot access="protected">removeRelation()</slot> <slot access="protected">newRelation()</slot> - <slot access="protected">currentRelationChanged(QListBoxItem *item)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> + <slot access="protected">currentRelationChanged(TQListBoxItem *item)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> |