summaryrefslogtreecommitdiffstats
path: root/klinkstatus/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'klinkstatus/src/engine')
-rw-r--r--klinkstatus/src/engine/linkchecker.cpp82
-rw-r--r--klinkstatus/src/engine/linkchecker.h14
-rw-r--r--klinkstatus/src/engine/linkfilter.cpp6
-rw-r--r--klinkstatus/src/engine/linkfilter.h10
-rw-r--r--klinkstatus/src/engine/linkstatus.cpp58
-rw-r--r--klinkstatus/src/engine/linkstatus.h42
-rw-r--r--klinkstatus/src/engine/linkstatus_impl.h142
-rw-r--r--klinkstatus/src/engine/searchmanager.cpp80
-rw-r--r--klinkstatus/src/engine/searchmanager.h32
-rw-r--r--klinkstatus/src/engine/searchmanager_impl.h2
10 files changed, 234 insertions, 234 deletions
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_;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 10:31:41 +0000