From 9445f97b426e97c6ce46de18fba4030da45d56df Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:36:38 -0600 Subject: Rename old tq methods that no longer need a unique name --- klinkstatus/src/parser/url.cpp | 6 +++--- klinkstatus/src/parser/url.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'klinkstatus/src/parser') 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 const& v) +bool Url::existUrl(KURL const& url, vector 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 const& v); +bool existUrl(KURL const& url, vector 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); -- cgit v1.2.1