Replace various '#define' strings - part 6

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

5 files changed, 14 insertions, 14 deletions

diff --git a/kopete/libkopete/kcautoconfigmodule.cpp b/kopete/libkopete/kcautoconfigmodule.cpp
index 751a0c01..d079984a 100644
--- a/kopete/libkopete/kcautoconfigmodule.cpp
+++ b/kopete/libkopete/kcautoconfigmodule.cpp
@@ -34,7 +34,7 @@ KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, co
 		: TDECModule( parent, name, args )
 		, d( new KCAutoConfigModulePrivate )
 {
-	d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) );
+	d->kautoconfig = new KAutoConfig( this );
 	connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified()));
 	connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified()));
 }
@@ -43,7 +43,7 @@ KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * paren
     : TDECModule( instance, parent, args )
     , d( new KCAutoConfigModulePrivate )
 {
-	d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) );
+	d->kautoconfig = new KAutoConfig( this );
 	connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified()));
 	connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified()));
 }
@@ -53,7 +53,7 @@ KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * paren
 KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config,TQWidget * parent, const char * name, const TQStringList & args )
 		: TDECModule( parent, name, args )    , d( new KCAutoConfigModulePrivate )
 {
-	d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) );
+	d->kautoconfig = new KAutoConfig( config, this );
 	connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified()));
 	connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified()));
 }
@@ -62,7 +62,7 @@ KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config , TDEInstance * instan
     : TDECModule( instance, parent, args )
     , d( new KCAutoConfigModulePrivate )
 {
-	d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) );
+	d->kautoconfig = new KAutoConfig( config, this );
 	connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified()));
 	connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified()));
 }
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index 9730d100..e7bfdfe2 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -368,7 +368,7 @@ KNotification *KNotification::userEvent( const TQString& text, const TQPixmap& p
 	 */
 
 	
-	KNotification *notify=new KNotification(TQT_TQOBJECT(widget));
+	KNotification *notify=new KNotification(widget);
 	notify->d->widget=widget;
 	notify->d->text=text;
 	notify->d->actions=actions;
diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp
index df4353ad..57cc1752 100644
--- a/kopete/libkopete/kopetechatsessionmanager.cpp
+++ b/kopete/libkopete/kopetechatsessionmanager.cpp
@@ -38,7 +38,7 @@ ChatSessionManager* ChatSessionManager::s_self = 0L;
 ChatSessionManager* ChatSessionManager::self()
 {
 	if( !s_self )
-		s_self = new ChatSessionManager( TQT_TQOBJECT(kapp) );
+		s_self = new ChatSessionManager( kapp );
 
 	return s_self;
 }
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index b1d9005e..35520c83 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -210,7 +210,7 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
 	if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() )
 	{
 		TDEAction *actionAddContact = new TDEAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ),
-		                                         0, TQT_TQOBJECT(this), TQT_SLOT( slotAddContact() ), TQT_TQOBJECT(menu), "actionAddContact" );
+		                                         0, this, TQT_SLOT( slotAddContact() ), menu, "actionAddContact" );
 		actionAddContact->plug( menu );
 		menu->insertSeparator();
 	}
@@ -219,15 +219,15 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
 	bool reach = account()->isConnected() && isReachable();
 	bool myself = (this == account()->myself());
 
-	TDEAction *actionSendMessage = KopeteStdAction::sendMessage( TQT_TQOBJECT(this), TQT_SLOT( sendMessage() ), TQT_TQOBJECT(menu), "actionSendMessage" );
+	TDEAction *actionSendMessage = KopeteStdAction::sendMessage( this, TQT_SLOT( sendMessage() ), menu, "actionSendMessage" );
 	actionSendMessage->setEnabled( reach && !myself );
 	actionSendMessage->plug( menu );
 
-	TDEAction *actionChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( startChat() ), TQT_TQOBJECT(menu), "actionChat" );
+	TDEAction *actionChat = KopeteStdAction::chat( this, TQT_SLOT( startChat() ), menu, "actionChat" );
 	actionChat->setEnabled( reach && !myself );
 	actionChat->plug( menu );
 
-	TDEAction *actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( sendFile() ), TQT_TQOBJECT(menu), "actionSendFile" );
+	TDEAction *actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( sendFile() ), menu, "actionSendFile" );
 	actionSendFile->setEnabled( reach && d->fileCapable && !myself );
 	actionSendFile->plug( menu );
 
@@ -248,9 +248,9 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
 	menu->insertSeparator();
 
 	if( metaContact() && !metaContact()->isTemporary() )
-		KopeteStdAction::changeMetaContact( TQT_TQOBJECT(this), TQT_SLOT( changeMetaContact() ), TQT_TQOBJECT(menu), "actionChangeMetaContact" )->plug( menu );
+		KopeteStdAction::changeMetaContact( this, TQT_SLOT( changeMetaContact() ), menu, "actionChangeMetaContact" )->plug( menu );
 
-	KopeteStdAction::contactInfo( TQT_TQOBJECT(this), TQT_SLOT( slotUserInfo() ), TQT_TQOBJECT(menu), "actionUserInfo" )->plug( menu );
+	KopeteStdAction::contactInfo( this, TQT_SLOT( slotUserInfo() ), menu, "actionUserInfo" )->plug( menu );
 
 #if 0 //this is not fully implemented yet (and doesn't work).  disable for now   - Olivier 2005-01-11
 	if ( account()->isBlocked( d->contactId ) )
@@ -260,7 +260,7 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
 #endif
 
 	if( metaContact() && !metaContact()->isTemporary() )
-		KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), TQT_TQOBJECT(menu), "actionDeleteContact" )->plug( menu );
+		KopeteStdAction::deleteContact( this, TQT_SLOT( slotDelete() ), menu, "actionDeleteContact" )->plug( menu );
 
 	return menu;
 }
diff --git a/kopete/libkopete/ui/kopetepasswordwidget.cpp b/kopete/libkopete/ui/kopetepasswordwidget.cpp
index da41a35f..10f6117f 100644
--- a/kopete/libkopete/ui/kopetepasswordwidget.cpp
+++ b/kopete/libkopete/ui/kopetepasswordwidget.cpp
@@ -49,7 +49,7 @@ void Kopete::UI::PasswordWidget::load( Kopete::Password *source )
 	{
 		mRemembered->setTristate();
 		mRemembered->setNoChange();
-		source->requestWithoutPrompt( TQT_TQOBJECT(this), TQT_SLOT( receivePassword( const TQString & ) ) );
+		source->requestWithoutPrompt( this, TQT_SLOT( receivePassword( const TQString & ) ) );
 	}
 	else
 	{