Rename a number of old tq methods that are no longer tq specific

31 files changed, 519 insertions, 519 deletions

diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index 62150888..3a775cf4 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -106,7 +106,7 @@ void ActionManager::initPart(KLinkStatusPart* part)
     // *************** Settings menu *********************
 
     (void) new KAction(i18n("Configure KLinkStatus..."), "configure",
-                       0, d->part, TQT_SLOT(slotConfigureKLinktqStatus()),
+                       0, d->part, TQT_SLOT(slotConfigureKLinkStatus()),
                        TQT_TQOBJECT(d->actionCollection), "configure_klinkstatus");
 
     // *************** Help menu *********************
diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp
index bf54a59b..5667735d 100644
--- a/klinkstatus/src/engine/linkchecker.cpp
+++ b/klinkstatus/src/engine/linkchecker.cpp
@@ -24,7 +24,7 @@
 
 #include <tqstring.h>
 #include <tqtimer.h>
-#include <tqtextcodec.h> 
+#include <textcodec.h> 
 #include <tqcstring.h>
 
 #include <kio/netaccess.h>
@@ -43,7 +43,7 @@
 
 int LinkChecker::count_ = 0;
 
-LinkChecker::LinkChecker(LinktqStatus* linkstatus, int time_out,
+LinkChecker::LinkChecker(LinkStatus* linkstatus, int time_out,
                          TQObject *parent, const char *name)
         : TQObject(parent, name), search_manager_(0), 
         linkstatus_(linkstatus), t_job_(0), time_out_(time_out), checker_(0), document_charset_(), 
@@ -69,7 +69,7 @@ void LinkChecker::check()
 {
     Q_ASSERT(!finnished_);
 
-    KURL url(linktqStatus()->absoluteUrl());
+    KURL url(linkStatus()->absoluteUrl());
     Q_ASSERT(url.isValid());
 
     if(url.hasRef()) {
@@ -128,7 +128,7 @@ void LinkChecker::slotTimeOut()
             linkstatus_->setErrorOccurred(true);
             linkstatus_->setChecked(true);
             linkstatus_->setError(i18n("Timeout"));
-            linkstatus_->settqStatus(LinktqStatus::TIMEOUT);
+            linkstatus_->setStatus(LinkStatus::TIMEOUT);
 
             killJob();
             finnish();
@@ -146,9 +146,9 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type)
 
     Q_ASSERT(t_job_);
 
-    LinktqStatus* ls = 0;
+    LinkStatus* ls = 0;
 /*    if(redirection_)
-        ls = linktqStatus()->redirection();
+        ls = linkStatus()->redirection();
     else*/
         ls = linkstatus_;
     Q_ASSERT(ls);
@@ -168,7 +168,7 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type)
             if(!url.protocol().startsWith("http"))
             {
                 ls->setStatusText("OK");
-                ls->settqStatus(LinktqStatus::SUCCESSFULL);
+                ls->setStatus(LinkStatus::SUCCESSFULL);
                 
                 killJob();                
                 finnish();
@@ -186,7 +186,7 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type)
                 {
                     //kdDebug(23100) <<  "mimetype: " << type << endl;
                     ls->setStatusText("OK");
-                    ls->settqStatus(LinktqStatus::SUCCESSFULL);
+                    ls->setStatus(LinkStatus::SUCCESSFULL);
                     
                     killJob();                    
                     finnish();
@@ -206,9 +206,9 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data)
     
     Q_ASSERT(t_job_);
     
-    LinktqStatus* ls = 0;
+    LinkStatus* ls = 0;
 /*    if(redirection_)
-        ls = linktqStatus()->redirection();
+        ls = linkStatus()->redirection();
     else*/
         ls = linkstatus_;
     Q_ASSERT(ls);
@@ -235,7 +235,7 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data)
                 if(header_checked_)
                 {
                     killJob();
-                    linkstatus_->settqStatus(getHttptqStatus());
+                    linkstatus_->setStatus(getHttpStatus());
                     linkstatus_->setChecked(true);
                     finnish();
                     return;
@@ -253,7 +253,7 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data)
                 if(ls->mimeType() != "text/html" && header_checked_)
                 {
                     //kdDebug(23100) <<  "mimetype of " << ls->absoluteUrl().prettyURL() << ": " << ls->mimeType() << endl;
-                    ls->settqStatus(getHttptqStatus());
+                    ls->setStatus(getHttpStatus());
                     killJob();
                     finnish(); // if finnish is called before kill what you get is a segfault, don't know why
                     return;
@@ -262,7 +262,7 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data)
                 {
                     //kdDebug(23100) <<  "ERROR PAGE" << endl;
                     ls->setIsErrorPage(true);
-                    ls->settqStatus(getHttptqStatus());
+                    ls->setStatus(getHttpStatus());
                     killJob();
                     finnish();
                     return;
@@ -339,9 +339,9 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
         return;
     }
 
-    LinktqStatus* ls = 0;
+    LinkStatus* ls = 0;
     if(redirection_)
-        ls = linktqStatus()->redirection();
+        ls = linkStatus()->redirection();
     else
         ls = linkstatus_;
     Q_ASSERT(ls);
@@ -366,15 +366,15 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
         if(job->error() == KIO::ERR_IS_DIRECTORY)
         {
             ls->setStatusText("OK");
-            ls->settqStatus(LinktqStatus::SUCCESSFULL);
+            ls->setStatus(LinkStatus::SUCCESSFULL);
         }
         else
         {
             ls->setErrorOccurred(true);
             if(job->error() == KIO::ERR_SERVER_TIMEOUT)
-                ls->settqStatus(LinktqStatus::TIMEOUT);
+                ls->setStatus(LinkStatus::TIMEOUT);
             else
-                ls->settqStatus(LinktqStatus::BROKEN);
+                ls->setStatus(LinkStatus::BROKEN);
 
             if(job->errorString().isEmpty())
                 kdWarning(23100) << "\n\nError string is empty, error = " << job->error() << "\n\n\n";
@@ -389,7 +389,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
     {
         if(!ls->absoluteUrl().protocol().startsWith("http")) {
             ls->setStatusText("OK");
-            ls->settqStatus(LinktqStatus::SUCCESSFULL);
+            ls->setStatus(LinkStatus::SUCCESSFULL);
            }
         else
         {
@@ -402,7 +402,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
             }
             Q_ASSERT(header_checked_);
             
-            ls->settqStatus(getHttptqStatus());
+            ls->setStatus(getHttpStatus());
         }
 
         if(!doc_html_.isNull() && !doc_html_.isEmpty())
@@ -449,10 +449,10 @@ bool LinkChecker::processRedirection(KURL const& toUrl)
     linkstatus_->setHttpHeader(getHttpHeader(t_job_, false));
     linkstatus_->setIsRedirection(true);
     linkstatus_->setStatusText("redirection");
-    linkstatus_->settqStatus(LinktqStatus::HTTP_REDIRECTION);
+    linkstatus_->setStatus(LinkStatus::HTTP_REDIRECTION);
     linkstatus_->setChecked(true);
     
-    LinktqStatus* ls_red = new LinktqStatus(*linkstatus_);
+    LinkStatus* ls_red = new LinkStatus(*linkstatus_);
     ls_red->setAbsoluteUrl(toUrl);
     ls_red->setRootUrl(linkstatus_->rootUrl());
 
@@ -534,23 +534,23 @@ HttpResponseHeader LinkChecker::getHttpHeader(KIO::Job* /*job*/, bool remember_c
 
 void LinkChecker::checkRef()
 {
-    KURL url(linktqStatus()->absoluteUrl());
+    KURL url(linkStatus()->absoluteUrl());
     Q_ASSERT(url.hasRef());
     
     TQString ref = url.ref();
     if(ref == "" || ref == "top") {
         linkstatus_->setStatusText("OK");
-        linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL);
+        linkstatus_->setStatus(LinkStatus::SUCCESSFULL);
         finnish();
         return;
     }
 
     TQString url_base;
-    LinktqStatus const* ls_parent = 0;
+    LinkStatus const* ls_parent = 0;
     int i_ref = -1;
 
-    if(linktqStatus()->originalUrl().startsWith("#"))
-        ls_parent = linktqStatus()->parent();
+    if(linkStatus()->originalUrl().startsWith("#"))
+        ls_parent = linkStatus()->parent();
 
     else
     {
@@ -560,7 +560,7 @@ void LinkChecker::checkRef()
 
         Q_ASSERT(search_manager_);
 
-        ls_parent = search_manager_->linktqStatus(url_base);
+        ls_parent = search_manager_->linkStatus(url_base);
     }
 
     if(ls_parent)
@@ -603,22 +603,22 @@ void LinkChecker::checkRef(KURL const& url)
         search_manager_->addHtmlPart(url_string, html_part);
     }
 
-    if(hasAnchor(html_part, linktqStatus()->absoluteUrl().ref()))
+    if(hasAnchor(html_part, linkStatus()->absoluteUrl().ref()))
     {
         linkstatus_->setStatusText("OK");
-        linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL);
+        linkstatus_->setStatus(LinkStatus::SUCCESSFULL);
     }
     else
     {
         linkstatus_->setErrorOccurred(true);
         linkstatus_->setError(i18n( "Link destination not found." ));
-        linkstatus_->settqStatus(LinktqStatus::BROKEN);
+        linkstatus_->setStatus(LinkStatus::BROKEN);
     }
 
     finnish();
 }
 
-void LinkChecker::checkRef(LinktqStatus const* linkstatus_parent)
+void LinkChecker::checkRef(LinkStatus const* linkstatus_parent)
 {
     Q_ASSERT(search_manager_);
 
@@ -638,16 +638,16 @@ void LinkChecker::checkRef(LinktqStatus const* linkstatus_parent)
         search_manager_->addHtmlPart(url_string, html_part);
     }
 
-    if(hasAnchor(html_part, linktqStatus()->absoluteUrl().ref()))
+    if(hasAnchor(html_part, linkStatus()->absoluteUrl().ref()))
     {
         linkstatus_->setStatusText("OK");
-        linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL);
+        linkstatus_->setStatus(LinkStatus::SUCCESSFULL);
     }
     else
     {
         linkstatus_->setErrorOccurred(true);
         linkstatus_->setError(i18n( "Link destination not found." ));
-        linkstatus_->settqStatus(LinktqStatus::BROKEN);
+        linkstatus_->setStatus(LinkStatus::BROKEN);
     }
 
     finnish();
@@ -684,20 +684,20 @@ void LinkChecker::killJob()
     aux->kill(true); // quietly   
 }
 
-LinktqStatus::tqStatus LinkChecker::getHttptqStatus() const
+LinkStatus::Status LinkChecker::getHttpStatus() const
 {
     TQString status_code = TQString::number(linkstatus_->httpHeader().statusCode());
     
     if(status_code[0] == '2')
-        return LinktqStatus::SUCCESSFULL;
+        return LinkStatus::SUCCESSFULL;
     else if(status_code[0] == '3')
-        return LinktqStatus::HTTP_REDIRECTION;
+        return LinkStatus::HTTP_REDIRECTION;
     else if(status_code[0] == '4')
-        return LinktqStatus::HTTP_CLIENT_ERROR;
+        return LinkStatus::HTTP_CLIENT_ERROR;
     else if(status_code[0] == '5')
-        return LinktqStatus::HTTP_SERVER_ERROR;
+        return LinkStatus::HTTP_SERVER_ERROR;
     else
-        return LinktqStatus::UNDETERMINED;
+        return LinkStatus::UNDETERMINED;
 }
 
 #include "linkchecker.moc"
diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h
index 7eca50c8..86b01bb3 100644
--- a/klinkstatus/src/engine/linkchecker.h
+++ b/klinkstatus/src/engine/linkchecker.h
@@ -42,7 +42,7 @@ class LinkChecker : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    LinkChecker(LinktqStatus* linkstatus, int time_out = 50,
+    LinkChecker(LinkStatus* linkstatus, int time_out = 50,
                 TQObject *parent = 0, const char *name = 0);
     ~LinkChecker();
 
@@ -50,13 +50,13 @@ public:
     void check();
     void setSearchManager(SearchManager* search_manager);
 
-    LinktqStatus const* linktqStatus() const;
+    LinkStatus const* linkStatus() const;
 
     static bool hasAnchor(KHTMLPart* html_part, TQString const& anchor);
 
 signals:
 
-    void transactionFinished(const LinktqStatus * linkstatus,
+    void transactionFinished(const LinkStatus * linkstatus,
                              LinkChecker * checker);
     void jobFinnished(LinkChecker * checker);
 
@@ -76,8 +76,8 @@ protected:
 
 private:
     
-    LinktqStatus::tqStatus getHttptqStatus() const;
-    void checkRef(LinktqStatus const* linkstatus_parent);
+    LinkStatus::Status getHttpStatus() const;
+    void checkRef(LinkStatus const* linkstatus_parent);
     void checkRef(KURL const& url);
     void killJob();    
     /**
@@ -91,7 +91,7 @@ private:
 private:
 
     SearchManager* search_manager_;
-    LinktqStatus* const linkstatus_;
+    LinkStatus* const linkstatus_;
     KIO::TransferJob* t_job_;
     int time_out_;
     LinkChecker* checker_;
@@ -120,7 +120,7 @@ private:
     static int count_; // debug attribute that counts how many links were checked
 };
 
-inline LinktqStatus const* LinkChecker::linktqStatus() const
+inline LinkStatus const* LinkChecker::linkStatus() const
 {
     return linkstatus_;
 }
diff --git a/klinkstatus/src/engine/linkfilter.cpp b/klinkstatus/src/engine/linkfilter.cpp
index a626b5f8..27612600 100644
--- a/klinkstatus/src/engine/linkfilter.cpp
+++ b/klinkstatus/src/engine/linkfilter.cpp
@@ -22,7 +22,7 @@
 #include "linkstatus.h"
 
 
-LinkMatcher::LinkMatcher(TQString const& text, ResultView::tqStatus status)
+LinkMatcher::LinkMatcher(TQString const& text, ResultView::Status status)
     : m_text(text), m_status(status)
 {
 }
@@ -31,7 +31,7 @@ LinkMatcher::~LinkMatcher()
 {
 }
 
-bool LinkMatcher::matches(LinktqStatus const& link ) const
+bool LinkMatcher::matches(LinkStatus const& link ) const
 {
 /*    kdDebug() << link.absoluteUrl().url() << endl;
     kdDebug() << link.label() << endl;
@@ -39,7 +39,7 @@ bool LinkMatcher::matches(LinktqStatus const& link ) const
     kdDebug() << link.label().contains(m_text) << endl;
     */
     return (link.absoluteUrl().url().contains(m_text, false) || link.label().contains(m_text, false)) &&
-            ResultView::displayableWithtqStatus(&link, m_status);
+            ResultView::displayableWithStatus(&link, m_status);
 }
 
 
diff --git a/klinkstatus/src/engine/linkfilter.h b/klinkstatus/src/engine/linkfilter.h
index a47a37c8..0b5af1f6 100644
--- a/klinkstatus/src/engine/linkfilter.h
+++ b/klinkstatus/src/engine/linkfilter.h
@@ -28,22 +28,22 @@
 class LinkMatcher
 {
 public:
-    LinkMatcher(TQString const& text, ResultView::tqStatus status);
+    LinkMatcher(TQString const& text, ResultView::Status status);
     ~LinkMatcher();
 
-    bool matches(LinktqStatus const& link) const;
+    bool matches(LinkStatus const& link) const;
 
     void setText(const TQString& text) { m_text = text; }
     TQString text() const { return m_text; }
 
-    void settqStatus(ResultView::tqStatus status) { m_status = status; }
-    ResultView::tqStatus status() const { return m_status; }
+    void setStatus(ResultView::Status status) { m_status = status; }
+    ResultView::Status status() const { return m_status; }
     
     bool nullFilter() const { return m_text.isEmpty() && m_status == ResultView::none; }
         
 private:
     TQString m_text;
-    ResultView::tqStatus m_status;
+    ResultView::Status m_status;
 };
 
 #endif
diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp
index e41bba75..bf5986f5 100644
--- a/klinkstatus/src/engine/linkstatus.cpp
+++ b/klinkstatus/src/engine/linkstatus.cpp
@@ -28,20 +28,20 @@
 #include <tqdom.h>
 
 
-LinktqStatus::~LinktqStatus()
+LinkStatus::~LinkStatus()
 {
     //kdDebug(23100) <<  "|";
 
-    for(uint i = 0; i != tqchildren_nodes_.size(); ++i)
+    for(uint i = 0; i != children_nodes_.size(); ++i)
     {
-        if(tqchildren_nodes_[i])
+        if(children_nodes_[i])
         {
-            delete tqchildren_nodes_[i];
-            tqchildren_nodes_[i] = 0;
+            delete children_nodes_[i];
+            children_nodes_[i] = 0;
         }
     }
 
-    tqchildren_nodes_.clear();
+    children_nodes_.clear();
 
     if(isRedirection())
     {
@@ -53,7 +53,7 @@ LinktqStatus::~LinktqStatus()
     }
 }
 
-void LinktqStatus::reset()
+void LinkStatus::reset()
 {
     depth_ = -1;
     external_domain_depth_ = -1;
@@ -71,16 +71,16 @@ void LinktqStatus::reset()
     http_header_ = HttpResponseHeader();
     error_ = "";
 
-    for(uint i = 0; i != tqchildren_nodes_.size(); ++i)
+    for(uint i = 0; i != children_nodes_.size(); ++i)
     {
-        if(tqchildren_nodes_[i])
+        if(children_nodes_[i])
         {
-            delete tqchildren_nodes_[i];
-            tqchildren_nodes_[i] = 0;
+            delete children_nodes_[i];
+            children_nodes_[i] = 0;
         }
     }
 
-    tqchildren_nodes_.clear();
+    children_nodes_.clear();
 
     if(isRedirection())
     {
@@ -94,27 +94,27 @@ void LinktqStatus::reset()
     base_URI_ = "";
 }
 
-TQString const LinktqStatus::toString() const
+TQString const LinkStatus::toString() const
 {
     TQString aux;
 
     if(!is_root_)
     {
         Q_ASSERT(parent_);
-        aux += i18n( "Parent: %1" ).tqarg( parent()->absoluteUrl().prettyURL() ) + "\n";
+        aux += i18n( "Parent: %1" ).arg( parent()->absoluteUrl().prettyURL() ) + "\n";
     }
     Q_ASSERT(!original_url_.isNull());
 
-    aux += i18n( "URL: %1" ).tqarg( absoluteUrl().prettyURL() ) + "\n";
-    aux += i18n( "Original URL: %1" ).tqarg( originalUrl() ) + "\n";
+    aux += i18n( "URL: %1" ).arg( absoluteUrl().prettyURL() ) + "\n";
+    aux += i18n( "Original URL: %1" ).arg( originalUrl() ) + "\n";
     if(node())
-        aux += i18n( "Node: %1" ).tqarg( node()->content() ) + "\n";
+        aux += i18n( "Node: %1" ).arg( node()->content() ) + "\n";
 
     return aux;
 }
 
 
-LinktqStatus* LinktqStatus::lastRedirection(LinktqStatus* ls)
+LinkStatus* LinkStatus::lastRedirection(LinkStatus* ls)
 {
     if(ls->isRedirection())
         if(ls->redirection())
@@ -125,7 +125,7 @@ LinktqStatus* LinktqStatus::lastRedirection(LinktqStatus* ls)
         return ls;
 }
 
-void LinktqStatus::loadNode()
+void LinkStatus::loadNode()
 {
     Q_ASSERT(node_);
 
@@ -136,32 +136,32 @@ void LinktqStatus::loadNode()
     {
         setErrorOccurred(true);
         setError(i18n( "Malformed" ));
-        settqStatus(LinktqStatus::MALFORMED);
+        setStatus(LinkStatus::MALFORMED);
         kdDebug(23100) <<  "Malformed:" << endl;
         kdDebug(23100) <<  "Node: " << node()->content() << endl;
         //kdDebug(23100) <<  toString() << endl; // probable segfault
     }
 }
 
-bool LinktqStatus::malformed() const // don't inline please (#include "node.h")
+bool LinkStatus::malformed() const // don't inline please (#include "node.h")
 {
     return (malformed_ || node_->malformed());
 }
 
-void LinktqStatus::setChildrenNodes(vector<Node*> const& nodes) // don't inline please (#include "node.h")
+void LinkStatus::setChildrenNodes(vector<Node*> const& nodes) // don't inline please (#include "node.h")
 {
-    tqchildren_nodes_.reserve(nodes.size());
-    tqchildren_nodes_ = nodes;
+    children_nodes_.reserve(nodes.size());
+    children_nodes_ = nodes;
 }
 
-void LinktqStatus::setMalformed(bool flag)
+void LinkStatus::setMalformed(bool flag)
 {
     malformed_ = flag;
     if(flag)
     {
         setErrorOccurred(true);
         setError(i18n( "Malformed" ));
-        settqStatus(LinktqStatus::MALFORMED);
+        setStatus(LinkStatus::MALFORMED);
         kdDebug(23100) <<  "Malformed!" << endl;
         kdDebug(23100) <<  node()->content() << endl;
         //kdDebug(23100) <<  toString() << endl; // probable segfault
@@ -170,11 +170,11 @@ void LinktqStatus::setMalformed(bool flag)
     {
         setErrorOccurred(false);
         setError("");
-        settqStatus(LinktqStatus::UNDETERMINED);
+        setStatus(LinkStatus::UNDETERMINED);
     }
 }
 
-void LinktqStatus::save(TQDomElement& element) const
+void LinkStatus::save(TQDomElement& element) const
 {
     TQDomElement child_element = element.ownerDocument().createElement("link");
 
@@ -186,7 +186,7 @@ void LinktqStatus::save(TQDomElement& element) const
     // <status>
     tmp_1 = element.ownerDocument().createElement("status");
     tmp_1.setAttribute("broken", 
-                       ResultView::displayableWithtqStatus(this, ResultView::bad) ? 
+                       ResultView::displayableWithStatus(this, ResultView::bad) ? 
                                "true" : "false");
     tmp_1.appendChild(element.ownerDocument().createTextNode(statusText()));
     child_element.appendChild(tmp_1);
diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h
index 3880791f..ac49801f 100644
--- a/klinkstatus/src/engine/linkstatus.h
+++ b/klinkstatus/src/engine/linkstatus.h
@@ -43,11 +43,11 @@ using namespace std;
 
 class Node;
 
-class LinktqStatus
+class LinkStatus
 {
 public:
 
-    enum tqStatus {
+    enum Status {
         UNDETERMINED,
         SUCCESSFULL,
         BROKEN,
@@ -59,29 +59,29 @@ public:
         MALFORMED
     };
     
-    LinktqStatus();
-    LinktqStatus(KURL const& absolute_url);
-    LinktqStatus(Node* node, LinktqStatus* parent);
-    ~LinktqStatus();
+    LinkStatus();
+    LinkStatus(KURL const& absolute_url);
+    LinkStatus(Node* node, LinkStatus* parent);
+    ~LinkStatus();
 
     void save(TQDomElement& element) const;
     
     void reset();
     void setRootUrl(KURL const& url);
-    void settqStatus(tqStatus status);
+    void setStatus(Status status);
     void setDepth(uint depth);
-    void setParent(LinktqStatus* parent);
+    void setParent(LinkStatus* parent);
     void setOriginalUrl(TQString const& url_original);
     void setLabel(TQString const& label);
     void setAbsoluteUrl(KURL const& url_absoluto);
     void setDocHtml(TQString const& doc_html);
     void setHttpHeader(HttpResponseHeader const& cabecalho_http);
-    void setStatusText(TQString const& statusText); // FIXME Legacy. This should be eliminated in favor of LinktqStatus::tqStatus
+    void setStatusText(TQString const& statusText); // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status
     void setError(TQString const& error);
     void setIsRoot(bool flag);
     void setErrorOccurred(bool houve_error);
     void setIsRedirection(bool e_redirection);
-    void setRedirection(LinktqStatus* redirection);
+    void setRedirection(LinkStatus* redirection);
     void setNode(Node* node);
     void setChildrenNodes(vector<Node*> const& nodes);
     void addChildNode(Node* node);
@@ -102,25 +102,25 @@ public:
     void addReferrer(KURL const& url);
 
     KURL const& rootUrl() const;
-    tqStatus const& status() const;
+    Status const& status() const;
     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* parent() const;
+    LinkStatus const* parent() const;
     TQString const& originalUrl() const;
     TQString const& label() const;
     KURL const& absoluteUrl() const;
     TQString const& docHtml() const;
     HttpResponseHeader const& httpHeader() const;
     HttpResponseHeader& httpHeader();
-    TQString statusText() const; // FIXME Legacy. This should be eliminated in favor of LinktqStatus::tqStatus
+    TQString statusText() const; // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status
     TQString const& error() const;
     bool isRoot() const;
     bool errorOccurred() const;
     bool isRedirection() const;
-    LinktqStatus* redirection() const;
+    LinkStatus* redirection() const;
     Node* node() const;
-    vector<Node*> const& tqchildrenNodes() const;
+    vector<Node*> const& childrenNodes() const;
     TQString const toString() const;
     bool checked() const;
     int externalDomainDepth() const;
@@ -137,7 +137,7 @@ public:
     TreeViewItem* treeViewItem() const;
     TQValueVector<KURL> const& referrers() const;
 
-    static LinktqStatus* lastRedirection(LinktqStatus* ls);
+    static LinkStatus* lastRedirection(LinkStatus* ls);
 
 private:
 
@@ -149,7 +149,7 @@ private:
 private:
 
     KURL root_url_; // The URL which made the search start
-    tqStatus status_;
+    Status status_;
     int depth_;
     int external_domain_depth_; // Para se poder escolher explorar domains diferentes ate n depth
     TQString original_url_;
@@ -157,14 +157,14 @@ private:
     KURL absolute_url_;
     TQString doc_html_;
     HttpResponseHeader http_header_;
-    TQString status_text_; // FIXME Legacy. This should be eliminated in favor of LinktqStatus::tqStatus
+    TQString status_text_; // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status
     TQString error_;
     bool is_root_;
     bool error_occurred_;
     bool is_redirection_;
-    vector<Node*> tqchildren_nodes_;
-    LinktqStatus* parent_;
-    LinktqStatus* redirection_;
+    vector<Node*> children_nodes_;
+    LinkStatus* parent_;
+    LinkStatus* redirection_;
     bool checked_;
     bool only_check_header_;
     bool malformed_;
diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h
index f8d6bfd5..4a2e4099 100644
--- a/klinkstatus/src/engine/linkstatus_impl.h
+++ b/klinkstatus/src/engine/linkstatus_impl.h
@@ -18,16 +18,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-inline LinktqStatus::LinktqStatus()
-        : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
+inline LinkStatus::LinkStatus()
+        : status_(LinkStatus::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),
         node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
 {}
 
-inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
-        : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
+inline LinkStatus::LinkStatus(KURL const& absolute_url)
+        : status_(LinkStatus::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),
         node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
@@ -36,8 +36,8 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
     setAbsoluteUrl(absolute_url);
 }
 
-inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent)
-        : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
+inline LinkStatus::LinkStatus(Node* node, LinkStatus* parent)
+        : status_(LinkStatus::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),
         node_(node), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
@@ -50,22 +50,22 @@ inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent)
     setRootUrl(parent->rootUrl());
 }
 
-inline void LinktqStatus::setRootUrl(KURL const& url)
+inline void LinkStatus::setRootUrl(KURL const& url)
 {
     root_url_ = url;
 }
 
-inline void LinktqStatus::settqStatus(tqStatus status)
+inline void LinkStatus::setStatus(Status status)
 {
     status_ = status;
 }
 
-inline void LinktqStatus::setDepth(uint depth)
+inline void LinkStatus::setDepth(uint depth)
 {
     depth_ = depth;
 }
 
-inline void LinktqStatus::setParent(LinktqStatus* parent)
+inline void LinkStatus::setParent(LinkStatus* parent)
 {
     Q_ASSERT(parent);
 
@@ -73,105 +73,105 @@ inline void LinktqStatus::setParent(LinktqStatus* parent)
     addReferrer(parent->absoluteUrl());
 }
 
-inline void LinktqStatus::setAbsoluteUrl(KURL const& url_absoluto)
+inline void LinkStatus::setAbsoluteUrl(KURL const& url_absoluto)
 {
     absolute_url_ = url_absoluto;
 }
 
-inline void LinktqStatus::setOriginalUrl(TQString const& url_original)
+inline void LinkStatus::setOriginalUrl(TQString const& url_original)
 {
     original_url_ = url_original;
 }
 
-inline void LinktqStatus::setLabel(TQString const& label)
+inline void LinkStatus::setLabel(TQString const& label)
 {
     label_ = label;
 }
 
-inline void LinktqStatus::setDocHtml(TQString const& doc_html)
+inline void LinkStatus::setDocHtml(TQString const& doc_html)
 {
     Q_ASSERT(!doc_html.isEmpty());
     doc_html_ = doc_html;
 }
 
-inline void LinktqStatus::setHttpHeader(HttpResponseHeader const& cabecalho_http)
+inline void LinkStatus::setHttpHeader(HttpResponseHeader const& cabecalho_http)
 {
     http_header_ = cabecalho_http;
 }
 
-inline void LinktqStatus::setStatusText(TQString const& status)
+inline void LinkStatus::setStatusText(TQString const& status)
 {
     Q_ASSERT(!status.isEmpty());
     status_text_ = status;
 }
 
-inline void LinktqStatus::setError(TQString const& error)
+inline void LinkStatus::setError(TQString const& error)
 {
     Q_ASSERT(!error.isEmpty());
     error_ = error;
 }
 
-inline void LinktqStatus::setErrorOccurred(bool houve_error)
+inline void LinkStatus::setErrorOccurred(bool houve_error)
 {
     error_occurred_ = houve_error;
 }
 
-inline void LinktqStatus::setIsRoot(bool flag)
+inline void LinkStatus::setIsRoot(bool flag)
 {
     is_root_ = flag;
     label_ = i18n("ROOT");
 }
 
-inline void LinktqStatus::setRedirection(LinktqStatus* redirection)
+inline void LinkStatus::setRedirection(LinkStatus* redirection)
 {
     Q_ASSERT(redirection != NULL);
     Q_ASSERT(isRedirection());
     redirection_ = redirection;
 }
 
-inline void LinktqStatus::setIsRedirection(bool e_redirection)
+inline void LinkStatus::setIsRedirection(bool e_redirection)
 {
     is_redirection_ = e_redirection;
 }
 
-inline void LinktqStatus::addChildNode(Node* node)
+inline void LinkStatus::addChildNode(Node* node)
 {
-    tqchildren_nodes_.push_back(node);
+    children_nodes_.push_back(node);
 }
 
-inline void LinktqStatus::reserveMemoryForChildrenNodes(int n)
+inline void LinkStatus::reserveMemoryForChildrenNodes(int n)
 {
     Q_ASSERT(n > 0);
-    tqchildren_nodes_.reserve(n);
+    children_nodes_.reserve(n);
 }
 
-inline void LinktqStatus::setChecked(bool flag)
+inline void LinkStatus::setChecked(bool flag)
 {
     checked_ = flag;
 }
 
-inline void LinktqStatus::setExternalDomainDepth(int p)
+inline void LinkStatus::setExternalDomainDepth(int p)
 {
     Q_ASSERT(p >= -1);
     external_domain_depth_ = p;
 }
 
-inline void LinktqStatus::setOnlyCheckHeader(bool flag)
+inline void LinkStatus::setOnlyCheckHeader(bool flag)
 {
     only_check_header_= flag;
 }
 
-inline void LinktqStatus::setHasBaseURI(bool flag)
+inline void LinkStatus::setHasBaseURI(bool flag)
 {
     has_base_URI_ = flag;
 }
 
-inline void LinktqStatus::setHasHtmlDocTitle(bool flag)
+inline void LinkStatus::setHasHtmlDocTitle(bool flag)
 {
     has_html_doc_title_ = flag;
 }
 
-inline void LinktqStatus::setBaseURI(KURL const& base_url)
+inline void LinkStatus::setBaseURI(KURL const& base_url)
 {
     if(!base_url.isValid())
     {
@@ -186,7 +186,7 @@ inline void LinktqStatus::setBaseURI(KURL const& base_url)
     base_URI_ = base_url;
 }
 
-inline void LinktqStatus::setHtmlDocTitle(TQString const& title)
+inline void LinkStatus::setHtmlDocTitle(TQString const& title)
 {
     if(title.isNull() || title.isEmpty())
     {
@@ -199,34 +199,34 @@ inline void LinktqStatus::setHtmlDocTitle(TQString const& title)
     html_doc_title_ = title;
 }
 
-inline void LinktqStatus::setIgnored(bool flag)
+inline void LinkStatus::setIgnored(bool flag)
 {
     ignored_ = flag;
 }
 
-inline void LinktqStatus::setMimeType(TQString const& mimetype)
+inline void LinkStatus::setMimeType(TQString const& mimetype)
 {
     Q_ASSERT(!mimetype.isNull() && !mimetype.isEmpty());
     mimetype_ = mimetype;
 }
 
-inline void LinktqStatus::setIsErrorPage(bool flag)
+inline void LinkStatus::setIsErrorPage(bool flag)
 {
     is_error_page_ = flag;
 }
 
-inline void LinktqStatus::setIsLocalRestrict(bool flag)
+inline void LinkStatus::setIsLocalRestrict(bool flag)
 {
     is_local_restrict_ = flag;
 }
 
-inline void LinktqStatus::setTreeViewItem(TreeViewItem* tree_view_item)
+inline void LinkStatus::setTreeViewItem(TreeViewItem* tree_view_item)
 {
     Q_ASSERT(tree_view_item);
     tree_view_item_ = tree_view_item;
 }
 
-inline void LinktqStatus::addReferrer(KURL const& url)
+inline void LinkStatus::addReferrer(KURL const& url)
 {
     Q_ASSERT(url.isValid());
 
@@ -236,67 +236,67 @@ inline void LinktqStatus::addReferrer(KURL const& url)
 
 
 
-inline KURL const& LinktqStatus::rootUrl() const
+inline KURL const& LinkStatus::rootUrl() const
 {
     return root_url_;
 }
 
-inline LinktqStatus::tqStatus const& LinktqStatus::status() const
+inline LinkStatus::Status const& LinkStatus::status() const
 {
     return status_;
 }
 
-inline uint LinktqStatus::depth() const
+inline uint LinkStatus::depth() const
 {
     return depth_;
 }
 
-inline bool LinktqStatus::local() const
+inline bool LinkStatus::local() const
 {
     return external_domain_depth_ == -1;
 }
 
-inline bool LinktqStatus::isLocalRestrict() const
+inline bool LinkStatus::isLocalRestrict() const
 {
     return is_local_restrict_;
 }
 
-inline LinktqStatus const* LinktqStatus::parent() const
+inline LinkStatus const* LinkStatus::parent() const
 {
     return parent_;
 }
 
-inline TQString const& LinktqStatus::originalUrl() const
+inline TQString const& LinkStatus::originalUrl() const
 {
     return original_url_;
 }
 
-inline TQString const& LinktqStatus::label() const
+inline TQString const& LinkStatus::label() const
 {
     return label_;
 }
 
-inline KURL const& LinktqStatus::absoluteUrl() const
+inline KURL const& LinkStatus::absoluteUrl() const
 {
     return absolute_url_;
 }
 
-inline TQString const& LinktqStatus::docHtml() const
+inline TQString const& LinkStatus::docHtml() const
 {
     return doc_html_;
 }
 
-inline HttpResponseHeader const& LinktqStatus::httpHeader() const
+inline HttpResponseHeader const& LinkStatus::httpHeader() const
 {
     return http_header_;
 }
 
-inline HttpResponseHeader& LinktqStatus::httpHeader()
+inline HttpResponseHeader& LinkStatus::httpHeader()
 {
     return http_header_;
 }
 
-inline TQString LinktqStatus::statusText() const
+inline TQString LinkStatus::statusText() const
 {
     if(errorOccurred())
         return error();
@@ -314,103 +314,103 @@ inline TQString LinktqStatus::statusText() const
     }
 }
 
-inline TQString const& LinktqStatus::error() const
+inline TQString const& LinkStatus::error() const
 {
     return error_;
 }
 
-inline bool LinktqStatus::isRoot() const
+inline bool LinkStatus::isRoot() const
 {
     return is_root_;
 }
 
-inline bool LinktqStatus::errorOccurred() const
+inline bool LinkStatus::errorOccurred() const
 {
     return error_occurred_;
 }
 
-inline bool LinktqStatus::isRedirection() const
+inline bool LinkStatus::isRedirection() const
 {
     return is_redirection_;
 }
 
-inline LinktqStatus* LinktqStatus::redirection() const
+inline LinkStatus* LinkStatus::redirection() const
 {
     Q_ASSERT(isRedirection());
     
     return redirection_;
 }
 
-inline Node* LinktqStatus::node() const
+inline Node* LinkStatus::node() const
 {
     //Q_ASSERT(node_);
     return node_;
 }
 
-inline vector<Node*> const& LinktqStatus::tqchildrenNodes() const
+inline vector<Node*> const& LinkStatus::childrenNodes() const
 {
-    return tqchildren_nodes_;
+    return children_nodes_;
 }
 
-inline bool LinktqStatus::checked() const
+inline bool LinkStatus::checked() const
 {
     return checked_;
 }
 
-inline int LinktqStatus::externalDomainDepth() const
+inline int LinkStatus::externalDomainDepth() const
 {
     return external_domain_depth_;
 }
 
-inline bool LinktqStatus::onlyCheckHeader() const
+inline bool LinkStatus::onlyCheckHeader() const
 {
     return only_check_header_;
 }
 
-inline bool LinktqStatus::hasBaseURI() const
+inline bool LinkStatus::hasBaseURI() const
 {
     return has_base_URI_;
 }
 
-inline bool LinktqStatus::hasHtmlDocTitle() const
+inline bool LinkStatus::hasHtmlDocTitle() const
 {
     return has_html_doc_title_;
 }
 
-inline KURL const& LinktqStatus::baseURI() const
+inline KURL const& LinkStatus::baseURI() const
 {
     Q_ASSERT(hasBaseURI());
     return base_URI_;
 }
 
-inline TQString const& LinktqStatus::htmlDocTitle() const
+inline TQString const& LinkStatus::htmlDocTitle() const
 {
     Q_ASSERT(has_html_doc_title_);
     return html_doc_title_;
 }
 
-inline bool LinktqStatus::ignored() const
+inline bool LinkStatus::ignored() const
 {
     return ignored_;
 }
 
-inline TQString LinktqStatus::mimeType() const
+inline TQString LinkStatus::mimeType() const
 {
     Q_ASSERT(!mimetype_.isNull());
     return mimetype_;
 }
 
-inline bool LinktqStatus::isErrorPage() const
+inline bool LinkStatus::isErrorPage() const
 {
     return is_error_page_;
 }
 
-inline TreeViewItem* LinktqStatus::treeViewItem() const
+inline TreeViewItem* LinkStatus::treeViewItem() const
 {
     return tree_view_item_;
 }
 
-inline TQValueVector<KURL> const& LinktqStatus::referrers() const
+inline TQValueVector<KURL> const& LinkStatus::referrers() const
 {
     return referrers_;
 }
diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp
index 6ca04b3a..591b3acd 100644
--- a/klinkstatus/src/engine/searchmanager.cpp
+++ b/klinkstatus/src/engine/searchmanager.cpp
@@ -191,8 +191,8 @@ void SearchManager::checkRoot()
     LinkChecker* checker = new LinkChecker(&root_, time_out_, this, "link_checker");
     checker->setSearchManager(this);
 
-    connect(checker, TQT_SIGNAL(transactionFinished(const LinktqStatus *, LinkChecker *)),
-            this, TQT_SLOT(slotRootChecked(const LinktqStatus *, LinkChecker *)));
+    connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)),
+            this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *)));
     /*
         connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)),
                 this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *)));
@@ -200,11 +200,11 @@ void SearchManager::checkRoot()
     checker->check();
 }
 
-void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * checker)
+void SearchManager::slotRootChecked(const LinkStatus * link, LinkChecker * checker)
 {
     kdDebug(23100) <<  "SearchManager::slotRootChecked:" << endl;
     kdDebug(23100) <<  link->absoluteUrl().url() << " -> " << 
-            LinktqStatus::lastRedirection(&root_)->absoluteUrl().url() << endl;
+            LinkStatus::lastRedirection(&root_)->absoluteUrl().url() << endl;
 
     Q_ASSERT(checked_links_ == 0);
     Q_ASSERT(search_results_.size() == 0);
@@ -217,11 +217,11 @@ void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * che
     {
         current_depth_ = 1;
 
-        vector<LinktqStatus*> no = tqchildren(LinktqStatus::lastRedirection(&root_));
+        vector<LinkStatus*> no = children(LinkStatus::lastRedirection(&root_));
 
         emit signalLinksToCheckTotalSteps(no.size());
 
-        vector< vector<LinktqStatus*> > nivel;
+        vector< vector<LinkStatus*> > nivel;
         nivel.push_back(no);
 
         search_results_.push_back(nivel);
@@ -255,14 +255,14 @@ void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * che
     checker = 0;
 }
 
-vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
+vector<LinkStatus*> SearchManager::children(LinkStatus* link)
 {
-    vector<LinktqStatus*> tqchildren;
+    vector<LinkStatus*> children;
 
     if(!link || link->absoluteUrl().hasRef())
-        return tqchildren;
+        return children;
 
-    vector<Node*> const& nodes = link->tqchildrenNodes();
+    vector<Node*> const& nodes = link->childrenNodes();
 
     int count = 0;
     for(uint i = 0; i != nodes.size(); ++i)
@@ -278,12 +278,12 @@ vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
 
         if( (node->isLink() &&
                 checkable(url, *link) &&
-                !Url::existUrl(url, tqchildren) &&
+                !Url::existUrl(url, children) &&
                 !node->url().isEmpty())
                 ||
                 node->malformed() )
         {
-            LinktqStatus* ls = new LinktqStatus(node, link);
+            LinkStatus* ls = new LinkStatus(node, link);
             ls->setAbsoluteUrl(url);
 
             if(localDomain(ls->absoluteUrl()))
@@ -310,7 +310,7 @@ vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
             }
             Q_ASSERT(link->externalDomainDepth() <= external_domain_depth_);
 
-            tqchildren.push_back(ls);
+            children.push_back(ls);
         }
         if(count == 50)
         {
@@ -319,7 +319,7 @@ vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
         }
     }
 
-    return tqchildren;
+    return children;
 }
 
 bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const
@@ -331,7 +331,7 @@ bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const
         for(uint j = 0; j != search_results_[i].size(); ++j)
             for(uint l = 0; l != (search_results_[i])[j].size(); ++l)
             {
-                LinktqStatus* tmp = search_results_[i][j][l];
+                LinkStatus* tmp = search_results_[i][j][l];
                 Q_ASSERT(tmp);                
                 if(tmp->absoluteUrl() == url)
                 { // URL exists
@@ -352,7 +352,7 @@ bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const
     return false;
 }
 
-LinktqStatus const* SearchManager::linktqStatus(TQString const& s_url) const
+LinkStatus const* SearchManager::linkStatus(TQString const& s_url) const
 {
     Q_ASSERT(!s_url.isEmpty());
 
@@ -366,7 +366,7 @@ LinktqStatus const* SearchManager::linktqStatus(TQString const& s_url) const
             {
                 ++count;
 
-                LinktqStatus* ls = search_results_[i][j][l];
+                LinkStatus* ls = search_results_[i][j][l];
                 Q_ASSERT(ls);
                 if(ls->absoluteUrl().url() == s_url && ls->checked())
                     return ls;
@@ -402,7 +402,7 @@ void SearchManager::continueSearch()
 {
     Q_ASSERT(!links_being_checked_);
 
-    vector<LinktqStatus*> const& no = nodeToAnalize();
+    vector<LinkStatus*> const& no = nodeToAnalize();
 
     if((uint)current_index_ < no.size())
         checkVectorLinks(no);
@@ -442,7 +442,7 @@ void SearchManager::continueSearch()
     }
 }
 
-vector<LinktqStatus*> const& SearchManager::nodeToAnalize() const
+vector<LinkStatus*> const& SearchManager::nodeToAnalize() const
 {
     Q_ASSERT( (uint)current_depth_ == search_results_.size() );
     Q_ASSERT( (uint)current_node_ < (search_results_[current_depth_ - 1]).size() );
@@ -450,14 +450,14 @@ vector<LinktqStatus*> const& SearchManager::nodeToAnalize() const
     return (search_results_[current_depth_ - 1])[current_node_];
 }
 
-void SearchManager::checkVectorLinks(vector<LinktqStatus*> const& links)
+void SearchManager::checkVectorLinks(vector<LinkStatus*> const& links)
 {
     checkLinksSimultaneously(chooseLinks(links));
 }
 
-vector<LinktqStatus*> SearchManager::chooseLinks(vector<LinktqStatus*> const& links)
+vector<LinkStatus*> SearchManager::chooseLinks(vector<LinkStatus*> const& links)
 {
-    vector<LinktqStatus*> escolha;
+    vector<LinkStatus*> escolha;
     for(int i = 0; i != max_simultaneous_connections_; ++i)
     {
         if((uint)current_index_ < links.size())
@@ -466,7 +466,7 @@ vector<LinktqStatus*> SearchManager::chooseLinks(vector<LinktqStatus*> const& li
     return escolha;
 }
 
-void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
+void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links)
 {
     Q_ASSERT(finished_connections_ <= max_simultaneous_connections_);
     finished_connections_ = 0;
@@ -480,7 +480,7 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
 
     for(uint i = 0; i != links.size(); ++i)
     {
-        LinktqStatus* ls(links[i]);
+        LinkStatus* ls(links[i]);
         Q_ASSERT(ls);
 
         TQString protocol = ls->absoluteUrl().protocol();
@@ -491,7 +491,7 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
         if(ls->malformed())
         {
             Q_ASSERT(ls->errorOccurred());
-            Q_ASSERT(ls->status() == LinktqStatus::MALFORMED);
+            Q_ASSERT(ls->status() == LinkStatus::MALFORMED);
 
             ls->setChecked(true);
             slotLinkChecked(ls, 0);
@@ -503,7 +503,7 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
             ls->setIgnored(true);
             ls->setErrorOccurred(true);
             ls->setError(i18n( "Javascript not supported" ));
-            ls->settqStatus(LinktqStatus::NOT_SUPPORTED);
+            ls->setStatus(LinkStatus::NOT_SUPPORTED);
             ls->setChecked(true);
             slotLinkChecked(ls, 0);
         }
@@ -513,8 +513,8 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
                     ++ignored_links_;
                     ls->setIgnored(true);
                     ls->setErrorOccurred(true);
-                    ls->setError(i18n("Protocol %1 not supported").tqarg(protocol));
-                    ls->settqStatus(LinktqStatus::MALFORMED);
+                    ls->setError(i18n("Protocol %1 not supported").arg(protocol));
+                    ls->setStatus(LinkStatus::MALFORMED);
                     ls->setChecked(true);
                     slotLinkChecked(ls, 0);
                 }
@@ -524,8 +524,8 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
             LinkChecker* checker = new LinkChecker(ls, time_out_, this, "link_checker");
             checker->setSearchManager(this);
 
-            connect(checker, TQT_SIGNAL(transactionFinished(const LinktqStatus *, LinkChecker *)),
-                    this, TQT_SLOT(slotLinkChecked(const LinktqStatus *, LinkChecker *)));
+            connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)),
+                    this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *)));
             /*
                         connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)),
                                 this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *)));
@@ -535,11 +535,11 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
     }
 }
 
-void SearchManager::slotLinkChecked(const LinktqStatus * link, LinkChecker * checker)
+void SearchManager::slotLinkChecked(const LinkStatus * link, LinkChecker * checker)
 {
     kdDebug(23100) <<  "SearchManager::slotLinkChecked:" << endl;
 //     kdDebug(23100) <<  link->absoluteUrl().url() << " -> " << 
-//             LinktqStatus::lastRedirection((const_cast<LinktqStatus*> (link)))->absoluteUrl().url() << endl;
+//             LinkStatus::lastRedirection((const_cast<LinkStatus*> (link)))->absoluteUrl().url() << endl;
 
     Q_ASSERT(link);
     emit signalLinkChecked(link, checker);
@@ -569,8 +569,8 @@ void SearchManager::slotLinkChecked(const LinktqStatus * link, LinkChecker * che
 
 void SearchManager::addLevel()
 {
-    search_results_.push_back(vector< vector <LinktqStatus*> >());
-    vector< vector <LinktqStatus*> >& ultimo_nivel(search_results_[search_results_.size() - 2]);
+    search_results_.push_back(vector< vector <LinkStatus*> >());
+    vector< vector <LinkStatus*> >& ultimo_nivel(search_results_[search_results_.size() - 2]);
 
     number_of_level_links_ = 0;
     number_of_links_to_check_ = 0;
@@ -591,7 +591,7 @@ void SearchManager::addLevel()
         uint end_sub1 = ultimo_nivel[i].size();
         for(uint j = 0; j != end_sub1; ++j) // links
         {
-            vector <LinktqStatus*> f(tqchildren( LinktqStatus::lastRedirection(((ultimo_nivel[i])[j])) ));
+            vector <LinkStatus*> f(children( LinkStatus::lastRedirection(((ultimo_nivel[i])[j])) ));
             if(f.size() != 0)
             {
                 search_results_[search_results_.size() - 1].push_back(f);
@@ -608,7 +608,7 @@ void SearchManager::addLevel()
         emit signalLinksToCheckTotalSteps(number_of_links_to_check_);
 }
 
-bool SearchManager::checkable(KURL const& url, LinktqStatus const& link_parent) const
+bool SearchManager::checkable(KURL const& url, LinkStatus const& link_parent) const
 {
     if(existUrl(url, link_parent.absoluteUrl()))
         return false;
@@ -638,7 +638,7 @@ bool SearchManager::checkable(KURL const& url, LinktqStatus const& link_parent)
     return true;
 }
 
-bool SearchManager::checkableByDomain(KURL const& url, LinktqStatus const& link_parent) const
+bool SearchManager::checkableByDomain(KURL const& url, LinkStatus const& link_parent) const
 {
     bool result = false;
     if(localDomain(url))
@@ -781,7 +781,7 @@ bool SearchManager::generalDomain() const
     }
 }
 
-bool SearchManager::onlyCheckHeader(LinktqStatus* ls) const
+bool SearchManager::onlyCheckHeader(LinkStatus* ls) const
 {
     if(search_mode_ == depth)
         return current_depth_ == depth_;
@@ -805,7 +805,7 @@ void SearchManager::slotLinkCheckerFinnished(LinkChecker * checker)
     kdDebug(23100) <<  "deleting linkchecker" << endl;
 
     Q_ASSERT(checker);
-    //Q_ASSERT(checker->linktqStatus()->checked());
+    //Q_ASSERT(checker->linkStatus()->checked());
 
     delete checker;
     checker = 0;
@@ -891,7 +891,7 @@ void SearchManager::save(TQDomElement& element) const
         {
             for(uint l = 0; l != (search_results_[i])[j].size(); ++l)
             {
-                LinktqStatus* ls = ((search_results_[i])[j])[l];
+                LinkStatus* ls = ((search_results_[i])[j])[l];
                 if(ls->checked())
                     ls->save(child_element);
             }
diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h
index d2414cfe..39628917 100644
--- a/klinkstatus/src/engine/searchmanager.h
+++ b/klinkstatus/src/engine/searchmanager.h
@@ -95,12 +95,12 @@ public:
     SearchMode const& searchMode() const;
     bool checkRegularExpressions() const { return check_regular_expressions_; }
     bool existUrl(KURL const& url, KURL const& url_parent) const;
-    LinktqStatus const* linktqStatus(TQString const& s_url) const;
+    LinkStatus const* linkStatus(TQString const& s_url) const;
     int checkedLinks() const;
     TQTime timeElapsed() const;
     bool checkParentDirs() const;
     bool checkExternalLinks() const;
-    LinktqStatus const* linkStatusRoot() const;
+    LinkStatus const* linkStatusRoot() const;
     int maxSimultaneousConnections() const;
     int timeOut() const;
     
@@ -110,20 +110,20 @@ public:
 private:
 
     void checkRoot();
-    void checkVectorLinks(vector<LinktqStatus*> const& links); // corresponde a um no de um nivel de depth
-    vector<LinktqStatus*> tqchildren(LinktqStatus* link);
+    void checkVectorLinks(vector<LinkStatus*> const& links); // corresponde a um no de um nivel de depth
+    vector<LinkStatus*> children(LinkStatus* link);
     void startSearch();
     void continueSearch();
     void finnish();
     void pause();
-    vector<LinktqStatus*> const& nodeToAnalize() const;
-    vector<LinktqStatus*> chooseLinks(vector<LinktqStatus*> const& links);
-    void checkLinksSimultaneously(vector<LinktqStatus*> const& links);
+    vector<LinkStatus*> const& nodeToAnalize() const;
+    vector<LinkStatus*> chooseLinks(vector<LinkStatus*> const& links);
+    void checkLinksSimultaneously(vector<LinkStatus*> const& links);
     void addLevel();
-    bool checkableByDomain(KURL const& url, LinktqStatus const& link_parent) const;
-    bool checkable(KURL const& url, LinktqStatus const& link_parent) const;
+    bool checkableByDomain(KURL const& url, LinkStatus const& link_parent) const;
+    bool checkable(KURL const& url, LinkStatus const& link_parent) const;
     int maximumCurrentConnections() const;
-    bool onlyCheckHeader(LinktqStatus* ls) const;
+    bool onlyCheckHeader(LinkStatus* ls) const;
 
     /*
       Entende-se por domain vago um domain do tipo www.google.pt ou google.pt, pelo que,
@@ -135,15 +135,15 @@ private:
 
 private slots:
 
-    void slotRootChecked(const LinktqStatus * link, LinkChecker * checker);
-    void slotLinkChecked(const LinktqStatus * link, LinkChecker * checker);
+    void slotRootChecked(const LinkStatus * link, LinkChecker * checker);
+    void slotLinkChecked(const LinkStatus * link, LinkChecker * checker);
     void slotSearchFinished();
     void slotLinkCheckerFinnished(LinkChecker * checker);
 
 signals:
 
-    void signalRootChecked(const LinktqStatus * link, LinkChecker * checker);
-    void signalLinkChecked(const LinktqStatus * link, LinkChecker * checker);
+    void signalRootChecked(const LinkStatus * link, LinkChecker * checker);
+    void signalLinkChecked(const LinkStatus * link, LinkChecker * checker);
     void signalSearchFinished();
     void signalSearchPaused();
     void signalAddingLevelTotalSteps(uint number_of_links);
@@ -155,7 +155,7 @@ private:
 
     int max_simultaneous_connections_;
     SearchMode search_mode_;
-    LinktqStatus root_;
+    LinkStatus root_;
     bool has_document_root_;
     KURL document_root_url_; // in case of non http protocols the document root must be explicitly given
     int depth_;
@@ -185,7 +185,7 @@ private:
     bool check_regular_expressions_;
     uint number_of_level_links_;
     uint number_of_links_to_check_;
-    vector< vector< vector <LinktqStatus*> > > search_results_;
+    vector< vector< vector <LinkStatus*> > > search_results_;
     KHTMLPartMap html_parts_;
 };
 
diff --git a/klinkstatus/src/engine/searchmanager_impl.h b/klinkstatus/src/engine/searchmanager_impl.h
index 947e98ff..736d2c10 100644
--- a/klinkstatus/src/engine/searchmanager_impl.h
+++ b/klinkstatus/src/engine/searchmanager_impl.h
@@ -111,7 +111,7 @@ inline bool SearchManager::checkExternalLinks() const
     return check_external_links_;
 }
 
-inline LinktqStatus const* SearchManager::linkStatusRoot() const
+inline LinkStatus const* SearchManager::linkStatusRoot() const
 {
     return &root_;
 }
diff --git a/klinkstatus/src/klinkstatus.lsm b/klinkstatus/src/klinkstatus.lsm
index 0cc4c0c1..94221faf 100644
--- a/klinkstatus/src/klinkstatus.lsm
+++ b/klinkstatus/src/klinkstatus.lsm
@@ -1,5 +1,5 @@
 Begin3
-Title:          KLinktqStatus -- Some description
+Title:          KLinkStatus -- Some description
 Version:        0.2.1
 Entered-date:   
 Description:    
diff --git a/klinkstatus/src/parser/url.cpp b/klinkstatus/src/parser/url.cpp
index 814acfd2..affc35c9 100644
--- a/klinkstatus/src/parser/url.cpp
+++ b/klinkstatus/src/parser/url.cpp
@@ -45,7 +45,7 @@ Node::LinkType Url::resolveLinkType(TQString const& url)
         return Node::relative;
 }
 
-KURL Url::normalizeUrl(TQString const& string_url, LinktqStatus const& link_parent, TQString const& document_root)
+KURL Url::normalizeUrl(TQString const& string_url, LinkStatus const& link_parent, TQString const& document_root)
 {
     TQString _string_url = string_url.stripWhiteSpace();
 
@@ -124,7 +124,7 @@ KURL Url::normalizeUrl(TQString const& string_url)
     }
 }
 
-bool Url::existUrl(KURL const& url, vector<LinktqStatus*> const& v)
+bool Url::existUrl(KURL const& url, vector<LinkStatus*> const& v)
 {
     if(url.prettyURL().isEmpty())
         return true;
@@ -248,7 +248,7 @@ bool Url::hasProtocol(TQString const& url)
 /**
 	http://linkstatus.paradigma.co.pt/en/index.html&bix=bix -> /en/index.html&bix=bix
 */
-TQString Url::convertToLocal(LinktqStatus const* ls)
+TQString Url::convertToLocal(LinkStatus const* ls)
 {
     KURL url = ls->absoluteUrl();
     KURL base_url = ls->rootUrl();
diff --git a/klinkstatus/src/parser/url.h b/klinkstatus/src/parser/url.h
index 574f4fa5..f90f2b33 100644
--- a/klinkstatus/src/parser/url.h
+++ b/klinkstatus/src/parser/url.h
@@ -32,18 +32,18 @@
 using namespace std;
 
 
-class LinktqStatus;
+class LinkStatus;
 
 namespace Url
 {
 Node::LinkType resolveLinkType(TQString const& url);
-KURL normalizeUrl(TQString const& string_url, LinktqStatus const& link_parent, TQString const& document_root);
+KURL normalizeUrl(TQString const& string_url, LinkStatus const& link_parent, TQString const& document_root);
 KURL normalizeUrl(TQString const& string_url);
 bool validUrl(KURL const& url);
-bool existUrl(KURL const& url, vector<LinktqStatus*> const& v);
+bool existUrl(KURL const& url, vector<LinkStatus*> const& v);
 bool equalHost(TQString const& host1, TQString const& host2, bool restrict = false);
 bool hasProtocol(TQString const& url);
-TQString convertToLocal(LinktqStatus const* ls);
+TQString convertToLocal(LinkStatus const* ls);
 bool localDomain(KURL const& url1, KURL const& url2, bool restrict = true);
 bool parentDir(KURL const& url1, KURL const& url2);
 bool externalLink(KURL const& url1, KURL const& url2, bool restrict = true);
diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp
index b1563285..9a813211 100644
--- a/klinkstatus/src/ui/documentrootdialog.cpp
+++ b/klinkstatus/src/ui/documentrootdialog.cpp
@@ -24,7 +24,7 @@
 #include <kurl.h>
 
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 
diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp
index b19f7764..3318132c 100644
--- a/klinkstatus/src/ui/resultssearchbar.cpp
+++ b/klinkstatus/src/ui/resultssearchbar.cpp
@@ -35,19 +35,19 @@
 #include <tqtimer.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 class ResultsSearchBar::ResultsSearchBarPrivate
 {
 public:
     ResultsSearchBarPrivate()
-    : tqlayout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0)
+    : layout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0)
     {}
 
     TQString searchText;
     TQTimer timer;
-    TQHBoxLayout* tqlayout;
+    TQHBoxLayout* layout;
     KLineEdit* searchLine;
     KComboBox* searchCombo;
     int delay;
@@ -57,31 +57,31 @@ public:
 ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
         : TQWidget(parent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate)
 {
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
     
-    d->tqlayout = new TQHBoxLayout(this);    
-    d->tqlayout->setMargin(2);
-    d->tqlayout->setSpacing(5);
+    d->layout = new TQHBoxLayout(this);    
+    d->layout->setMargin(2);
+    d->layout->setSpacing(5);
     
     TQToolButton* clearButton = new TQToolButton(this);
     clearButton->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
     clearButton->setAutoRaise(true);
-    d->tqlayout->addWidget(clearButton);
+    d->layout->addWidget(clearButton);
 
     TQLabel* searchLabel = new TQLabel(this);
     searchLabel->setText(i18n("S&earch:"));
-    d->tqlayout->addWidget(searchLabel);
+    d->layout->addWidget(searchLabel);
 
     d->searchLine = new KLineEdit(this, "searchline");
     connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)),
             this, TQT_SLOT(slotSearchStringChanged(const TQString &)));
 
     searchLabel->setBuddy(d->searchLine);
-    d->tqlayout->addWidget(d->searchLine);
+    d->layout->addWidget(d->searchLine);
 
     TQLabel* statusLabel = new TQLabel(this);
     statusLabel->setText( i18n("Status:") );
-    d->tqlayout->addWidget(statusLabel);
+    d->layout->addWidget(statusLabel);
 
     d->searchCombo = new KComboBox(this, "searchcombo");
     TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small);
@@ -95,7 +95,7 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
     d->searchCombo->insertItem(iconBroken, i18n("Broken Links"));
     d->searchCombo->insertItem(iconMalformed, i18n("Malformed Links"));
     d->searchCombo->insertItem(iconUndetermined, i18n("Undetermined Links"));
-    d->tqlayout->addWidget(d->searchCombo);
+    d->layout->addWidget(d->searchCombo);
 
     TQToolTip::add(clearButton, i18n("Clear filter"));
     TQToolTip::add( d->searchLine, i18n("Enter the terms to filter the result link list"));
@@ -147,7 +147,7 @@ void ResultsSearchBar::slotClearSearch()
     }
 }
 
-void ResultsSearchBar::slotSettqStatus(int status)
+void ResultsSearchBar::slotSetStatus(int status)
 {
     d->searchCombo->setCurrentItem(status);
 }
@@ -187,19 +187,19 @@ void ResultsSearchBar::slotActivateSearch()
 {
     kdDebug(23100) << "ResultsSearchBar::slotActivateSearch" << endl;
     
-    ResultView::tqStatus status = selectedtqStatus();
+    ResultView::Status status = selectedStatus();
     
     emit signalSearch(LinkMatcher(d->searchLine->text(), status));
 }
 
 LinkMatcher ResultsSearchBar::currentLinkMatcher() const
 {
-    return LinkMatcher(d->searchLine->text(), selectedtqStatus());
+    return LinkMatcher(d->searchLine->text(), selectedStatus());
 }
 
-ResultView::tqStatus ResultsSearchBar::selectedtqStatus() const
+ResultView::Status ResultsSearchBar::selectedStatus() const
 {
-    ResultView::tqStatus status = ResultView::none;
+    ResultView::Status status = ResultView::none;
     
     if(d->searchCombo->currentItem())
     {
diff --git a/klinkstatus/src/ui/resultssearchbar.h b/klinkstatus/src/ui/resultssearchbar.h
index c99b1da1..1c161e99 100644
--- a/klinkstatus/src/ui/resultssearchbar.h
+++ b/klinkstatus/src/ui/resultssearchbar.h
@@ -52,7 +52,7 @@ signals:
 
 public slots:
     void slotClearSearch();
-    void slotSettqStatus(int status);
+    void slotSetStatus(int status);
     void slotSetText(const TQString& text);
 
 private slots:
@@ -63,7 +63,7 @@ private slots:
 
 private:
     
-    ResultView::tqStatus selectedtqStatus() const;
+    ResultView::Status selectedStatus() const;
     
 private:
 
diff --git a/klinkstatus/src/ui/resultview.cpp b/klinkstatus/src/ui/resultview.cpp
index 507d06e3..fdf65099 100644
--- a/klinkstatus/src/ui/resultview.cpp
+++ b/klinkstatus/src/ui/resultview.cpp
@@ -69,31 +69,31 @@ void ResultView::setColumns(TQStringList const& columns)
     number_of_columns_ = columns.size();
 }
 
-bool ResultView::displayableWithtqStatus(LinktqStatus const* ls, tqStatus const& status)
+bool ResultView::displayableWithStatus(LinkStatus const* ls, Status const& status)
 {
     if(status == ResultView::good)
     {
         return 
-                ls->status() == LinktqStatus::SUCCESSFULL ||
-                ls->status() == LinktqStatus::HTTP_REDIRECTION;
+                ls->status() == LinkStatus::SUCCESSFULL ||
+                ls->status() == LinkStatus::HTTP_REDIRECTION;
     }
     else if(status == ResultView::bad)
     {
         return 
-                ls->status() == LinktqStatus::BROKEN ||
-                ls->status() == LinktqStatus::HTTP_CLIENT_ERROR ||
-                ls->status() == LinktqStatus::HTTP_SERVER_ERROR;
+                ls->status() == LinkStatus::BROKEN ||
+                ls->status() == LinkStatus::HTTP_CLIENT_ERROR ||
+                ls->status() == LinkStatus::HTTP_SERVER_ERROR;
     }
     else if(status == ResultView::malformed)
     {
-        return ls->status() == LinktqStatus::MALFORMED;
+        return ls->status() == LinkStatus::MALFORMED;
     }
     else if(status == ResultView::undetermined)
     {
         return 
-                ls->status() == LinktqStatus::UNDETERMINED ||
-                ls->status() == LinktqStatus::TIMEOUT ||
-                ls->status() == LinktqStatus::NOT_SUPPORTED;
+                ls->status() == LinkStatus::UNDETERMINED ||
+                ls->status() == LinkStatus::TIMEOUT ||
+                ls->status() == LinkStatus::NOT_SUPPORTED;
     }
     else
         return true;
@@ -102,8 +102,8 @@ bool ResultView::displayableWithtqStatus(LinktqStatus const* ls, tqStatus const&
 
 // ******************************* ResultViewItem *****************************
 
-ResultViewItem::ResultViewItem(LinktqStatus const* linkstatus, int column_index)
-        : ls_((LinktqStatus*)linkstatus), column_index_(column_index)
+ResultViewItem::ResultViewItem(LinkStatus const* linkstatus, int column_index)
+        : ls_((LinkStatus*)linkstatus), column_index_(column_index)
 {
     Q_ASSERT(ls_);
     Q_ASSERT(column_index_ > 0);
@@ -123,7 +123,7 @@ int ResultViewItem::columnIndex() const
     return column_index_;
 }
 
-LinktqStatus const* ResultViewItem::linktqStatus() const
+LinkStatus const* ResultViewItem::linkStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
@@ -131,30 +131,30 @@ LinktqStatus const* ResultViewItem::linktqStatus() const
 
 TQColor const& ResultViewItem::textStatusColor() const
 {
-    if(linktqStatus()->errorOccurred())
+    if(linkStatus()->errorOccurred())
     {
-        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl;
-        if(linktqStatus()->error() == i18n( "Javascript not supported" ))
+        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linkStatus()->absoluteUrl().prettyURL() << endl;
+        if(linkStatus()->error() == i18n( "Javascript not supported" ))
             return TQt::lightGray;
         else
             return TQt::red;
     }
 
-    else if(linktqStatus()->absoluteUrl().hasRef())
+    else if(linkStatus()->absoluteUrl().hasRef())
         return TQt::blue;
 
-    else if(!linktqStatus()->absoluteUrl().protocol().startsWith("http"))
+    else if(!linkStatus()->absoluteUrl().protocol().startsWith("http"))
         return TQt::darkGreen;
 
     else
     {
-        TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode()));
+        TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode()));
 
         if(status_code[0] == '0')
         {
             kdWarning(23100) <<  "status code == 0: " << endl;
-            kdWarning(23100) <<  linktqStatus()->toString() << endl;
-            kdWarning(23100) <<  linktqStatus()->httpHeader().toString() << endl;
+            kdWarning(23100) <<  linkStatus()->toString() << endl;
+            kdWarning(23100) <<  linkStatus()->httpHeader().toString() << endl;
         }
         //Q_ASSERT(status_code[0] != '0');
 
diff --git a/klinkstatus/src/ui/resultview.h b/klinkstatus/src/ui/resultview.h
index 842ed68b..44e90390 100644
--- a/klinkstatus/src/ui/resultview.h
+++ b/klinkstatus/src/ui/resultview.h
@@ -27,7 +27,7 @@
 
 class KURL;
 
-class LinktqStatus;
+class LinkStatus;
 class CellToolTip;
 
 
@@ -43,7 +43,7 @@ public:
     static const TQString MARKUP_LABEL;
     static const TQString LINK_LABEL_LABEL;
     
-    enum tqStatus {
+    enum Status {
         none = 0,
         good,
         bad,
@@ -54,14 +54,14 @@ public:
     ResultView();
     virtual ~ResultView();
 
-    //virtual void insertResult(LinktqStatus const* linkstatus) = 0;
+    //virtual void insertResult(LinkStatus const* linkstatus) = 0;
     virtual void clear() = 0;
-    virtual void show(tqStatus const& status) = 0;
+    virtual void show(Status const& status) = 0;
     virtual void showAll() = 0;
     //virtual void ensureCellVisible(int row, int col) = 0;
 
     virtual void setColumns(TQStringList const& columns);
-    static bool displayableWithtqStatus(LinktqStatus const* ls, tqStatus const& status);
+    static bool displayableWithStatus(LinkStatus const* ls, Status const& status);
     
     int numberOfColumns() const { return number_of_columns_; }
     
@@ -105,7 +105,7 @@ private:
 class ResultViewItem
 {
 public:
-    ResultViewItem(LinktqStatus const* linkstatus,
+    ResultViewItem(LinkStatus const* linkstatus,
                    int column_index);
     virtual ~ResultViewItem();
     
@@ -113,7 +113,7 @@ public:
     virtual int columnIndex() const;
 
     virtual TQString toolTip() const = 0;
-    LinktqStatus const* linktqStatus() const;
+    LinkStatus const* linkStatus() const;
 
 protected:
 
@@ -125,7 +125,7 @@ protected:
 
 protected:
 
-    LinktqStatus* ls_;
+    LinkStatus* ls_;
     int column_index_;
     int alignment_;
 };
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 87831ffc..15f7d631 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -40,7 +40,7 @@
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <tqstringlist.h>
@@ -154,10 +154,10 @@ void SessionWidget::newSearchManager()
                                         TQT_TQOBJECT(this), "search_manager");
     Q_ASSERT(search_manager_);
 
-    connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinktqStatus *, LinkChecker *)),
-            this, TQT_SLOT(slotRootChecked(const LinktqStatus *, LinkChecker *)));
-    connect(search_manager_, TQT_SIGNAL(signalLinkChecked(const LinktqStatus *, LinkChecker *)),
-            this, TQT_SLOT(slotLinkChecked(const LinktqStatus *, LinkChecker *)));
+    connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)),
+            this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *)));
+    connect(search_manager_, TQT_SIGNAL(signalLinkChecked(const LinkStatus *, LinkChecker *)),
+            this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *)));
     connect(search_manager_, TQT_SIGNAL(signalSearchFinished()),
             this, TQT_SLOT(slotSearchFinished()));
     connect(search_manager_, TQT_SIGNAL(signalSearchPaused()),
@@ -356,7 +356,7 @@ bool SessionWidget::validFields()
         return true;
 }
 
-void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker * anal)
+void SessionWidget::slotRootChecked(LinkStatus const* linkstatus, LinkChecker * anal)
 {
     slotSetTimeElapsed();
     emit signalUpdateTabLabel(search_manager_->linkStatusRoot(), this);
@@ -368,7 +368,7 @@ void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker
 
     //table_linkstatus->insertResult(linkstatus);
     TreeViewItem* tree_view_item = new TreeViewItem(tree_view, tree_view->lastItem(), linkstatus);
-    LinktqStatus* ls = const_cast<LinktqStatus*> (linkstatus);
+    LinkStatus* ls = const_cast<LinkStatus*> (linkstatus);
     ls->setTreeViewItem(tree_view_item);
 
     if(linkstatus->isRedirection() && linkstatus->redirection())
@@ -378,7 +378,7 @@ void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker
     ActionManager::getInstance()->action("file_export_html")->setEnabled(!isEmpty());
 }
 
-void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker * anal)
+void SessionWidget::slotLinkChecked(LinkStatus const* linkstatus, LinkChecker * anal)
 {
     slotSetTimeElapsed();
 
@@ -416,7 +416,7 @@ void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker
             tree_view_item->setVisible(match);
         }
         
-        LinktqStatus* ls = const_cast<LinktqStatus*> (linkstatus);
+        LinkStatus* ls = const_cast<LinkStatus*> (linkstatus);
         ls->setTreeViewItem(tree_view_item);
 
         if(linkstatus->isRedirection() && linkstatus->redirection())
@@ -503,10 +503,10 @@ void SessionWidget::showBottomStatusLabel(TQListViewItem* item)
     TreeViewItem* _item = tree_view->myItem(item);
     if(_item)
     {
-        TQString status = _item->linktqStatus()->statusText();
+        TQString status = _item->linkStatus()->statusText();
         textlabel_status->setText(status);
 
-        if(textlabel_status->tqsizeHint().width() > textlabel_status->maximumWidth())
+        if(textlabel_status->sizeHint().width() > textlabel_status->maximumWidth())
             TQToolTip::add(textlabel_status, status);
         else
             TQToolTip::remove(textlabel_status);
diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h
index d171cc37..1c288632 100644
--- a/klinkstatus/src/ui/sessionwidget.h
+++ b/klinkstatus/src/ui/sessionwidget.h
@@ -70,7 +70,7 @@ public:
     bool stopped() const { return stopped_; }
 
 signals:
-    void signalUpdateTabLabel(const LinktqStatus *, SessionWidget*);
+    void signalUpdateTabLabel(const LinkStatus *, SessionWidget*);
     void signalSearchStarted();
     void signalSearchPaused();
     void signalSearchFinnished();
@@ -97,8 +97,8 @@ private slots:
     //virtual void slotSuggestDomain(bool toogle);
 
     void slotEnableCheckButton(const TQString &);
-    void slotRootChecked(LinktqStatus const* linkstatus, LinkChecker * anal);
-    void slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker * anal);
+    void slotRootChecked(LinkStatus const* linkstatus, LinkChecker * anal);
+    void slotLinkChecked(LinkStatus const* linkstatus, LinkChecker * anal);
     void slotSearchFinished();
     void slotSearchPaused();
     /** Shows the status of the clicked URL (row) for 5 seconds */
diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui
index 43d6029e..53cdd510 100644
--- a/klinkstatus/src/ui/sessionwidgetbase.ui
+++ b/klinkstatus/src/ui/sessionwidgetbase.ui
@@ -12,7 +12,7 @@
             <height>683</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>300</height>
@@ -41,7 +41,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout15</cstring>
+                        <cstring>layout15</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -49,7 +49,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout14</cstring>
+                                <cstring>layout14</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -57,7 +57,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout13</cstring>
+                                        <cstring>layout13</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -75,13 +75,13 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="tqminimumSize">
+                                            <property name="minimumSize">
                                                 <size>
                                                     <width>25</width>
                                                     <height>25</height>
                                                 </size>
                                             </property>
-                                            <property name="tqmaximumSize">
+                                            <property name="maximumSize">
                                                 <size>
                                                     <width>25</width>
                                                     <height>25</height>
@@ -109,7 +109,7 @@
                                             <property name="text">
                                                 <string>URL: </string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignVCenter|AlignLeft</set>
                                             </property>
                                         </widget>
@@ -150,7 +150,7 @@
                                             <property name="sizeType">
                                                 <enum>Maximum</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>16</width>
                                                     <height>20</height>
@@ -161,7 +161,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout10</cstring>
+                                        <cstring>layout10</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -225,7 +225,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>160</width>
                                                     <height>20</height>
@@ -236,7 +236,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout11</cstring>
+                                        <cstring>layout11</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -266,7 +266,7 @@
                                             <property name="sizeType">
                                                 <enum>MinimumExpanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>174</width>
                                                     <height>20</height>
@@ -277,7 +277,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout11</cstring>
+                                        <cstring>layout11</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -306,7 +306,7 @@
                                             <property name="sizeType">
                                                 <enum>Maximum</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>16</width>
                                                     <height>20</height>
@@ -338,7 +338,7 @@
             <property name="name">
                 <cstring>tree_view</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>300</height>
@@ -347,7 +347,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -357,7 +357,7 @@
                     <property name="name">
                         <cstring>textlabel_progressbar</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>94</width>
                             <height>0</height>
@@ -385,7 +385,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -403,7 +403,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>470</width>
                             <height>32767</height>
@@ -423,7 +423,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -432,7 +432,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout12_2</cstring>
+                        <cstring>layout12_2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -475,7 +475,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>80</width>
                                     <height>0</height>
diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
index 8fa3e5d7..87b73fbf 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui
+++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
@@ -69,7 +69,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>0</height>
diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui
index 62553ffb..72c420ca 100644
--- a/klinkstatus/src/ui/settings/configsearchdialog.ui
+++ b/klinkstatus/src/ui/settings/configsearchdialog.ui
@@ -39,7 +39,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -184,7 +184,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout21</cstring>
+                        <cstring>layout21</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -211,7 +211,7 @@
                             <property name="sizeType">
                                 <enum>Maximum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -220,7 +220,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout20</cstring>
+                                <cstring>layout20</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp
index 6aef2c97..dd72dd9f 100644
--- a/klinkstatus/src/ui/tablelinkstatus.cpp
+++ b/klinkstatus/src/ui/tablelinkstatus.cpp
@@ -26,7 +26,7 @@
 #include <tqmemarray.h>
 #include <tqtooltip.h>
 #include <tqpixmap.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpainter.h>
 #include <tqprocess.h>
 
@@ -106,17 +106,17 @@ void TableLinkstatus::setColumns(TQStringList const& columns)
     horizontal_header->adjustHeaderSize();
 }
 
-void TableLinkstatus::insertResult(LinktqStatus const* linkstatus)
+void TableLinkstatus::insertResult(LinkStatus const* linkstatus)
 {
     insereLinha(generateRowOfTableItems(linkstatus));
 }
 
-vector<TableItem*> TableLinkstatus::generateRowOfTableItems(LinktqStatus const* linkstatus)
+vector<TableItem*> TableLinkstatus::generateRowOfTableItems(LinkStatus const* linkstatus)
 {
     vector<TableItem*> items;
     int column = 1;
 
-    TableItem* item1 = new TableItemtqStatus(this, TQTableItem::Never,
+    TableItem* item1 = new TableItemStatus(this, TQTableItem::Never,
                                            linkstatus, column++);
     TableItem* item2 = new TableItemNome(this, TQTableItem::Never,
                                          linkstatus, column++);
@@ -147,10 +147,10 @@ void TableLinkstatus::insereLinha(vector<TableItem*> items)
         setItem(row, col, items[i]);
     }
 
-    if(items[col_url_ - 1]->tqsizeHint().width() > columnWidth(col_url_ - 1))
+    if(items[col_url_ - 1]->sizeHint().width() > columnWidth(col_url_ - 1))
     {
         setColumnStretchable(col_url_ - 1, false);
-        setColumnWidth(col_url_ - 1, items[col_url_ - 1]->tqsizeHint().width());
+        setColumnWidth(col_url_ - 1, items[col_url_ - 1]->sizeHint().width());
     }
 
     ensureCellVisible(row, 0);
@@ -178,14 +178,14 @@ void TableLinkstatus::removeColunas()
     Q_ASSERT(numCols() == 0);
 }
 
-void TableLinkstatus::show(ResultView::tqStatus const& status)
+void TableLinkstatus::show(ResultView::Status const& status)
 {
     for(int i = 0; i != numRows(); ++i)
     {
         int row = i;
         TableItem* _item = myItem(row, col_status_);
 
-        if(!ResultView::displayableWithtqStatus(_item->linktqStatus(), status))
+        if(!ResultView::displayableWithStatus(_item->linkStatus(), status))
             hideRow(row);
         else
             showRow(row);
@@ -230,7 +230,7 @@ bool TableLinkstatus::textFitsInCell(int row, int col) const
     TQTableItem* itm(myItem(row, col));
     Q_ASSERT(itm);
 
-    TQSize size_hint(itm->tqsizeHint());
+    TQSize size_hint(itm->sizeHint());
     int visible_width = 0;
 
     if(col == numCols() - 1)
@@ -261,8 +261,8 @@ void TableLinkstatus::slotPopupContextMenu(int r, int w, const TQPoint& pos)
     TableItem* table_item = myItem(r, w);
     if(table_item)
     {
-        TQValueVector<KURL> referrers = table_item->linktqStatus()->referrers();
-        loadContextTableMenu(referrers, table_item->linktqStatus()->isRoot());
+        TQValueVector<KURL> referrers = table_item->linkStatus()->referrers();
+        loadContextTableMenu(referrers, table_item->linkStatus()->isRoot());
         context_table_menu_.popup(pos);
     }
 }
@@ -313,7 +313,7 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers,
 void TableLinkstatus::slotCopyUrlToClipboard() const
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQString content(_item->linktqStatus()->absoluteUrl().prettyURL());
+    TQString content(_item->linkStatus()->absoluteUrl().prettyURL());
     TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
@@ -321,7 +321,7 @@ void TableLinkstatus::slotCopyUrlToClipboard() const
 void TableLinkstatus::slotCopyParentUrlToClipboard() const
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL());
+    TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL());
     TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
@@ -336,7 +336,7 @@ void TableLinkstatus::slotCopyCellTextToClipboard() const
 void TableLinkstatus::slotEditReferrersWithQuanta()
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
 
     if(Global::isQuantaAvailableViaDCOP())
     {
@@ -369,7 +369,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(int id)
     index -= 2; // The list of referrers starts on index = 2
 
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
     Q_ASSERT(index >= 0 && (uint)index < referrers.size());
 
     slotEditReferrerWithQuanta(referrers[index]);
@@ -386,7 +386,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url)
 
         if(!success)
         {
-            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").tqarg(filePath);
+            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").arg(filePath);
             KMessageBox::error(parentWidget(), message);
         }
     }
@@ -400,7 +400,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url)
 void TableLinkstatus::slotViewUrlInBrowser()
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    KURL url = _item->linktqStatus()->absoluteUrl();
+    KURL url = _item->linkStatus()->absoluteUrl();
 
     if(url.isValid())
     {
@@ -414,13 +414,13 @@ void TableLinkstatus::slotViewParentUrlInBrowser()
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
 
-    if(_item->linktqStatus()->isRoot())
+    if(_item->linkStatus()->isRoot())
     {
         KMessageBox::sorry(this, i18n("ROOT URL."));
     }
     else
     {
-        LinktqStatus const* ls_parent = _item->linktqStatus()->parent();
+        LinkStatus const* ls_parent = _item->linkStatus()->parent();
         Q_ASSERT(ls_parent);
 
         KURL url = ls_parent->absoluteUrl();
@@ -439,11 +439,11 @@ void TableLinkstatus::slotViewParentUrlInBrowser()
 */
 
 TableItem::TableItem(TQTable* table, EditType et,
-                     LinktqStatus const* linkstatus,
-                     int column_index, int tqalignment)
+                     LinkStatus const* linkstatus,
+                     int column_index, int alignment)
         : TQTableItem(table, et, ""), ResultViewItem(linkstatus, column_index),
-        /*ls_((LinktqStatus*)linkstatus),
-        column_index_(column_index),*/ alignment_(tqalignment)
+        /*ls_((LinkStatus*)linkstatus),
+        column_index_(column_index),*/ alignment_(alignment)
 {
     //Q_ASSERT(ls_);
     //Q_ASSERT(column_index_ > 0);
@@ -467,17 +467,17 @@ int TableItem::columnIndex() const
     return ResultViewItem::columnIndex();
 }
 
-void TableItem::tqsetAlignment(int aFlags)
+void TableItem::setAlignment(int aFlags)
 {
     alignment_ = aFlags;
 }
 
-int TableItem::tqalignment() const
+int TableItem::alignment() const
 {
     return alignment_;
 }
 /*
-LinktqStatus const* const TableItem::linktqStatus() const
+LinkStatus const* const TableItem::linkStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
@@ -485,31 +485,31 @@ LinktqStatus const* const TableItem::linktqStatus() const
 
 TQColor const& TableItem::textStatusColor() const
 {
-    if(linktqStatus()->errorOccurred())
+    if(linkStatus()->errorOccurred())
     {
-        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl;
-        if(linktqStatus()->error() == i18n( "Javascript not supported" ))
+        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linkStatus()->absoluteUrl().prettyURL() << endl;
+        if(linkStatus()->error() == i18n( "Javascript not supported" ))
             return TQt::lightGray;
         else
             return TQt::red;
     }
 
-    else if(linktqStatus()->absoluteUrl().hasRef())
+    else if(linkStatus()->absoluteUrl().hasRef())
         return TQt::blue;
 
-    else if(linktqStatus()->absoluteUrl().protocol() != "http" &&
-            linktqStatus()->absoluteUrl().protocol() != "https")
+    else if(linkStatus()->absoluteUrl().protocol() != "http" &&
+            linkStatus()->absoluteUrl().protocol() != "https")
         return TQt::darkGreen;
 
     else
     {
-        TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode()));
+        TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode()));
 
         if(status_code[0] == '0')
         {
             kdWarning(23100) <<  "status code == 0: " << endl;
-            kdWarning(23100) <<  linktqStatus()->toString() << endl;
-            kdWarning(23100) <<  linktqStatus()->httpHeader().toString() << endl;
+            kdWarning(23100) <<  linkStatus()->toString() << endl;
+            kdWarning(23100) <<  linkStatus()->httpHeader().toString() << endl;
         }
         //Q_ASSERT(status_code[0] != '0');
 
@@ -538,7 +538,7 @@ TQColor const& TableItem::textStatusColor() const
 */
 
 TableItemURL::TableItemURL(TQTable* table, EditType et,
-                           LinktqStatus const* linkstatus, int column_index)
+                           LinkStatus const* linkstatus, int column_index)
         : TableItem(table, et, linkstatus, column_index)
 {
     setText();
@@ -546,17 +546,17 @@ TableItemURL::TableItemURL(TQTable* table, EditType et,
 
 void TableItemURL::setText()
 {
-    if(linktqStatus()->node() && linktqStatus()->malformed())
+    if(linkStatus()->node() && linkStatus()->malformed())
     {
-        if(linktqStatus()->node()->url().isEmpty())
-            TQTableItem::setText( linktqStatus()->node()->content().simplifyWhiteSpace() );
+        if(linkStatus()->node()->url().isEmpty())
+            TQTableItem::setText( linkStatus()->node()->content().simplifyWhiteSpace() );
         else
-            TQTableItem::setText( linktqStatus()->node()->url() );
+            TQTableItem::setText( linkStatus()->node()->url() );
     }
     else
     {
-        KURL url = linktqStatus()->absoluteUrl();
-        TQTableItem::setText(::convertToLocal(linktqStatus()));
+        KURL url = linkStatus()->absoluteUrl();
+        TQTableItem::setText(::convertToLocal(linkStatus()));
     }
 }
 
@@ -583,19 +583,19 @@ TQColor const& TableItemURL::textStatusColor() const
 {
     // TODO clean this code
 
-    TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode()));
+    TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode()));
 
-    if(linktqStatus()->errorOccurred())
+    if(linkStatus()->errorOccurred())
     {
-        if(linktqStatus()->error().contains(i18n( "Timeout" )))
+        if(linkStatus()->error().contains(i18n( "Timeout" )))
             return darkMagenta;
-        else if(linktqStatus()->error().contains(i18n( "not supported" )))
+        else if(linkStatus()->error().contains(i18n( "not supported" )))
             return lightGray;
         else
             return red;
     }
-    else if(linktqStatus()->absoluteUrl().protocol() != "http" &&
-            linktqStatus()->absoluteUrl().protocol() != "https")
+    else if(linkStatus()->absoluteUrl().protocol() != "http" &&
+            linkStatus()->absoluteUrl().protocol() != "https")
         return black;
 
     else if(status_code[0] == '5')
@@ -610,53 +610,53 @@ TQColor const& TableItemURL::textStatusColor() const
 
 /*
 
-********************* TableItemtqStatus ***************************
+********************* TableItemStatus ***************************
 
 */
 
-TableItemtqStatus::TableItemtqStatus(TQTable* table, EditType et,
-                                 LinktqStatus const* linkstatus, int column_index)
+TableItemStatus::TableItemStatus(TQTable* table, EditType et,
+                                 LinkStatus const* linkstatus, int column_index)
         : TableItem(table, et, linkstatus, column_index)
 {
-    tqsetAlignment(TQt::AlignHCenter /*| TQt :: AlignVCenter*/);
+    setAlignment(TQt::AlignHCenter /*| TQt :: AlignVCenter*/);
     setText();
     setPixmap();
 }
 
-void TableItemtqStatus::setText()
+void TableItemStatus::setText()
 {
-    if(linktqStatus()->errorOccurred() ||
-            linktqStatus()->status() == "OK" ||
-            linktqStatus()->status() == "304")
+    if(linkStatus()->errorOccurred() ||
+            linkStatus()->status() == "OK" ||
+            linkStatus()->status() == "304")
     {
         TQTableItem::setText("");
     }
     else
     {
         /*
-                if(linktqStatus()->httpHeader().statusCode() == 0)
+                if(linkStatus()->httpHeader().statusCode() == 0)
                 {
                     kdDebug(23100) <<  "TableItemStatus::setText : statusCode() == 0" << endl;
-                    kdDebug(23100) <<  linktqStatus()->toString() << endl;
-                    kdDebug(23100) <<  linktqStatus()->docHtml() << endl;
+                    kdDebug(23100) <<  linkStatus()->toString() << endl;
+                    kdDebug(23100) <<  linkStatus()->docHtml() << endl;
                 }
         */
-        //Q_ASSERT(linktqStatus()->httpHeader().statusCode() != 0); //<------------------------------------------------------------
-        //TQTableItem::setText( TQString::number(linktqStatus()->httpHeader().statusCode()) );
-        TQTableItem::setText( linktqStatus()->status() );
+        //Q_ASSERT(linkStatus()->httpHeader().statusCode() != 0); //<------------------------------------------------------------
+        //TQTableItem::setText( TQString::number(linkStatus()->httpHeader().statusCode()) );
+        TQTableItem::setText( linkStatus()->status() );
     }
 }
 
-void TableItemtqStatus::setPixmap()
+void TableItemStatus::setPixmap()
 {
-    if(linktqStatus()->errorOccurred())
+    if(linkStatus()->errorOccurred())
     {
 
-        if(linktqStatus()->error().contains(i18n( "Timeout" )))
+        if(linkStatus()->error().contains(i18n( "Timeout" )))
         {
             TQTableItem::setPixmap(SmallIcon("kalarm"));
         }
-        else if(linktqStatus()->error() == i18n( "Malformed" ))
+        else if(linkStatus()->error() == i18n( "Malformed" ))
         {
             TQTableItem::setPixmap(SmallIcon("bug"));
         }
@@ -665,27 +665,27 @@ void TableItemtqStatus::setPixmap()
             TQTableItem::setPixmap(SmallIcon("no"));
         }
     }
-    else if(linktqStatus()->status() == "304")
+    else if(linkStatus()->status() == "304")
         TQTableItem::setPixmap(UserIcon("304"));
 
-    else if(linktqStatus()->status() == "OK")
+    else if(linkStatus()->status() == "OK")
         TQTableItem::setPixmap(SmallIcon("ok"));
 }
 
-TQString TableItemtqStatus::toolTip() const
+TQString TableItemStatus::toolTip() const
 {
-    if(linktqStatus()->errorOccurred() ||
-            linktqStatus()->absoluteUrl().hasRef() ||
-            (linktqStatus()->absoluteUrl().protocol() != "http" &&
-             linktqStatus()->absoluteUrl().protocol() != "https"))
+    if(linkStatus()->errorOccurred() ||
+            linkStatus()->absoluteUrl().hasRef() ||
+            (linkStatus()->absoluteUrl().protocol() != "http" &&
+             linkStatus()->absoluteUrl().protocol() != "https"))
     {
-        return i18n("%1").tqarg(linktqStatus()->status());
+        return i18n("%1").arg(linkStatus()->status());
     }
     else
-        return i18n("%1").tqarg(linktqStatus()->httpHeader().reasonPhrase());
+        return i18n("%1").arg(linkStatus()->httpHeader().reasonPhrase());
 }
 
-void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg,
+void TableItemStatus::paint( TQPainter *p, const TQColorGroup &cg,
                              const TQRect &cr, bool selected )
 {
     p->fillRect( 0, 0, cr.width(), cr.height(),
@@ -716,7 +716,7 @@ void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg,
     else
         p->setPen( m_cg.text() );
     p->drawText( x + 2, 0, w - x - 4, h,
-                 wordWrap() ? (tqalignment() | WordBreak) : tqalignment(), text() );
+                 wordWrap() ? (alignment() | WordBreak) : alignment(), text() );
 }
 
 /*
@@ -726,7 +726,7 @@ void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg,
 */
 
 TableItemNome::TableItemNome(TQTable* table, EditType et,
-                             LinktqStatus const* linkstatus, int column_index)
+                             LinkStatus const* linkstatus, int column_index)
         : TableItem(table, et, linkstatus, column_index)
 {
     setText();
@@ -734,7 +734,7 @@ TableItemNome::TableItemNome(TQTable* table, EditType et,
 
 void TableItemNome::setText()
 {
-    TQString label(linktqStatus()->label());
+    TQString label(linkStatus()->label());
     if(!label.isNull())
         TQTableItem::setText(label.simplifyWhiteSpace());
 }
diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h
index d3113ee0..6f601508 100644
--- a/klinkstatus/src/ui/tablelinkstatus.h
+++ b/klinkstatus/src/ui/tablelinkstatus.h
@@ -58,12 +58,12 @@ public:
     virtual void setColumns(TQStringList const& columns);
 
     /* Insere uma nova entrada no fim da tabela */
-    virtual void insertResult(LinktqStatus const* linkstatus);
+    virtual void insertResult(LinkStatus const* linkstatus);
 
 
     virtual void clear();
     void removeColunas();
-    virtual void show(ResultView::tqStatus const& status);
+    virtual void show(ResultView::Status const& status);
     virtual void showAll();
 
 
@@ -90,7 +90,7 @@ private slots:
 
 private:
 
-    vector<TableItem*> generateRowOfTableItems(LinktqStatus const* linkstatus);
+    vector<TableItem*> generateRowOfTableItems(LinkStatus const* linkstatus);
     void insereLinha(vector<TableItem*> items);
 
 private:
@@ -110,18 +110,18 @@ class TableItem: public TQTableItem, public ResultViewItem
 public:
 
     TableItem(TQTable* table, EditType et,
-              LinktqStatus const* linkstatus,
-              int column_index, int tqalignment = TQt::AlignLeft);
+              LinkStatus const* linkstatus,
+              int column_index, int alignment = TQt::AlignLeft);
     virtual ~TableItem();
 
     virtual void setColumnIndex(int i);
     virtual int columnIndex() const;
 
-    void tqsetAlignment(int aFlags);
-    virtual int tqalignment() const;
+    void setAlignment(int aFlags);
+    virtual int alignment() const;
 
     virtual TQString toolTip() const = 0;
-    //LinktqStatus const* const linktqStatus() const;
+    //LinkStatus const* const linkStatus() const;
 
 protected:
 
@@ -133,7 +133,7 @@ protected:
 
 private:
 
-    //LinktqStatus* ls_;
+    //LinkStatus* ls_;
     //int column_index_;
     int alignment_;
 };
@@ -144,7 +144,7 @@ class TableItemURL: public TableItem
 public:
 
     TableItemURL(TQTable* table, EditType et,
-                 LinktqStatus const* linkstatus, int column_index = 3);
+                 LinkStatus const* linkstatus, int column_index = 3);
     //virtual ~TableItemURL(){};
 
     virtual TQString toolTip() const;
@@ -158,13 +158,13 @@ protected:
 };
 
 
-class TableItemtqStatus: public TableItem
+class TableItemStatus: public TableItem
 {
 public:
 
-    TableItemtqStatus(TQTable* table, EditType et,
-                    LinktqStatus const* linkstatus, int column_index = 1);
-    //virtual ~TableItemtqStatus(){};
+    TableItemStatus(TQTable* table, EditType et,
+                    LinkStatus const* linkstatus, int column_index = 1);
+    //virtual ~TableItemStatus(){};
 
     virtual TQString toolTip() const;
 
@@ -181,7 +181,7 @@ class TableItemNome: public TableItem
 public:
 
     TableItemNome(TQTable* table, EditType et,
-                  LinktqStatus const* linkstatus, int column_index = 2);
+                  LinkStatus const* linkstatus, int column_index = 2);
     //virtual ~TableItemNome(){};
 
     virtual TQString toolTip() const;
diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp
index 7502d58b..bc7f1492 100644
--- a/klinkstatus/src/ui/tabwidgetsession.cpp
+++ b/klinkstatus/src/ui/tabwidgetsession.cpp
@@ -117,8 +117,8 @@ SessionWidget* TabWidgetSession::newSession()
 {
     // TODO: settings: number of connections, timeout
     SessionWidget* session_widget = newSessionWidget();
-    connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinktqStatus *, SessionWidget*)),
-            this, TQT_SLOT(updateTabLabel(const LinktqStatus *, SessionWidget*)));
+    connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)),
+            this, TQT_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*)));
 
     insertTab(session_widget, i18n("Session") + i18n(TQString::number(count() + 1).ascii()));
     
@@ -166,7 +166,7 @@ SessionWidget* TabWidgetSession::newSessionWidget()
     return session_widget;
 }
 
-void TabWidgetSession::updateTabLabel(LinktqStatus const* linkstatus, SessionWidget* page)
+void TabWidgetSession::updateTabLabel(LinkStatus const* linkstatus, SessionWidget* page)
 {
     TQString label;
     KURL url = linkstatus->absoluteUrl();
diff --git a/klinkstatus/src/ui/tabwidgetsession.h b/klinkstatus/src/ui/tabwidgetsession.h
index 4c83ba49..c98adb0a 100644
--- a/klinkstatus/src/ui/tabwidgetsession.h
+++ b/klinkstatus/src/ui/tabwidgetsession.h
@@ -27,7 +27,7 @@
 class TQToolButton;
 
 class SessionWidget;
-class LinktqStatus;
+class LinkStatus;
 
 
 /**
@@ -59,7 +59,7 @@ public slots:
     SessionWidget* newSession();
     SessionWidget* newSession(KURL const& url);
     void closeSession();
-    void updateTabLabel(LinktqStatus const* linkstatus, SessionWidget*);
+    void updateTabLabel(LinkStatus const* linkstatus, SessionWidget*);
     void slotLoadSettings();
     
     void slotHideSearchPanel();
diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp
index 21bcdf02..8bc51471 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -30,7 +30,7 @@
 
 #include <tqvaluevector.h>
 #include <tqheader.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include "treeview.h"
 #include "../global.h"
@@ -114,16 +114,16 @@ void TreeView::removeColunas()
     clear();
 }
 
-void TreeView::show(ResultView::tqStatus const& status)
+void TreeView::show(ResultView::Status const& status)
 {
     TQListViewItemIterator it(static_cast<KListView*> (this));
     while(it.current())
     {
         TreeViewItem* item = myItem(it.current());
-        if(!ResultView::displayableWithtqStatus(item->linktqStatus(), status))
+        if(!ResultView::displayableWithStatus(item->linkStatus(), status))
         {
             item->setVisible(false);
-            //kdDebug(23100) << "Hide: " << item->linktqStatus()->absoluteUrl().url() << endl;
+            //kdDebug(23100) << "Hide: " << item->linkStatus()->absoluteUrl().url() << endl;
         }
         else
         {
@@ -135,7 +135,7 @@ void TreeView::show(ResultView::tqStatus const& status)
                 TreeViewItem* parent = myItem(item->parent());
                 while(parent)
                 {
-                    kdDebug(23100) << "Show: " << parent->linktqStatus()->absoluteUrl().url() << endl;
+                    kdDebug(23100) << "Show: " << parent->linkStatus()->absoluteUrl().url() << endl;
 
                     parent->setVisible(true);
                     //parent->setEnabled(false);
@@ -159,7 +159,7 @@ void TreeView::show(LinkMatcher link_matcher)
     while(it.current())
     {
         TreeViewItem* item = myItem(it.current());
-        bool match = link_matcher.matches(*(item->linktqStatus()));
+        bool match = link_matcher.matches(*(item->linkStatus()));
         
         if(tree_display_)
             item->setEnabled(match);
@@ -199,7 +199,7 @@ void TreeView::resizeEvent(TQResizeEvent *e)
 {
     KListView::resizeEvent(e);
     resetColumns();
-    clipper()->tqrepaint();
+    clipper()->repaint();
 }
 
 void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, int col)
@@ -209,8 +209,8 @@ void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, in
     TreeViewItem* tree_item = myItem(item);
     if(tree_item)
     {
-        TQValueVector<KURL> referrers = tree_item->linktqStatus()->referrers();
-        loadContextTableMenu(referrers, tree_item->linktqStatus()->isRoot());
+        TQValueVector<KURL> referrers = tree_item->linkStatus()->referrers();
+        loadContextTableMenu(referrers, tree_item->linkStatus()->isRoot());
         context_table_menu_.popup(pos);
     }
 }
@@ -218,16 +218,16 @@ void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, in
 void TreeView::slotCopyUrlToClipboard() const
 {
     TreeViewItem* _item = myItem(currentItem());
-    TQString content(_item->linktqStatus()->absoluteUrl().prettyURL());
-    TQClipboard* cb = kapp->tqclipboard();
+    TQString content(_item->linkStatus()->absoluteUrl().prettyURL());
+    TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
 
 void TreeView::slotCopyParentUrlToClipboard() const
 {
     TreeViewItem* _item = myItem(currentItem());
-    TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL());
-    TQClipboard* cb = kapp->tqclipboard();
+    TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL());
+    TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
 
@@ -235,14 +235,14 @@ void TreeView::slotCopyCellTextToClipboard() const
 {
     TreeViewItem* _item = myItem(currentItem());
     TQString cell_text(_item->text(current_column_));
-    TQClipboard* cb = kapp->tqclipboard();
+    TQClipboard* cb = kapp->clipboard();
     cb->setText(cell_text);
 }
 
 void TreeView::slotEditReferrersWithQuanta()
 {
     TreeViewItem* _item = myItem(currentItem());
-    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
 
     if(Global::isQuantaAvailableViaDCOP())
     {
@@ -275,7 +275,7 @@ void TreeView::slotEditReferrerWithQuanta(int id)
     index -= 2; // The list of referrers starts on index = 2
 
     TreeViewItem* _item = myItem(currentItem());
-    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
     Q_ASSERT(index >= 0 && (uint)index < referrers.size());
 
     slotEditReferrerWithQuanta(referrers[index]);
@@ -292,7 +292,7 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url)
 
         if(!success)
         {
-            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").tqarg(filePath);
+            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").arg(filePath);
             KMessageBox::error(parentWidget(), message);
         }
     }
@@ -306,7 +306,7 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url)
 void TreeView::slotViewUrlInBrowser()
 {
     TreeViewItem* _item = myItem(currentItem());
-    KURL url = _item->linktqStatus()->absoluteUrl();
+    KURL url = _item->linkStatus()->absoluteUrl();
 
     if(url.isValid())
     {
@@ -320,13 +320,13 @@ void TreeView::slotViewParentUrlInBrowser()
 {
     TreeViewItem* _item = myItem(currentItem());
  
-    if(_item->linktqStatus()->isRoot())
+    if(_item->linkStatus()->isRoot())
     {
         KMessageBox::sorry(this, i18n("ROOT URL."));
     }
     else
     {
-        LinktqStatus const* ls_parent = _item->linktqStatus()->parent();
+        LinkStatus const* ls_parent = _item->linkStatus()->parent();
         Q_ASSERT(ls_parent);
 
         KURL url = ls_parent->absoluteUrl();
@@ -393,7 +393,7 @@ TreeViewItem* TreeView::myItem(TQListViewItem* item) const
 /* ******************************* TreeViewItem ******************************* */
 
 TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after,
-                           LinktqStatus const* linkstatus)
+                           LinkStatus const* linkstatus)
         : KListViewItem(parent, after),
         last_child_(0), root_(parent)
 {
@@ -401,7 +401,7 @@ TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after,
 }
 
 TreeViewItem::TreeViewItem(TreeView* root, TQListViewItem* listview_item, TQListViewItem* after,
-                           LinktqStatus const* linkstatus)
+                           LinkStatus const* linkstatus)
         : KListViewItem(listview_item, after),
         last_child_(0), root_(root)
 
@@ -412,7 +412,7 @@ TreeViewItem::TreeViewItem(TreeView* root, TQListViewItem* listview_item, TQList
 TreeViewItem::~TreeViewItem()
 {}
 
-void TreeViewItem::init(LinktqStatus const* linkstatus)
+void TreeViewItem::init(LinkStatus const* linkstatus)
 {
     setOpen(true);
 
@@ -450,15 +450,15 @@ TQString TreeViewItem::key(int column, bool) const
     switch(column)
     {
     case 1: // status column
-        return linktqStatus()->statusText();
+        return linkStatus()->statusText();
     }
 
     return text(column);
 }
 
-LinktqStatus const* TreeViewItem::linktqStatus() const
+LinkStatus const* TreeViewItem::linkStatus() const
 {
-    return column_items_[0].linktqStatus();
+    return column_items_[0].linkStatus();
 }
 
 void TreeViewItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align)
@@ -478,7 +478,7 @@ void TreeViewItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column,
 
 /* ******************************* TreeColumnViewItem ******************************* */
 
-TreeColumnViewItem::TreeColumnViewItem(TreeView* root, LinktqStatus const* linkstatus, int column_index)
+TreeColumnViewItem::TreeColumnViewItem(TreeView* root, LinkStatus const* linkstatus, int column_index)
     : root_(root), ls_(linkstatus), column_index_(column_index)
 {
     Q_ASSERT(ls_);
@@ -501,7 +501,7 @@ int TreeColumnViewItem::columnIndex() const
     return column_index_;
 }
 
-LinktqStatus const* TreeColumnViewItem::linktqStatus() const
+LinkStatus const* TreeColumnViewItem::linkStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
@@ -511,23 +511,23 @@ TQColor const& TreeColumnViewItem::textStatusColor() const
 {
     if(columnIndex() == root_->urlColumnIndex() || columnIndex() == root_->statusColumnIndex())
     {
-        if(linktqStatus()->status() == LinktqStatus::BROKEN)
+        if(linkStatus()->status() == LinkStatus::BROKEN)
             return TQt::red;
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_CLIENT_ERROR)
+        else if(linkStatus()->status() == LinkStatus::HTTP_CLIENT_ERROR)
             return TQt::red;
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_REDIRECTION)
+        else if(linkStatus()->status() == LinkStatus::HTTP_REDIRECTION)
             return TQt::black;
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_SERVER_ERROR)
+        else if(linkStatus()->status() == LinkStatus::HTTP_SERVER_ERROR)
             return TQt::darkMagenta;
-        else if(linktqStatus()->status() == LinktqStatus::MALFORMED)
+        else if(linkStatus()->status() == LinkStatus::MALFORMED)
             return TQt::red;
-        else if(linktqStatus()->status() == LinktqStatus::NOT_SUPPORTED)
+        else if(linkStatus()->status() == LinkStatus::NOT_SUPPORTED)
             return TQt::lightGray;
-        else if(linktqStatus()->status() == LinktqStatus::SUCCESSFULL)
+        else if(linkStatus()->status() == LinkStatus::SUCCESSFULL)
             return TQt::black;
-        else if(linktqStatus()->status() == LinktqStatus::TIMEOUT)
+        else if(linkStatus()->status() == LinkStatus::TIMEOUT)
             return TQt::darkMagenta;
-        else if(linktqStatus()->status() == LinktqStatus::UNDETERMINED)
+        else if(linkStatus()->status() == LinkStatus::UNDETERMINED)
             return TQt::blue;
         
         return TQt::red;
@@ -544,17 +544,17 @@ TQString TreeColumnViewItem::text(int column) const
     
     if(column == root_->urlColumnIndex())
     {
-        if(linktqStatus()->node() && linktqStatus()->malformed())
+        if(linkStatus()->node() && linkStatus()->malformed())
         {
-            if(linktqStatus()->node()->url().isEmpty())
-                return linktqStatus()->node()->content().simplifyWhiteSpace();
+            if(linkStatus()->node()->url().isEmpty())
+                return linkStatus()->node()->content().simplifyWhiteSpace();
             else
-                return linktqStatus()->node()->url();
+                return linkStatus()->node()->url();
         }
         else
         {
-            KURL url = linktqStatus()->absoluteUrl();
-            return Url::convertToLocal(linktqStatus());
+            KURL url = linkStatus()->absoluteUrl();
+            return Url::convertToLocal(linkStatus());
         }        
     }
     else if(column == root_->statusColumnIndex())
@@ -563,7 +563,7 @@ TQString TreeColumnViewItem::text(int column) const
     }
     else if(column == root_->labelColumnIndex())
     {
-        TQString label(linktqStatus()->label());
+        TQString label(linkStatus()->label());
         if(!label.isNull())
             return label.simplifyWhiteSpace();
     }
@@ -577,28 +577,28 @@ TQPixmap TreeColumnViewItem::pixmap(int column) const
 
     if(column == root_->statusColumnIndex())
     {
-        if(linktqStatus()->status() == LinktqStatus::BROKEN)
+        if(linkStatus()->status() == LinkStatus::BROKEN)
             return SmallIcon("no");
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_CLIENT_ERROR)
+        else if(linkStatus()->status() == LinkStatus::HTTP_CLIENT_ERROR)
             return SmallIcon("no");
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_REDIRECTION) 
+        else if(linkStatus()->status() == LinkStatus::HTTP_REDIRECTION) 
         {
-            if(linktqStatus()->statusText() == "304")
+            if(linkStatus()->statusText() == "304")
                 return UserIcon("304");
             else
                 return SmallIcon("redo");
         }
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_SERVER_ERROR)
+        else if(linkStatus()->status() == LinkStatus::HTTP_SERVER_ERROR)
             return SmallIcon("no");
-        else if(linktqStatus()->status() == LinktqStatus::MALFORMED)
+        else if(linkStatus()->status() == LinkStatus::MALFORMED)
             return SmallIcon("editdelete");
-        else if(linktqStatus()->status() == LinktqStatus::NOT_SUPPORTED)
+        else if(linkStatus()->status() == LinkStatus::NOT_SUPPORTED)
             return SmallIcon("help");
-        else if(linktqStatus()->status() == LinktqStatus::SUCCESSFULL)
+        else if(linkStatus()->status() == LinkStatus::SUCCESSFULL)
             return SmallIcon("ok");
-        else if(linktqStatus()->status() == LinktqStatus::TIMEOUT)
+        else if(linkStatus()->status() == LinkStatus::TIMEOUT)
             return SmallIcon("history_clear");
-        else if(linktqStatus()->status() == LinktqStatus::UNDETERMINED)
+        else if(linkStatus()->status() == LinkStatus::UNDETERMINED)
             return SmallIcon("help");
     }
     
diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h
index 6b48cc63..8735a595 100644
--- a/klinkstatus/src/ui/treeview.h
+++ b/klinkstatus/src/ui/treeview.h
@@ -38,7 +38,7 @@ public:
     virtual void setColumns(TQStringList const& columns);
     virtual void clear();
     void removeColunas();
-    virtual void show(ResultView::tqStatus const& status);
+    virtual void show(ResultView::Status const& status);
     void show(LinkMatcher link_matcher);
     virtual void showAll();
     
@@ -92,22 +92,22 @@ class TreeViewItem: public KListViewItem
 public:
 
     TreeViewItem(TreeView* parent, TQListViewItem* after,
-                 LinktqStatus const* linkstatus);
+                 LinkStatus const* linkstatus);
     TreeViewItem(TreeView* root, TQListViewItem* parent_item, TQListViewItem* after,
-                 LinktqStatus const* linkstatus);
+                 LinkStatus const* linkstatus);
     virtual ~TreeViewItem();
 
     void setLastChild(TQListViewItem* last_child);
     TQListViewItem* lastChild() const;
     
     TQString key(int column, bool) const;
-    LinktqStatus const* linktqStatus() const;
+    LinkStatus const* linkStatus() const;
 
 protected:
     virtual void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align);
 
 private:
-    void init(LinktqStatus const* linkstatus);
+    void init(LinkStatus const* linkstatus);
 
 private:
     TQValueVector<TreeColumnViewItem> column_items_;
@@ -124,19 +124,19 @@ public:
     TreeColumnViewItem()
     {}
     ;
-    TreeColumnViewItem(TreeView* root, LinktqStatus const* linkstatus, int column_index);
+    TreeColumnViewItem(TreeView* root, LinkStatus const* linkstatus, int column_index);
     ~TreeColumnViewItem();
 
     //void setColumnIndex(int i);
     int columnIndex() const;
-    LinktqStatus const* linktqStatus() const;
+    LinkStatus const* linkStatus() const;
     TQColor const& textStatusColor() const;
     TQString text(int column) const;
     TQPixmap pixmap(int column) const;
 
 private:
     TreeView* root_;
-    LinktqStatus const* ls_;
+    LinkStatus const* ls_;
     int column_index_;
 };
 
diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp
index 4a04834b..31db321e 100644
--- a/klinkstatus/src/utils/xsl.cpp
+++ b/klinkstatus/src/utils/xsl.cpp
@@ -35,7 +35,7 @@
 
 #include <tqregexp.h>
 #include <tqsignal.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqthread.h>
 #include <tqevent.h>
 #include <tqmutex.h>
@@ -141,7 +141,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe
     {
         if ( styleSheet )
         {
-            static TQCString appPath( TQString::tqfromLatin1("\"%1\"").tqarg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::tqfromLatin1("styles/data") ).front() ).utf8() );
+            static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() );
 
             static const char* params[3] = {
                 "appdata",
@@ -179,7 +179,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe
 
     if ( resultString.isEmpty() )
     {
-        resultString = i18n( "<div><b>KLinkStatus encountered the following error while parsing a message:</b><br />%1</div>" ).tqarg( errorMsg );
+        resultString = i18n( "<div><b>KLinkStatus encountered the following error while parsing a message:</b><br />%1</div>" ).arg( errorMsg );
     }
 
     #ifdef RAWXSL
@@ -235,7 +235,7 @@ void XSLT::setXSLT( const TQString &_document )
     //  Actually, since we need to parse into a libxml2 document anyway, this whole
     //  nonsense could be replaced with some simple XPath expressions - JK
     //
-    TQRegExp elementMatch( TQString::tqfromLatin1( "<kopete-i18n>(.*)</kopete-i18n>" ) );
+    TQRegExp elementMatch( TQString::fromLatin1( "<kopete-i18n>(.*)</kopete-i18n>" ) );
     elementMatch.setMinimal( true );
     TQString document = _document;
     int pos;
@@ -261,21 +261,21 @@ void XSLT::setXSLT( const TQString &_document )
         {
             prependPercent = false;
 
-            if ( *it == TQString::tqfromLatin1( "TIME" ) )
+            if ( *it == TQString::fromLatin1( "TIME" ) )
             {
-                trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@time\"/>" );
+                trans += TQString::fromLatin1( "<xsl:value-of select=\"@time\"/>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "TIMESTAMP" ) )
+            else if ( *it == TQString::fromLatin1( "TIMESTAMP" ) )
             {
-                trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
+                trans += TQString::fromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "FORMATTEDTIMESTAMP" ) )
+            else if ( *it == TQString::fromLatin1( "FORMATTEDTIMESTAMP" ) )
             {
-                trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
+                trans += TQString::fromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::fromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
                     "<xsl:choose>"
                         "<xsl:when test='from/contact/@contactId=from/contact/contactDisplayName/@text'>"
                             "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/metaContactDisplayName/@text\"/>"
@@ -290,9 +290,9 @@ void XSLT::setXSLT( const TQString &_document )
                     "</xsl:attribute>"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/contactDisplayName/@text\"/></span>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::fromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
                     "<xsl:choose>"
                         "<xsl:when test='to/contact/@contactId=from/contact/contactDisplayName/@text'>"
                             "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/metaContactDisplayName/@text\"/>"
@@ -307,37 +307,37 @@ void XSLT::setXSLT( const TQString &_document )
                     "</xsl:attribute>"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/contactDisplayName/@text\"/></span>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::fromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::tqfromLatin1( "<span>"
+                trans += TQString::fromLatin1( "<span>"
                 "<xsl:attribute name=\"dir\">"
                 "<xsl:value-of select=\"from/contact/metaContactDisplayName/@dir\"/>"
                 "</xsl:attribute>"
                 "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/metaContactDisplayName/@text\"/></span>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::fromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::tqfromLatin1( "<span>"
+                trans += TQString::fromLatin1( "<span>"
                 "<xsl:attribute name=\"dir\">"
                     "<xsl:value-of select=\"to/contact/metaContactDisplayName/@dir\"/>"
                     "</xsl:attribute>"
                 "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/metaContactDisplayName/@text\"/></span>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_ID" ) )
+            else if ( *it == TQString::fromLatin1( "FROM_CONTACT_ID" ) )
             {
-                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/contactDisplayName/@text\"/></xsl:attribute>"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/@contactId\"/></span>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_ID" ) )
+            else if ( *it == TQString::fromLatin1( "TO_CONTACT_ID" ) )
             {
-                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/contactDisplayName/@text\"/></xsl:attribute>"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/@contactId\"/></span>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "BODY" ) )
+            else if ( *it == TQString::fromLatin1( "BODY" ) )
             {
-                trans += TQString::tqfromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
+                trans += TQString::fromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
             }
             else
             {
@@ -387,7 +387,7 @@ void XSLT::setXSLT( const TQString &_document )
             }
 
             if( !flags.isEmpty() )
-                setProperty("flags", flags.join( TQString::tqfromLatin1("|") ) );
+                setProperty("flags", flags.join( TQString::fromLatin1("|") ) );
         }
         else
         {