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/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 +-- 18 files changed, 44 insertions(+), 44 deletions(-) (limited to 'klinkstatus/src/ui') 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); -- cgit v1.2.1