rename the following methods:

tqparent parent
tqmask mask


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

7 files changed, 24 insertions, 24 deletions

diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp
index 7efe5a45..bf54a59b 100644
--- a/klinkstatus/src/engine/linkchecker.cpp
+++ b/klinkstatus/src/engine/linkchecker.cpp
@@ -44,8 +44,8 @@
 int LinkChecker::count_ = 0;
 
 LinkChecker::LinkChecker(LinktqStatus* linkstatus, int time_out,
-                         TQObject *tqparent, const char *name)
-        : TQObject(tqparent, name), search_manager_(0), 
+                         TQObject *parent, const char *name)
+        : TQObject(parent, name), search_manager_(0), 
         linkstatus_(linkstatus), t_job_(0), time_out_(time_out), checker_(0), document_charset_(), 
         redirection_(false), header_checked_(false), finnished_(false), 
         parsing_(false), is_charset_checked_(false), has_defined_charset_(false)
@@ -84,8 +84,8 @@ void LinkChecker::check()
 
     t_job_->addMetaData("PropagateHttpHeader", "true"); // to have the http header
 
-    if (linkstatus_->tqparent()) {
-        t_job_->addMetaData("referrer", linkstatus_->tqparent()->absoluteUrl().prettyURL());
+    if (linkstatus_->parent()) {
+        t_job_->addMetaData("referrer", linkstatus_->parent()->absoluteUrl().prettyURL());
     }
 
     if(search_manager_->sendIdentification())
@@ -550,7 +550,7 @@ void LinkChecker::checkRef()
     int i_ref = -1;
 
     if(linktqStatus()->originalUrl().startsWith("#"))
-        ls_parent = linktqStatus()->tqparent();
+        ls_parent = linktqStatus()->parent();
 
     else
     {
diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h
index 74cf9eb9..9b13d210 100644
--- a/klinkstatus/src/engine/linkchecker.h
+++ b/klinkstatus/src/engine/linkchecker.h
@@ -43,7 +43,7 @@ class LinkChecker : public TQObject
   TQ_OBJECT
 public:
     LinkChecker(LinktqStatus* linkstatus, int time_out = 50,
-                TQObject *tqparent = 0, const char *name = 0);
+                TQObject *parent = 0, const char *name = 0);
     ~LinkChecker();
 
     //virtual void run();
diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp
index d95c7860..ac70b73e 100644
--- a/klinkstatus/src/engine/linkstatus.cpp
+++ b/klinkstatus/src/engine/linkstatus.cpp
@@ -101,7 +101,7 @@ TQString const LinktqStatus::toString() const
     if(!is_root_)
     {
         Q_ASSERT(parent_);
-        aux += i18n( "Parent: %1" ).tqarg( tqparent()->absoluteUrl().prettyURL() ) + "\n";
+        aux += i18n( "Parent: %1" ).tqarg( parent()->absoluteUrl().prettyURL() ) + "\n";
     }
     Q_ASSERT(!original_url_.isNull());
 
diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h
index a74282f8..dddf320e 100644
--- a/klinkstatus/src/engine/linkstatus.h
+++ b/klinkstatus/src/engine/linkstatus.h
@@ -61,7 +61,7 @@ public:
     
     LinktqStatus();
     LinktqStatus(KURL const& absolute_url);
-    LinktqStatus(Node* node, LinktqStatus* tqparent);
+    LinktqStatus(Node* node, LinktqStatus* parent);
     ~LinktqStatus();
 
     void save(TQDomElement& element) const;
@@ -70,7 +70,7 @@ public:
     void setRootUrl(KURL const& url);
     void settqStatus(tqStatus status);
     void setDepth(uint depth);
-    void setParent(LinktqStatus* tqparent);
+    void setParent(LinktqStatus* parent);
     void setOriginalUrl(TQString const& url_original);
     void setLabel(TQString const& label);
     void setAbsoluteUrl(KURL const& url_absoluto);
@@ -106,7 +106,7 @@ public:
     uint depth() const;
     bool local() const;         // linkstatus.paradigma.co.pt == paradigma.co.pt
     bool isLocalRestrict() const; // linkstatus.paradigma.co.pt != paradigma.co.pt
-    LinktqStatus const* tqparent() const;
+    LinktqStatus const* parent() const;
     TQString const& originalUrl() const;
     TQString const& label() const;
     KURL const& absoluteUrl() const;
@@ -142,7 +142,7 @@ public:
 private:
 
     /**
-       Load some atributes in function of his tqparent node.
+       Load some atributes in function of his parent node.
     */
     void loadNode();
 
diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h
index a29bcdcc..3b1b3062 100644
--- a/klinkstatus/src/engine/linkstatus_impl.h
+++ b/klinkstatus/src/engine/linkstatus_impl.h
@@ -36,7 +36,7 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
     setAbsoluteUrl(absolute_url);
 }
 
-inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent)
+inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent)
         : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
         error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
@@ -45,9 +45,9 @@ inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent)
 {
     loadNode();
 
-    setDepth(tqparent->depth() + 1);
-    setParent(tqparent);
-    setRootUrl(tqparent->rootUrl());
+    setDepth(parent->depth() + 1);
+    setParent(parent);
+    setRootUrl(parent->rootUrl());
 }
 
 inline void LinktqStatus::setRootUrl(KURL const& url)
@@ -65,12 +65,12 @@ inline void LinktqStatus::setDepth(uint depth)
     depth_ = depth;
 }
 
-inline void LinktqStatus::setParent(LinktqStatus* tqparent)
+inline void LinktqStatus::setParent(LinktqStatus* parent)
 {
-    Q_ASSERT(tqparent);
+    Q_ASSERT(parent);
 
-    parent_ = tqparent;
-    addReferrer(tqparent->absoluteUrl());
+    parent_ = parent;
+    addReferrer(parent->absoluteUrl());
 }
 
 inline void LinktqStatus::setAbsoluteUrl(KURL const& url_absoluto)
@@ -176,7 +176,7 @@ inline void LinktqStatus::setBaseURI(KURL const& base_url)
     if(!base_url.isValid())
     {
         kdWarning(23100) <<  "base url not valid: " << endl
-        << "tqparent: " << tqparent()->absoluteUrl().prettyURL() << endl
+        << "parent: " << parent()->absoluteUrl().prettyURL() << endl
         << "url: " << absoluteUrl().prettyURL() << endl
         << "base url resolved: " << base_url.prettyURL() << endl;
     }
@@ -261,7 +261,7 @@ inline bool LinktqStatus::isLocalRestrict() const
     return is_local_restrict_;
 }
 
-inline LinktqStatus const* LinktqStatus::tqparent() const
+inline LinktqStatus const* LinktqStatus::parent() const
 {
     return parent_;
 }
diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp
index 82c7350a..6ba9a1ba 100644
--- a/klinkstatus/src/engine/searchmanager.cpp
+++ b/klinkstatus/src/engine/searchmanager.cpp
@@ -37,8 +37,8 @@
 
 
 SearchManager::SearchManager(int max_simultaneous_connections, int time_out,
-                             TQObject *tqparent, const char *name)
-        : TQObject(tqparent, name),
+                             TQObject *parent, const char *name)
+        : TQObject(parent, name),
         max_simultaneous_connections_(max_simultaneous_connections), has_document_root_(false), 
         depth_(-1), current_depth_(0), external_domain_depth_(0),
         current_node_(0), current_index_(0), links_being_checked_(0),
diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h
index e977eae4..bee819da 100644
--- a/klinkstatus/src/engine/searchmanager.h
+++ b/klinkstatus/src/engine/searchmanager.h
@@ -55,7 +55,7 @@ public:
     };
 
     SearchManager(int max_simultaneous_connections = 3, int time_out = 50,
-                  TQObject *tqparent = 0, const char *name = 0);
+                  TQObject *parent = 0, const char *name = 0);
     ~SearchManager();
     
     TQString toXML() const;