From 6c79d50fa9fbdff7f69ca57a8ab5fcc942375593 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- klinkstatus/src/actionmanager.cpp | 4 +-- klinkstatus/src/actionmanager.h | 2 +- klinkstatus/src/engine/linkchecker.cpp | 10 +++---- klinkstatus/src/engine/linkchecker.h | 2 +- klinkstatus/src/engine/linkstatus.cpp | 2 +- klinkstatus/src/engine/linkstatus.h | 8 +++--- klinkstatus/src/engine/linkstatus_impl.h | 20 +++++++------- klinkstatus/src/engine/searchmanager.cpp | 4 +-- klinkstatus/src/engine/searchmanager.h | 2 +- klinkstatus/src/global.cpp | 4 +-- klinkstatus/src/global.h | 2 +- klinkstatus/src/klinkstatus_part.cpp | 4 +-- klinkstatus/src/klinkstatus_part.h | 2 +- klinkstatus/src/parser/url.cpp | 2 +- klinkstatus/src/ui/documentrootdialog.cpp | 4 +-- klinkstatus/src/ui/documentrootdialog.h | 2 +- klinkstatus/src/ui/klshistorycombo.cpp | 4 +-- klinkstatus/src/ui/klshistorycombo.h | 2 +- klinkstatus/src/ui/resultssearchbar.cpp | 4 +-- klinkstatus/src/ui/resultssearchbar.h | 2 +- klinkstatus/src/ui/sessionwidget.cpp | 6 ++-- klinkstatus/src/ui/sessionwidget.h | 2 +- klinkstatus/src/ui/sessionwidgetbase.ui | 2 +- .../src/ui/settings/configidentificationdialog.cpp | 4 +-- .../src/ui/settings/configidentificationdialog.h | 2 +- klinkstatus/src/ui/settings/configsearchdialog.ui | 2 +- klinkstatus/src/ui/tablelinkstatus.cpp | 8 +++--- klinkstatus/src/ui/tablelinkstatus.h | 2 +- klinkstatus/src/ui/tabwidgetsession.cpp | 4 +-- klinkstatus/src/ui/tabwidgetsession.h | 2 +- klinkstatus/src/ui/treeview.cpp | 32 +++++++++++----------- klinkstatus/src/ui/treeview.h | 4 +-- klinkstatus/src/utils/xsl.cpp | 4 +-- klinkstatus/src/utils/xsl.h | 2 +- 34 files changed, 81 insertions(+), 81 deletions(-) (limited to 'klinkstatus/src') diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index 94506ea3..2f74369d 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -63,8 +63,8 @@ public: SessionWidget* sessionWidget; }; -ActionManager::ActionManager(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), d(new ActionManagerPrivate) +ActionManager::ActionManager(TQObject *parent, const char *name) + : TQObject(parent, name), d(new ActionManagerPrivate) {} ActionManager::~ActionManager() diff --git a/klinkstatus/src/actionmanager.h b/klinkstatus/src/actionmanager.h index b2426d8d..bd9fdd7f 100644 --- a/klinkstatus/src/actionmanager.h +++ b/klinkstatus/src/actionmanager.h @@ -39,7 +39,7 @@ class ActionManager : public TQObject Q_OBJECT TQ_OBJECT public: - ActionManager(TQObject* tqparent=0, const char* name=0); + ActionManager(TQObject* parent=0, const char* name=0); virtual ~ActionManager(); static ActionManager* getInstance(); diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 7efe5a45..bf54a59b 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -44,8 +44,8 @@ int LinkChecker::count_ = 0; LinkChecker::LinkChecker(LinktqStatus* linkstatus, int time_out, - TQObject *tqparent, const char *name) - : TQObject(tqparent, name), search_manager_(0), + TQObject *parent, const char *name) + : TQObject(parent, name), search_manager_(0), linkstatus_(linkstatus), t_job_(0), time_out_(time_out), checker_(0), document_charset_(), redirection_(false), header_checked_(false), finnished_(false), parsing_(false), is_charset_checked_(false), has_defined_charset_(false) @@ -84,8 +84,8 @@ void LinkChecker::check() t_job_->addMetaData("PropagateHttpHeader", "true"); // to have the http header - if (linkstatus_->tqparent()) { - t_job_->addMetaData("referrer", linkstatus_->tqparent()->absoluteUrl().prettyURL()); + if (linkstatus_->parent()) { + t_job_->addMetaData("referrer", linkstatus_->parent()->absoluteUrl().prettyURL()); } if(search_manager_->sendIdentification()) @@ -550,7 +550,7 @@ void LinkChecker::checkRef() int i_ref = -1; if(linktqStatus()->originalUrl().startsWith("#")) - ls_parent = linktqStatus()->tqparent(); + ls_parent = linktqStatus()->parent(); else { diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index 74cf9eb9..9b13d210 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -43,7 +43,7 @@ class LinkChecker : public TQObject TQ_OBJECT public: LinkChecker(LinktqStatus* linkstatus, int time_out = 50, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); ~LinkChecker(); //virtual void run(); diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp index d95c7860..ac70b73e 100644 --- a/klinkstatus/src/engine/linkstatus.cpp +++ b/klinkstatus/src/engine/linkstatus.cpp @@ -101,7 +101,7 @@ TQString const LinktqStatus::toString() const if(!is_root_) { Q_ASSERT(parent_); - aux += i18n( "Parent: %1" ).tqarg( tqparent()->absoluteUrl().prettyURL() ) + "\n"; + aux += i18n( "Parent: %1" ).tqarg( parent()->absoluteUrl().prettyURL() ) + "\n"; } Q_ASSERT(!original_url_.isNull()); diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h index a74282f8..dddf320e 100644 --- a/klinkstatus/src/engine/linkstatus.h +++ b/klinkstatus/src/engine/linkstatus.h @@ -61,7 +61,7 @@ public: LinktqStatus(); LinktqStatus(KURL const& absolute_url); - LinktqStatus(Node* node, LinktqStatus* tqparent); + LinktqStatus(Node* node, LinktqStatus* parent); ~LinktqStatus(); void save(TQDomElement& element) const; @@ -70,7 +70,7 @@ public: void setRootUrl(KURL const& url); void settqStatus(tqStatus status); void setDepth(uint depth); - void setParent(LinktqStatus* tqparent); + void setParent(LinktqStatus* parent); void setOriginalUrl(TQString const& url_original); void setLabel(TQString const& label); void setAbsoluteUrl(KURL const& url_absoluto); @@ -106,7 +106,7 @@ public: 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* tqparent() const; + LinktqStatus const* parent() const; TQString const& originalUrl() const; TQString const& label() const; KURL const& absoluteUrl() const; @@ -142,7 +142,7 @@ public: private: /** - Load some atributes in function of his tqparent node. + Load some atributes in function of his parent node. */ void loadNode(); diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h index a29bcdcc..3b1b3062 100644 --- a/klinkstatus/src/engine/linkstatus_impl.h +++ b/klinkstatus/src/engine/linkstatus_impl.h @@ -36,7 +36,7 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url) setAbsoluteUrl(absolute_url); } -inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent) +inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent) : status_(LinktqStatus::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), @@ -45,9 +45,9 @@ inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent) { loadNode(); - setDepth(tqparent->depth() + 1); - setParent(tqparent); - setRootUrl(tqparent->rootUrl()); + setDepth(parent->depth() + 1); + setParent(parent); + setRootUrl(parent->rootUrl()); } inline void LinktqStatus::setRootUrl(KURL const& url) @@ -65,12 +65,12 @@ inline void LinktqStatus::setDepth(uint depth) depth_ = depth; } -inline void LinktqStatus::setParent(LinktqStatus* tqparent) +inline void LinktqStatus::setParent(LinktqStatus* parent) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); - parent_ = tqparent; - addReferrer(tqparent->absoluteUrl()); + parent_ = parent; + addReferrer(parent->absoluteUrl()); } inline void LinktqStatus::setAbsoluteUrl(KURL const& url_absoluto) @@ -176,7 +176,7 @@ inline void LinktqStatus::setBaseURI(KURL const& base_url) if(!base_url.isValid()) { kdWarning(23100) << "base url not valid: " << endl - << "tqparent: " << tqparent()->absoluteUrl().prettyURL() << endl + << "parent: " << parent()->absoluteUrl().prettyURL() << endl << "url: " << absoluteUrl().prettyURL() << endl << "base url resolved: " << base_url.prettyURL() << endl; } @@ -261,7 +261,7 @@ inline bool LinktqStatus::isLocalRestrict() const return is_local_restrict_; } -inline LinktqStatus const* LinktqStatus::tqparent() const +inline LinktqStatus const* LinktqStatus::parent() const { return parent_; } diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 82c7350a..6ba9a1ba 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -37,8 +37,8 @@ SearchManager::SearchManager(int max_simultaneous_connections, int time_out, - TQObject *tqparent, const char *name) - : TQObject(tqparent, name), + TQObject *parent, const char *name) + : TQObject(parent, name), max_simultaneous_connections_(max_simultaneous_connections), has_document_root_(false), depth_(-1), current_depth_(0), external_domain_depth_(0), current_node_(0), current_index_(0), links_being_checked_(0), diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h index e977eae4..bee819da 100644 --- a/klinkstatus/src/engine/searchmanager.h +++ b/klinkstatus/src/engine/searchmanager.h @@ -55,7 +55,7 @@ public: }; SearchManager(int max_simultaneous_connections = 3, int time_out = 50, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); ~SearchManager(); TQString toXML() const; diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index 9fe9d96d..89a852a7 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -40,8 +40,8 @@ Global* Global::self() return m_self_; } -Global::Global(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), loop_started_(false) +Global::Global(TQObject *parent, const char *name) + : TQObject(parent, name), loop_started_(false) { m_self_ = this; dcop_client_ = kapp->dcopClient(); diff --git a/klinkstatus/src/global.h b/klinkstatus/src/global.h index 1e465404..27832ab1 100644 --- a/klinkstatus/src/global.h +++ b/klinkstatus/src/global.h @@ -40,7 +40,7 @@ public: static void openQuanta(TQStringList const& args); private: - Global(TQObject *tqparent = 0, const char *name = 0); + Global(TQObject *parent = 0, const char *name = 0); static void execCommand(TQString const& command); private slots: diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index 54b08f0b..6d8df6a8 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -56,9 +56,9 @@ typedef KParts::GenericFactory KLinkStatusFactory; K_EXPORT_COMPONENT_FACTORY( libklinkstatuspart, KLinkStatusFactory ) KLinkStatusPart::KLinkStatusPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList & /*string_list*/) - : KParts::ReadOnlyPart(tqparent, name), m_dlgAbout(0) + : KParts::ReadOnlyPart(parent, name), m_dlgAbout(0) { setInstance(KLinkStatusFactory::instance()); diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h index 8d9eaf2e..60988054 100644 --- a/klinkstatus/src/klinkstatus_part.h +++ b/klinkstatus/src/klinkstatus_part.h @@ -40,7 +40,7 @@ class KLinkStatusPart: public KParts::ReadOnlyPart TQ_OBJECT public: KLinkStatusPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList& args); virtual ~KLinkStatusPart(); diff --git a/klinkstatus/src/parser/url.cpp b/klinkstatus/src/parser/url.cpp index 90a6e4e6..8ba29138 100644 --- a/klinkstatus/src/parser/url.cpp +++ b/klinkstatus/src/parser/url.cpp @@ -294,7 +294,7 @@ bool Url::localDomain(KURL const& url1, KURL const& url2, bool restrict) } /** - Returns true if url2 is a tqparent of url1. + Returns true if url2 is a parent of url1. */ bool Url::parentDir(KURL const& url1, KURL const& url2) { diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp index 622faedf..8c55519e 100644 --- a/klinkstatus/src/ui/documentrootdialog.cpp +++ b/klinkstatus/src/ui/documentrootdialog.cpp @@ -28,8 +28,8 @@ #include -DocumentRootDialog::DocumentRootDialog(TQWidget *tqparent, TQString const& url) - : KDialogBase(tqparent, "DocumentRootDialog", true, "Choose a Document Root", +DocumentRootDialog::DocumentRootDialog(TQWidget *parent, TQString const& url) + : KDialogBase(parent, "DocumentRootDialog", true, "Choose a Document Root", KDialogBase::Ok, KDialogBase::Ok, true), m_url(url) { diff --git a/klinkstatus/src/ui/documentrootdialog.h b/klinkstatus/src/ui/documentrootdialog.h index cf531e51..a78d7009 100644 --- a/klinkstatus/src/ui/documentrootdialog.h +++ b/klinkstatus/src/ui/documentrootdialog.h @@ -32,7 +32,7 @@ class DocumentRootDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - DocumentRootDialog(TQWidget *tqparent, TQString const& url); + DocumentRootDialog(TQWidget *parent, TQString const& url); ~DocumentRootDialog(); void setUrl(const TQString& theValue) { m_url = theValue; } diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index f342faa7..7ca1e533 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -24,8 +24,8 @@ bool KLSHistoryCombo::items_saved_ = false; -KLSHistoryCombo::KLSHistoryCombo(TQWidget *tqparent, const char *name) - : KHistoryCombo(tqparent, name) +KLSHistoryCombo::KLSHistoryCombo(TQWidget *parent, const char *name) + : KHistoryCombo(parent, name) { setMaxCount(KLSConfig::maxCountComboUrl()); diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h index 4627f55a..26c0e652 100644 --- a/klinkstatus/src/ui/klshistorycombo.h +++ b/klinkstatus/src/ui/klshistorycombo.h @@ -25,7 +25,7 @@ class KLSHistoryCombo : public KHistoryCombo TQ_OBJECT public: - KLSHistoryCombo(TQWidget* tqparent, const char* name); + KLSHistoryCombo(TQWidget* parent, const char* name); ~KLSHistoryCombo(); void init(); diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index 8d039558..10d47fda 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -54,8 +54,8 @@ public: int m_lastComboIndex; }; -ResultsSearchBar::ResultsSearchBar(TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate) +ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) + : TQWidget(parent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate) { tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); diff --git a/klinkstatus/src/ui/resultssearchbar.h b/klinkstatus/src/ui/resultssearchbar.h index a51c3f72..c177c5aa 100644 --- a/klinkstatus/src/ui/resultssearchbar.h +++ b/klinkstatus/src/ui/resultssearchbar.h @@ -35,7 +35,7 @@ class ResultsSearchBar : public TQWidget Q_OBJECT TQ_OBJECT public: - ResultsSearchBar(TQWidget *tqparent = 0, const char *name = 0); + ResultsSearchBar(TQWidget *parent = 0, const char *name = 0); ~ResultsSearchBar(); TQString const& text() const; diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 26123b6b..970ec7c6 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -66,8 +66,8 @@ SessionWidget::SessionWidget(int max_simultaneous_connections, int time_out, - TQWidget* tqparent, const char* name, WFlags f) - : SessionWidgetBase(tqparent, name, f), search_manager_(0), + TQWidget* parent, const char* name, WFlags f) + : SessionWidgetBase(parent, name, f), search_manager_(0), action_manager_(ActionManager::getInstance()), ready_(true), to_start_(false), to_pause_(false), to_stop_(false), in_progress_(false), paused_(false), stopped_(true), @@ -392,7 +392,7 @@ void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker if(linkstatus->checked()) { TreeViewItem* tree_view_item = 0; - TreeViewItem* parent_item = linkstatus->tqparent()->treeViewItem(); + TreeViewItem* parent_item = linkstatus->parent()->treeViewItem(); bool match = resultsSearchBar->currentLinkMatcher().matches(*linkstatus); if(tree_display_) diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h index a10df805..93fdca70 100644 --- a/klinkstatus/src/ui/sessionwidget.h +++ b/klinkstatus/src/ui/sessionwidget.h @@ -50,7 +50,7 @@ class SessionWidget: public SessionWidgetBase public: SessionWidget(int max_simultaneous_connections = 3, int time_out = 50, - TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0); + TQWidget* parent = 0, const char* name = 0, WFlags f = 0); ~SessionWidget(); diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui index 7cf9819a..43d6029e 100644 --- a/klinkstatus/src/ui/sessionwidgetbase.ui +++ b/klinkstatus/src/ui/sessionwidgetbase.ui @@ -212,7 +212,7 @@ true - Do &not check tqparent folders + Do &not check parent folders diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp index 28f00d81..f2675d81 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp +++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp @@ -29,8 +29,8 @@ #include "../cfg/klsconfig.h" -ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *tqparent, const char *name) - : ConfigIdentificationDialogUi(tqparent, name) +ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *parent, const char *name) + : ConfigIdentificationDialogUi(parent, name) { if(KLSConfig::userAgent().isEmpty()) { diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.h b/klinkstatus/src/ui/settings/configidentificationdialog.h index 033a74c5..da260180 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.h +++ b/klinkstatus/src/ui/settings/configidentificationdialog.h @@ -31,7 +31,7 @@ class ConfigIdentificationDialog : public ConfigIdentificationDialogUi Q_OBJECT TQ_OBJECT public: - ConfigIdentificationDialog(TQWidget *tqparent = 0, const char *name = 0); + ConfigIdentificationDialog(TQWidget *parent = 0, const char *name = 0); ~ConfigIdentificationDialog(); private slots: diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui index 4c63274b..62553ffb 100644 --- a/klinkstatus/src/ui/settings/configsearchdialog.ui +++ b/klinkstatus/src/ui/settings/configsearchdialog.ui @@ -149,7 +149,7 @@ kcfg_CheckParentFolders - Check tqparent folders + Check parent folders true diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 9fbd3b31..7f35d1f2 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -46,11 +46,11 @@ */ -TableLinkstatus::TableLinkstatus(TQWidget * tqparent, const char * name, +TableLinkstatus::TableLinkstatus(TQWidget * parent, const char * name, int column_index_status, int column_index_label, int column_index_URL) - : TQTable(tqparent, name), + : TQTable(parent, name), ResultView(column_index_status, column_index_label, column_index_URL) //context_table_menu_(this, "context_table_menu") { @@ -321,7 +321,7 @@ void TableLinkstatus::slotCopyUrlToClipboard() const void TableLinkstatus::slotCopyParentUrlToClipboard() const { TableItem* _item = myItem(currentRow(), currentColumn()); - TQString content(_item->linktqStatus()->tqparent()->absoluteUrl().prettyURL()); + TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL()); TQClipboard* cb = kapp->clipboard(); cb->setText(content); } @@ -420,7 +420,7 @@ void TableLinkstatus::slotViewParentUrlInBrowser() } else { - LinktqStatus const* ls_parent = _item->linktqStatus()->tqparent(); + LinktqStatus const* ls_parent = _item->linktqStatus()->parent(); Q_ASSERT(ls_parent); KURL url = ls_parent->absoluteUrl(); diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h index 70f6fd41..a8aebf8d 100644 --- a/klinkstatus/src/ui/tablelinkstatus.h +++ b/klinkstatus/src/ui/tablelinkstatus.h @@ -49,7 +49,7 @@ class TableLinkstatus: public TQTable, public ResultView TQ_OBJECT public: - TableLinkstatus(TQWidget * tqparent = 0, const char * name = 0, + TableLinkstatus(TQWidget * parent = 0, const char * name = 0, int column_index_status = 1, int column_index_label = 2, int column_index_URL = 3); diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 24c89d0f..fedbe573 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -42,8 +42,8 @@ #include -TabWidgetSession::TabWidgetSession(TQWidget* tqparent, const char* name, WFlags f) - : KTabWidget(tqparent, name, f) // tabs_ is initialized with size 17 +TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) + : KTabWidget(parent, name, f) // tabs_ is initialized with size 17 { setFocusPolicy(TQ_NoFocus); setMargin(0); diff --git a/klinkstatus/src/ui/tabwidgetsession.h b/klinkstatus/src/ui/tabwidgetsession.h index 4b315a85..1632fc9a 100644 --- a/klinkstatus/src/ui/tabwidgetsession.h +++ b/klinkstatus/src/ui/tabwidgetsession.h @@ -41,7 +41,7 @@ class TabWidgetSession : public KTabWidget TQ_OBJECT public: - TabWidgetSession(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0); + TabWidgetSession(TQWidget * parent = 0, const char * name = 0, WFlags f = 0); ~TabWidgetSession(); /** Set the URL in the current session widget */ diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index b5d42143..1d8f546e 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -39,8 +39,8 @@ #include "../cfg/klsconfig.h" -TreeView::TreeView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name), +TreeView::TreeView(TQWidget *parent, const char *name) + : KListView(parent, name), ResultView(), current_column_(0) { @@ -130,20 +130,20 @@ void TreeView::show(ResultView::tqStatus const& status) item->setVisible(true); //item->setEnabled(true); /* - if(KLSConfig::displayTreeView() && status != ResultView::good && item->tqparent()) + if(KLSConfig::displayTreeView() && status != ResultView::good && item->parent()) { - TreeViewItem* tqparent = myItem(item->tqparent()); - while(tqparent) + TreeViewItem* parent = myItem(item->parent()); + while(parent) { - kdDebug(23100) << "Show: " << tqparent->linktqStatus()->absoluteUrl().url() << endl; + kdDebug(23100) << "Show: " << parent->linktqStatus()->absoluteUrl().url() << endl; - tqparent->setVisible(true); - //tqparent->setEnabled(false); + parent->setVisible(true); + //parent->setEnabled(false); - if(tqparent->tqparent()) - tqparent = myItem(tqparent->tqparent()); + if(parent->parent()) + parent = myItem(parent->parent()); else - tqparent = 0; + parent = 0; } } */ @@ -226,7 +226,7 @@ void TreeView::slotCopyUrlToClipboard() const void TreeView::slotCopyParentUrlToClipboard() const { TreeViewItem* _item = myItem(currentItem()); - TQString content(_item->linktqStatus()->tqparent()->absoluteUrl().prettyURL()); + TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL()); TQClipboard* cb = kapp->tqclipboard(); cb->setText(content); } @@ -326,7 +326,7 @@ void TreeView::slotViewParentUrlInBrowser() } else { - LinktqStatus const* ls_parent = _item->linktqStatus()->tqparent(); + LinktqStatus const* ls_parent = _item->linktqStatus()->parent(); Q_ASSERT(ls_parent); KURL url = ls_parent->absoluteUrl(); @@ -392,10 +392,10 @@ TreeViewItem* TreeView::myItem(TQListViewItem* item) const /* ******************************* TreeViewItem ******************************* */ -TreeViewItem::TreeViewItem(TreeView* tqparent, TQListViewItem* after, +TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after, LinktqStatus const* linkstatus) - : KListViewItem(tqparent, after), - last_child_(0), root_(tqparent) + : KListViewItem(parent, after), + last_child_(0), root_(parent) { init(linkstatus); } diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h index dc3e62e8..05862bd4 100644 --- a/klinkstatus/src/ui/treeview.h +++ b/klinkstatus/src/ui/treeview.h @@ -32,7 +32,7 @@ class TreeView : public KListView, public ResultView TQ_OBJECT public: - TreeView(TQWidget *tqparent = 0, const char *name = 0); + TreeView(TQWidget *parent = 0, const char *name = 0); ~TreeView(); virtual void setColumns(TQStringList const& columns); @@ -91,7 +91,7 @@ class TreeViewItem: public KListViewItem { public: - TreeViewItem(TreeView* tqparent, TQListViewItem* after, + TreeViewItem(TreeView* parent, TQListViewItem* after, LinktqStatus const* linkstatus); TreeViewItem(TreeView* root, TQListViewItem* parent_item, TQListViewItem* after, LinktqStatus const* linkstatus); diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index 541c0498..fc3c8f31 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -196,8 +196,8 @@ public: unsigned int flags; }; -XSLT::XSLT( const TQString &document, TQObject *tqparent ) - : TQObject( tqparent ), d(new XSLTPrivate) +XSLT::XSLT( const TQString &document, TQObject *parent ) + : TQObject( parent ), d(new XSLTPrivate) { d->flags = 0; d->xslDoc = 0; diff --git a/klinkstatus/src/utils/xsl.h b/klinkstatus/src/utils/xsl.h index 93d6a74b..0760ae1b 100644 --- a/klinkstatus/src/utils/xsl.h +++ b/klinkstatus/src/utils/xsl.h @@ -57,7 +57,7 @@ public: * * Constructs a new XSLT parser using the provided XSLT document */ - XSLT( const TQString &xsltDocument, TQObject *tqparent = 0L ); + XSLT( const TQString &xsltDocument, TQObject *parent = 0L ); virtual ~XSLT(); -- cgit v1.2.3