4 files changed, 9 insertions, 9 deletions
diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp
index cec4cd52..d95c7860 100644
--- a/klinkstatus/src/engine/linkstatus.cpp
+++ b/klinkstatus/src/engine/linkstatus.cpp
@@ -90,7 +90,7 @@ void LinktqStatus::reset()
             redirection_ = 0;
         }
     }
-    Q_ASSERT(!tqparent_);
+    Q_ASSERT(!parent_);
     base_URI_ = "";
 }
 
@@ -100,7 +100,7 @@ TQString const LinktqStatus::toString() const
 
     if(!is_root_)
     {
-        Q_ASSERT(tqparent_);
+        Q_ASSERT(parent_);
         aux += i18n( "Parent: %1" ).tqarg( tqparent()->absoluteUrl().prettyURL() ) + "\n";
     }
     Q_ASSERT(!original_url_.isNull());
diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h
index 7ec26ca9..a74282f8 100644
--- a/klinkstatus/src/engine/linkstatus.h
+++ b/klinkstatus/src/engine/linkstatus.h
@@ -163,7 +163,7 @@ private:
     bool error_occurred_;
     bool is_redirection_;
     vector<Node*> tqchildren_nodes_;
-    LinktqStatus* tqparent_;
+    LinktqStatus* parent_;
     LinktqStatus* redirection_;
     bool checked_;
     bool only_check_header_;
diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h
index 4d3faf36..a29bcdcc 100644
--- a/klinkstatus/src/engine/linkstatus_impl.h
+++ b/klinkstatus/src/engine/linkstatus_impl.h
@@ -20,7 +20,7 @@
 
 inline LinktqStatus::LinktqStatus()
         : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
-        error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
+        error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
         node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
@@ -28,7 +28,7 @@ inline LinktqStatus::LinktqStatus()
 
 inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
         : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
-        error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
+        error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
         node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
@@ -38,7 +38,7 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
 
 inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent)
         : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
-        error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
+        error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
         node_(node), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
@@ -69,7 +69,7 @@ inline void LinktqStatus::setParent(LinktqStatus* tqparent)
 {
     Q_ASSERT(tqparent);
 
-    tqparent_ = tqparent;
+    parent_ = tqparent;
     addReferrer(tqparent->absoluteUrl());
 }
 
@@ -263,7 +263,7 @@ inline bool LinktqStatus::isLocalRestrict() const
 
 inline LinktqStatus const* LinktqStatus::tqparent() const
 {
-    return tqparent_;
+    return parent_;
 }
 
 inline TQString const& LinktqStatus::originalUrl() const
diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp
index 3a34d04c..02d85853 100644
--- a/klinkstatus/src/engine/searchmanager.cpp
+++ b/klinkstatus/src/engine/searchmanager.cpp
@@ -618,7 +618,7 @@ bool SearchManager::checkable(KURL const& url, LinktqStatus const& link_parent)
 
     if(!check_parent_dirs_)
     {
-        if(Url::tqparentDir(root_.absoluteUrl(), url))
+        if(Url::parentDir(root_.absoluteUrl(), url))
             return false;
     }
     if(!check_external_links_)