From 84c989c19db5daab602a67f47ca0f5fd7a2b53d2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 12:01:04 -0600 Subject: Remove additional unneeded tq method conversions --- klinkstatus/src/engine/linkstatus.cpp | 32 ++++++++++++++++---------------- klinkstatus/src/engine/linkstatus.h | 4 ++-- klinkstatus/src/engine/linkstatus_impl.h | 8 ++++---- klinkstatus/src/engine/searchmanager.cpp | 20 ++++++++++---------- klinkstatus/src/engine/searchmanager.h | 2 +- klinkstatus/src/ui/sessionwidgetbase.ui | 2 +- klinkstatus/src/ui/tablelinkstatus.cpp | 14 +++++++------- klinkstatus/src/ui/tablelinkstatus.h | 4 ++-- klinkstatus/src/ui/treeview.cpp | 4 ++-- klinkstatus/src/utils/xsl.cpp | 4 ++-- 10 files changed, 47 insertions(+), 47 deletions(-) (limited to 'klinkstatus') diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp index 2c31dd73..bf5986f5 100644 --- a/klinkstatus/src/engine/linkstatus.cpp +++ b/klinkstatus/src/engine/linkstatus.cpp @@ -32,16 +32,16 @@ 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()) { @@ -71,16 +71,16 @@ void LinkStatus::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()) { @@ -101,14 +101,14 @@ TQString const LinkStatus::toString() const 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; } @@ -150,8 +150,8 @@ bool LinkStatus::malformed() const // don't inline please (#include "node.h") void LinkStatus::setChildrenNodes(vector 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 LinkStatus::setMalformed(bool flag) diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h index 693a95fc..ac49801f 100644 --- a/klinkstatus/src/engine/linkstatus.h +++ b/klinkstatus/src/engine/linkstatus.h @@ -120,7 +120,7 @@ public: bool isRedirection() const; LinkStatus* redirection() const; Node* node() const; - vector const& tqchildrenNodes() const; + vector const& childrenNodes() const; TQString const toString() const; bool checked() const; int externalDomainDepth() const; @@ -162,7 +162,7 @@ private: bool is_root_; bool error_occurred_; bool is_redirection_; - vector tqchildren_nodes_; + vector children_nodes_; LinkStatus* parent_; LinkStatus* redirection_; bool checked_; diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h index 52c5d92e..4a2e4099 100644 --- a/klinkstatus/src/engine/linkstatus_impl.h +++ b/klinkstatus/src/engine/linkstatus_impl.h @@ -136,13 +136,13 @@ inline void LinkStatus::setIsRedirection(bool e_redirection) inline void LinkStatus::addChildNode(Node* node) { - tqchildren_nodes_.push_back(node); + children_nodes_.push_back(node); } inline void LinkStatus::reserveMemoryForChildrenNodes(int n) { Q_ASSERT(n > 0); - tqchildren_nodes_.reserve(n); + children_nodes_.reserve(n); } inline void LinkStatus::setChecked(bool flag) @@ -347,9 +347,9 @@ inline Node* LinkStatus::node() const return node_; } -inline vector const& LinkStatus::tqchildrenNodes() const +inline vector const& LinkStatus::childrenNodes() const { - return tqchildren_nodes_; + return children_nodes_; } inline bool LinkStatus::checked() const diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 1070db43..591b3acd 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -217,7 +217,7 @@ void SearchManager::slotRootChecked(const LinkStatus * link, LinkChecker * check { current_depth_ = 1; - vector no = tqchildren(LinkStatus::lastRedirection(&root_)); + vector no = children(LinkStatus::lastRedirection(&root_)); emit signalLinksToCheckTotalSteps(no.size()); @@ -255,14 +255,14 @@ void SearchManager::slotRootChecked(const LinkStatus * link, LinkChecker * check checker = 0; } -vector SearchManager::tqchildren(LinkStatus* link) +vector SearchManager::children(LinkStatus* link) { - vector tqchildren; + vector children; if(!link || link->absoluteUrl().hasRef()) - return tqchildren; + return children; - vector const& nodes = link->tqchildrenNodes(); + vector const& nodes = link->childrenNodes(); int count = 0; for(uint i = 0; i != nodes.size(); ++i) @@ -278,7 +278,7 @@ vector SearchManager::tqchildren(LinkStatus* link) if( (node->isLink() && checkable(url, *link) && - !Url::existUrl(url, tqchildren) && + !Url::existUrl(url, children) && !node->url().isEmpty()) || node->malformed() ) @@ -310,7 +310,7 @@ vector SearchManager::tqchildren(LinkStatus* link) } Q_ASSERT(link->externalDomainDepth() <= external_domain_depth_); - tqchildren.push_back(ls); + children.push_back(ls); } if(count == 50) { @@ -319,7 +319,7 @@ vector SearchManager::tqchildren(LinkStatus* link) } } - return tqchildren; + return children; } bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const @@ -513,7 +513,7 @@ void SearchManager::checkLinksSimultaneously(vector const& links) ++ignored_links_; ls->setIgnored(true); ls->setErrorOccurred(true); - ls->setError(i18n("Protocol %1 not supported").tqarg(protocol)); + ls->setError(i18n("Protocol %1 not supported").arg(protocol)); ls->setStatus(LinkStatus::MALFORMED); ls->setChecked(true); slotLinkChecked(ls, 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 f(tqchildren( LinkStatus::lastRedirection(((ultimo_nivel[i])[j])) )); + vector f(children( LinkStatus::lastRedirection(((ultimo_nivel[i])[j])) )); if(f.size() != 0) { search_results_[search_results_.size() - 1].push_back(f); diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h index bef360a1..39628917 100644 --- a/klinkstatus/src/engine/searchmanager.h +++ b/klinkstatus/src/engine/searchmanager.h @@ -111,7 +111,7 @@ private: void checkRoot(); void checkVectorLinks(vector const& links); // corresponde a um no de um nivel de depth - vector tqchildren(LinkStatus* link); + vector children(LinkStatus* link); void startSearch(); void continueSearch(); void finnish(); diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui index 75538524..355d3bb1 100644 --- a/klinkstatus/src/ui/sessionwidgetbase.ui +++ b/klinkstatus/src/ui/sessionwidgetbase.ui @@ -109,7 +109,7 @@ URL: - + AlignVCenter|AlignLeft diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 1ca0b251..d1609d31 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -386,7 +386,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url) if(!success) { - TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").tqarg(filePath); + TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").arg(filePath); KMessageBox::error(parentWidget(), message); } } @@ -440,10 +440,10 @@ void TableLinkstatus::slotViewParentUrlInBrowser() TableItem::TableItem(TQTable* table, EditType et, LinkStatus const* linkstatus, - int column_index, int tqalignment) + int column_index, int alignment) : TQTableItem(table, et, ""), ResultViewItem(linkstatus, column_index), /*ls_((LinkStatus*)linkstatus), - column_index_(column_index),*/ alignment_(tqalignment) + column_index_(column_index),*/ alignment_(alignment) { //Q_ASSERT(ls_); //Q_ASSERT(column_index_ > 0); @@ -472,7 +472,7 @@ void TableItem::setAlignment(int aFlags) alignment_ = aFlags; } -int TableItem::tqalignment() const +int TableItem::alignment() const { return alignment_; } @@ -679,10 +679,10 @@ TQString TableItemStatus::toolTip() const (linkStatus()->absoluteUrl().protocol() != "http" && linkStatus()->absoluteUrl().protocol() != "https")) { - return i18n("%1").tqarg(linkStatus()->status()); + return i18n("%1").arg(linkStatus()->status()); } else - return i18n("%1").tqarg(linkStatus()->httpHeader().reasonPhrase()); + return i18n("%1").arg(linkStatus()->httpHeader().reasonPhrase()); } void TableItemStatus::paint( TQPainter *p, const TQColorGroup &cg, @@ -716,7 +716,7 @@ void TableItemStatus::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() ); } /* diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h index 58269c98..6f601508 100644 --- a/klinkstatus/src/ui/tablelinkstatus.h +++ b/klinkstatus/src/ui/tablelinkstatus.h @@ -111,14 +111,14 @@ public: TableItem(TQTable* table, EditType et, LinkStatus const* linkstatus, - int column_index, int tqalignment = TQt::AlignLeft); + int column_index, int alignment = TQt::AlignLeft); virtual ~TableItem(); virtual void setColumnIndex(int i); virtual int columnIndex() const; void setAlignment(int aFlags); - virtual int tqalignment() const; + virtual int alignment() const; virtual TQString toolTip() const = 0; //LinkStatus const* const linkStatus() const; diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index 9a6302f7..814d2a27 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -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) @@ -292,7 +292,7 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url) if(!success) { - TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").tqarg(filePath); + TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").arg(filePath); KMessageBox::error(parentWidget(), message); } } diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index a44ac475..fd3884a5 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -141,7 +141,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe { if ( styleSheet ) { - static TQCString appPath( TQString::fromLatin1("\"%1\"").tqarg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("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( "
KLinkStatus encountered the following error while parsing a message:
%1
" ).tqarg( errorMsg ); + resultString = i18n( "
KLinkStatus encountered the following error while parsing a message:
%1
" ).arg( errorMsg ); } #ifdef RAWXSL -- cgit v1.2.3