From 9c9412b30c54468adc9e506cc76c5d113fbf5056 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:03 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kopete/protocols/yahoo/yahooaccount.cpp | 20 ++++++++++---------- kopete/protocols/yahoo/yahooaccount.h | 14 +++++++------- kopete/protocols/yahoo/yahoochatsession.cpp | 18 +++++++++--------- kopete/protocols/yahoo/yahoochatsession.h | 4 ++-- .../yahoo/yahooconferencemessagemanager.cpp | 2 +- .../protocols/yahoo/yahooconferencemessagemanager.h | 6 +++--- kopete/protocols/yahoo/yahoocontact.cpp | 16 ++++++++-------- kopete/protocols/yahoo/yahoocontact.h | 16 ++++++++-------- kopete/protocols/yahoo/yahooprotocol.h | 6 +++--- 9 files changed, 51 insertions(+), 51 deletions(-) (limited to 'kopete/protocols/yahoo') diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 7e36d04e..4edc14e6 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -81,23 +81,23 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con m_chatChatSession = 0; // FIXME - //m_openInboxAction = new KAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this ); + //m_openInboxAction = new TDEAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this ); //, "m_openInboxAction" ); //TQObject::connect(m_openInboxAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenInbox() ) ); - //m_openYABAction = new KAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this ); + //m_openYABAction = new TDEAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this ); //, "m_openYABAction" ); //TQObject::connect(m_openYABAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenYAB() ) ); - //m_editOwnYABEntry = new KAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this ); + //m_editOwnYABEntry = new TDEAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this ); //, "m_editOwnYABEntry" ); //TQObject::connect(m_editOwnYABEntry, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotEditOwnYABEntry() ) ); - //m_joinChatAction = new KAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this ); + //m_joinChatAction = new TDEAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this ); //, "m_joinChatAction" ); //TQObject::connect(m_joinChatAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotJoinChatRoom() ) ); - m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); - m_openYABAction = new KAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQT_SLOT( slotOpenYAB() ), this, "m_openYABAction" ); - m_editOwnYABEntry = new KAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQT_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" ); - m_joinChatAction = new KAction( i18n( "&Join chat room..."), "contents", 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction"); + m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); + m_openYABAction = new TDEAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQT_SLOT( slotOpenYAB() ), this, "m_openYABAction" ); + m_editOwnYABEntry = new TDEAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQT_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" ); + m_joinChatAction = new TDEAction( i18n( "&Join chat room..."), "contents", 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction"); YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() ); setMyself( _myself ); @@ -634,13 +634,13 @@ void YahooAccount::slotGoOffline() static_cast( myself() )->setOnlineStatus( m_protocol->Offline ); } -KActionMenu* YahooAccount::actionMenu() +TDEActionMenu* YahooAccount::actionMenu() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; // FIXME (to check) //Kopete::Account::fillActionMenu( actionMenu ); - KActionMenu *theActionMenu = Kopete::Account::actionMenu(); + TDEActionMenu *theActionMenu = Kopete::Account::actionMenu(); // FIXME: (to check) //actionMenu->addSeparator(); diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index 9f8d1d22..92a1aa43 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -38,8 +38,8 @@ #include "yahootypes.h" class TQColor; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class YahooContact; class YahooAccount; class YahooProtocol; @@ -78,7 +78,7 @@ public: */ YahooContact *contact(const TQString &id); - virtual KActionMenu* actionMenu(); + virtual TDEActionMenu* actionMenu(); /** * Sets the yahoo away status @@ -292,10 +292,10 @@ private: YahooWebcam *m_webcam; - KAction *m_openInboxAction; // Menu item openInbox - KAction *m_openYABAction; // Menu item openYahooAddressbook - KAction *m_editOwnYABEntry; // Menu item editOwnYABEntry - KAction *m_joinChatAction; // Menu item joinChatAction + TDEAction *m_openInboxAction; // Menu item openInbox + TDEAction *m_openYABAction; // Menu item openYahooAddressbook + TDEAction *m_editOwnYABEntry; // Menu item editOwnYABEntry + TDEAction *m_joinChatAction; // Menu item joinChatAction Client *m_session; // The Connection object }; diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index 3bb8e717..c8eaf102 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -53,11 +53,11 @@ YahooChatSession::YahooChatSession( Kopete::Protocol *protocol, const Kopete::Co setInstance(protocol->instance()); // Add Actions - new KAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQT_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ; - new KAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQT_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ; - new KAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQT_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ; - new KAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQT_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ; - new KAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" ); + new TDEAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQT_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ; + new TDEAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQT_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ; + new TDEAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQT_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ; + new TDEAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQT_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ; + new TDEAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" ); YahooContact *c = static_cast( others.first() ); connect( c, TQT_SIGNAL( displayPictureChanged() ), this, TQT_SLOT( slotDisplayPictureChanged() ) ); @@ -127,17 +127,17 @@ void YahooChatSession::slotDisplayPictureChanged() int sz=22; // get the size of the toolbar were the aciton is plugged. // if you know a better way to get the toolbar, let me know - KMainWindow *w= view(false) ? dynamic_cast( view(false)->mainWidget()->topLevelWidget() ) : 0L; + TDEMainWindow *w= view(false) ? dynamic_cast( view(false)->mainWidget()->topLevelWidget() ) : 0L; if(w) { //We connected that in the constructor. we don't need to keep this slot active. disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); - TQPtrListIterator it=w->toolBarIterator() ; - KAction *imgAction=actionCollection()->action("yahooDisplayPicture"); + TQPtrListIterator it=w->toolBarIterator() ; + TDEAction *imgAction=actionCollection()->action("yahooDisplayPicture"); if(imgAction) while(it) { - KToolBar *tb=*it; + TDEToolBar *tb=*it; if(imgAction->isPlugged(tb)) { sz=tb->iconSize(); diff --git a/kopete/protocols/yahoo/yahoochatsession.h b/kopete/protocols/yahoo/yahoochatsession.h index 7109d816..f56b1a08 100644 --- a/kopete/protocols/yahoo/yahoochatsession.h +++ b/kopete/protocols/yahoo/yahoochatsession.h @@ -18,9 +18,9 @@ #include "kopetechatsession.h" -class KActionCollection; +class TDEActionCollection; class YahooContact; -class KActionMenu; +class TDEActionMenu; class TQLabel; diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 8e6132b6..64656e75 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -47,7 +47,7 @@ YahooConferenceChatSession::YahooConferenceChatSession( const TQString & yahooRo m_yahooRoom = yahooRoom; - m_actionInvite = new KAction( i18n( "&Invite others" ), "kontact_contacts", this, TQT_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite"); + m_actionInvite = new TDEAction( i18n( "&Invite others" ), "kontact_contacts", this, TQT_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite"); setXMLFile("yahooconferenceui.rc"); } diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.h b/kopete/protocols/yahoo/yahooconferencemessagemanager.h index 363dc003..d09cee4f 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.h +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.h @@ -21,10 +21,10 @@ #include "kopetechatsession.h" -class KActionCollection; +class TDEActionCollection; class YahooContact; class YahooAccount; -class KActionMenu; +class TDEActionMenu; /** * @author Duncan Mac-Vicar Prett @@ -50,7 +50,7 @@ protected slots: private: TQString m_yahooRoom; - KAction *m_actionInvite; + TDEAction *m_actionInvite; }; #endif diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 62b7c6c9..fbc1718d 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -361,12 +361,12 @@ void YahooContact::slotChatSessionDestroyed() m_sessionActive = false; } -TQPtrList *YahooContact::customContextMenuActions() +TQPtrList *YahooContact::customContextMenuActions() { - TQPtrList *actionCollection = new TQPtrList(); + TQPtrList *actionCollection = new TQPtrList(); if ( !m_webcamAction ) { - m_webcamAction = new KAction( i18n( "View &Webcam" ), "webcamreceive", KShortcut(), + m_webcamAction = new TDEAction( i18n( "View &Webcam" ), "webcamreceive", TDEShortcut(), this, TQT_SLOT( requestWebcam() ), this, "view_webcam" ); } if ( isReachable() ) @@ -377,7 +377,7 @@ TQPtrList *YahooContact::customContextMenuActions() if( !m_inviteWebcamAction ) { - m_inviteWebcamAction = new KAction( i18n( "Invite to view your Webcam" ), "webcamsend", KShortcut(), + m_inviteWebcamAction = new TDEAction( i18n( "Invite to view your Webcam" ), "webcamsend", TDEShortcut(), this, TQT_SLOT( inviteWebcam() ), this, "invite_webcam" ); } if ( isReachable() ) @@ -388,7 +388,7 @@ TQPtrList *YahooContact::customContextMenuActions() if ( !m_buzzAction ) { - m_buzzAction = new KAction( i18n( "&Buzz Contact" ), "bell", KShortcut(), this, TQT_SLOT( buzzContact() ), this, "buzz_contact"); + m_buzzAction = new TDEAction( i18n( "&Buzz Contact" ), "bell", TDEShortcut(), this, TQT_SLOT( buzzContact() ), this, "buzz_contact"); } if ( isReachable() ) m_buzzAction->setEnabled( true ); @@ -398,7 +398,7 @@ TQPtrList *YahooContact::customContextMenuActions() if ( !m_stealthAction ) { - m_stealthAction = new KAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", KShortcut(), this, TQT_SLOT( stealthContact() ), this, "stealth_contact"); + m_stealthAction = new TDEAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", TDEShortcut(), this, TQT_SLOT( stealthContact() ), this, "stealth_contact"); } if ( isReachable() ) m_stealthAction->setEnabled( true ); @@ -408,7 +408,7 @@ TQPtrList *YahooContact::customContextMenuActions() if ( !m_inviteConferenceAction ) { - m_inviteConferenceAction = new KAction( i18n( "&Invite to Conference" ), "kontact_contacts", KShortcut(), this, TQT_SLOT( inviteConference() ), this, "invite_conference"); + m_inviteConferenceAction = new TDEAction( i18n( "&Invite to Conference" ), "kontact_contacts", TDEShortcut(), this, TQT_SLOT( inviteConference() ), this, "invite_conference"); } if ( isReachable() ) m_inviteConferenceAction->setEnabled( true ); @@ -418,7 +418,7 @@ TQPtrList *YahooContact::customContextMenuActions() if ( !m_profileAction ) { - m_profileAction = new KAction( i18n( "&View Yahoo Profile" ), "kontact_notes", KShortcut(), this, TQT_SLOT( slotUserProfile() ), this, "profile_contact"); + m_profileAction = new TDEAction( i18n( "&View Yahoo Profile" ), "kontact_notes", TDEShortcut(), this, TQT_SLOT( slotUserProfile() ), this, "profile_contact"); } m_profileAction->setEnabled( true ); actionCollection->append( m_profileAction ); diff --git a/kopete/protocols/yahoo/yahoocontact.h b/kopete/protocols/yahoo/yahoocontact.h index dd2f9f8b..eb8c0d1d 100644 --- a/kopete/protocols/yahoo/yahoocontact.h +++ b/kopete/protocols/yahoo/yahoocontact.h @@ -24,7 +24,7 @@ /* Kopete Includes */ #include "kopetecontact.h" -class KAction; +class TDEAction; class KTempFile; namespace Kopete { class ChatSession; } @@ -49,7 +49,7 @@ public: /** Base Class Reimplementations **/ virtual bool isOnline() const; virtual bool isReachable(); - virtual TQPtrList *customContextMenuActions(); + virtual TQPtrList *customContextMenuActions(); virtual Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate= Kopete::Contact::CanCreate ); virtual void serialize( TQMap &serializedData, TQMap &addressBookData ); @@ -128,12 +128,12 @@ private: bool m_receivingWebcam; bool m_sessionActive; - KAction* m_stealthAction; - KAction* m_profileAction; - KAction* m_webcamAction; - KAction* m_inviteWebcamAction; - KAction* m_buzzAction; - KAction* m_inviteConferenceAction; + TDEAction* m_stealthAction; + TDEAction* m_profileAction; + TDEAction* m_webcamAction; + TDEAction* m_inviteWebcamAction; + TDEAction* m_buzzAction; + TDEAction* m_inviteConferenceAction; }; #endif diff --git a/kopete/protocols/yahoo/yahooprotocol.h b/kopete/protocols/yahoo/yahooprotocol.h index 7acbea7d..075b84db 100644 --- a/kopete/protocols/yahoo/yahooprotocol.h +++ b/kopete/protocols/yahoo/yahooprotocol.h @@ -31,9 +31,9 @@ #include "kopetecontactproperty.h" class YahooContact; -class KPopupMenu; -class KActionMenu; -class KAction; +class TDEPopupMenu; +class TDEActionMenu; +class TDEAction; namespace Kopete { class MetaContact; } namespace Kopete { class Message; } class YahooPreferences; -- cgit v1.2.3