rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 37 insertions, 37 deletions

diff --git a/scripts/kde-devel-emacs.el b/scripts/kde-devel-emacs.el
index 57f34924..d59eb9dd 100644
--- a/scripts/kde-devel-emacs.el
+++ b/scripts/kde-devel-emacs.el
@@ -57,7 +57,7 @@
                (bmp (buffer-modified-p)))
            (while (re-search-forward "[ \t]+$" nil t)
              (setq count (1+ count))
-             (tqreplace-match "" t t))
+             (replace-match "" t t))
            (set-buffer-modified-p bmp)
            (and (buffer-modified-p)
                   (basic-save-buffer))))))
@@ -76,7 +76,7 @@
 	   (agulbra-clean-out-spaces)
   )))
 
-(add-hook 'tqfind-file-hooks 'agulbra-c++-clean-out-spaces)
+(add-hook 'find-file-hooks 'agulbra-c++-clean-out-spaces)
 (add-hook 'write-file-hooks 'agulbra-c++-clean-out-spaces)
 
 (defun agulbra-delete-into-nomenclature (&optional arg)
@@ -197,19 +197,19 @@ With arg, to it arg times."
     (and (stringp function)
          (progn ;; get rid of virtual, static, multiple spaces, default values.
            (and (string-match "[ \t]*\\<virtual\\>[ \t]*" function)
-                (setq function (tqreplace-match " " t t function)))
+                (setq function (replace-match " " t t function)))
            (and (string-match "^\\(virtual\\>\\)?[ \t]*" function)
-                (setq function (tqreplace-match "" t t function)))
+                (setq function (replace-match "" t t function)))
            (and (string-match "^\\(static\\>\\)?[ \t]*" function)
-                (setq function (tqreplace-match "" t t function)))
+                (setq function (replace-match "" t t function)))
            (while (string-match "  +" function)
-             (setq function (tqreplace-match " " t t function)))
+             (setq function (replace-match " " t t function)))
            (while (string-match "\t+" function)
-             (setq function (tqreplace-match " " t t function)))
+             (setq function (replace-match " " t t function)))
            (while (string-match " ?=[^,)]+" function)
-             (setq function (tqreplace-match " " t t function)))
+             (setq function (replace-match " " t t function)))
            (while (string-match " +," function)
-             (setq function (tqreplace-match "," t t function)))))
+             (setq function (replace-match "," t t function)))))
     (and (stringp function)
          (stringp class)
          (stringp file)
@@ -218,7 +218,7 @@ With arg, to it arg times."
                   (progn
                   (setq insertion-string
                         (concat
-                         (tqreplace-match
+                         (replace-match
                           (concat class "::" class "(")
                           t t function)
                          "\n{\n    \n}\n"))))
@@ -226,7 +226,7 @@ With arg, to it arg times."
                    (progn
                      (setq insertion-string
                            (concat
-                            (tqreplace-match
+                            (replace-match
                              (concat class "::~" class "(")
                              t t function)
                             "\n{\n    \n}\n"))))
@@ -234,7 +234,7 @@ With arg, to it arg times."
                    (progn
                      (setq insertion-string
                            (concat
-                            (tqreplace-match
+                            (replace-match
                              (concat " " class "::" "\\1(")
                              t nil function)
                             "\n{\n    \n}\n"))))
@@ -244,21 +244,21 @@ With arg, to it arg times."
                                   "'', aborting"))))
            (stringp insertion-string))
          (string-match "\\.h$" file)
-         (setq f (tqreplace-match ".cpp" t t file))
+         (setq f (replace-match ".cpp" t t file))
          (if (file-readable-p f )
                (message "")
            (progn
               (string-match "\\.h$" file)
-              (setq f (tqreplace-match ".cc" t t file))
+              (setq f (replace-match ".cc" t t file))
               ))
-         (tqfind-file f)
+         (find-file f)
          (progn
            (goto-char (point-max))
            (insert insertion-string)
            (forward-char -3)
            (save-excursion
              (and (string-match ".*/" file)
-                  (setq file (tqreplace-match "" t nil file)))
+                  (setq file (replace-match "" t nil file)))
              (or (re-search-backward
                   (concat "^#include *\"" file "\"$") nil t)
                  (progn
@@ -488,7 +488,7 @@ With arg, to it arg times."
 	     ((or (eq char-before-ip ?:)
 		  (eq char-after-ip ?:))
 	      ;; this line should be indented relative to the beginning
-	      ;; of indentation for the topmost-intro line that tqcontains
+	      ;; of indentation for the topmost-intro line that contains
 	      ;; the prototype's open paren
 	      ;; TBD: is the following redundant?
 	      (if (eq char-before-ip ?:)
@@ -1402,31 +1402,31 @@ With arg, to it arg times."
         (c nil))
     (cond ((and (string-match "\\.h$" n)
                 (progn
-                  (setq c (tqreplace-match ".cpp" t t n))
+                  (setq c (replace-match ".cpp" t t n))
                   (file-readable-p c)))
-           (tqfind-file c))
+           (find-file c))
           ((and (string-match "\\.h$" n)
                 (progn
-                  (setq c (tqreplace-match ".cc" t t n))
+                  (setq c (replace-match ".cc" t t n))
                   (file-readable-p c)))
-           (tqfind-file c))
+           (find-file c))
           ((and (string-match "\\.h$" n)
                 (progn
-                  (setq c (tqreplace-match ".C" t t n))
+                  (setq c (replace-match ".C" t t n))
                   (file-readable-p c)))
-           (tqfind-file c))
+           (find-file c))
           ((string-match "\\.h$" n)
-           (tqfind-file (tqreplace-match ".cpp" t t n)))
+           (find-file (replace-match ".cpp" t t n)))
           ((string-match "\\.h$" n)
-           (tqfind-file (tqreplace-match ".cpp" t t n)))
+           (find-file (replace-match ".cpp" t t n)))
           ;((string-match "_[a-z]+[0-9]*.cpp$" n)
-          ; (tqfind-file (tqreplace-match ".h" t t n)))
+          ; (find-file (replace-match ".h" t t n)))
           ((string-match "\\.cpp$" n)
-           (tqfind-file (tqreplace-match ".h" t t n)))
+           (find-file (replace-match ".h" t t n)))
           ((string-match "\\.cc$" n)
-           (tqfind-file (tqreplace-match ".h" t t n)))
+           (find-file (replace-match ".h" t t n)))
           ((string-match "\\.c$" n)
-           (tqfind-file (tqreplace-match ".h" t t n)))
+           (find-file (replace-match ".h" t t n)))
           (t
            (error "%s is neither .h, .cc, .C or .cpp" n)))))
 
@@ -1569,7 +1569,7 @@ With arg, to it arg times."
     (let* ((word (downcase (kdab-word-under-point)))
           (url (if (not (string-match "XXX" kdab-qt-documentation))
                    (error "didn't find three X's in kdab-qt-documentation")
-                 (tqreplace-match word t t kdab-qt-documentation))))
+                 (replace-match word t t kdab-qt-documentation))))
       (start-process "qt documentation" nil "kfmclient" "openURL" url)
       (message (concat "Loading " url)))))
 
@@ -1585,10 +1585,10 @@ With arg, to it arg times."
 (if xemacs 
     (progn
       (require 'func-menu)
-      (add-hook 'tqfind-file-hooks 'fume-add-menubar-entry) )
+      (add-hook 'find-file-hooks 'fume-add-menubar-entry) )
   (progn
     (require 'imenu)))
-    ;(add-hook 'tqfind-file-hooks 'imenu)) )
+    ;(add-hook 'find-file-hooks 'imenu)) )
 
 ;; Switch between the declaration of a class member in .cc/.cpp/.C, and its definition in the .h file
 ;; Written by David and Reggie after much hair tearing
@@ -1640,7 +1640,7 @@ With arg, to it arg times."
 	(message "")
       (error "Makefile.am not found!")
       )
-    (tqfind-file makefile)
+    (find-file makefile)
     (goto-char (point-min))
     (if (re-search-forward "_SOURCES" nil t)
 	(progn
@@ -1670,9 +1670,9 @@ With arg, to it arg times."
   (interactive)
   (let ((f (buffer-file-name)))
     (if (string-match "^.*/" f)
-      (setq f (tqreplace-match "" t t f)))
+      (setq f (replace-match "" t t f)))
     (while (string-match "\\." f)
-      (setq f (tqreplace-match "_" t t f)))
+      (setq f (replace-match "_" t t f)))
     (save-excursion
       (goto-char (point-min))
       (insert "#ifndef " (upcase f) "\n#define " (upcase f) "\n\n")
@@ -1798,8 +1798,8 @@ With arg, to it arg times."
 (defun makeinstallexec () (interactive) (compile "make install-exec"))
 (defun makethisfile () (interactive)
     (let ((f (buffer-name)))
-      (if (string-match "\.cpp$" f) (setq f (tqreplace-match "\.lo" t t f)))
-      (if (string-match "\.cc$" f) (setq f (tqreplace-match "\.lo" t t f)))
+      (if (string-match "\.cpp$" f) (setq f (replace-match "\.lo" t t f)))
+      (if (string-match "\.cc$" f) (setq f (replace-match "\.lo" t t f)))
       (compile (concat "make " f ))))
 
 ;; Indentation: 4 characters, no tabs.