From 330c33ab6f97b279737bf9527c9add7bb1475450 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- buildtools/lib/parsers/autotools/autotools.ll | 2 +- buildtools/lib/parsers/autotools/autotools_lex.cpp | 2 +- buildtools/lib/parsers/qmake/location.hh | 2 +- buildtools/lib/parsers/qmake/position.hh | 2 +- buildtools/lib/parsers/qmake/qmake.yy | 2 +- buildtools/lib/parsers/qmake/qmake_lex.h | 2 +- buildtools/lib/parsers/qmake/qmake_yacc.cpp | 4 ++-- buildtools/lib/parsers/qmake/qmake_yacc.hpp | 2 +- buildtools/lib/parsers/qmake/qmakeast.cpp | 2 +- buildtools/lib/parsers/qmake/stack.hh | 2 +- buildtools/lib/parsers/qmake/tests/runner.cpp | 2 +- buildtools/lib/widgets/envvartools.cpp | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'buildtools/lib') diff --git a/buildtools/lib/parsers/autotools/autotools.ll b/buildtools/lib/parsers/autotools/autotools.ll index d6f2a9bb..f05f8ff6 100644 --- a/buildtools/lib/parsers/autotools/autotools.ll +++ b/buildtools/lib/parsers/autotools/autotools.ll @@ -98,7 +98,7 @@ rule [\t]+[^\n]* {id_list} { yylval.value = yytext; - yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\")); + yylval.value = yylval.value.mid(0, yylval.value.findRev("\\")); unput('\\'); BEGIN(INITIAL); return (ID_LIST); diff --git a/buildtools/lib/parsers/autotools/autotools_lex.cpp b/buildtools/lib/parsers/autotools/autotools_lex.cpp index e534d74f..d20bbdb6 100644 --- a/buildtools/lib/parsers/autotools/autotools_lex.cpp +++ b/buildtools/lib/parsers/autotools/autotools_lex.cpp @@ -841,7 +841,7 @@ YY_RULE_SETUP #line 99 "autotools.ll" { yylval.value = yytext; - yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\")); + yylval.value = yylval.value.mid(0, yylval.value.findRev("\\")); unput('\\'); BEGIN(INITIAL); return (ID_LIST); diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.hh index 41ec2015..d6247645 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 tqcontains +/* As a special exception, you may create a larger work that contains 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 diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.hh index 63fe2d81..6e95eb95 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 tqcontains +/* As a special exception, you may create a larger work that contains 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 diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy index 75d306d0..a9c0e745 100644 --- a/buildtools/lib/parsers/qmake/qmake.yy +++ b/buildtools/lib/parsers/qmake/qmake.yy @@ -359,7 +359,7 @@ function_call : ID_SIMPLE LBRACE function_args RBRACE depth++; //qWarning("%s", $1.ascii()); - if ($1.tqcontains("include")) + if ($1.contains("include")) { IncludeAST *includeAST = new IncludeAST(); includeAST->projectName = $3; diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h index 514631bf..fe133946 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.h +++ b/buildtools/lib/parsers/qmake/qmake_lex.h @@ -46,4 +46,4 @@ namespace TQMake #endif -// kate: space-indent on; indent-width 4; tab-width: 4; tqreplace-tabs on; auto-insert-doxygen on +// kate: space-indent on; indent-width 4; tab-width: 4; replace-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 718cb4f5..6824f633 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 tqcontains +/* As a special exception, you may create a larger work that contains 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 @@ -679,7 +679,7 @@ namespace TQMake depth++; //qWarning("%s", $1.ascii()); - if ((yysemantic_stack_[(4) - (1)].value).tqcontains("include")) + if ((yysemantic_stack_[(4) - (1)].value).contains("include")) { IncludeAST *includeAST = new IncludeAST(); includeAST->projectName = (yysemantic_stack_[(4) - (3)].value); diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp index 0b67bb14..9ca20a08 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 tqcontains +/* As a special exception, you may create a larger work that contains 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 diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index c551abef..2c1e5a53 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -165,6 +165,6 @@ void IncludeAST::writeBack(TQString &/*buffer*/) } -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.hh index 07f71922..dfc6c67e 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 tqcontains +/* As a special exception, you may create a larger work that contains 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 diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp index 5dd417db..9af86fe7 100644 --- a/buildtools/lib/parsers/qmake/tests/runner.cpp +++ b/buildtools/lib/parsers/qmake/tests/runner.cpp @@ -95,7 +95,7 @@ private: TQString replaceWs(TQString s) { - return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); + return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); } virtual void processAssignment( TQMake::AssignmentAST* a) diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp index 7c3a115f..13b1391a 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.tqreplace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''")); + res.replace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''")); res.prepend("\""); res.append("\""); return res; -- cgit v1.2.3