diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-21 11:50:28 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-22 10:21:09 +0900 |
commit | d4393c1136b5fda7936d7506e3b9e3e6ac8e5897 (patch) | |
tree | 4e62267e24b4002d3a0f36a5b62578b902937bd7 /tdewallet | |
parent | 5b1fdb9a3fa898c7bc3921e75ae04eece2332fb3 (diff) | |
download | tdeutils-d4393c1136b5fda7936d7506e3b9e3e6ac8e5897.tar.gz tdeutils-d4393c1136b5fda7936d7506e3b9e3e6ac8e5897.zip |
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 83b7abfb88bb8d138bab0ab1c9f3e2d3afa418c2)
Diffstat (limited to 'tdewallet')
-rw-r--r-- | tdewallet/kwmapeditor.cpp | 2 | ||||
-rw-r--r-- | tdewallet/tdewalleteditor.cpp | 18 | ||||
-rw-r--r-- | tdewallet/tdewalletmanager.cpp | 26 | ||||
-rw-r--r-- | tdewallet/tdewalletpopup.cpp | 10 |
4 files changed, 28 insertions, 28 deletions
diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp index 32ff65e..87e2f88 100644 --- a/tdewallet/kwmapeditor.cpp +++ b/tdewallet/kwmapeditor.cpp @@ -34,7 +34,7 @@ KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name) : TQTable(0, 3, parent, name), _map(map) { _ac = new TDEActionCollection(this); - _copyAct = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), _ac); + _copyAct = KStdAction::copy(this, TQT_SLOT(copy()), _ac); connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty())); connect(this, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), this, TQT_SLOT(contextMenu(int,int,const TQPoint&))); diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp index 4fd16f5..81321f7 100644 --- a/tdewallet/tdewalleteditor.cpp +++ b/tdewallet/tdewalleteditor.cpp @@ -66,7 +66,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * : TDEMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) { _newWallet = false; _ww = new WalletWidget(this, "Wallet Widget"); - _copyPassAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyPassword()), actionCollection()); + _copyPassAction = KStdAction::copy(this, TQT_SLOT(copyPassword()), actionCollection()); TQVBoxLayout *box = new TQVBoxLayout(_ww->_entryListFrame); box->setSpacing( KDialog::spacingHint() ); @@ -159,48 +159,48 @@ void TDEWalletEditor::layout() { void TDEWalletEditor::createActions() { _newFolderAction = new TDEAction(i18n("&New Folder..."), "folder-new", - 0, TQT_TQOBJECT(this), TQT_SLOT(createFolder()), actionCollection(), + 0, this, TQT_SLOT(createFolder()), actionCollection(), "create_folder"); connect(this, TQT_SIGNAL(enableFolderActions(bool)), _newFolderAction, TQT_SLOT(setEnabled(bool))); _deleteFolderAction = new TDEAction(i18n("&Delete Folder"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(deleteFolder()), actionCollection(), + this, TQT_SLOT(deleteFolder()), actionCollection(), "delete_folder"); connect(this, TQT_SIGNAL(enableContextFolderActions(bool)), _deleteFolderAction, TQT_SLOT(setEnabled(bool))); connect(this, TQT_SIGNAL(enableFolderActions(bool)), _deleteFolderAction, TQT_SLOT(setEnabled(bool))); - _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), + _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, this, TQT_SLOT(changePassword()), actionCollection(), "change_password"); connect(this, TQT_SIGNAL(enableWalletActions(bool)), _passwordAction, TQT_SLOT(setEnabled(bool))); - _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, TQT_TQOBJECT(this), + _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, this, TQT_SLOT(importWallet()), actionCollection(), "merge"); connect(this, TQT_SIGNAL(enableWalletActions(bool)), _mergeAction, TQT_SLOT(setEnabled(bool))); - _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, TQT_TQOBJECT(this), + _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, this, TQT_SLOT(importXML()), actionCollection(), "import"); connect(this, TQT_SIGNAL(enableWalletActions(bool)), _importAction, TQT_SLOT(setEnabled(bool))); - _exportAction = new TDEAction(i18n("&Export..."), 0, 0, TQT_TQOBJECT(this), + _exportAction = new TDEAction(i18n("&Export..."), 0, 0, this, TQT_SLOT(exportXML()), actionCollection(), "export"); connect(this, TQT_SIGNAL(enableWalletActions(bool)), _exportAction, TQT_SLOT(setEnabled(bool))); - _saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); + _saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); connect(this, TQT_SIGNAL(enableWalletActions(bool)), _saveAsAction, TQT_SLOT(setEnabled(bool))); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); emit enableWalletActions(false); diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp index 4f7d824..8bc0b20 100644 --- a/tdewallet/tdewalletmanager.cpp +++ b/tdewallet/tdewalletmanager.cpp @@ -84,8 +84,8 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) } _iconView = new TDEWalletIconView(this, "tdewalletmanager icon view"); - connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(TQIconViewItem*))); - connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&))); + connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), this, TQT_SLOT(openWallet(TQIconViewItem*))); + connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&))); updateWalletDisplay(); setCentralWidget(_iconView); @@ -112,28 +112,28 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) // wallet closes before we are done opening. We will then stay // open. Must check that a wallet is still open here. - new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, this, TQT_SLOT(createWallet()), actionCollection(), "wallet_create"); TDEAction *act = new TDEAction(i18n("Configure &Wallet..."), "configure", - 0, TQT_TQOBJECT(this), TQT_SLOT(setupWallet()), actionCollection(), + 0, this, TQT_SLOT(setupWallet()), actionCollection(), "wallet_settings"); if (_tray) { act->plug(_tray->contextMenu()); } - act = new TDEAction(i18n("Close &All Wallets"), 0, 0, TQT_TQOBJECT(this), + act = new TDEAction(i18n("Close &All Wallets"), 0, 0, this, TQT_SLOT(closeAllWallets()), actionCollection(), "close_all_wallets"); if (_tray) { act->plug(_tray->contextMenu()); } - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(shuttingDown()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(shuttingDown()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); createGUI("tdewalletmanager.rc"); - accel->connectItem(accel->insertItem(Key_Return), TQT_TQOBJECT(this), TQT_SLOT(openWallet())); - accel->connectItem(accel->insertItem(Key_Delete), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet())); + accel->connectItem(accel->insertItem(Key_Return), this, TQT_SLOT(openWallet())); + accel->connectItem(accel->insertItem(Key_Delete), this, TQT_SLOT(deleteWallet())); if (_tray) { _tray->show(); @@ -208,11 +208,11 @@ TQPtrStack<TQIconViewItem> trash; void TDEWalletManager::contextMenu(TQIconViewItem *item, const TQPoint& pos) { if (item) { TQGuardedPtr<TDEWalletPopup> popupMenu = new TDEWalletPopup(item->text(), this); - connect(popupMenu, TQT_SIGNAL(walletOpened(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletClosed(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(closeWallet(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletDeleted(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletChangePassword(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(changeWalletPassword(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletCreated()), TQT_TQOBJECT(this), TQT_SLOT(createWallet())); + connect(popupMenu, TQT_SIGNAL(walletOpened(const TQString&)), this, TQT_SLOT(openWallet(const TQString&))); + connect(popupMenu, TQT_SIGNAL(walletClosed(const TQString&)), this, TQT_SLOT(closeWallet(const TQString&))); + connect(popupMenu, TQT_SIGNAL(walletDeleted(const TQString&)), this, TQT_SLOT(deleteWallet(const TQString&))); + connect(popupMenu, TQT_SIGNAL(walletChangePassword(const TQString&)), this, TQT_SLOT(changeWalletPassword(const TQString&))); + connect(popupMenu, TQT_SIGNAL(walletCreated()), this, TQT_SLOT(createWallet())); popupMenu->exec(pos); delete popupMenu; } diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp index 92cbe40..e4939cc 100644 --- a/tdewallet/tdewalletpopup.cpp +++ b/tdewallet/tdewalletpopup.cpp @@ -34,15 +34,15 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c TDEActionCollection *ac = new TDEActionCollection(this, "tdewallet context actions"); TDEAction *act; - act = new TDEAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this), + act = new TDEAction(i18n("&New Wallet..."), 0, 0, this, TQT_SLOT(createWallet()), ac, "wallet_create"); act->plug(this); - act = new TDEAction(i18n("&Open..."), 0, Key_Return, TQT_TQOBJECT(this), + act = new TDEAction(i18n("&Open..."), 0, Key_Return, this, TQT_SLOT(openWallet()), ac, "wallet_open"); act->plug(this); - act = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this), + act = new TDEAction(i18n("Change &Password..."), 0, 0, this, TQT_SLOT(changeWalletPassword()), ac, "wallet_password"); act->plug(this); @@ -60,14 +60,14 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c insertItem(i18n("Disconnec&t"), pm); } - act = KStdAction::close( TQT_TQOBJECT(this), + act = KStdAction::close( this, TQT_SLOT(closeWallet()), ac, "wallet_close"); // FIXME: let's track this inside the manager so we don't need a dcop // roundtrip here. act->setEnabled(TDEWallet::Wallet::isOpen(wallet)); act->plug(this); - act = new TDEAction(i18n("&Delete"), 0, Key_Delete, TQT_TQOBJECT(this), + act = new TDEAction(i18n("&Delete"), 0, Key_Delete, this, TQT_SLOT(deleteWallet()), ac, "wallet_delete"); act->plug(this); } |