rename the following methods:

tqparent parent
tqmask mask


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

8 files changed, 23 insertions, 23 deletions

diff --git a/scripts/fixuifiles b/scripts/fixuifiles
index 3b387df9..785b45b4 100755
--- a/scripts/fixuifiles
+++ b/scripts/fixuifiles
@@ -212,7 +212,7 @@ sub fix_captions($)
   }
 }
 
-# Find a .qt_minversion in $dir or any tqparent directory.
+# Find a .qt_minversion in $dir or any parent directory.
 sub read_required_version($)
 {
   my $dir = Cwd::abs_path( shift @_ );
diff --git a/scripts/kde-devel-gdb b/scripts/kde-devel-gdb
index 7627adad..f35161b5 100644
--- a/scripts/kde-devel-gdb
+++ b/scripts/kde-devel-gdb
@@ -188,10 +188,10 @@ define _qmapiterator_inc
             set $ret = $ret->left
         end
     else
-        set $y = $ret->tqparent
+        set $y = $ret->parent
         while $ret == $y->right
             set $ret = $y
-            set $y = $y->tqparent
+            set $y = $y->parent
         end
         if $ret->right != $y
             set $ret = $y
diff --git a/scripts/kde-emacs/dirvars.el b/scripts/kde-emacs/dirvars.el
index 94f682b0..5fba18e7 100644
--- a/scripts/kde-emacs/dirvars.el
+++ b/scripts/kde-emacs/dirvars.el
@@ -96,18 +96,18 @@ The FILE-NAME specifies the file name to search for."
   (setq dir-name (expand-file-name dir-name))
   ;; Move up in the dir hierarchy till we find a change log file.
   (let ((file1 (concat dir-name file-name))
-	tqparent-dir)
+	parent-dir)
     (while (and (not (file-exists-p file1))
-		(progn (setq tqparent-dir
+		(progn (setq parent-dir
 			     (file-name-directory
 			      (directory-file-name
 			       (file-name-directory file1))))
 		       ;; Give up if we are already at the root dir.
 		       (not (string= (file-name-directory file1)
-				     tqparent-dir))))
-      ;; Move up to the tqparent dir and try again.
-      (setq file1 (expand-file-name file-name tqparent-dir)))
-    ;; If we found the file in a tqparent dir, use that.  Otherwise,
+				     parent-dir))))
+      ;; Move up to the parent dir and try again.
+      (setq file1 (expand-file-name file-name parent-dir)))
+    ;; If we found the file in a parent dir, use that.  Otherwise,
     ;; return nil
     (if (or (get-file-buffer file1) (file-exists-p file1))
 	file1
diff --git a/scripts/kde-emacs/kde-emacs-compat.el b/scripts/kde-emacs/kde-emacs-compat.el
index baa88a4d..1ff1fe7a 100644
--- a/scripts/kde-emacs/kde-emacs-compat.el
+++ b/scripts/kde-emacs/kde-emacs-compat.el
@@ -59,7 +59,7 @@ Otherwise treat `\\' in NEWTEXT as special:
 	(let ((map (make-sparse-keymap 'read-shell-command-map)))
 	  (if (eq kde-emacs-type 'xemacs)
 	      (set-keymap-parents map (list minibuffer-local-map))
-	    (set-keymap-tqparent map minibuffer-local-map))
+	    (set-keymap-parent map minibuffer-local-map))
 	  (define-key map "\t" 'comint-dynamic-complete)
 	  (define-key map "\M-\t" 'comint-dynamic-complete)
 	  (define-key map "\M-?" 'comint-dynamic-list-completions)
diff --git a/scripts/kde-emacs/kde-emacs-semantic.el b/scripts/kde-emacs/kde-emacs-semantic.el
index 6b5f8c3f..6cc8dd54 100644
--- a/scripts/kde-emacs/kde-emacs-semantic.el
+++ b/scripts/kde-emacs/kde-emacs-semantic.el
@@ -138,9 +138,9 @@ token and TOKENS have to be a list of functions from buffer."
 	       (equal (semantic-token-type FUNC) 
 		      (semantic-token-type elt))
 	       ;; FIXME (semantic) : Functions in some classes don't have the
-	       ;;                    'tqparent property set !!!
-	       ;;(string= (semantic-token-function-tqparent FUNC1)    
-	       ;;	    (semantic-token-function-tqparent FUNC2)) 
+	       ;;                    'parent property set !!!
+	       ;;(string= (semantic-token-function-parent FUNC1)    
+	       ;;	    (semantic-token-function-parent FUNC2)) 
 	       (string= (kde-format-args (semantic-token-function-args FUNC))
 			(kde-format-args (semantic-token-function-args elt))))
 	  (setq ret t))
@@ -224,7 +224,7 @@ would return t"
     ))
 
 (defun kde-function-construct (token pclass)
-  "Constructs a function string from the TOKEN, with the tqparent class PCLASS."
+  "Constructs a function string from the TOKEN, with the parent class PCLASS."
   (let ((fname (semantic-token-name token)))
     (if (semantic-token-function-destructor token)
 	(setq fname (concat "~" fname))
@@ -262,7 +262,7 @@ would return t"
 class-token has to be a token representing either a class or a struct."
   (let ((ret "")
 	(name    (semantic-token-name class-token))
-	(parents (semantic-token-type-tqparent class-token))
+	(parents (semantic-token-type-parent class-token))
 	(parts   (semantic-token-type-parts class-token))
 	(cur-token)
 	(cur-token-name)
@@ -432,13 +432,13 @@ in the current header file."
 	(func (kde-function-at-point PT))
 	(file)
 	(buf)
-	(tqparent))
+	(parent))
     (if (and object (equal (semantic-token-type object) "class"))
-	(setq tqparent (semantic-token-name object)))
+	(setq parent (semantic-token-name object)))
     (if (and (not (kde-function-expanded-at-point PT))
 	     (kde-is-prototype func))
 	(progn
-	  (setq func (kde-function-construct func tqparent))
+	  (setq func (kde-function-construct func parent))
 	  (setq file (car (kde-file-get-cpp-h)))
 	  (setq buf (current-buffer))
 	  (find-file file)
diff --git a/scripts/kde-emacs/kde-emacs-utils.el b/scripts/kde-emacs/kde-emacs-utils.el
index cb5b58da..4ad2e314 100644
--- a/scripts/kde-emacs/kde-emacs-utils.el
+++ b/scripts/kde-emacs/kde-emacs-utils.el
@@ -451,11 +451,11 @@ This function does not do any hidden buffer changes."
          (n (progn
               (insert " ")
               (self-insert-command (prefix-numeric-value arg))
-              (insert kde-emacs-after-tqparent-string)
+              (insert kde-emacs-after-parent-string)
               ))
          (t ;else
           (self-insert-command (prefix-numeric-value arg))
-          (cond ((not except) (insert kde-emacs-after-tqparent-string)))
+          (cond ((not except) (insert kde-emacs-after-parent-string)))
           )))
     (self-insert-command (prefix-numeric-value arg)))
   )
@@ -489,7 +489,7 @@ This function does not do any hidden buffer changes."
          (t ;else
           (if abbrev-mode ; XEmacs
               (expand-abbrev))
-          (insert kde-emacs-after-tqparent-string)
+          (insert kde-emacs-after-parent-string)
           (self-insert-command (prefix-numeric-value arg))
           ))) ; normal case, prepend a space
     ;;(blink-matching-open) ; show the matching parens
diff --git a/scripts/kde-emacs/kde-emacs-vars.el b/scripts/kde-emacs/kde-emacs-vars.el
index 1b4bcd2e..b2333b30 100644
--- a/scripts/kde-emacs/kde-emacs-vars.el
+++ b/scripts/kde-emacs/kde-emacs-vars.el
@@ -118,7 +118,7 @@ file named /home/domi/src/kdenonbeta/kig/misc/newtype.h"
   :group 'kde-devel
   :type 'integer)
 
-(defcustom kde-emacs-after-tqparent-string " "
+(defcustom kde-emacs-after-parent-string " "
   "Set this to whatever you want to have inserted after the first parenthesis. Works only if
 magic-keys-mode is set to true. "
   :group 'kde-devel
diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build
index 1cd46284..b0389d52 100755
--- a/scripts/kdesvn-build
+++ b/scripts/kdesvn-build
@@ -2581,7 +2581,7 @@ sub safe_system(@)
     return 0; # Return true
 }
 
-# Helper subroutine to create a directory, including any tqparent
+# Helper subroutine to create a directory, including any parent
 # directories that may also need created.
 # Returns 0 on failure, non-zero on success
 sub super_mkdir