Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 83b7abfb88bb8d138bab0ab1c9f3e2d3afa418c2)

1 files changed, 13 insertions, 13 deletions

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;
 	}