Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 24 insertions, 24 deletions

diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index 8bc0b20..37608c2 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -61,7 +61,7 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
 		_tray = new KSystemTray(this, "tdewalletmanager tray");
 		_tray->setPixmap(loadSystemTrayIcon("wallet_closed"));
 		TQToolTip::add(_tray, i18n("TDE Wallet: No wallets open."));
-		connect(_tray, TQT_SIGNAL(quitSelected()), TQT_SLOT(shuttingDown()));
+		connect(_tray, TQ_SIGNAL(quitSelected()), TQ_SLOT(shuttingDown()));
 		TQStringList wl = TDEWallet::Wallet::walletList();
 		bool isOpen = false;
 		for (TQStringList::Iterator it = wl.begin(); it != wl.end(); ++it) {
@@ -76,7 +76,7 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
 		if (!isOpen && kapp->isRestored()) {
 			delete _tray;
 			_tray = 0L;
-			TQTimer::singleShot( 0, kapp, TQT_SLOT( quit()));
+			TQTimer::singleShot( 0, kapp, TQ_SLOT( quit()));
 			return;
 		}
 	} else {
@@ -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*)), this, TQT_SLOT(openWallet(TQIconViewItem*)));
-	connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
+	connect(_iconView, TQ_SIGNAL(executed(TQIconViewItem*)), this, TQ_SLOT(openWallet(TQIconViewItem*)));
+	connect(_iconView, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQ_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
 
 	updateWalletDisplay();
 	setCentralWidget(_iconView);
@@ -94,13 +94,13 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
 	_dcopRef = new DCOPRef("kded", "tdewalletd");
 	_dcopRef->dcopClient()->setNotifications(true);
 	connect(_dcopRef->dcopClient(),
-		TQT_SIGNAL(applicationRemoved(const TQCString&)),
+		TQ_SIGNAL(applicationRemoved(const TQCString&)),
 		this,
-		TQT_SLOT(possiblyRescan(const TQCString&)));
+		TQ_SLOT(possiblyRescan(const TQCString&)));
 	connect(_dcopRef->dcopClient(),
-		TQT_SIGNAL(applicationRegistered(const TQCString&)),
+		TQ_SIGNAL(applicationRegistered(const TQCString&)),
 		this,
-		TQT_SLOT(possiblyRescan(const TQCString&)));
+		TQ_SLOT(possiblyRescan(const TQCString&)));
 
 	connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "allWalletsClosed()", "allWalletsClosed()", false);
 	connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "walletClosed(TQString)", "updateWalletDisplay()", false);
@@ -113,27 +113,27 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
 	//        open.  Must check that a wallet is still open here.
 
 	new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, this,
-			TQT_SLOT(createWallet()), actionCollection(),
+			TQ_SLOT(createWallet()), actionCollection(),
 			"wallet_create");
 	TDEAction *act = new TDEAction(i18n("Configure &Wallet..."), "configure",
-			0, this, TQT_SLOT(setupWallet()), actionCollection(),
+			0, this, TQ_SLOT(setupWallet()), actionCollection(),
 			"wallet_settings");
 	if (_tray) {
 		act->plug(_tray->contextMenu());
 	}
 	act = new TDEAction(i18n("Close &All Wallets"), 0, 0, this,
-			TQT_SLOT(closeAllWallets()), actionCollection(),
+			TQ_SLOT(closeAllWallets()), actionCollection(),
 			"close_all_wallets");
 	if (_tray) {
 		act->plug(_tray->contextMenu());
 	}
-	KStdAction::quit(this, TQT_SLOT(shuttingDown()), actionCollection());
-	KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
+	KStdAction::quit(this, TQ_SLOT(shuttingDown()), actionCollection());
+	KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()),
 actionCollection());
 
 	createGUI("tdewalletmanager.rc");
-	accel->connectItem(accel->insertItem(Key_Return), this, TQT_SLOT(openWallet()));
-	accel->connectItem(accel->insertItem(Key_Delete), this, TQT_SLOT(deleteWallet()));
+	accel->connectItem(accel->insertItem(Key_Return), this, TQ_SLOT(openWallet()));
+	accel->connectItem(accel->insertItem(Key_Delete), this, TQ_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&)), 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()));
+		connect(popupMenu, TQ_SIGNAL(walletOpened(const TQString&)), this, TQ_SLOT(openWallet(const TQString&)));
+		connect(popupMenu, TQ_SIGNAL(walletClosed(const TQString&)), this, TQ_SLOT(closeWallet(const TQString&)));
+		connect(popupMenu, TQ_SIGNAL(walletDeleted(const TQString&)), this, TQ_SLOT(deleteWallet(const TQString&)));
+		connect(popupMenu, TQ_SIGNAL(walletChangePassword(const TQString&)), this, TQ_SLOT(changeWalletPassword(const TQString&)));
+		connect(popupMenu, TQ_SIGNAL(walletCreated()), this, TQ_SLOT(createWallet()));
 		popupMenu->exec(pos);
 		delete popupMenu;
 	}
@@ -256,8 +256,8 @@ void TDEWalletManager::changeWalletPassword(const TQString& walletName) {
 void TDEWalletManager::openWalletFile(const TQString& path) {
 	TDEWalletEditor *we = new TDEWalletEditor(path, true, this, "Wallet Editor");
 	if (we->isOpen()) {
-		connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)),
-			this, TQT_SLOT(editorClosed(TDEMainWindow*)));
+		connect(we, TQ_SIGNAL(editorClosed(TDEMainWindow*)),
+			this, TQ_SLOT(editorClosed(TDEMainWindow*)));
 		we->show();
 	} else {
 		KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path));
@@ -297,8 +297,8 @@ void TDEWalletManager::openWallet(const TQString& walletName, bool newWallet) {
 	TDEWalletEditor *we = new TDEWalletEditor(walletName, false, this, "Wallet Editor");
 	we->setNewWallet(newWallet);
 	if (we->isOpen()) {
-		connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)),
-			this, TQT_SLOT(editorClosed(TDEMainWindow*)));
+		connect(we, TQ_SIGNAL(editorClosed(TDEMainWindow*)),
+			this, TQ_SLOT(editorClosed(TDEMainWindow*)));
 		we->show();
 		_windows.append(we);
 	} else if (!newWallet) {