diff options
Diffstat (limited to 'buildtools/lib/parsers')
21 files changed, 206 insertions, 206 deletions
diff --git a/buildtools/lib/parsers/autotools/autotools_yacc.cpp b/buildtools/lib/parsers/autotools/autotools_yacc.cpp index 827cf4bc..93cdb733 100644 --- a/buildtools/lib/parsers/autotools/autotools_yacc.cpp +++ b/buildtools/lib/parsers/autotools/autotools_yacc.cpp @@ -150,7 +150,7 @@ noinst_HEADERS = foo.h #regognize me @fixme 1 shift/reduce conflict in "line_body" rule */ -#include <qvaluestack.h> +#include <tqvaluestack.h> #include "autotoolsast.h" #define YYSTYPE_IS_DECLARED @@ -164,7 +164,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. @@ -183,7 +183,7 @@ struct Result { foo3.cpp foo4.cpp </pre> */ - QStringList values; + TQStringList values; }; typedef Result YYSTYPE; @@ -206,7 +206,7 @@ When a scope or function scope statement is parsed, the child ProjectAST is crea 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). */ -QValueStack<ProjectAST*> projects; +TQValueStack<ProjectAST*> projects; /** The current depth of AST node is stored here. @@ -1381,7 +1381,7 @@ yyreduce: { AssignmentAST *node = new AssignmentAST(); node->scopedID = yyvsp[-1].value; - node->values = QStringList(yyvsp[0].value); + node->values = TQStringList(yyvsp[0].value); yyval.node = node; ;} break; diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index 757f4699..ddcbddc3 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp @@ -28,7 +28,7 @@ namespace AutoTools { AST::~AST() { - for (QValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) { AST *node = *it; delete node; @@ -40,9 +40,9 @@ void AST::addChildAST(AST *node) m_children.append(node); } -void AST::writeBack(QString &buffer) +void AST::writeBack(TQString &buffer) { - for (QValueList<AST*>::const_iterator it = m_children.constBegin(); + for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); it != m_children.constEnd(); ++it) { if (*it) @@ -50,9 +50,9 @@ void AST::writeBack(QString &buffer) } } -QString AST::indentation() +TQString AST::indentation() { - QString result; + TQString result; for (int i = 0; i < depth(); i++) result += '\t'; return result; @@ -63,14 +63,14 @@ bool AST::hasChildren() const return !m_children.isEmpty(); } -QValueList<AST*> AST::children() const +TQValueList<AST*> AST::children() const { return m_children; } //ProjectAST -void ProjectAST::writeBack(QString &buffer) +void ProjectAST::writeBack(TQString &buffer) { if ( isRule() ) buffer += scopedID; @@ -87,27 +87,27 @@ void ProjectAST::addChildAST(AST *node) AST::addChildAST(node); } -void AssignmentAST::writeBack(QString &buffer) +void AssignmentAST::writeBack(TQString &buffer) { buffer += indentation() + scopedID + " " + op + values.join(""); } -void AutomakeTargetAST::writeBack( QString& buffer ) +void AutomakeTargetAST::writeBack( TQString& buffer ) { buffer += target + ":" + deps.join(""); } -void ConditionAST::writeBack( QString& buffer ) +void ConditionAST::writeBack( TQString& buffer ) { buffer += indentation() + type + " " + conditionName; } -void NewLineAST::writeBack(QString &buffer) +void NewLineAST::writeBack(TQString &buffer) { buffer += "\n"; } -void CommentAST::writeBack(QString &buffer) +void CommentAST::writeBack(TQString &buffer) { buffer += indentation() + comment; } diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index 9c7ae66a..768e3e07 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.h +++ b/buildtools/lib/parsers/autotools/autotoolsast.h @@ -23,7 +23,7 @@ #ifndef AUTOTOOLSAST_H #define AUTOTOOLSAST_H -#include <qstringlist.h> +#include <tqstringlist.h> /** @file autotools.h @@ -71,7 +71,7 @@ public: * This is a default implementation which iterates over child nodes * and calls writeBack for each child node. */ - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /** @return The type of the node.*/ virtual NodeType nodeType() const { return m_nodeType; } @@ -83,7 +83,7 @@ public: int depth() const { return m_depth; } /** @return The indentation string based on node depth.*/ - virtual QString indentation(); + virtual TQString indentation(); //! \return true if this AST has children bool hasChildren() const; @@ -92,13 +92,13 @@ public: * Get the children of this ast * \return the list of this ast's childre */ - QValueList<AST*> children() const; + TQValueList<AST*> children() const; protected: NodeType m_nodeType; - QValueList<AST*> m_children; + TQValueList<AST*> m_children; private: int m_depth; @@ -135,7 +135,7 @@ public: /** Constructs a project node of given @p kind. */ ProjectAST(Kind kind = Project): AST(AST::ProjectAST), m_kind(kind) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); virtual void addChildAST(AST *node); /** @return true if this node is a project.*/ @@ -150,16 +150,16 @@ public: bool isEmpty() const { return m_kind == Empty; } /**Scoped identifier (scope name or rule).*/ - QString scopedID; + TQString scopedID; /**Function arguments. Empty for other kinds of projects.*/ - QString args; + TQString args; /** The automake conditional has an else attached */ bool hasElse; /**List of statements.*/ - QValueList<AutoTools::AST*> statements; + TQValueList<AutoTools::AST*> statements; private: Kind m_kind; @@ -192,16 +192,16 @@ class AssignmentAST: public AST public: AssignmentAST(): AST(AST::AssignmentAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Scoped name of the variable.*/ - QString scopedID; + TQString scopedID; /**Operator.*/ - QString op; + TQString op; /**List of values.*/ - QStringList values; + TQStringList values; }; class AutomakeTargetAST : public AST @@ -209,13 +209,13 @@ class AutomakeTargetAST : public AST public: AutomakeTargetAST() : AST(AST::TargetAST) {} - virtual void writeBack( QString& buffer ); + virtual void writeBack( TQString& buffer ); /// The name of the target - QString target; + TQString target; /// The dependencies for the target, if any - QStringList deps; + TQStringList deps; }; class ConditionAST : public AST @@ -223,13 +223,13 @@ class ConditionAST : public AST public: ConditionAST() : AST( AST::MakefileConditionalAST ) {} - virtual void writeBack( QString& buffer ); + virtual void writeBack( TQString& buffer ); /// The keyword for the condition (if, else, endif) - QString type; + TQString type; /// The name of the condition - QString conditionName; + TQString conditionName; }; /** @@ -241,7 +241,7 @@ class NewLineAST: public AST public: NewLineAST(): AST(AST::NewLineAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); }; @@ -255,10 +255,10 @@ class CommentAST: public AST public: CommentAST(): AST(AST::CommentAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Comment text.*/ - QString comment; + TQString comment; }; diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp index a3d53151..05734c3f 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp @@ -24,13 +24,13 @@ #include "autotoolsast.h" #include <stdio.h> -#include <qvaluestack.h> +#include <tqvaluestack.h> #include <kio/netaccess.h> extern FILE *yyin, *yyout; extern int yyparse(); //extern int yydebug; -extern QValueStack<AutoTools::ProjectAST *> projects; +extern TQValueStack<AutoTools::ProjectAST *> projects; namespace AutoTools { @@ -49,14 +49,14 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast) return ret; } -int Driver::parseFile(QString fileName, ProjectAST **ast) +int Driver::parseFile(TQString fileName, ProjectAST **ast) { return parseFile(fileName.ascii(), ast); } int Driver::parseFile(KURL fileName, ProjectAST **ast) { - QString tmpFile; + TQString tmpFile; int ret = 0; if (KIO::NetAccess::download(fileName, tmpFile, 0)) ret = parseFile(tmpFile, ast); diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.h b/buildtools/lib/parsers/autotools/autotoolsdriver.h index 4e52c6ec..5f6ac7e7 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.h +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.h @@ -23,7 +23,7 @@ #ifndef QMAKEQMAKEDRIVER_H #define QMAKEQMAKEDRIVER_H -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <kurl.h> namespace AutoTools { @@ -49,14 +49,14 @@ public: * @return The result of parsing. Result is 0 on success and <> 0 on failure. */ static int parseFile(const char *fileName, ProjectAST **ast); - static int parseFile(QString fileName, ProjectAST **ast); + static int parseFile(TQString fileName, ProjectAST **ast); static int parseFile(KURL fileName, ProjectAST **ast); /* template<class Op> static void walkAST(Op &op, const ProjectAST *ast) { // op(ast); - for (QValueList<QMake::AST*>::const_iterator it = ast->statements.constBegin(); + for (TQValueList<QMake::AST*>::const_iterator it = ast->statements.constBegin(); it != ast->statements.constEnd(); ++it) { const AST *child = *it; diff --git a/buildtools/lib/parsers/autotools/tests/viewer.cpp b/buildtools/lib/parsers/autotools/tests/viewer.cpp index 24d6aea4..0dc8e733 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer.cpp @@ -19,61 +19,61 @@ ***************************************************************************/ #include "viewer.h" -#include <qdir.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qfiledialog.h> -#include <qtextedit.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qlistview.h> -#include <qtabwidget.h> +#include <tqdir.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqfiledialog.h> +#include <tqtextedit.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqlistview.h> +#include <tqtabwidget.h> #include <autotoolsast.h> #include <autotoolsdriver.h> using namespace AutoTools; -Viewer::Viewer(QWidget *parent, const char *name) +Viewer::Viewer(TQWidget *parent, const char *name) :ViewerBase(parent, name) { - if (QFile::exists(QDir::currentDirPath() + "/" + "qtlist")) + if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { - QFile f(QDir::currentDirPath() + "/" + "qtlist"); + TQFile f(TQDir::currentDirPath() + "/" + "qtlist"); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); while (!str.eof()) files->insertItem(str.readLine()); } ast->setSorting(-1); - parentProject.push((QListViewItem*)0); + parentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() { if (allLocation->text().isEmpty()) return; - QDir d(allLocation->text()); - QStringList l = d.entryList("*.am"); - for (QStringList::iterator it = l.begin(); it != l.end(); ++it) - (*it) = QDir::cleanDirPath(allLocation->text() + "/" + (*it)); + TQDir d(allLocation->text()); + TQStringList l = d.entryList("*.am"); + for (TQStringList::iterator it = l.begin(); it != l.end(); ++it) + (*it) = TQDir::cleanDirPath(allLocation->text() + "/" + (*it)); files->insertStringList(l); } void Viewer::choose_clicked() { - QString fileName = QFileDialog::getOpenFileName(QDir::currentDirPath(), "*.am", this); + TQString fileName = TQFileDialog::getOpenFileName(TQDir::currentDirPath(), "*.am", this); if (!fileName.isEmpty()) files->insertItem(fileName); } -void Viewer::files_currentChanged(QListBoxItem* item) +void Viewer::files_currentChanged(TQListBoxItem* item) { ast->clear(); - QFile f(item->text()); + TQFile f(item->text()); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); source->setText(str.read()); f.close(); @@ -86,30 +86,30 @@ void Viewer::files_currentChanged(QListBoxItem* item) tabWidget2_selected("Source to be written back"); } -void Viewer::tabWidget2_selected(const QString& text) +void Viewer::tabWidget2_selected(const TQString& text) { if ((text == "Source to be written back") && projectAST) { - QString buffer; + TQString buffer; projectAST->writeBack(buffer); writeBack->setText(buffer); } } -void Viewer::processAST(ProjectAST *projectAST, QListViewItem *globAfter) +void Viewer::processAST(ProjectAST *projectAST, TQListViewItem *globAfter) { - QListViewItem *projectIt; + TQListViewItem *projectIt; if (!parentProject.top()) - projectIt = new QListViewItem(ast, "Project"); + projectIt = new TQListViewItem(ast, "Project"); else { if ( projectAST->isConditionalScope() || projectAST->isRule() ) - projectIt = new QListViewItem(parentProject.top(), globAfter, projectAST->scopedID); + projectIt = new TQListViewItem(parentProject.top(), globAfter, projectAST->scopedID); } projectIt->setOpen(true); - QListViewItem *after = 0; - for (QValueList<AST*>::const_iterator it = projectAST->statements.constBegin(); + TQListViewItem *after = 0; + for (TQValueList<AST*>::const_iterator it = projectAST->statements.constBegin(); it != projectAST->statements.constEnd(); ++it) { AST *ast = *it; @@ -118,7 +118,7 @@ void Viewer::processAST(ProjectAST *projectAST, QListViewItem *globAfter) switch (ast->nodeType()) { case AST::AssignmentAST: { AssignmentAST *assignmentAST = static_cast<AssignmentAST*>(ast); - QListViewItem *item = new QListViewItem(projectIt, after, + TQListViewItem *item = new TQListViewItem(projectIt, after, assignmentAST->scopedID, assignmentAST->op, assignmentAST->values.join("")); item->setMultiLinesEnabled(true); after = item; } @@ -127,25 +127,25 @@ void Viewer::processAST(ProjectAST *projectAST, QListViewItem *globAfter) case AST::TargetAST: { AutomakeTargetAST* ata = static_cast<AutomakeTargetAST*>(ast); - QListViewItem* item = new QListViewItem(projectIt, after, - ata->target, QString::null, ata->deps.join("")); + TQListViewItem* item = new TQListViewItem(projectIt, after, + ata->target, TQString::null, ata->deps.join("")); after = item; } break; case AST::NewLineAST: -// after = new QListViewItem(projectIt, after, "<newline>"); +// after = new TQListViewItem(projectIt, after, "<newline>"); break; case AST::CommentAST: -// after = new QListViewItem(projectIt, after, "<comment>"); +// after = new TQListViewItem(projectIt, after, "<comment>"); break; case AST::MakefileConditionalAST: { ConditionAST* ata = static_cast<ConditionAST*>(ast); - QListViewItem* item = new QListViewItem(projectIt, after, - ata->type, ata->conditionName, QString::null ); + TQListViewItem* item = new TQListViewItem(projectIt, after, + ata->type, ata->conditionName, TQString::null ); after = item; } case AST::ProjectAST: { diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h index f46cec46..3b0443f7 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer.h +++ b/buildtools/lib/parsers/autotools/tests/viewer.h @@ -20,7 +20,7 @@ #ifndef VIEWER_H #define VIEWER_H -#include <qvaluestack.h> +#include <tqvaluestack.h> #include "viewerbase.h" @@ -31,16 +31,16 @@ class QListViewItem; class Viewer: public ViewerBase { Q_OBJECT public: - Viewer(QWidget *parent = 0, const char *name = 0); - void processAST(AutoTools::ProjectAST *projectAST, QListViewItem *globAfter = 0); + Viewer(TQWidget *parent = 0, const char *name = 0); + void processAST(AutoTools::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: - virtual void tabWidget2_selected(const QString&); - virtual void files_currentChanged(QListBoxItem*); + virtual void tabWidget2_selected(const TQString&); + virtual void files_currentChanged(TQListBoxItem*); virtual void choose_clicked(); virtual void addAll_clicked(); private: AutoTools::ProjectAST *projectAST; - QValueStack<QListViewItem *> parentProject; + TQValueStack<TQListViewItem *> parentProject; }; #endif diff --git a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp index 707a1364..380767a9 100644 --- a/buildtools/lib/parsers/autotools/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/autotools/tests/viewer_main.cpp @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qapplication.h> +#include <tqapplication.h> #include "viewer.h" int main(int argc, char **argv) { - QApplication app(argc, argv); + TQApplication app(argc, argv); Viewer viewer; app.setMainWidget(&viewer); diff --git a/buildtools/lib/parsers/qmake/qmake_lex.cpp b/buildtools/lib/parsers/qmake/qmake_lex.cpp index a428b163..9fe37664 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.cpp +++ b/buildtools/lib/parsers/qmake/qmake_lex.cpp @@ -953,7 +953,7 @@ case 2: YY_RULE_SETUP #line 83 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::LIST_WS; } YY_BREAK @@ -963,7 +963,7 @@ YY_RULE_SETUP #line 88 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::CONT; } YY_BREAK @@ -973,7 +973,7 @@ YY_RULE_SETUP #line 94 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COMMENT_CONT; } YY_BREAK @@ -981,7 +981,7 @@ case 5: YY_RULE_SETUP #line 100 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::ID_SIMPLE); } YY_BREAK @@ -989,7 +989,7 @@ case 6: YY_RULE_SETUP #line 105 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); mylval->value = mylval->value.mid(0, mylval->value.length()-1); unput(')'); BEGIN(INITIAL); @@ -1001,7 +1001,7 @@ YY_RULE_SETUP #line 113 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::VARIABLE_VALUE; } YY_BREAK @@ -1010,7 +1010,7 @@ YY_RULE_SETUP #line 119 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::QUOTED_VARIABLE_VALUE; } YY_BREAK @@ -1019,7 +1019,7 @@ YY_RULE_SETUP #line 125 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::EQ; } YY_BREAK @@ -1028,7 +1028,7 @@ YY_RULE_SETUP #line 131 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::PLUSEQ; } YY_BREAK @@ -1037,7 +1037,7 @@ YY_RULE_SETUP #line 137 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::MINUSEQ; } YY_BREAK @@ -1046,7 +1046,7 @@ YY_RULE_SETUP #line 143 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::STAREQ; } YY_BREAK @@ -1055,7 +1055,7 @@ YY_RULE_SETUP #line 149 "qmake.ll" { BEGIN(vallist); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::TILDEEQ; } YY_BREAK @@ -1100,7 +1100,7 @@ case 19: YY_RULE_SETUP #line 177 "qmake.ll" { - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return Parser::token::token::COLON; } YY_BREAK @@ -1110,7 +1110,7 @@ YY_RULE_SETUP #line 183 "qmake.ll" { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } @@ -1121,7 +1121,7 @@ YY_RULE_SETUP #line 190 "qmake.ll" { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); setLineEndingFromString( mylval->value ); return Parser::token::token::NEWLINE; } @@ -1132,7 +1132,7 @@ YY_RULE_SETUP #line 197 "qmake.ll" { BEGIN(INITIAL); - mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() ); + mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() ); return (Parser::token::token::COMMENT); } YY_BREAK @@ -2215,7 +2215,7 @@ namespace QMake return yylex(); } - void Lexer::setLineEndingFromString( const QString& str ) + void Lexer::setLineEndingFromString( const TQString& str ) { if( str.endsWith("\r\n") && m_lineEnding == None ) m_lineEnding = Windows; diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h index 1b91e747..242cec2a 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.h +++ b/buildtools/lib/parsers/qmake/qmake_lex.h @@ -36,7 +36,7 @@ namespace QMake Lexer( std::istream* argin = 0, std::ostream* argout = 0 ); int yylex( QMake::Parser::semantic_type* yylval ); int yylex(); - void setLineEndingFromString( const QString& ); + void setLineEndingFromString( const TQString& ); LineEnding lineending(); private: QMake::Parser::semantic_type* mylval; diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp index 9cd09ebe..32722979 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp @@ -144,7 +144,7 @@ namespace QMake #endif /// Build a parser object. - Parser::Parser (QMake::Lexer* lexer_yyarg, QValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg) + Parser::Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg) : yydebug_ (false), yycdebug_ (&std::cerr), lexer (lexer_yyarg), @@ -584,7 +584,7 @@ namespace QMake case 26: #line 293 "qmake.yy" { - (yyval.values) = QStringList(); + (yyval.values) = TQStringList(); (yyval.values).append( (yysemantic_stack_[(2) - (1)].value) ); (yyval.values).append( (yysemantic_stack_[(2) - (2)].value) ); ;} @@ -611,8 +611,8 @@ namespace QMake case 30: #line 312 "qmake.yy" { - (yyval.value) = QString(); - (yyval.indent) = QString(); + (yyval.value) = TQString(); + (yyval.indent) = TQString(); ;} break; diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp index 60030b3c..91583cd3 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp @@ -85,9 +85,9 @@ SOURCES = foo #regognize me @fixme 1 shift/reduce conflict in "line_body" rule */ -#include <qvaluestack.h> +#include <tqvaluestack.h> #include "qmakeast.h" -#include <qregexp.h> +#include <tqregexp.h> #define YYSTYPE_IS_DECLARED @@ -102,7 +102,7 @@ struct Result { Result(): node(0) {} /**Type of semantic value for simple grammar rules.*/ - QString value; + TQString value; /**Type of semantic value for grammar rules which are parts of AST.*/ AST *node; /**Type of semantic value for "multiline_values" grammar rule. @@ -121,8 +121,8 @@ struct Result { foo3.cpp foo4.cpp </pre> */ - QStringList values; - QString indent; + TQStringList values; + TQString indent; }; #define YYSTYPE Result @@ -143,7 +143,7 @@ When a scope or function scope statement is parsed, the child ProjectAST is crea 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). */ -//QValueStack<ProjectAST*> projects; +//TQValueStack<ProjectAST*> projects; /** The current depth of AST node is stored here. @@ -249,7 +249,7 @@ namespace QMake typedef token::yytokentype token_type; /// Build a parser object. - Parser (QMake::Lexer* lexer_yyarg, QValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg); + Parser (QMake::Lexer* lexer_yyarg, TQValueStack<ProjectAST*>& projects_yyarg, int depth_yyarg); virtual ~Parser (); /// Parse. @@ -409,7 +409,7 @@ namespace QMake /* User arguments. */ QMake::Lexer* lexer; - QValueStack<ProjectAST*>& projects; + TQValueStack<ProjectAST*>& projects; int depth; }; } diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index a60e9a53..91e48d2d 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -27,7 +27,7 @@ namespace QMake { AST::~AST() { - for (QValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<AST*>::iterator it = m_children.begin(); it != m_children.end(); ++it) { AST *node = *it; delete node; @@ -45,9 +45,9 @@ void AST::removeChildAST(AST *node) m_children.remove(node); } -void AST::writeBack(QString &buffer) +void AST::writeBack(TQString &buffer) { - for (QValueList<AST*>::const_iterator it = m_children.constBegin(); + for (TQValueList<AST*>::const_iterator it = m_children.constBegin(); it != m_children.constEnd(); ++it) { if (*it) @@ -57,9 +57,9 @@ void AST::writeBack(QString &buffer) } } -QString AST::indentation() +TQString AST::indentation() { - QString result; + TQString result; for (int i = 0; i < depth(); i++) result += " "; return result; @@ -67,10 +67,10 @@ QString AST::indentation() //ProjectAST -void ProjectAST::writeBack(QString &buffer) +void ProjectAST::writeBack(TQString &buffer) { bool hasActualStatements = false; - for (QValueList<QMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it) + for (TQValueList<QMake::AST*>::const_iterator it = m_children.begin(); it != m_children.end(); ++it) { if ((*it)->nodeType() != AST::IncludeAST) { @@ -128,7 +128,7 @@ AssignmentAST::~AssignmentAST() { } -void AssignmentAST::writeBack(QString &buffer) +void AssignmentAST::writeBack(TQString &buffer) { if( !buffer.endsWith(": ") ) buffer += indentation(); @@ -141,7 +141,7 @@ void AssignmentAST::writeBack(QString &buffer) //NewLineAST -void NewLineAST::writeBack(QString &buffer) +void NewLineAST::writeBack(TQString &buffer) { buffer += "\n"; } @@ -149,7 +149,7 @@ void NewLineAST::writeBack(QString &buffer) //CommentAST -void CommentAST::writeBack(QString &buffer) +void CommentAST::writeBack(TQString &buffer) { if( !buffer.endsWith(": ") ) buffer += indentation(); @@ -159,7 +159,7 @@ void CommentAST::writeBack(QString &buffer) //IncludeAST -void IncludeAST::writeBack(QString &/*buffer*/) +void IncludeAST::writeBack(TQString &/*buffer*/) { } diff --git a/buildtools/lib/parsers/qmake/qmakeast.h b/buildtools/lib/parsers/qmake/qmakeast.h index 35612fc1..45aedb2e 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.h +++ b/buildtools/lib/parsers/qmake/qmakeast.h @@ -20,7 +20,7 @@ #ifndef QMAKEQMAKEAST_H #define QMAKEQMAKEAST_H -#include <qstringlist.h> +#include <tqstringlist.h> /** @file qmakeast.h @@ -66,7 +66,7 @@ public: /**Writes information stored in the AST into the @p buffer. This is a default implementation which iterates over child nodes and calls writeBack for each child node.*/ - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**@return The type of the node.*/ virtual NodeType nodeType() const { return m_nodeType; } @@ -76,10 +76,10 @@ public: /**@return The depth of the node in AST.*/ int depth() const { return m_depth; } /**@return The indentation string based on node depth.*/ - virtual QString indentation(); + virtual TQString indentation(); /**The list of child AST nodes.*/ - QValueList<AST*> m_children; + TQValueList<AST*> m_children; protected: NodeType m_nodeType; @@ -122,7 +122,7 @@ public: /**Constructs a project node of given @p kind.*/ ProjectAST(Kind kind = Project): AST(AST::ProjectAST), m_kind(kind) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**@return true if this node is a project.*/ bool isProject() const { return m_kind == Project; } @@ -133,20 +133,20 @@ public: /**@return true if this node is empty.*/ bool isEmpty() const { return m_kind == Empty; } - void setFileName(const QString& fileName) { m_fileName = fileName; } - QString fileName() const { return m_fileName; } + void setFileName(const TQString& fileName) { m_fileName = fileName; } + TQString fileName() const { return m_fileName; } void setLineEnding( LineEnding ); LineEnding lineEnding(); /**Scoped identifier (scope name or function name).*/ - QString scopedID; + TQString scopedID; /**Function arguments. Empty for other kinds of projects.*/ - QString args; + TQString args; private: Kind m_kind; - QString m_fileName; + TQString m_fileName; LineEnding m_lineEnding; }; @@ -176,16 +176,16 @@ public: AssignmentAST(): AST(AST::AssignmentAST){} ~AssignmentAST(); - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Scoped name of the variable.*/ - QString scopedID; + TQString scopedID; /**Operator.*/ - QString op; + TQString op; /**List of values.*/ - QStringList values; + TQStringList values; /**Indentation of multiline values*/ - QString indent; + TQString indent; }; @@ -197,7 +197,7 @@ class NewLineAST: public AST { public: NewLineAST(): AST(AST::NewLineAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); }; @@ -210,10 +210,10 @@ class CommentAST: public AST { public: CommentAST(): AST(AST::CommentAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); /**Comment text.*/ - QString comment; + TQString comment; }; @@ -226,9 +226,9 @@ class IncludeAST: public AST { public: IncludeAST(): AST(AST::IncludeAST) {} - virtual void writeBack(QString &buffer); + virtual void writeBack(TQString &buffer); - QString projectName; + TQString projectName; }; } diff --git a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp index 052f5f00..1f7e6cb6 100644 --- a/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp +++ b/buildtools/lib/parsers/qmake/qmakeastvisitor.cpp @@ -29,7 +29,7 @@ void ASTVisitor::processProject(ProjectAST *project) enterScope(project); else if (project->isFunctionScope()) enterFunctionScope(project); - for (QValueList<QMake::AST*>::const_iterator it = project->m_children.constBegin(); + for (TQValueList<QMake::AST*>::const_iterator it = project->m_children.constBegin(); it != project->m_children.constEnd(); ++it) { AST *ast = *it; diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp index 1b7aece6..e2d93ef8 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.cpp +++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp @@ -20,7 +20,7 @@ #include "qmakedriver.h" #include "qmakeast.h" -#include <qvaluestack.h> +#include <tqvaluestack.h> #include <kio/netaccess.h> #include <iostream> @@ -44,7 +44,7 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) Lexer l(&inf); l.set_debug(debug); int depth = 0; - QValueStack<ProjectAST*> stack; + TQValueStack<ProjectAST*> stack; Parser p(&l, stack, depth); p.set_debug_level(debug); int ret = p.parse(); @@ -66,14 +66,14 @@ int Driver::parseFile(const char *fileName, ProjectAST **ast, int debug) return ret; } -int Driver::parseFile(QString fileName, ProjectAST **ast, int debug) +int Driver::parseFile(TQString fileName, ProjectAST **ast, int debug) { return parseFile(fileName.ascii(), ast, debug); } int Driver::parseFile(KURL fileName, ProjectAST **ast, int debug) { - QString tmpFile; + TQString tmpFile; int ret = 0; if (KIO::NetAccess::download(fileName, tmpFile, 0)) ret = parseFile(tmpFile, ast, debug); @@ -88,7 +88,7 @@ int Driver::parseString( const char* string, ProjectAST **ast, int debug ) Lexer l(&ins); l.set_debug(debug); int depth = 0; - QValueStack<ProjectAST*> stack; + TQValueStack<ProjectAST*> stack; Parser p(&l, stack, depth); p.set_debug_level(debug); int ret = p.parse(); diff --git a/buildtools/lib/parsers/qmake/qmakedriver.h b/buildtools/lib/parsers/qmake/qmakedriver.h index 37441bf8..daa06057 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.h +++ b/buildtools/lib/parsers/qmake/qmakedriver.h @@ -44,7 +44,7 @@ public: @return The result of parsing. Result is 0 on success and <> 0 on failure. */ static int parseFile(const char *fileName, ProjectAST **ast, int debug); - static int parseFile(QString fileName, ProjectAST **ast, int debug); + static int parseFile(TQString fileName, ProjectAST **ast, int debug); static int parseFile(KURL fileName, ProjectAST **ast, int debug); static int parseString(const char* string, ProjectAST **ast, int debug); diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp index 140b39f4..6f1d5956 100644 --- a/buildtools/lib/parsers/qmake/tests/runner.cpp +++ b/buildtools/lib/parsers/qmake/tests/runner.cpp @@ -24,7 +24,7 @@ #include "qmakedriver.h" #include "qmakeastvisitor.h" -#include <qstring.h> +#include <tqstring.h> #include <kdebug.h> #include <kcmdlineargs.h> @@ -93,7 +93,7 @@ private: QMake::ASTVisitor::leaveFunctionScope(p); } - QString replaceWs(QString s) + TQString replaceWs(TQString s) { return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); } @@ -122,9 +122,9 @@ private: QMake::ASTVisitor::processInclude(a); } - QString getIndent() + TQString getIndent() { - QString ind; + TQString ind; for( int i = 0 ; i < indent ; i++) ind += " "; return ind; @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) if ( !silent ) { pa.processProject(projectAST); - QString profile; + TQString profile; projectAST->writeBack(profile); kdDebug(9024) << "QMake file written back:\n" << profile << endl; } diff --git a/buildtools/lib/parsers/qmake/tests/viewer.cpp b/buildtools/lib/parsers/qmake/tests/viewer.cpp index a550a426..4583ab11 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer.cpp @@ -19,15 +19,15 @@ ***************************************************************************/ #include "viewer.h" -#include <qdir.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qfiledialog.h> -#include <qtextedit.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qlistview.h> -#include <qtabwidget.h> +#include <tqdir.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqfiledialog.h> +#include <tqtextedit.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqlistview.h> +#include <tqtabwidget.h> #include <qmakeast.h> #include <qmakedriver.h> @@ -35,46 +35,46 @@ using namespace QMake; -Viewer::Viewer(QWidget *parent, const char *name) +Viewer::Viewer(TQWidget *parent, const char *name) :ViewerBase(parent, name), projectAST(0) { - if (QFile::exists(QDir::currentDirPath() + "/" + "qtlist")) + if (TQFile::exists(TQDir::currentDirPath() + "/" + "qtlist")) { - QFile f(QDir::currentDirPath() + "/" + "qtlist"); + TQFile f(TQDir::currentDirPath() + "/" + "qtlist"); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); while (!str.eof()) files->insertItem(str.readLine()); } ast->setSorting(-1); -// parentProject.push((QListViewItem*)0); +// parentProject.push((TQListViewItem*)0); } void Viewer::addAll_clicked() { if (allLocation->text().isEmpty()) return; - QDir d(allLocation->text()); - QStringList l = d.entryList("*.pro *.pri"); - for (QStringList::iterator it = l.begin(); it != l.end(); ++it) - (*it) = QDir::cleanDirPath(allLocation->text() + "/" + (*it)); + TQDir d(allLocation->text()); + TQStringList l = d.entryList("*.pro *.pri"); + for (TQStringList::iterator it = l.begin(); it != l.end(); ++it) + (*it) = TQDir::cleanDirPath(allLocation->text() + "/" + (*it)); files->insertStringList(l); } void Viewer::choose_clicked() { - QString fileName = QFileDialog::getOpenFileName(QDir::currentDirPath(), "*.pro *.pri", this); + TQString fileName = TQFileDialog::getOpenFileName(TQDir::currentDirPath(), "*.pro *.pri", this); if (!fileName.isEmpty()) files->insertItem(fileName); } -void Viewer::files_currentChanged(QListBoxItem* item) +void Viewer::files_currentChanged(TQListBoxItem* item) { ast->clear(); - QFile f(item->text()); + TQFile f(item->text()); f.open(IO_ReadOnly); - QTextStream str(&f); + TQTextStream str(&f); source->setText(str.read()); f.close(); @@ -87,11 +87,11 @@ void Viewer::files_currentChanged(QListBoxItem* item) tabWidget2_selected("Source to be written back"); } -void Viewer::tabWidget2_selected(const QString& text) +void Viewer::tabWidget2_selected(const TQString& text) { if ((text == "Source to Be Written Back") && projectAST) { - QString buffer; + TQString buffer; projectAST->writeBack(buffer); writeBack->setText(buffer); } @@ -102,7 +102,7 @@ public: ViewerVisitor(Viewer *v): ASTVisitor() { this->v = v; - parentProject.push((QListViewItem*)0); + parentProject.push((TQListViewItem*)0); } virtual void processProject(ProjectAST *project) @@ -112,10 +112,10 @@ public: virtual void enterRealProject(ProjectAST *project) { - QListViewItem *projectIt; + TQListViewItem *projectIt; if (!parentProject.top()) { - projectIt = new QListViewItem(v->ast, "Project"); + projectIt = new TQListViewItem(v->ast, "Project"); projectIt->setOpen(true); parentProject.push(projectIt); } @@ -124,7 +124,7 @@ public: } virtual void enterScope(ProjectAST *scope) { - QListViewItem *projectIt = new QListViewItem(parentProject.top(), scope->scopedID, "scope"); + TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), scope->scopedID, "scope"); parentProject.push(projectIt); ASTVisitor::enterScope(scope); } @@ -134,7 +134,7 @@ public: } virtual void enterFunctionScope(ProjectAST *fscope) { - QListViewItem *projectIt = new QListViewItem(parentProject.top(), + TQListViewItem *projectIt = new TQListViewItem(parentProject.top(), fscope->scopedID + "(" + fscope->args + ")", "function scope"); parentProject.push(projectIt); ASTVisitor::enterFunctionScope(fscope); @@ -145,7 +145,7 @@ public: } virtual void processAssignment(AssignmentAST *assignment) { - QListViewItem *item = new QListViewItem(parentProject.top(), + TQListViewItem *item = new TQListViewItem(parentProject.top(), assignment->scopedID, assignment->op, assignment->values.join("|"), "assignment"); item->setMultiLinesEnabled(true); @@ -154,26 +154,26 @@ public: } virtual void processNewLine(NewLineAST *newline) { - new QListViewItem(parentProject.top(), "<newline>"); + new TQListViewItem(parentProject.top(), "<newline>"); ASTVisitor::processNewLine(newline); } virtual void processComment(CommentAST *comment) { - new QListViewItem(parentProject.top(), "<comment>"); + new TQListViewItem(parentProject.top(), "<comment>"); ASTVisitor::processComment(comment); } virtual void processInclude(IncludeAST *include) { - new QListViewItem(parentProject.top(), "<include>", include->projectName); + new TQListViewItem(parentProject.top(), "<include>", include->projectName); QMake::ASTVisitor::processInclude(include); } Viewer *v; - QValueStack<QListViewItem *> parentProject; + TQValueStack<TQListViewItem *> parentProject; }; -void Viewer::processAST(QMake::ProjectAST *projectAST, QListViewItem *globAfter) +void Viewer::processAST(QMake::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 b22632a1..07e91da1 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer.h +++ b/buildtools/lib/parsers/qmake/tests/viewer.h @@ -20,7 +20,7 @@ #ifndef VIEWER_H #define VIEWER_H -#include <qvaluestack.h> +#include <tqvaluestack.h> #include "viewerbase.h" @@ -33,11 +33,11 @@ class QListViewItem; class Viewer: public ViewerBase { Q_OBJECT public: - Viewer(QWidget *parent = 0, const char *name = 0); - void processAST(QMake::ProjectAST *projectAST, QListViewItem *globAfter = 0); + Viewer(TQWidget *parent = 0, const char *name = 0); + void processAST(QMake::ProjectAST *projectAST, TQListViewItem *globAfter = 0); public slots: - virtual void tabWidget2_selected(const QString&); - virtual void files_currentChanged(QListBoxItem*); + virtual void tabWidget2_selected(const TQString&); + virtual void files_currentChanged(TQListBoxItem*); virtual void choose_clicked(); virtual void addAll_clicked(); private: diff --git a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp index d2a8a1ad..c31ea02c 100644 --- a/buildtools/lib/parsers/qmake/tests/viewer_main.cpp +++ b/buildtools/lib/parsers/qmake/tests/viewer_main.cpp @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qapplication.h> +#include <tqapplication.h> #include "viewer.h" int main(int argc, char **argv) { - QApplication app(argc, argv); + TQApplication app(argc, argv); Viewer viewer; app.setMainWidget(&viewer); |