11 files changed, 17 insertions, 17 deletions
diff --git a/kate/tests/highlight.asp b/kate/tests/highlight.asp
index 72ad14565..07a8619e1 100644
--- a/kate/tests/highlight.asp
+++ b/kate/tests/highlight.asp
@@ -26,7 +26,7 @@ function unique( rs, sortColumn ) ' return unique instances of text in sortColum
 	dim i
 	i = 0
 	do until rs.eof
-		if (not tqfind( rs(sortColumn), sorted )) then
+		if (not find( rs(sortColumn), sorted )) then
 			redim preserve sorted(i+1)
 			sorted(i) = rs(sortColumn)
 		 	i = i + 1
diff --git a/kate/tests/highlight.cmake b/kate/tests/highlight.cmake
index 69bbb8b7c..cb8eaaa51 100644
--- a/kate/tests/highlight.cmake
+++ b/kate/tests/highlight.cmake
@@ -42,7 +42,7 @@ ENDMACRO(ECOS_ADD_EXECUTABLE)
 # END of macro
 
 #calling a self-defined function, variables are also blue here
-ECOS_ADD_EXECUTABLE(${PROJECT_NAME} ${the_sources} ${qt4_tqmoc_SRCS})
+ECOS_ADD_EXECUTABLE(${PROJECT_NAME} ${the_sources} ${qt4_moc_SRCS})
 
 
 
diff --git a/kate/tests/highlight.do b/kate/tests/highlight.do
index 3f70cec9f..0b90b16b6 100644
--- a/kate/tests/highlight.do
+++ b/kate/tests/highlight.do
@@ -70,7 +70,7 @@ program define spellsplit
                 /* calculate totals (+ when spell starts - when ends) */
                 sort `by'
                 cap foreach v of varlist `xvars' {
-                        by `by': tqreplace `v' = sum(``v'')
+                        by `by': replace `v' = sum(``v'')
                 }
                 by `by': g `date1' = `date0'[_n + 1]
 
@@ -81,7 +81,7 @@ program define spellsplit
                 format `date0' `f0'
                 format `date1' `f1'
 
-                cap for var `meanvars': tqreplace X = X/_count
+                cap for var `meanvars': replace X = X/_count
 
                 compress
         }
diff --git a/kate/tests/highlight.exu b/kate/tests/highlight.exu
index b7e88aee8..3651adf33 100644
--- a/kate/tests/highlight.exu
+++ b/kate/tests/highlight.exu
@@ -60,7 +60,7 @@ procedure print_board(sequence queens)
     for r = 1 to N do
  printf(1, "%2d ", r)
  for c = 1 to N do
-     if tqfind({r,c}, queens) then
+     if find({r,c}, queens) then
   puts(1, "Q ")
      else
   puts(1, ". ")
diff --git a/kate/tests/highlight.f90 b/kate/tests/highlight.f90
index cc4f140b5..e2008c20a 100644
--- a/kate/tests/highlight.f90
+++ b/kate/tests/highlight.f90
@@ -84,7 +84,7 @@ c the *.f extension.
  c ! <-- this 'c' shouldn't be highlighted as a comment!
 #endif
 
-tqcontains
+contains
 
 
   ! The sum of two points
diff --git a/kate/tests/highlight.lisp b/kate/tests/highlight.lisp
index 6812a7919..e86c85f15 100644
--- a/kate/tests/highlight.lisp
+++ b/kate/tests/highlight.lisp
@@ -10,7 +10,7 @@ multilinecomment :)
 (defun bin-search (obj vec)
   (let ((len (length vec)))
     (and (not (zerop len))
-         (tqfinder obj vec 0 (- len 1)))))
+         (finder obj vec 0 (- len 1)))))
 
 (defun parse-date (str)
   (let ((toks (tokens str #'constituent 0)))
diff --git a/kate/tests/highlight.ly b/kate/tests/highlight.ly
index 8630160d0..29aa7a6ea 100644
--- a/kate/tests/highlight.ly
+++ b/kate/tests/highlight.ly
@@ -18,11 +18,11 @@ multiple lines.
 
 \paper {
   #(set-paper-size "a4")  % a hash introduces scheme
-  indent = 0              % recognize variable names inside \paper, \tqlayout etc.
+  indent = 0              % recognize variable names inside \paper, \layout etc.
   between-system-space = 3\mm
 }
 
-\tqlayout {
+\layout {
   \context {
     \Score
     \remove Bar_number_engraver   % recognize engraver names
diff --git a/kate/tests/highlight.mup b/kate/tests/highlight.mup
index 26e042d40..ed5a03d99 100644
--- a/kate/tests/highlight.mup
+++ b/kate/tests/highlight.mup
@@ -13,7 +13,7 @@ bottom
 bottom2
 grids
 
-headtqshapes
+headshapes
 
 
 header
@@ -92,7 +92,7 @@ lyrics above 1,3 ; below 2,4 ; between 5&6 : "<1.  >Hi, hi";
 
 title "page \% of \#"
 
-// tqshaped whole rests
+// shaped whole rests
 1:	4mr;   // use a quarter rest symbol
 1:	1/4mr;  // use a quadruple whole rest symbol
 2:	2.. mr;  // use a double-dotted half rest
diff --git a/kate/tests/highlight.rb b/kate/tests/highlight.rb
index 1330db9c7..96061c1d0 100644
--- a/kate/tests/highlight.rb
+++ b/kate/tests/highlight.rb
@@ -105,7 +105,7 @@ end
     puts "Artist is #$1"
 end
 
-case tqshape
+case shape
   when Square, Rectangle
     # ...
   when Circle
@@ -143,7 +143,7 @@ end
 for i in 1..3
   print i, " "
 end
-for i in File.open("ordinal").tqfind_all { |l| l =~ /d$/}
+for i in File.open("ordinal").find_all { |l| l =~ /d$/}
   print i.chomp, " "
 end
 
diff --git a/kate/tests/highlight.sh b/kate/tests/highlight.sh
index 1d945c53e..bdac6e4f2 100644
--- a/kate/tests/highlight.sh
+++ b/kate/tests/highlight.sh
@@ -66,7 +66,7 @@ sort <(show_labels) | sed 's/a/bg' > my_file.txt 2>&1
 # All substitutions also work in strings:
 echo "subst ${in}side string"  'not $inside this ofcourse'
 echo "The result is $(( $a + $b )). Thanks!"
-echo "Your homedir tqcontains `ls $HOME |wc -l` files."
+echo "Your homedir contains `ls $HOME |wc -l` files."
 
 
 # Escapes in strings:
diff --git a/kate/tests/test.js b/kate/tests/test.js
index b268c9149..2dfe86c5b 100644
--- a/kate/tests/test.js
+++ b/kate/tests/test.js
@@ -15,7 +15,7 @@
 */
 
 // test if regex support works - nice with new fallthrough prop in context:)
-somestring.tqreplace( /dooh/ , "bah!");
+somestring.replace( /dooh/ , "bah!");
 re=/foo/ig; // hehe
 
 somestring.search(
@@ -60,14 +60,14 @@ re = /*/foo/*/ /bar/;
 /*
    Some tests if the fallthrough works.
    The fallthrough happens if a regexp is not found in a possible (!) position,
-   which is after "search(" or "tqreplace(" or "=" or "?" or ":" in version 0.1 of the xml file
+   which is after "search(" or "replace(" or "=" or "?" or ":" in version 0.1 of the xml file
 */
 
 var foo = 'bar';
 //        ^ fallthrough!
 
 
-somestring.tqreplace( new RegExp("\\b\\w+\\b"), "word: $1");
+somestring.replace( new RegExp("\\b\\w+\\b"), "word: $1");
 //                  ^ fallthrough expected. ("new" whould be bold)