Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1329ec6abbcb7b79cd960e0ca138f16598d5f11f)

14 files changed, 58 insertions, 58 deletions

diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp
index 8340e98b..1c40302c 100644
--- a/kopete/libkopete/ui/accountselector.cpp
+++ b/kopete/libkopete/ui/accountselector.cpp
@@ -119,8 +119,8 @@ void AccountSelector::initUI()
 		}
 	}
 
-	connect(d->lv, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-		this, TQT_SLOT(slotSelectionChanged(TQListViewItem *)));
+	connect(d->lv, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+		this, TQ_SLOT(slotSelectionChanged(TQListViewItem *)));
 }
 
 
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp
index 80f9fba5..638f095b 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.cpp
+++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp
@@ -41,8 +41,8 @@ namespace UI {
 AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 )
 {
 	btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::fromLatin1( "locationbar_erase" ) : TQString::fromLatin1( "clear_left") ) );
-	connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) );
-	connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) );
+	connect( btnClear, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClearAddressee() ) );
+	connect( btnSelectAddressee, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelectAddressee() ) );
 }
 
 void AddressBookLinkWidget::setAddressee( const TDEABC::Addressee& addr )
diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp
index a63e15a2..6af9d64f 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.cpp
+++ b/kopete/libkopete/ui/addressbookselectordialog.cpp
@@ -42,7 +42,7 @@ AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, cons
 	enableButtonOK(false);
 	//setHelp("linkaddressbook");
 
-	connect(m_addressBookSelectorWidget, TQT_SIGNAL(addresseeListClicked( TQListViewItem * )), TQT_SLOT(slotWidgetAddresseeListClicked( TQListViewItem * )));
+	connect(m_addressBookSelectorWidget, TQ_SIGNAL(addresseeListClicked( TQListViewItem * )), TQ_SLOT(slotWidgetAddresseeListClicked( TQListViewItem * )));
 
 	if ( !preSelectUid.isEmpty() )
 		m_addressBookSelectorWidget->selectAddressee(preSelectUid);
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 4f12bfab..bb46107b 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -60,17 +60,17 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch
 	m_addressBook = Kopete::KABCPersistence::self()->addressBook();
 
 	// Addressee validation connections
-	connect( addAddresseeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddAddresseeClicked() ) );
-	connect( addAddresseeButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( addAddresseeClicked() ) );	
-
-	connect( addresseeListView, TQT_SIGNAL( clicked(TQListViewItem * ) ),
-			TQT_SIGNAL( addresseeListClicked( TQListViewItem * ) ) );
-	connect( addresseeListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-			TQT_SIGNAL( addresseeListClicked( TQListViewItem * ) ) );
-	connect( addresseeListView, TQT_SIGNAL( spacePressed( TQListViewItem * ) ),
-			TQT_SIGNAL( addresseeListClicked( TQListViewItem * ) ) );
+	connect( addAddresseeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddAddresseeClicked() ) );
+	connect( addAddresseeButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( addAddresseeClicked() ) );	
+
+	connect( addresseeListView, TQ_SIGNAL( clicked(TQListViewItem * ) ),
+			TQ_SIGNAL( addresseeListClicked( TQListViewItem * ) ) );
+	connect( addresseeListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+			TQ_SIGNAL( addresseeListClicked( TQListViewItem * ) ) );
+	connect( addresseeListView, TQ_SIGNAL( spacePressed( TQListViewItem * ) ),
+			TQ_SIGNAL( addresseeListClicked( TQListViewItem * ) ) );
 	
-	connect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) );
+	connect( m_addressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQ_SLOT( slotLoadAddressees() ) );
 	
 	//We should add a clear TDEAction here.  But we can't really do that with a designer file :\  this sucks
 
@@ -86,7 +86,7 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch
 
 AddressBookSelectorWidget::~AddressBookSelectorWidget()
 {
-	disconnect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) );
+	disconnect( m_addressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQ_SLOT( slotLoadAddressees() ) );
 }
 
 
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp
index 642a8be3..be8ce604 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.cpp
+++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp
@@ -102,10 +102,10 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId,
 	}
 	d->widget->m_groupList->setCurrentText(TQString()); //default to top-level
 
-	connect( d->widget->widAddresseeLink, TQT_SIGNAL( addresseeChanged( const TDEABC::Addressee& ) ), this, TQT_SLOT( slotAddresseeSelected( const TDEABC::Addressee& ) ) );
-	connect( d->widget->m_infoButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotInfoClicked() ) );
+	connect( d->widget->widAddresseeLink, TQ_SIGNAL( addresseeChanged( const TDEABC::Addressee& ) ), this, TQ_SLOT( slotAddresseeSelected( const TDEABC::Addressee& ) ) );
+	connect( d->widget->m_infoButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotInfoClicked() ) );
 
-	connect( this, TQT_SIGNAL(okClicked()) , this , TQT_SLOT(slotFinished()));
+	connect( this, TQ_SIGNAL(okClicked()) , this , TQ_SLOT(slotFinished()));
 
 }
 
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.h b/kopete/libkopete/ui/contactaddednotifydialog.h
index 139375d0..d012f022 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.h
+++ b/kopete/libkopete/ui/contactaddednotifydialog.h
@@ -44,8 +44,8 @@ namespace UI {
 
 	Kopete::UI::ContactAddedNotifyDialog *dialog =
 			new ContactAddedNotifyDialog(contactId, TQString(),account);
-	TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogApplied()));
-	TQObject::connect(dialog,TQT_SIGNAL(infoClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogInfo()));
+	TQObject::connect(dialog,TQ_SIGNAL(applyClicked(const TQString&)),this,TQ_SLOT(contactAddedDialogApplied()));
+	TQObject::connect(dialog,TQ_SIGNAL(infoClicked(const TQString&)),this,TQ_SLOT(contactAddedDialogInfo()));
 	dialog->show();
 
  * @endcode
diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp
index f0b86442..3bf1e5b5 100644
--- a/kopete/libkopete/ui/kopetecontactaction.cpp
+++ b/kopete/libkopete/ui/kopetecontactaction.cpp
@@ -28,8 +28,8 @@ KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObje
 {
 	m_contact = contact;
 
-	connect( this, TQT_SIGNAL( activated() ), TQT_SLOT( slotContactActionActivated() ) );
-	connect( this, TQT_SIGNAL( activated( Kopete::Contact * ) ), receiver, slot );
+	connect( this, TQ_SIGNAL( activated() ), TQ_SLOT( slotContactActionActivated() ) );
+	connect( this, TQ_SIGNAL( activated( Kopete::Contact * ) ), receiver, slot );
 }
 
 KopeteContactAction::~KopeteContactAction()
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
index 25aa6140..81936036 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -52,7 +52,7 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo
 
 	setMainWidget(m_view);
 
-	connect(m_view->cmdBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowsePressed()));
+	connect(m_view->cmdBrowse, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowsePressed()));
 }
 
 KopeteFileConfirmDialog::~KopeteFileConfirmDialog()
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index 965b2d25..6d9952ad 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -105,16 +105,16 @@ struct ListView::Private
 ListView::ListView( TQWidget *parent, const char *name )
  : TDEListView( parent, name ), d( new Private )
 {
-	connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) );
+	connect( &d->sortTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSort() ) );
 
 	// We have our own tooltips, don't use the default TQListView ones
 	setShowToolTips( false );
 	d->toolTip.reset( new ToolTip( viewport(), this ) );
 
-	connect( this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ),
-	         TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
-	connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-	         TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+	connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ),
+	         TQ_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
+	connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+	         TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
 
 	// set up flags for nicer painting
 	clearWFlags( WStaticContents );
diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp
index a71b19f5..f194ecd5 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.cpp
+++ b/kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -1180,14 +1180,14 @@ public:
 	SharedTimer( int period ) : period(period), users(0) {}
 	void attach( TQObject *target, const char *slot )
 	{
-		connect( this, TQT_SIGNAL(timeout()), target, slot );
+		connect( this, TQ_SIGNAL(timeout()), target, slot );
 		if( users++ == 0 )
 			start( period );
 		//kdDebug(14000) << "SharedTimer::attach: users is now " << users << "\n";
 	}
 	void detach( TQObject *target, const char *slot )
 	{
-		disconnect( this, TQT_SIGNAL(timeout()), target, slot );
+		disconnect( this, TQ_SIGNAL(timeout()), target, slot );
 		if( --users == 0 )
 			stop();
 		//kdDebug(14000) << "SharedTimer::detach: users is now " << users << "\n";
@@ -1227,9 +1227,9 @@ class Item::Private
 {
 public:
 	Private( Item *item )
-	 : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) )
+	 : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQ_SLOT( slotLayoutAnimateItems() ) )
 	 , animateLayout( true ), opacity( 1.0 )
-	 , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) )
+	 , visibilityTimer( theVisibilityTimer(), item, TQ_SLOT( slotUpdateVisibility() ) )
 	 , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true )
 	{
 	}
@@ -1305,10 +1305,10 @@ void Item::setEffects( bool animation, bool fading, bool folding )
 
 void Item::initLVI()
 {
-	connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) );
-	connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) );
-	//connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) );
-	//connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) );
+	connect( listView()->header(), TQ_SIGNAL( sizeChange( int, int, int ) ), TQ_SLOT( slotColumnResized() ) );
+	connect( &d->layoutTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotLayoutItems() ) );
+	//connect( &d->layoutAnimateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotLayoutAnimateItems() ) );
+	//connect( &d->visibilityTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateVisibility() ) );
 	setVisible( false );
 	setTargetVisibility( true );
 }
diff --git a/kopete/libkopete/ui/kopetepasswordwidget.cpp b/kopete/libkopete/ui/kopetepasswordwidget.cpp
index 10f6117f..37c411ca 100644
--- a/kopete/libkopete/ui/kopetepasswordwidget.cpp
+++ b/kopete/libkopete/ui/kopetepasswordwidget.cpp
@@ -41,15 +41,15 @@ Kopete::UI::PasswordWidget::~PasswordWidget()
 
 void Kopete::UI::PasswordWidget::load( Kopete::Password *source )
 {
-	disconnect( mRemembered, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotRememberChanged() ) );
-	disconnect( mPassword, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
-	disconnect( mRemembered, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SIGNAL( changed() ) );
+	disconnect( mRemembered, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( slotRememberChanged() ) );
+	disconnect( mPassword, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+	disconnect( mRemembered, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SIGNAL( changed() ) );
 
 	if ( source && source->remembered() )
 	{
 		mRemembered->setTristate();
 		mRemembered->setNoChange();
-		source->requestWithoutPrompt( this, TQT_SLOT( receivePassword( const TQString & ) ) );
+		source->requestWithoutPrompt( this, TQ_SLOT( receivePassword( const TQString & ) ) );
 	}
 	else
 	{
@@ -64,9 +64,9 @@ void Kopete::UI::PasswordWidget::load( Kopete::Password *source )
 
 	mPassword->setEnabled( false );
 
-	connect( mRemembered, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotRememberChanged() ) );
-	connect( mPassword, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
-	connect( mRemembered, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SIGNAL( changed() ) );
+	connect( mRemembered, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( slotRememberChanged() ) );
+	connect( mPassword, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+	connect( mRemembered, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SIGNAL( changed() ) );
 
 	emit changed();
 }
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index a5ba38d8..466a1c60 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -42,7 +42,7 @@ KopetePreferencesAction::KopetePreferencesAction( TDEActionCollection *parent, c
 	TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name )
 
 {
-	connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotShowPreferences() ) );
+	connect( this, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotShowPreferences() ) );
 }
 
 KopetePreferencesAction::~KopetePreferencesAction()
diff --git a/kopete/libkopete/ui/kopeteview.h b/kopete/libkopete/ui/kopeteview.h
index b1daf472..86f3233f 100644
--- a/kopete/libkopete/ui/kopeteview.h
+++ b/kopete/libkopete/ui/kopeteview.h
@@ -120,7 +120,7 @@ class KOPETE_EXPORT KopeteView
 		/**
 		 * @brief Inform the view the message was sent successfully
 		 *
-		 * This should be reimplemented as a TQT_SLOT in any derived objects
+		 * This should be reimplemented as a TQ_SLOT in any derived objects
 		 */
 		virtual void messageSentSuccessfully() = 0;
 
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 8d049a5d..8e7fc61a 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -73,10 +73,10 @@ MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *
 	d->metaContact = mc;
 	d->photoSize = 60;
 	
-	connect( d->metaContact, TQT_SIGNAL( photoChanged() ),
-		TQT_SLOT( slotPhotoChanged() ) );
-	connect( d->metaContact, TQT_SIGNAL( displayNameChanged(const TQString&, const TQString&) ),
-		TQT_SLOT( slotDisplayNameChanged() ) );
+	connect( d->metaContact, TQ_SIGNAL( photoChanged() ),
+		TQ_SLOT( slotPhotoChanged() ) );
+	connect( d->metaContact, TQ_SIGNAL( displayNameChanged(const TQString&, const TQString&) ),
+		TQ_SLOT( slotDisplayNameChanged() ) );
 	buildVisualComponents();
 }
 
@@ -188,14 +188,14 @@ MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *parent, const ch
 	d->widget = new MetaContactSelectorWidget_Base(this);
 	l->addWidget(d->widget);
 	
-	connect( d->widget->metaContactListView, TQT_SIGNAL( clicked(TQListViewItem * ) ),
-			TQT_SIGNAL( metaContactListClicked( TQListViewItem * ) ) );
-	connect( d->widget->metaContactListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-			TQT_SIGNAL( metaContactListClicked( TQListViewItem * ) ) );
-	connect( d->widget->metaContactListView, TQT_SIGNAL( spacePressed( TQListViewItem * ) ),
-			TQT_SIGNAL( metaContactListClicked( TQListViewItem * ) ) );
+	connect( d->widget->metaContactListView, TQ_SIGNAL( clicked(TQListViewItem * ) ),
+			TQ_SIGNAL( metaContactListClicked( TQListViewItem * ) ) );
+	connect( d->widget->metaContactListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+			TQ_SIGNAL( metaContactListClicked( TQListViewItem * ) ) );
+	connect( d->widget->metaContactListView, TQ_SIGNAL( spacePressed( TQListViewItem * ) ),
+			TQ_SIGNAL( metaContactListClicked( TQListViewItem * ) ) );
 	
-	connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), this, TQT_SLOT( slotLoadMetaContacts() ) );
+	connect( Kopete::ContactList::self(), TQ_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), this, TQ_SLOT( slotLoadMetaContacts() ) );
 	
 	d->widget->kListViewSearchLine->setListView(d->widget->metaContactListView);
 	d->widget->metaContactListView->setFullWidth( true );
@@ -207,7 +207,7 @@ MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *parent, const ch
 
 MetaContactSelectorWidget::~MetaContactSelectorWidget()
 {
-	disconnect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), this, TQT_SLOT( slotLoadMetaContacts() ) );
+	disconnect( Kopete::ContactList::self(), TQ_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), this, TQ_SLOT( slotLoadMetaContacts() ) );
 }