summaryrefslogtreecommitdiffstats
path: root/buildtools/lib/parsers/qmake
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/lib/parsers/qmake')
-rw-r--r--buildtools/lib/parsers/qmake/location.hh2
-rw-r--r--buildtools/lib/parsers/qmake/position.hh2
-rw-r--r--buildtools/lib/parsers/qmake/qmake.yy2
-rw-r--r--buildtools/lib/parsers/qmake/qmake_lex.h2
-rw-r--r--buildtools/lib/parsers/qmake/qmake_yacc.cpp4
-rw-r--r--buildtools/lib/parsers/qmake/qmake_yacc.hpp2
-rw-r--r--buildtools/lib/parsers/qmake/qmakeast.cpp2
-rw-r--r--buildtools/lib/parsers/qmake/stack.hh2
-rw-r--r--buildtools/lib/parsers/qmake/tests/runner.cpp2
9 files changed, 10 insertions, 10 deletions
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", $<value>1.ascii());
- if ($<value>1.tqcontains("include"))
+ if ($<value>1.contains("include"))
{
IncludeAST *includeAST = new IncludeAST();
includeAST->projectName = $<value>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", $<value>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)