Replace various '#define' strings - part 6

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

19 files changed, 105 insertions, 105 deletions

diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index a60902d9..bc4d3227 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -161,8 +161,8 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch
 	editPart()->widget()->setFocus();
 
 	// init actions
-	KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection() );
-	KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(closeView()),actionCollection() );
+	KStdAction::copy( this, TQT_SLOT(copy()), actionCollection() );
+	KStdAction::close( this, TQT_SLOT(closeView()),actionCollection() );
 
 	setCaption( m_manager->displayName(), false );
 
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 919f669b..eef4ab09 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -314,28 +314,28 @@ void KopeteChatWindow::initActions(void)
 	createStandardStatusBarAction();
 
 	chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), TQKeySequence(Key_Return) ,
-		TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), coll, "chat_send" );
+		this, TQT_SLOT( slotSendMessage() ), coll, "chat_send" );
 	chatSend->setEnabled( false );
 
- 	KStdAction::save ( TQT_TQOBJECT(this), TQT_SLOT(slotChatSave()), coll );
- 	KStdAction::print ( TQT_TQOBJECT(this), TQT_SLOT(slotChatPrint()), coll );
-	TDEAction* quitAction = KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT(close()), coll );
+ 	KStdAction::save ( this, TQT_SLOT(slotChatSave()), coll );
+ 	KStdAction::print ( this, TQT_SLOT(slotChatPrint()), coll );
+	TDEAction* quitAction = KStdAction::quit ( this, TQT_SLOT(close()), coll );
 	quitAction->setText( i18n("Close All Chats") );
 
-	tabClose = KStdAction::close ( TQT_TQOBJECT(this), TQT_SLOT(slotChatClosed()), coll, "tabs_close" );
+	tabClose = KStdAction::close ( this, TQT_SLOT(slotChatClosed()), coll, "tabs_close" );
 
 	tabRight=new TDEAction( i18n( "&Activate Next Tab" ), 0, TDEStdAccel::tabNext(),
-		TQT_TQOBJECT(this), TQT_SLOT( slotNextTab() ), coll, "tabs_right" );
+		this, TQT_SLOT( slotNextTab() ), coll, "tabs_right" );
 	tabLeft=new TDEAction( i18n( "&Activate Previous Tab" ), 0, TDEStdAccel::tabPrev(),
-		TQT_TQOBJECT(this), TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" );
+		this, TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" );
 	tabLeft->setEnabled( false );
 	tabRight->setEnabled( false );
 
-	nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT( slotNickComplete() ), coll , "nick_compete");
+	nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, this, TQT_SLOT( slotNickComplete() ), coll , "nick_compete");
 	nickComplete->setShortcut( TQKeySequence( Key_Tab ) );
 
 	tabDetach = new TDEAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" );
+		this, TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" );
 	tabDetach->setEnabled( false );
 
 	actionDetachMenu = new TDEActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" );
@@ -350,36 +350,36 @@ void KopeteChatWindow::initActions(void)
 
 	tabDetach->setShortcut( TQKeySequence(CTRL + SHIFT + Key_B) );
 
-	KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCut()), coll);
-	KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll);
-	KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), coll);
+	KStdAction::cut( this, TQT_SLOT(slotCut()), coll);
+	KStdAction::copy( this, TQT_SLOT(slotCopy()), coll);
+	KStdAction::paste( this, TQT_SLOT(slotPaste()), coll);
 
-	new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFont() ), coll, "format_font" );
-	new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
-	new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
+	new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, this, TQT_SLOT( slotSetFont() ), coll, "format_font" );
+	new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, this, TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
+	new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, this, TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
 
 	historyUp = new TDEAction( i18n( "Previous History" ), TQString(), 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotHistoryUp() ), coll, "history_up" );
+		this, TQT_SLOT( slotHistoryUp() ), coll, "history_up" );
 	historyUp->setShortcut( TQKeySequence(CTRL + Key_Up) );
 
 	historyDown = new TDEAction( i18n( "Next History" ), TQString(), 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotHistoryDown() ), coll, "history_down" );
+		this, TQT_SLOT( slotHistoryDown() ), coll, "history_down" );
 	historyDown->setShortcut( TQKeySequence(CTRL + Key_Down) );
 
-	KStdAction::prior( TQT_TQOBJECT(this), TQT_SLOT( slotPageUp() ), coll, "scroll_up" );
-	KStdAction::next( TQT_TQOBJECT(this), TQT_SLOT( slotPageDown() ), coll, "scroll_down" );
+	KStdAction::prior( this, TQT_SLOT( slotPageUp() ), coll, "scroll_up" );
+	KStdAction::next( this, TQT_SLOT( slotPageDown() ), coll, "scroll_down" );
 
-	KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), coll );
+	KStdAction::showMenubar( this, TQT_SLOT(slotViewMenuBar()), coll );
 
 	membersLeft = new TDEToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
+		this, TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
 	membersRight = new TDEToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
+		this, TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
 	toggleMembers = new TDEToggleAction( i18n( "Show" ), TQString(), 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
+		this, TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
 	toggleMembers->setCheckedState(i18n("Hide"));
 	toggleAutoSpellCheck = new TDEToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0,
-		TQT_TQOBJECT(this), TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
+		this, TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
 	toggleAutoSpellCheck->setChecked( true );
 
 	actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" );
@@ -393,7 +393,7 @@ void KopeteChatWindow::initActions(void)
 	// add configure key bindings menu item
 	KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll );
 
-	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), coll);
+	KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), coll);
 	KopeteStdAction::preferences( coll , "settings_prefs" );
 
 	//The Sending movie
@@ -994,7 +994,7 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
 		if( ++contactCount == 15 && contact != m_them.getLast() )
 		{
 			TDEActionMenu *moreMenu = new TDEActionMenu( i18n("More..."),
-				 TQString::fromLatin1("folder_open"), TQT_TQOBJECT(contactsMenu) );
+				 TQString::fromLatin1("folder_open"), contactsMenu );
 			connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
 				moreMenu, TQT_SLOT(deleteLater() ) );
 			moreMenu->plug( contactsMenu );
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 9bd4aaf6..4f0b24ea 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -207,15 +207,15 @@ void KopeteEmailWindow::initActions(void)
 	TDEActionCollection *coll = actionCollection();
 
 	d->chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotReplySend() ), coll, "chat_send" );
+		this, TQT_SLOT( slotReplySend() ), coll, "chat_send" );
 	//Default to 'Return' for sending messages
 	d->chatSend->setShortcut( TQKeySequence( Key_Return ) );
 
-	KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT( slotCloseView() ), coll );
+	KStdAction::quit ( this, TQT_SLOT( slotCloseView() ), coll );
 
-	KStdAction::cut( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( cut() ), coll );
-	KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll);
-	KStdAction::paste( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( paste() ), coll );
+	KStdAction::cut( d->editPart->widget(), TQT_SLOT( cut() ), coll );
+	KStdAction::copy( this, TQT_SLOT(slotCopy()), coll);
+	KStdAction::paste( d->editPart->widget(), TQT_SLOT( paste() ), coll );
 
 	new TDEAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0,
 	             d->editPart, TQT_SLOT( setFont() ), coll, "format_font" );
@@ -224,7 +224,7 @@ void KopeteEmailWindow::initActions(void)
 	new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0,
 	             d->editPart, TQT_SLOT( setBgColor() ), coll, "format_bgcolor" );
 
-	KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotViewMenuBar() ), coll );
+	KStdAction::showMenubar( this, TQT_SLOT( slotViewMenuBar() ), coll );
 	setStandardToolBarMenuEnabled( true );
 
 	d->actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" );
@@ -233,7 +233,7 @@ void KopeteEmailWindow::initActions(void)
 
 	// add configure key bindings menu item
 	KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll );
-	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT( slotConfToolbar() ), coll);
+	KStdAction::configureToolbars(this, TQT_SLOT( slotConfToolbar() ), coll);
 	//FIXME: no longer works?
 	KopeteStdAction::preferences( coll , "settings_prefs" );
 
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 19b67ff6..70b0692f 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -36,13 +36,13 @@ public:
 };
 
 KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& )
-	: KParts::ReadOnlyPart( TQT_TQOBJECT(wparent), wname ? wname : "rich_text_part" )
+	: KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" )
 {
 	KopeteRichTextEditPart( wparent, wname, false );
 }
 
 KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities )
-  : KParts::ReadOnlyPart( TQT_TQOBJECT(parent), name ? name : "rich_text_part" ),
+  : KParts::ReadOnlyPart( parent, name ? name : "rich_text_part" ),
 	m_capabilities( capabilities ),
 	m_richTextEnabled( true )
 {
@@ -131,7 +131,7 @@ void KopeteRichTextEditPart::createActions( TDEActionCollection *ac )
 			this, TQT_SLOT( slotSetRichTextEnabled(bool) ) );
 
 	checkSpelling = new TDEAction( i18n("Check &Spelling"), "tools-check-spelling", 0,
-				TQT_TQOBJECT(editor), TQT_SLOT( checkSpelling() ), ac, "check_spelling" );
+				editor, TQT_SLOT( checkSpelling() ), ac, "check_spelling" );
 
 	//Fg Color
 	actionFgColor = new TDEAction( i18n("Text &Color..."), "color_line", 0,
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index a7b214b6..adf8ea32 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -461,33 +461,33 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name
 
 void KopeteContactListView::initActions( TDEActionCollection *ac )
 {
-	actionUndo = KStdAction::undo( TQT_TQOBJECT(this) , TQT_SLOT( slotUndo() ) , ac );
-	actionRedo = KStdAction::redo( TQT_TQOBJECT(this) , TQT_SLOT( slotRedo() ) , ac );
+	actionUndo = KStdAction::undo( this , TQT_SLOT( slotUndo() ) , ac );
+	actionRedo = KStdAction::redo( this , TQT_SLOT( slotRedo() ) , ac );
 	actionUndo->setEnabled(false);
 	actionRedo->setEnabled(false);
 
 
-	new TDEAction( i18n( "Create New Group..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ),
+	new TDEAction( i18n( "Create New Group..." ), 0, 0, this, TQT_SLOT( addGroup() ),
 		ac, "AddGroup" );
 
 	actionSendMessage = KopeteStdAction::sendMessage(
-		TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), ac, "contactSendMessage" );
-	actionStartChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( slotStartChat() ),
+		this, TQT_SLOT( slotSendMessage() ), ac, "contactSendMessage" );
+	actionStartChat = KopeteStdAction::chat( this, TQT_SLOT( slotStartChat() ),
 		ac, "contactStartChat" );
 
 	actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "edit-cut" ),
-														  0, TQT_TQOBJECT(this), TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" );
+														  0, this, TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" );
 	actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "edit-copy" ), 0,
-														 TQT_TQOBJECT(this), TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" );
+														 this, TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" );
 
-	actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ),
+	actionRemove = KopeteStdAction::deleteContact( this, TQT_SLOT( slotRemove() ),
 		ac, "contactRemove" );
 	actionSendEmail = new TDEAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ),
-		0, TQT_TQOBJECT(this), TQT_SLOT(  slotSendEmail() ), ac, "contactSendEmail" );
+		0, this, TQT_SLOT(  slotSendEmail() ), ac, "contactSendEmail" );
 	/* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/
 	actionRename = new TDEAction( i18n( "Rename" ), "document-save-as", 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), ac, "contactRename" );
-	actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ),
+		this, TQT_SLOT( slotRename() ), ac, "contactRename" );
+	actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( slotSendFile() ),
 		ac, "contactSendFile" );
 
 	actionAddContact = new TDEActionMenu( i18n( "&Add Contact" ),
@@ -495,7 +495,7 @@ void KopeteContactListView::initActions( TDEActionCollection *ac )
 	actionAddContact->popupMenu()->insertTitle( i18n("Select Account") );
 
 	actionAddTemporaryContact = new TDEAction( i18n( "Add to Your Contact List" ), "add_user", 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" );
+		this, TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" );
 
 	connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotMetaContactSelected( bool ) ) );
 
@@ -503,7 +503,7 @@ void KopeteContactListView::initActions( TDEActionCollection *ac )
 	connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered( const Kopete::Account* )), TQT_SLOT(slotAddSubContactActionAccountDeleted(const Kopete::Account *)));
 
 	actionProperties = new TDEAction( i18n( "&Properties" ), "edit_user", TQt::Key_Alt + TQt::Key_Return,
-		TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), ac, "contactProperties" );
+		this, TQT_SLOT( slotProperties() ), ac, "contactProperties" );
 
 	// Update enabled/disabled actions
 	slotViewSelectionChanged();
@@ -516,7 +516,7 @@ KopeteContactListView::~KopeteContactListView()
 
 void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* account)
 {
-	TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAddContact()), account);
+	TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , this, TQT_SLOT(slotAddContact()), account);
 	m_accountAddContactMap.insert( account, action);
 	actionAddContact->insert( action );
 }
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index 329f4944..80cddf94 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -209,7 +209,7 @@ void KopeteWindow::initActions()
 		actionCollection(), "AddContact" );
 	actionAddContact->setDelayed( false );
 	// this signal mapper is needed to call slotAddContact with the correct arguments
-	addContactMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+	addContactMapper = new TQSignalMapper( this );
 	connect( addContactMapper, TQT_SIGNAL( mapped( const TQString & ) ),
 		 this, TQT_SLOT( slotAddContactDialogInternal( const TQString & ) ) );
 
@@ -220,10 +220,10 @@ void KopeteWindow::initActions()
 	*/
 
 	actionDisconnect = new TDEAction( i18n( "O&ffline" ), "connect_no",
-		0, TQT_TQOBJECT(this), TQT_SLOT( slotDisconnectAll() ),
+		0, this, TQT_SLOT( slotDisconnectAll() ),
 		actionCollection(), "DisconnectAll" );
 
-	actionExportContacts = new TDEAction( i18n( "&Export Contacts..." ), "", 0, TQT_TQOBJECT(this),
+	actionExportContacts = new TDEAction( i18n( "&Export Contacts..." ), "", 0, this,
 		TQT_SLOT( showExportDialog() ),actionCollection(), "ExportContacts" );
 
 	/* the connection menu has been replaced by the set status menu
@@ -238,16 +238,16 @@ void KopeteWindow::initActions()
 	actionDisconnect->setEnabled(false);
 
 	selectAway = new TDEAction( i18n("&Away"), SmallIcon("kopeteaway"), 0,
-		TQT_TQOBJECT(this), TQT_SLOT( slotGlobalAway() ), actionCollection(),
+		this, TQT_SLOT( slotGlobalAway() ), actionCollection(),
 		"SetAwayAll" );
 
 	selectBusy = new TDEAction( i18n("&Busy"), SmallIcon("kopeteaway"), 0,
-					 TQT_TQOBJECT(this), TQT_SLOT( slotGlobalBusy() ), actionCollection(),
+					 this, TQT_SLOT( slotGlobalBusy() ), actionCollection(),
 					 "SetBusyAll" );
 
 
 	actionSetInvisible = new TDEAction( i18n( "&Invisible" ), "kopeteavailable", 0 ,
-		  TQT_TQOBJECT(this), TQT_SLOT( slotSetInvisibleAll() ), actionCollection(),
+		  this, TQT_SLOT( slotSetInvisibleAll() ), actionCollection(),
 		  "SetInvisibleAll" );
 
 
@@ -258,7 +258,7 @@ void KopeteWindow::initActions()
 		"SetAvailableAll" );*/
 
 	actionSetAvailable = new TDEAction( i18n("&Online"),
-		SmallIcon("kopeteavailable"), 0, TQT_TQOBJECT(this),
+		SmallIcon("kopeteavailable"), 0, this,
 		TQT_SLOT( slotGlobalAvailable() ), actionCollection(),
 		"SetAvailableAll" );
 
@@ -273,25 +273,25 @@ void KopeteWindow::initActions()
 
 	actionPrefs = KopeteStdAction::preferences( actionCollection(), "settings_prefs" );
 
-	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+	KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection());
 
 	setStandardToolBarMenuEnabled(true);
-	menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection(), "settings_showmenubar" );
-	statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar");
+	menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection(), "settings_showmenubar" );
+	statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar");
 
 	KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection(), "settings_keys" );
-	new TDEAction( i18n( "Configure Plugins..." ), "preferences-desktop-peripherals", 0, TQT_TQOBJECT(this),
+	new TDEAction( i18n( "Configure Plugins..." ), "preferences-desktop-peripherals", 0, this,
 		TQT_SLOT( slotConfigurePlugins() ), actionCollection(), "settings_plugins" );
-	new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
+	new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this,
 		TQT_SLOT( slotConfGlobalKeys() ), actionCollection(), "settings_global" );
 
-	KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection() );
-	KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" );
+	KStdAction::configureToolbars( this, TQT_SLOT(slotConfToolbar()), actionCollection() );
+	KStdAction::configureNotifications(this, TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" );
 
 	actionShowOffliners = new TDEToggleAction( i18n( "Show Offline &Users" ), "show_offliners", CTRL + Key_U,
-			TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" );
+			this, TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" );
 	actionShowEmptyGroups = new TDEToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G,
-			TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );
+			this, TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );
 
 	actionShowOffliners->setCheckedState(i18n("Hide Offline &Users"));
 	actionShowEmptyGroups->setCheckedState(i18n("Hide Empty &Groups"));
@@ -306,7 +306,7 @@ void KopeteWindow::initActions()
 	// quick search bar - clear button
 	TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ),
 		TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
-		0, TQT_TQOBJECT(searchBar), TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" );
+		0, searchBar, TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" );
 	resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n"
 		"Resets the quick search so that all contacts and groups are shown again." ) );
 
@@ -323,18 +323,18 @@ void KopeteWindow::initActions()
 	connect( setStatusMenu->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT(slotStatusMessageSelected( int ) ) );
 
 	// sync actions, config and prefs-dialog
-	connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigChanged()) );
+	connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(slotConfigChanged()) );
 	slotConfigChanged();
 
-	globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+	globalAccel = new TDEGlobalAccel( this );
 	globalAccel->insert( TQString::fromLatin1("Read Message"), i18n("Read Message"), i18n("Read the next pending message"),
 		CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+Key_I, Kopete::ChatSessionManager::self(), TQT_SLOT(slotReadMessage()) );
 
 	globalAccel->insert( TQString::fromLatin1("Show/Hide Contact List"), i18n("Show/Hide Contact List"), i18n("Show or hide the contact list"),
-		CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotShowHide()) );
+		CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, this, TQT_SLOT(slotShowHide()) );
 
 	globalAccel->insert( TQString::fromLatin1("Set Away/Back"), i18n("Set Away/Back"), i18n("Sets away from keyboard or sets back"),
-		CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAway()) );
+		CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, this, TQT_SLOT(slotToggleAway()) );
 
 	globalAccel->readSettings();
 	globalAccel->updateConnections();
@@ -722,7 +722,7 @@ void KopeteWindow::slotAccountRegistered( Kopete::Account *account )
 		TQT_SLOT( slotAccountStatusIconRightClicked( Kopete::Account *,
 		const TQPoint & ) ) );
 
-	m_accountStatusBarIcons.insert( account, TQT_TQOBJECT(sbIcon) );
+	m_accountStatusBarIcons.insert( account, sbIcon );
 	slotAccountStatusIconChanged( account->myself() );
 	
 	// add an item for this account to the add contact actionmenu
@@ -744,7 +744,7 @@ void KopeteWindow::slotAccountUnregistered( const Kopete::Account *account)
 	}
 
 	// the (void*)  is to remove the const.  i don't know why TQPtrList doesn't accept const ptr as key.
-	KopeteAccountStatusBarIcon *sbIcon = static_cast<KopeteAccountStatusBarIcon *>( TQT_TQWIDGET(m_accountStatusBarIcons[ (void*)account ]) );
+	KopeteAccountStatusBarIcon *sbIcon = static_cast<KopeteAccountStatusBarIcon *>( m_accountStatusBarIcons[ (void*)account ] );
 
 	if( !sbIcon )
 		return;
@@ -816,7 +816,7 @@ void KopeteWindow::slotAccountStatusIconChanged( Kopete::Contact *contact )
 		}
 	}
 	
-	KopeteAccountStatusBarIcon *i = static_cast<KopeteAccountStatusBarIcon *>( TQT_TQWIDGET(m_accountStatusBarIcons[ contact->account() ]) );
+	KopeteAccountStatusBarIcon *i = static_cast<KopeteAccountStatusBarIcon *>( m_accountStatusBarIcons[ contact->account() ] );
 	if( !i )
 		return;
 
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
 	{
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index c5ef4fa5..def0bd40 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -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, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
+	(void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
 	
 	
         CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions);
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 7a4e1795..01bff360 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -174,8 +174,8 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
 
 	//initActions
 	TDEActionCollection* ac = new TDEActionCollection(this);
-	mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac );
-	mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac );
+	mCopyAct = KStdAction::copy( this, TQT_SLOT(slotCopy()), ac );
+	mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQT_SLOT( slotCopyURL() ), ac );
 
 	resize(650, 700);
 	centerOnScreen(this);
@@ -196,7 +196,7 @@ void HistoryDialog::init()
 {
 	if(mMetaContact)
 	{
-		HistoryLogger logger(mMetaContact, TQT_TQOBJECT(this));
+		HistoryLogger logger(mMetaContact, this);
 		init(mMetaContact);
 	}
 	else
@@ -204,7 +204,7 @@ void HistoryDialog::init()
 		TQPtrListIterator<Kopete::MetaContact> it(mMetaContactList);
 		for(; it.current(); ++it)
 		{
-			HistoryLogger logger(*it, TQT_TQOBJECT(this));
+			HistoryLogger logger(*it, this);
 			init(*it);
 		}
 
@@ -226,7 +226,7 @@ void HistoryDialog::slotLoadDays()
 		
 		DMPair pair(mInit.dateMCList.first());
 		mInit.dateMCList.pop_front();
-		HistoryLogger logger(pair.metaContact(), TQT_TQOBJECT(this));
+		HistoryLogger logger(pair.metaContact(), this);
 		TQValueList<int> dayList = logger.getDaysForMonth(pair.date());
 		for (unsigned int i=0; i<dayList.count(); i++)
 		{
@@ -325,7 +325,7 @@ void HistoryDialog::dateSelected(TQListViewItem* it)
 
 	TQDate chosenDate = item->date();
 
-	HistoryLogger logger(item->metaContact(), TQT_TQOBJECT(this));
+	HistoryLogger logger(item->metaContact(), this);
 	TQValueList<Kopete::Message> msgs=logger.readMessages(chosenDate);
 
 	setMessages(msgs);
diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp
index 849d736d..209bc0bc 100644
--- a/kopete/plugins/webpresence/webpresencepreferences.cpp
+++ b/kopete/plugins/webpresence/webpresencepreferences.cpp
@@ -37,7 +37,7 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n
 	preferencesDialog->formatStylesheetURL->setFilter( "*.xsl" );
 
 	// KAutoConfig stuff
-	kautoconfig = new KAutoConfig(TDEGlobal::config(), TQT_TQOBJECT(this), "kautoconfig");
+	kautoconfig = new KAutoConfig(TDEGlobal::config(), this, "kautoconfig");
 	connect(kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(widgetModified()));
 	connect(kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified()));
 	kautoconfig->addWidget(preferencesDialog, "Web Presence Plugin");
diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp
index dd143de4..497f58b0 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.cpp
+++ b/kopete/protocols/gadu/gaduregisteraccount.cpp
@@ -45,7 +45,7 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name )
 	setButtonText( Ok, i18n( "&Cancel" ) );
 	enableButton( User1, false );
 
-	cRegister = new RegisterCommand( TQT_TQOBJECT(this) );
+	cRegister = new RegisterCommand( this );
 
 	emailRegexp = new TQRegExp(  "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" );
 	hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", TDEIcon::Small );
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index 15eba5dc..6229a294 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -770,7 +770,7 @@ void IRCProtocol::editNetworks( const TQString &networkName )
 	if( !netConf )
 	{
 		netConf = new NetworkConfig( Kopete::UI::Global::mainWidget(), "network_config", true );
-		netConf->host->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[\\w-\\.]*$"), TQT_TQOBJECT(netConf) ) );
+		netConf->host->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[\\w-\\.]*$"), netConf ) );
 		netConf->upButton->setIconSet( SmallIconSet( "go-up" )  );
 		netConf->downButton->setIconSet( SmallIconSet( "go-down" ) );
 
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 854eff97..2304bcd5 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -91,9 +91,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident
 			new TQListViewItem( ctcpList, it.key(), it.data() );
 	}
 
-	mUserName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^\\s]*$"), TQT_TQOBJECT(mUserName) ) );
-	mNickName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mNickName) ) );
-	mAltNickname->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mAltNickname) ) );
+	mUserName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^\\s]*$"), mUserName ) );
+	mNickName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), mNickName ) );
+	mAltNickname->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), mAltNickname ) );
 
 	charset->insertStringList( KCodecAction::supportedEncodings() );
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
index 1309ec01..cabd62b3 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
@@ -88,7 +88,7 @@ void BSocket::reset(bool clear)
 			appendRead(block);
 		}
 
-		d->sd.deleteLater(TQT_TQOBJECT(d->qsock));
+		d->sd.deleteLater(d->qsock);
 		d->qsock = 0;
 	}
 	else {
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 3947de3e..37cc1dd8 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -76,7 +76,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
 
 	d->ui = new MSNEditAccountUI( this );
 
-	d->autoConfig = new KAutoConfig( TQT_TQOBJECT(d->ui) );
+	d->autoConfig = new KAutoConfig( d->ui );
 	d->autoConfig->addWidget( d->ui->global_settings_page, "MSN" );
 	d->autoConfig->addWidget( d->ui->privacy_page, "MSN" );
 	//the JabberAccount need to be saved as text, and can't be handled by kautoconfig