Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 59 insertions, 59 deletions

diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index eef4ab09..20549de2 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -196,7 +196,7 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name )
 		m_button_send->setEnabled( false );
 		m_button_send->setFont( statusBar()->font() );
 		m_button_send->setFixedHeight( statusBar()->sizeHint().height() );
-		connect( m_button_send, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSendMessage() ) );
+		connect( m_button_send, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSendMessage() ) );
 		statusBar()->addWidget( m_button_send, 0, true );
 	}
 	else
@@ -314,86 +314,86 @@ void KopeteChatWindow::initActions(void)
 	createStandardStatusBarAction();
 
 	chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), TQKeySequence(Key_Return) ,
-		this, TQT_SLOT( slotSendMessage() ), coll, "chat_send" );
+		this, TQ_SLOT( slotSendMessage() ), coll, "chat_send" );
 	chatSend->setEnabled( false );
 
- 	KStdAction::save ( this, TQT_SLOT(slotChatSave()), coll );
- 	KStdAction::print ( this, TQT_SLOT(slotChatPrint()), coll );
-	TDEAction* quitAction = KStdAction::quit ( this, TQT_SLOT(close()), coll );
+ 	KStdAction::save ( this, TQ_SLOT(slotChatSave()), coll );
+ 	KStdAction::print ( this, TQ_SLOT(slotChatPrint()), coll );
+	TDEAction* quitAction = KStdAction::quit ( this, TQ_SLOT(close()), coll );
 	quitAction->setText( i18n("Close All Chats") );
 
-	tabClose = KStdAction::close ( this, TQT_SLOT(slotChatClosed()), coll, "tabs_close" );
+	tabClose = KStdAction::close ( this, TQ_SLOT(slotChatClosed()), coll, "tabs_close" );
 
 	tabRight=new TDEAction( i18n( "&Activate Next Tab" ), 0, TDEStdAccel::tabNext(),
-		this, TQT_SLOT( slotNextTab() ), coll, "tabs_right" );
+		this, TQ_SLOT( slotNextTab() ), coll, "tabs_right" );
 	tabLeft=new TDEAction( i18n( "&Activate Previous Tab" ), 0, TDEStdAccel::tabPrev(),
-		this, TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" );
+		this, TQ_SLOT( slotPreviousTab() ), coll, "tabs_left" );
 	tabLeft->setEnabled( false );
 	tabRight->setEnabled( false );
 
-	nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, this, TQT_SLOT( slotNickComplete() ), coll , "nick_compete");
+	nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, this, TQ_SLOT( slotNickComplete() ), coll , "nick_compete");
 	nickComplete->setShortcut( TQKeySequence( Key_Tab ) );
 
 	tabDetach = new TDEAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0,
-		this, TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" );
+		this, TQ_SLOT( slotDetachChat() ), coll, "tabs_detach" );
 	tabDetach->setEnabled( false );
 
 	actionDetachMenu = new TDEActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" );
 	actionDetachMenu->setDelayed( false );
 
-	connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareDetachMenu()) );
-	connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDetachChat(int)) );
+	connect ( actionDetachMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPrepareDetachMenu()) );
+	connect ( actionDetachMenu->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDetachChat(int)) );
 
 	actionTabPlacementMenu = new TDEActionMenu( i18n( "&Tab Placement" ), coll, "tabs_placement" );
-	connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPreparePlacementMenu()) );
-	connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPlaceTabs(int)) );
+	connect ( actionTabPlacementMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPreparePlacementMenu()) );
+	connect ( actionTabPlacementMenu->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPlaceTabs(int)) );
 
 	tabDetach->setShortcut( TQKeySequence(CTRL + SHIFT + Key_B) );
 
-	KStdAction::cut( this, TQT_SLOT(slotCut()), coll);
-	KStdAction::copy( this, TQT_SLOT(slotCopy()), coll);
-	KStdAction::paste( this, TQT_SLOT(slotPaste()), coll);
+	KStdAction::cut( this, TQ_SLOT(slotCut()), coll);
+	KStdAction::copy( this, TQ_SLOT(slotCopy()), coll);
+	KStdAction::paste( this, TQ_SLOT(slotPaste()), coll);
 
-	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" );
+	new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, this, TQ_SLOT( slotSetFont() ), coll, "format_font" );
+	new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, this, TQ_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
+	new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, this, TQ_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
 
 	historyUp = new TDEAction( i18n( "Previous History" ), TQString(), 0,
-		this, TQT_SLOT( slotHistoryUp() ), coll, "history_up" );
+		this, TQ_SLOT( slotHistoryUp() ), coll, "history_up" );
 	historyUp->setShortcut( TQKeySequence(CTRL + Key_Up) );
 
 	historyDown = new TDEAction( i18n( "Next History" ), TQString(), 0,
-		this, TQT_SLOT( slotHistoryDown() ), coll, "history_down" );
+		this, TQ_SLOT( slotHistoryDown() ), coll, "history_down" );
 	historyDown->setShortcut( TQKeySequence(CTRL + Key_Down) );
 
-	KStdAction::prior( this, TQT_SLOT( slotPageUp() ), coll, "scroll_up" );
-	KStdAction::next( this, TQT_SLOT( slotPageDown() ), coll, "scroll_down" );
+	KStdAction::prior( this, TQ_SLOT( slotPageUp() ), coll, "scroll_up" );
+	KStdAction::next( this, TQ_SLOT( slotPageDown() ), coll, "scroll_down" );
 
-	KStdAction::showMenubar( this, TQT_SLOT(slotViewMenuBar()), coll );
+	KStdAction::showMenubar( this, TQ_SLOT(slotViewMenuBar()), coll );
 
 	membersLeft = new TDEToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0,
-		this, TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
+		this, TQ_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
 	membersRight = new TDEToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0,
-		this, TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
+		this, TQ_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
 	toggleMembers = new TDEToggleAction( i18n( "Show" ), TQString(), 0,
-		this, TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
+		this, TQ_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
 	toggleMembers->setCheckedState(i18n("Hide"));
 	toggleAutoSpellCheck = new TDEToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0,
-		this, TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
+		this, TQ_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
 	toggleAutoSpellCheck->setChecked( true );
 
 	actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" );
 	actionSmileyMenu->setDelayed( false );
-	connect(actionSmileyMenu, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSmileyActivated(const TQString &)));
+	connect(actionSmileyMenu, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSmileyActivated(const TQString &)));
 
 	actionContactMenu = new TDEActionMenu(i18n("Co&ntacts"), coll, "contacts_menu" );
 	actionContactMenu->setDelayed( false );
-	connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareContactMenu()) );
+	connect ( actionContactMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPrepareContactMenu()) );
 
 	// add configure key bindings menu item
-	KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll );
+	KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), coll );
 
-	KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), coll);
+	KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), coll);
 	KopeteStdAction::preferences( coll , "settings_prefs" );
 
 	//The Sending movie
@@ -422,7 +422,7 @@ void KopeteChatWindow::initActions(void)
 	createGUI( 0L );
 
 	// Special handling for remembering whether the format toolbar is visible or not
-	connect ( toolBar("formatToolBar"), TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(slotToggleFormatToolbar(bool)) );
+	connect ( toolBar("formatToolBar"), TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(slotToggleFormatToolbar(bool)) );
 }
 
 const TQString KopeteChatWindow::fileContents( const TQString &path ) const
@@ -599,10 +599,10 @@ void KopeteChatWindow::createTabBar()
 #if KDE_IS_VERSION(3,4,0)
 		m_tabBar->setAutomaticResizeTabs(true);
 #endif
-		connect( m_tabBar, TQT_SIGNAL( closeRequest( TQWidget* )), this, TQT_SLOT( slotCloseChat( TQWidget* ) ) );
+		connect( m_tabBar, TQ_SIGNAL( closeRequest( TQWidget* )), this, TQ_SLOT( slotCloseChat( TQWidget* ) ) );
 
 		TQToolButton* m_rightWidget = new TQToolButton( m_tabBar );
-		connect( m_rightWidget, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChatClosed() ) );
+		connect( m_rightWidget, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChatClosed() ) );
 		m_rightWidget->setIconSet( SmallIcon( "tab_remove" ) );
 		m_rightWidget->adjustSize();
 		TQToolTip::add( m_rightWidget, i18n("Close the current tab"));
@@ -610,8 +610,8 @@ void KopeteChatWindow::createTabBar()
 
 		mainLayout->addWidget( m_tabBar );
 		m_tabBar->show();
-		connect ( m_tabBar, TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(setActiveView(TQWidget *)) );
-		connect ( m_tabBar, TQT_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) );
+		connect ( m_tabBar, TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(setActiveView(TQWidget *)) );
+		connect ( m_tabBar, TQ_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) );
 
 		for( ChatView *view = chatViewList.first(); view; view = chatViewList.next() )
 			addTab( view );
@@ -648,8 +648,8 @@ void KopeteChatWindow::addTab( ChatView *view )
 		view->show();
 	else
 		view->hide();
-	connect( view, TQT_SIGNAL( captionChanged( bool ) ), this, TQT_SLOT( updateChatLabel() ) );
-	connect( view, TQT_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQT_SLOT( slotUpdateCaptionIcons( ChatView* ) ) );
+	connect( view, TQ_SIGNAL( captionChanged( bool ) ), this, TQ_SLOT( updateChatLabel() ) );
+	connect( view, TQ_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQ_SLOT( slotUpdateCaptionIcons( ChatView* ) ) );
 	view->setCaption( view->caption(), false );
 }
 
@@ -670,8 +670,8 @@ void KopeteChatWindow::deleteTabBar()
 {
 	if( m_tabBar )
 	{
-		disconnect ( m_tabBar, TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(setActiveView(TQWidget *)) );
-		disconnect ( m_tabBar, TQT_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) );
+		disconnect ( m_tabBar, TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(setActiveView(TQWidget *)) );
+		disconnect ( m_tabBar, TQ_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) );
 
 		if( !chatViewList.isEmpty() )
 			setPrimaryChatView( chatViewList.first() );
@@ -700,17 +700,17 @@ void KopeteChatWindow::attachChatView( ChatView* newView )
 	newView->editWidget()->installEventFilter( this );
 
 	KCursor::setAutoHideCursor( newView->editWidget(), true, true );
-	connect( newView, TQT_SIGNAL(captionChanged( bool)), this, TQT_SLOT(slotSetCaption(bool)) );
-	connect( newView, TQT_SIGNAL(messageSuccess( ChatView* )), this, TQT_SLOT(slotStopAnimation( ChatView* )) );
-	connect( newView, TQT_SIGNAL(rtfEnabled( ChatView*, bool ) ), this, TQT_SLOT( slotRTFEnabled( ChatView*, bool ) ) );
-	connect( newView, TQT_SIGNAL(updateStatusIcon( ChatView* ) ), this, TQT_SLOT(slotUpdateCaptionIcons( ChatView* ) ) );
-	connect( newView, TQT_SIGNAL(updateChatState( ChatView*, int ) ), this, TQT_SLOT( updateChatState( ChatView*, int ) ) );
+	connect( newView, TQ_SIGNAL(captionChanged( bool)), this, TQ_SLOT(slotSetCaption(bool)) );
+	connect( newView, TQ_SIGNAL(messageSuccess( ChatView* )), this, TQ_SLOT(slotStopAnimation( ChatView* )) );
+	connect( newView, TQ_SIGNAL(rtfEnabled( ChatView*, bool ) ), this, TQ_SLOT( slotRTFEnabled( ChatView*, bool ) ) );
+	connect( newView, TQ_SIGNAL(updateStatusIcon( ChatView* ) ), this, TQ_SLOT(slotUpdateCaptionIcons( ChatView* ) ) );
+	connect( newView, TQ_SIGNAL(updateChatState( ChatView*, int ) ), this, TQ_SLOT( updateChatState( ChatView*, int ) ) );
 
 	updateSpellCheckAction();
 	checkDetachEnable();
 	newView->loadChatSettings();
-	connect( newView, TQT_SIGNAL(autoSpellCheckEnabled( ChatView*, bool ) ),
-	         this, TQT_SLOT( slotAutoSpellCheckEnabled( ChatView*, bool ) ) );
+	connect( newView, TQ_SIGNAL(autoSpellCheckEnabled( ChatView*, bool ) ),
+	         this, TQ_SLOT( slotAutoSpellCheckEnabled( ChatView*, bool ) ) );
 }
 
 void KopeteChatWindow::checkDetachEnable()
@@ -730,9 +730,9 @@ void KopeteChatWindow::detachChatView( ChatView *view )
 	if( !chatViewList.removeRef( view ) )
 		return;
 
-	disconnect( view, TQT_SIGNAL(captionChanged( bool)), this, TQT_SLOT(slotSetCaption(bool)) );
-	disconnect( view, TQT_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQT_SLOT( slotUpdateCaptionIcons( ChatView* ) ) );
-	disconnect( view, TQT_SIGNAL( updateChatState( ChatView*, int ) ), this, TQT_SLOT( updateChatState( ChatView*, int ) ) );
+	disconnect( view, TQ_SIGNAL(captionChanged( bool)), this, TQ_SLOT(slotSetCaption(bool)) );
+	disconnect( view, TQ_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQ_SLOT( slotUpdateCaptionIcons( ChatView* ) ) );
+	disconnect( view, TQ_SIGNAL( updateChatState( ChatView*, int ) ), this, TQ_SLOT( updateChatState( ChatView*, int ) ) );
 	view->editWidget()->removeEventFilter( this );
 
 	if( m_tabBar )
@@ -831,7 +831,7 @@ void KopeteChatWindow::updateBackground( const TQPixmap &pm )
 
 		backgroundFile = new KTempFile( TQString(), TQString::fromLatin1( ".bmp" ) );
 		pm.save( backgroundFile->name(), "BMP" );
-		TQTimer::singleShot( 100, this, TQT_SLOT( slotEnableUpdateBg() ) );
+		TQTimer::singleShot( 100, this, TQ_SLOT( slotEnableUpdateBg() ) );
 	}
 }
 
@@ -844,7 +844,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget )
 
 	if(m_activeView)
 	{
-		disconnect( m_activeView, TQT_SIGNAL( canSendChanged(bool) ), this, TQT_SLOT( slotUpdateSendEnabled() ) );
+		disconnect( m_activeView, TQ_SIGNAL( canSendChanged(bool) ), this, TQ_SLOT( slotUpdateSendEnabled() ) );
 		guiFactory()->removeClient(m_activeView->msgManager());
 		m_activeView->saveChatSettings();
 	}
@@ -860,7 +860,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget )
 	if( !chatViewList.contains( view ) )
 		attachChatView( view );
 
-	connect( m_activeView, TQT_SIGNAL( canSendChanged(bool) ), this, TQT_SLOT( slotUpdateSendEnabled() ) );
+	connect( m_activeView, TQ_SIGNAL( canSendChanged(bool) ), this, TQ_SLOT( slotUpdateSendEnabled() ) );
 
 	//Tell it it is active
 	m_activeView->setActive( true );
@@ -982,8 +982,8 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
 	for ( contact = m_them.first(); contact; contact = m_them.next() )
 	{
 		TDEPopupMenu *p = contact->popupMenu();
-		connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
-			p, TQT_SLOT(deleteLater() ) );
+		connect ( actionContactMenu->popupMenu(), TQ_SIGNAL(aboutToHide()),
+			p, TQ_SLOT(deleteLater() ) );
 
 		if( contact->metaContact() )
 			contactsMenu->insertItem( contact->onlineStatus().iconFor( contact ) , contact->metaContact()->displayName(), p );
@@ -995,8 +995,8 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
 		{
 			TDEActionMenu *moreMenu = new TDEActionMenu( i18n("More..."),
 				 TQString::fromLatin1("folder_open"), contactsMenu );
-			connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
-				moreMenu, TQT_SLOT(deleteLater() ) );
+			connect ( actionContactMenu->popupMenu(), TQ_SIGNAL(aboutToHide()),
+				moreMenu, TQ_SLOT(deleteLater() ) );
 			moreMenu->plug( contactsMenu );
 			contactsMenu = moreMenu->popupMenu();
 			contactCount = 0;