Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

6 files changed, 27 insertions, 27 deletions

diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index 8adf8fab..5b45231b 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -48,7 +48,7 @@ CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent )
 	setInstance( KGenericFactory<CryptographyPlugin>::instance() );
 
 
-	m_action=new TDEToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
+	m_action=new TDEToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQ_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
 	m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ;
 
 	setXMLFile("cryptographychatui.rc");
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 13756076..cd2a6b4f 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -59,24 +59,24 @@ CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, cons
 		pluginStatic_=this;
 
 	m_inboundHandler = new Kopete::SimpleMessageHandlerFactory( Kopete::Message::Inbound,
-		Kopete::MessageHandlerFactory::InStageToSent, this, TQT_SLOT( slotIncomingMessage( Kopete::Message& ) ) );
+		Kopete::MessageHandlerFactory::InStageToSent, this, TQ_SLOT( slotIncomingMessage( Kopete::Message& ) ) );
 	connect( Kopete::ChatSessionManager::self(),
-		TQT_SIGNAL( aboutToSend( Kopete::Message & ) ),
-		TQT_SLOT( slotOutgoingMessage( Kopete::Message & ) ) );
+		TQ_SIGNAL( aboutToSend( Kopete::Message & ) ),
+		TQ_SLOT( slotOutgoingMessage( Kopete::Message & ) ) );
 
 	m_cachedPass_timer = new TQTimer(this, "m_cachedPass_timer" );
-	TQObject::connect(m_cachedPass_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForgetCachedPass() ));
+	TQObject::connect(m_cachedPass_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForgetCachedPass() ));
 
 
-	TDEAction *action=new TDEAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQT_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey");
-	connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , action , TQT_SLOT(setEnabled(bool)));
+	TDEAction *action=new TDEAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQ_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey");
+	connect ( Kopete::ContactList::self() , TQ_SIGNAL( metaContactSelected(bool)) , action , TQ_SLOT(setEnabled(bool)));
 	action->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 );
 
 	setXMLFile("cryptographyui.rc");
 	loadSettings();
-	connect(this, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT( loadSettings() ) );
+	connect(this, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT( loadSettings() ) );
 	
-	connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * )) , TQT_SLOT( slotNewKMM( Kopete::ChatSession * ) ) );
+	connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( chatSessionCreated( Kopete::ChatSession * )) , TQ_SLOT( slotNewKMM( Kopete::ChatSession * ) ) );
 	//Add GUI action to all already existing kmm (if the plugin is launched when kopete already rining)
 	TQValueList<Kopete::ChatSession*> sessions = Kopete::ChatSessionManager::self()->sessions();
 	for (TQValueListIterator<Kopete::ChatSession*> it= sessions.begin(); it!=sessions.end() ; ++it)
@@ -144,7 +144,7 @@ bool CryptographyPlugin::passphraseHandling()
 
 	m_actionCollection = new TDEActionCollection(this);
 	TDEAction *actionTranslate = new TDEAction( i18n ("Translate"), 0,
-		this, TQT_SLOT( slotTranslateChat() ), m_actionCollection, "actionTranslate" );
+		this, TQ_SLOT( slotTranslateChat() ), m_actionCollection, "actionTranslate" );
 	m_actionCollection->insert( actionTranslate );
 
 	m_currentChatSession=KMM;
@@ -314,8 +314,8 @@ void CryptographyPlugin::slotForgetCachedPass()
 
 void CryptographyPlugin::slotNewKMM(Kopete::ChatSession *KMM) 
 {
-	connect(this , TQT_SIGNAL( destroyed(TQObject*)) ,
-			new CryptographyGUIClient(KMM) , TQT_SLOT(deleteLater()));
+	connect(this , TQ_SIGNAL( destroyed(TQObject*)) ,
+			new CryptographyGUIClient(KMM) , TQ_SLOT(deleteLater()));
 }
 
 
diff --git a/kopete/plugins/cryptography/cryptographypreferences.cpp b/kopete/plugins/cryptography/cryptographypreferences.cpp
index 1fe2d7ea..7b0b9d90 100644
--- a/kopete/plugins/cryptography/cryptographypreferences.cpp
+++ b/kopete/plugins/cryptography/cryptographypreferences.cpp
@@ -32,7 +32,7 @@ CryptographyPreferences::CryptographyPreferences(TQWidget *parent, const char* /
 {
 	// Add actuall widget generated from ui file.
 	preferencesDialog = new CryptographyPrefsUI(this);
-	connect (preferencesDialog->m_selectOwnKey , TQT_SIGNAL(pressed()) , this , TQT_SLOT(slotSelectPressed()));
+	connect (preferencesDialog->m_selectOwnKey , TQ_SIGNAL(pressed()) , this , TQ_SLOT(slotSelectPressed()));
 	setMainWidget( preferencesDialog ,"Cryptography Plugin");
 }
 
diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
index 26551a7e..645b7543 100644
--- a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
+++ b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
@@ -32,8 +32,8 @@ CryptographySelectUserKey::CryptographySelectUserKey(const TQString& key ,Kopete
 	view = new CryptographyUserKey_ui(this,"CryptographyUserKey_ui");
 	setMainWidget(view);
 
-	connect (view->m_selectKey , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotSelectPressed()));
-	connect (view->m_removeButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotRemovePressed()));
+	connect (view->m_selectKey , TQ_SIGNAL(clicked()) , this , TQ_SLOT(slotSelectPressed()));
+	connect (view->m_removeButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(slotRemovePressed()));
 
 	view->m_titleLabel->setText(i18n("Select public key for %1").arg(mc->displayName()));
 	view->m_editKey->setText(key);
@@ -45,7 +45,7 @@ CryptographySelectUserKey::~CryptographySelectUserKey()
 void CryptographySelectUserKey::slotSelectPressed()
 {
 	popupPublic *dialog=new popupPublic(this, "public_keys", 0,false);
-	connect(dialog,TQT_SIGNAL(selectedKey(TQString &,TQString,bool,bool)),this,TQT_SLOT(keySelected(TQString &)));
+	connect(dialog,TQ_SIGNAL(selectedKey(TQString &,TQString,bool,bool)),this,TQ_SLOT(keySelected(TQString &)));
 	dialog->show();
 }
 
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 403efbb7..c7750c7a 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -156,8 +156,8 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
   pclose(fp);
 
 
-  TQObject::connect(keysListpr,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotpreOk()));
-  TQObject::connect(keysListpr,TQT_SIGNAL(clicked(TQListViewItem *)),this,TQT_SLOT(slotSelect(TQListViewItem *)));
+  TQObject::connect(keysListpr,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotpreOk()));
+  TQObject::connect(keysListpr,TQ_SIGNAL(clicked(TQListViewItem *)),this,TQ_SLOT(slotSelect(TQListViewItem *)));
 
 
   keysListpr->setSelected(keysListpr->firstChild(),true);
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index def0bd40..882b2fe5 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -121,7 +121,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
                                             : "locationbar_erase"));
 	(void) new TQLabel(i18n("Search: "),hBar);
 	TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar);
-	connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
+	connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear()));
 	
         keysList = new TDEListView( page );
 	 keysList->addColumn(i18n("Name"));
@@ -144,7 +144,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
         boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,0);
 	
 	TDEActionCollection *actcol=new TDEActionCollection(this);
-	(void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
+	(void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQ_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
 	
 	
         CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions);
@@ -183,7 +183,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
                 TQWhatsThis::add
                         (CBsymmetric,i18n("<b>Symmetrical encryption</b>: encryption does not use keys. You just need to give a password "
                                           "to encrypt/decrypt the file"));
-                TQObject::connect(CBsymmetric,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(isSymetric(bool)));
+                TQObject::connect(CBsymmetric,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(isSymetric(bool)));
 
 //BEGIN modified for Kopete
 
@@ -213,11 +213,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
                 optiontxt->setText(customOptions);
                 TQWhatsThis::add
                         (optiontxt,i18n("<b>Custom option</b>: for experienced users only, allows you to enter a gpg command line option, like: '--armor'"));
-                TQObject::connect(optiontxt,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(customOpts(const TQString & )));
+                TQObject::connect(optiontxt,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(customOpts(const TQString & )));
         }*/
-        TQObject::connect(keysList,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotOk()));
-//	TQObject::connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(crypte()));
-        TQObject::connect(CBuntrusted,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(refresh(bool)));
+        TQObject::connect(keysList,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotOk()));
+//	TQObject::connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(crypte()));
+        TQObject::connect(CBuntrusted,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(refresh(bool)));
 
         char line[200]="\0";
         FILE *fp2;
@@ -350,8 +350,8 @@ void popupPublic::refreshkeys()
         KProcIO *encid=new KProcIO();
         *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
         /////////  when process ends, update dialog infos
-        TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotpreselect()));
-        TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *)));
+        TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotpreselect()));
+        TQObject::connect(encid, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotprocread(KProcIO *)));
         encid->start(TDEProcess::NotifyOnExit,true);
 }