From 625904bd3097f9749450428904ca14ff2531824d 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/kdeutils@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwallet/allyourbase.cpp | 42 +++++++++++++++++------------------ kwallet/allyourbase.h | 12 +++++----- kwallet/konfigurator/konfigurator.cpp | 8 +++---- kwallet/konfigurator/konfigurator.h | 2 +- kwallet/kwalleteditor.cpp | 28 +++++++++++------------ kwallet/kwalleteditor.h | 2 +- kwallet/kwalletmanager.cpp | 4 ++-- kwallet/kwalletmanager.h | 2 +- kwallet/kwalletpopup.cpp | 4 ++-- kwallet/kwalletpopup.h | 2 +- kwallet/kwmapeditor.cpp | 4 ++-- kwallet/kwmapeditor.h | 2 +- 12 files changed, 56 insertions(+), 56 deletions(-) (limited to 'kwallet') diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp index 2846172..c031b35 100644 --- a/kwallet/allyourbase.cpp +++ b/kwallet/allyourbase.cpp @@ -38,8 +38,8 @@ /**************** * KWalletFolderItem - ListView items to represent kwallet folders */ -KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* tqparent, const TQString &name, int entries) -: KListViewItem(tqparent),_wallet(w),_name(name),_entries(entries) { +KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString &name, int entries) +: KListViewItem(parent),_wallet(w),_name(name),_entries(entries) { setText(0, TQString("%1 (%2)").tqarg(_name).tqarg(_entries)); setRenameEnabled(0, false); setDragEnabled(true); @@ -121,8 +121,8 @@ KWalletFolderItem::~KWalletFolderItem() { * KWalletContainerItem - ListView items to represent kwallet containers, i.e. * passwords, maps, ... */ -KWalletContainerItem::KWalletContainerItem(TQListViewItem* tqparent, const TQString &name, KWallet::Wallet::EntryType type) -: KListViewItem(tqparent, name), _type(type) { +KWalletContainerItem::KWalletContainerItem(TQListViewItem* parent, const TQString &name, KWallet::Wallet::EntryType type) +: KListViewItem(parent, name), _type(type) { setRenameEnabled(0, false); setDragEnabled(true); } @@ -154,8 +154,8 @@ TQListViewItem *KWalletContainerItem::getItem(const TQString& key) { /**************** * KWalletEntryItem - ListView items to represent kwallet entries */ -KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* tqparent, const TQString& ename) -: KListViewItem(tqparent, ename), _wallet(w), _oldName(ename) { +KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename) +: KListViewItem(parent, ename), _wallet(w), _oldName(ename) { setRenameEnabled(0, true); setDragEnabled(true); } @@ -170,8 +170,8 @@ KWalletEntryItem::~KWalletEntryItem() { /**************** * KWalletItem - IconView items to represent wallets */ -KWalletItem::KWalletItem(TQIconView *tqparent, const TQString& walletName) -: TQIconViewItem(tqparent, walletName, DesktopIcon("kwalletmanager")) { +KWalletItem::KWalletItem(TQIconView *parent, const TQString& walletName) +: TQIconViewItem(parent, walletName, DesktopIcon("kwalletmanager")) { } KWalletItem::~KWalletItem() { @@ -300,12 +300,12 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList& lst //delete the folder from the source if we were moving TQt::ButtonState state = kapp->keyboardMouseState(); - if (e->source() && e->source()->tqparent() && - !strcmp(e->source()->tqparent()->className(), "KWalletEntryList") && + if (e->source() && e->source()->parent() && + !strcmp(e->source()->parent()->className(), "KWalletEntryList") && !(state & TQt::ControlButton)) { KWalletEntryList *el = - dynamic_cast(e->source()->tqparent()); + dynamic_cast(e->source()->parent()); if (el) { KWalletFolderItem *fi = dynamic_cast(el->selectedItem()); @@ -348,8 +348,8 @@ class KWalletFolderDrag : public TQStoredDrag { /**************** * KWalletEntryList - A listview to store wallet entries */ -KWalletEntryList::KWalletEntryList(TQWidget *tqparent, const char *name) -: KListView(tqparent, name) { +KWalletEntryList::KWalletEntryList(TQWidget *parent, const char *name) +: KListView(parent, name) { addColumn(i18n("Folders")); setRootIsDecorated(true); setDefaultRenameAction(Reject); @@ -389,10 +389,10 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) { TQListViewItem *sel = 0L; //detect if we are dragging from kwallet itself - if (e->source() && e->source()->tqparent() && - !strcmp(e->source()->tqparent()->className(), "KWalletEntryList")) { + if (e->source() && e->source()->parent() && + !strcmp(e->source()->parent()->className(), "KWalletEntryList")) { - el = dynamic_cast(e->source()->tqparent()); + el = dynamic_cast(e->source()->parent()); if (!el) { KMessageBox::error(this, i18n("An unexpected error occurred trying to drop the item")); } else @@ -401,7 +401,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) { if (e->provides("application/x-kwallet-entry")) { //do nothing if we are in the same folder - if (sel && sel->tqparent()->tqparent() == + if (sel && sel->parent()->parent() == KWalletEntryList::getItemFolder(item)) { e->ignore(); return; @@ -562,9 +562,9 @@ KWalletFolderItem *KWalletEntryList::getItemFolder(TQListViewItem *item) { case KWalletFolderItemClass: return dynamic_cast(item); case KWalletContainerItemClass: - return dynamic_cast(item->tqparent()); + return dynamic_cast(item->parent()); case KWalletEntryItemClass: - return dynamic_cast(item->tqparent()->tqparent()); + return dynamic_cast(item->parent()->parent()); } return 0; } @@ -618,8 +618,8 @@ class KWalletIconDrag : public TQIconDrag { /**************** * * KWalletIconView - An iconview to store wallets * */ -KWalletIconView::KWalletIconView(TQWidget *tqparent, const char *name) -: KIconView(tqparent, name) { +KWalletIconView::KWalletIconView(TQWidget *parent, const char *name) +: KIconView(parent, name) { KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList&))); } diff --git a/kwallet/allyourbase.h b/kwallet/allyourbase.h index 17f92a5..d7bb391 100644 --- a/kwallet/allyourbase.h +++ b/kwallet/allyourbase.h @@ -39,7 +39,7 @@ enum KWalletListItemClasses { class KWalletEntryItem : public KListViewItem { public: - KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* tqparent, const TQString& ename); + KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename); virtual ~KWalletEntryItem(); const TQString& oldName() { return _oldName; } @@ -57,7 +57,7 @@ class KWalletEntryItem : public KListViewItem { class KWalletContainerItem : public KListViewItem { public: - KWalletContainerItem(TQListViewItem* tqparent, const TQString& name, + KWalletContainerItem(TQListViewItem* parent, const TQString& name, KWallet::Wallet::EntryType type); virtual ~KWalletContainerItem(); @@ -73,7 +73,7 @@ class KWalletContainerItem : public KListViewItem { class KWalletFolderItem : public KListViewItem { public: - KWalletFolderItem(KWallet::Wallet *w, TQListView* tqparent, + KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString& name, int entries); virtual ~KWalletFolderItem(); @@ -99,7 +99,7 @@ class KWalletEntryList : public KListView { Q_OBJECT TQ_OBJECT public: - KWalletEntryList(TQWidget *tqparent, const char *name = 0L); + KWalletEntryList(TQWidget *parent, const char *name = 0L); virtual ~KWalletEntryList(); bool existsFolder(const TQString& name); @@ -122,7 +122,7 @@ class KWalletEntryList : public KListView { class KWalletItem : public TQIconViewItem { public: - KWalletItem(TQIconView *tqparent, const TQString& walletName); + KWalletItem(TQIconView *parent, const TQString& walletName); virtual ~KWalletItem(); virtual bool acceptDrop(const TQMimeSource *mime) const; @@ -136,7 +136,7 @@ class KWalletIconView : public KIconView { Q_OBJECT TQ_OBJECT public: - KWalletIconView(TQWidget *tqparent, const char *name = 0L); + KWalletIconView(TQWidget *parent, const char *name = 0L); virtual ~KWalletIconView(); protected slots: diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp index aeffa55..fd058ad 100644 --- a/kwallet/konfigurator/konfigurator.cpp +++ b/kwallet/konfigurator/konfigurator.cpp @@ -40,8 +40,8 @@ typedef KGenericFactory KWalletFactory; K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet")) -KWalletConfig::KWalletConfig(TQWidget *tqparent, const char *name, const TQStringList&) -: KCModule(KWalletFactory::instance(), tqparent, name) { +KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&) +: KCModule(KWalletFactory::instance(), parent, name) { KAboutData *about = new KAboutData(I18N_NOOP("kcmkwallet"), @@ -302,9 +302,9 @@ TQString KWalletConfig::quickHelp() const { void KWalletConfig::contextMenuRequested(TQListViewItem *item, const TQPoint& pos, int col) { Q_UNUSED(col) - if (item && item->tqparent()) { + if (item && item->parent()) { KPopupMenu *m = new KPopupMenu(this); - m->insertTitle(item->tqparent()->text(0)); + m->insertTitle(item->parent()->text(0)); m->insertItem(i18n("&Delete"), this, TQT_SLOT(deleteEntry()), Key_Delete); m->popup(pos); } diff --git a/kwallet/konfigurator/konfigurator.h b/kwallet/konfigurator/konfigurator.h index 63ba608..2c62842 100644 --- a/kwallet/konfigurator/konfigurator.h +++ b/kwallet/konfigurator/konfigurator.h @@ -30,7 +30,7 @@ class KWalletConfig : public KCModule { Q_OBJECT TQ_OBJECT public: - KWalletConfig(TQWidget *tqparent = 0L, const char *name = 0L, const TQStringList& = TQStringList()); + KWalletConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList& = TQStringList()); virtual ~KWalletConfig(); void load(); diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp index 5ab1f8f..e79610f 100644 --- a/kwallet/kwalleteditor.cpp +++ b/kwallet/kwalleteditor.cpp @@ -62,8 +62,8 @@ #include #include -KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *tqparent, const char *name) -: KMainWindow(tqparent, name), _walletName(wallet), _nonLocal(isPath) { +KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent, const char *name) +: KMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) { _newWallet = false; _ww = new WalletWidget(this, "Wallet Widget"); _copyPassAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyPassword()), actionCollection()); @@ -348,8 +348,8 @@ void KWalletEditor::saveEntry() { _ww->_saveChanges->setEnabled(false); _ww->_undoChanges->setEnabled(false); - if (item && _w && item->tqparent()) { - KWalletContainerItem *ci = dynamic_cast(item->tqparent()); + if (item && _w && item->parent()) { + KWalletContainerItem *ci = dynamic_cast(item->parent()); if (ci) { if (ci->type() == KWallet::Wallet::Password) { rc = _w->writePassword(item->text(0), _ww->_passwordValue->text()); @@ -387,11 +387,11 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) { switch (item->rtti()) { case KWalletEntryItemClass: - ci = dynamic_cast(item->tqparent()); + ci = dynamic_cast(item->parent()); if (!ci) { return; } - fi = dynamic_cast(ci->tqparent()); + fi = dynamic_cast(ci->parent()); if (!fi) { return; } @@ -430,7 +430,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) { break; case KWalletContainerItemClass: - fi = dynamic_cast(item->tqparent()); + fi = dynamic_cast(item->parent()); if (!fi) { return; } @@ -560,7 +560,7 @@ void KWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoint if (item) { if (item->rtti() == KWalletEntryItemClass) { - ci = dynamic_cast(item->tqparent()); + ci = dynamic_cast(item->parent()); if (!ci) { return; } @@ -635,9 +635,9 @@ void KWalletEditor::newEntry() { if (_w && item) { p = item; if (p->rtti() == KWalletEntryItemClass) { - p = item->tqparent(); + p = item->parent(); } - fi = dynamic_cast(p->tqparent()); + fi = dynamic_cast(p->parent()); if (!fi) { return; } @@ -671,10 +671,10 @@ void KWalletEditor::newEntry() { if (_w && item && !n.isEmpty()) { TQListViewItem *p = item; if (p->rtti() == KWalletEntryItemClass) { - p = item->tqparent(); + p = item->parent(); } - KWalletFolderItem *fi = dynamic_cast(p->tqparent()); + KWalletFolderItem *fi = dynamic_cast(p->parent()); if (!fi) { KMessageBox::error(this, i18n("An unexpected error occurred trying to add the new entry")); return; @@ -728,7 +728,7 @@ void KWalletEditor::listItemRenamed(TQListViewItem* item, int, const TQString& t if (_w->renameEntry(i->oldName(), t) == 0) { i->clearOldName(); - KWalletContainerItem *ci = dynamic_cast(item->tqparent()); + KWalletContainerItem *ci = dynamic_cast(item->parent()); if (!ci) { KMessageBox::error(this, i18n("An unexpected error occurred trying to rename the entry")); return; @@ -752,7 +752,7 @@ void KWalletEditor::deleteEntry() { if (_w && item) { int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the item '%1'?").tqarg(item->text(0)),"",KStdGuiItem::del()); if (rc == KMessageBox::Continue) { - KWalletFolderItem *fi = dynamic_cast(item->tqparent()->tqparent()); + KWalletFolderItem *fi = dynamic_cast(item->parent()->parent()); if (!fi) { KMessageBox::error(this, i18n("An unexpected error occurred trying to delete the entry")); return; diff --git a/kwallet/kwalleteditor.h b/kwallet/kwalleteditor.h index 7d4fe86..02f1342 100644 --- a/kwallet/kwalleteditor.h +++ b/kwallet/kwalleteditor.h @@ -39,7 +39,7 @@ class KWalletEditor : public KMainWindow { TQ_OBJECT public: - KWalletEditor(const TQString& wallet, bool isPath, TQWidget *tqparent = 0, const char* name = 0); + KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent = 0, const char* name = 0); virtual ~KWalletEditor(); bool isOpen() const { return _w != 0L; } diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp index 9a85df8..d65dcd2 100644 --- a/kwallet/kwalletmanager.cpp +++ b/kwallet/kwalletmanager.cpp @@ -46,8 +46,8 @@ #include #include -KWalletManager::KWalletManager(TQWidget *tqparent, const char *name, WFlags f) -: KMainWindow(tqparent, name, f), DCOPObject("KWalletManager") { +KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f) +: KMainWindow(parent, name, f), DCOPObject("KWalletManager") { KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); _kwalletdLaunch = false; TQAccel *accel = new TQAccel(this, "kwalletmanager"); diff --git a/kwallet/kwalletmanager.h b/kwallet/kwalletmanager.h index 922da8f..acb8006 100644 --- a/kwallet/kwalletmanager.h +++ b/kwallet/kwalletmanager.h @@ -36,7 +36,7 @@ class KWalletManager : public KMainWindow, public DCOPObject { K_DCOP public: - KWalletManager(TQWidget *tqparent = 0, const char* name = 0, WFlags f = 0); + KWalletManager(TQWidget *parent = 0, const char* name = 0, WFlags f = 0); virtual ~KWalletManager(); TQPixmap loadSystemTrayIcon(const TQString &icon); diff --git a/kwallet/kwalletpopup.cpp b/kwallet/kwalletpopup.cpp index 592c10e..032ec8a 100644 --- a/kwallet/kwalletpopup.cpp +++ b/kwallet/kwalletpopup.cpp @@ -28,8 +28,8 @@ #include #include -KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *tqparent, const char *name) -: KPopupMenu(tqparent, name), _walletName(wallet) { +KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char *name) +: KPopupMenu(parent, name), _walletName(wallet) { insertTitle(wallet); KActionCollection *ac = new KActionCollection(this, "kwallet context actions"); KAction *act; diff --git a/kwallet/kwalletpopup.h b/kwallet/kwalletpopup.h index 3d5d83c..ce35669 100644 --- a/kwallet/kwalletpopup.h +++ b/kwallet/kwalletpopup.h @@ -29,7 +29,7 @@ class KWalletPopup : public KPopupMenu { TQ_OBJECT public: - KWalletPopup(const TQString& wallet, TQWidget *tqparent = 0, const char* name = 0); + KWalletPopup(const TQString& wallet, TQWidget *parent = 0, const char* name = 0); virtual ~KWalletPopup(); public slots: diff --git a/kwallet/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp index 302540e..fd53723 100644 --- a/kwallet/kwmapeditor.cpp +++ b/kwallet/kwmapeditor.cpp @@ -31,8 +31,8 @@ #include #include -KWMapEditor::KWMapEditor(TQMap& map, TQWidget *tqparent, const char *name) -: TQTable(0, 3, tqparent, name), _map(map) { +KWMapEditor::KWMapEditor(TQMap& map, TQWidget *parent, const char *name) +: TQTable(0, 3, parent, name), _map(map) { _ac = new KActionCollection(this); _copyAct = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), _ac); connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty())); diff --git a/kwallet/kwmapeditor.h b/kwallet/kwmapeditor.h index 3b434af..fc34cbc 100644 --- a/kwallet/kwmapeditor.h +++ b/kwallet/kwmapeditor.h @@ -32,7 +32,7 @@ class KWMapEditor : public TQTable { TQ_OBJECT public: - KWMapEditor(TQMap& map, TQWidget *tqparent = 0, const char *name = 0); + KWMapEditor(TQMap& map, TQWidget *parent = 0, const char *name = 0); virtual ~KWMapEditor(); public slots: -- cgit v1.2.1