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/gadu/gaduaccount.cpp | 38 +++++++++++++++++----------------- kopete/protocols/gadu/gaduaccount.h | 4 ++-- kopete/protocols/gadu/gaducontact.cpp | 8 +++---- kopete/protocols/gadu/gaducontact.h | 10 ++++----- kopete/protocols/gadu/gaduprotocol.h | 4 ++-- kopete/protocols/gadu/ui/gadusearch.ui | 2 +- 6 files changed, 33 insertions(+), 33 deletions(-) (limited to 'kopete/protocols/gadu') diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index f9a725ee..542211f5 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -70,12 +70,12 @@ public: KFileDialog* saveListDialog; KFileDialog* loadListDialog; - KActionMenu* actionMenu_; - KAction* searchAction; - KAction* listputAction; - KAction* listToFileAction; - KAction* listFromFileAction; - KAction* friendsModeAction; + TDEActionMenu* actionMenu_; + TDEAction* searchAction; + TDEAction* listputAction; + TDEAction* listToFileAction; + TDEAction* listFromFileAction; + TDEAction* friendsModeAction; bool connectWithSSL; int currentServer; @@ -183,19 +183,19 @@ GaduAccount::~GaduAccount() void GaduAccount::initActions() { - p->searchAction = new KAction( i18n( "&Search for Friends" ), "", 0, + p->searchAction = new TDEAction( i18n( "&Search for Friends" ), "", 0, this, TQT_SLOT( slotSearch() ), this, "actionSearch" ); - p->listputAction = new KAction( i18n( "Export Contacts to Server" ), "", 0, + p->listputAction = new TDEAction( i18n( "Export Contacts to Server" ), "", 0, this, TQT_SLOT( slotExportContactsList() ), this, "actionListput" ); - p->listToFileAction = new KAction( i18n( "Export Contacts to File..." ), "", 0, + p->listToFileAction = new TDEAction( i18n( "Export Contacts to File..." ), "", 0, this, TQT_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" ); - p->listFromFileAction = new KAction( i18n( "Import Contacts From File..." ), "", 0, + p->listFromFileAction = new TDEAction( i18n( "Import Contacts From File..." ), "", 0, this, TQT_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" ); - p->friendsModeAction = new KToggleAction( i18n( "Only for Friends" ), "", 0, + p->friendsModeAction = new TDEToggleAction( i18n( "Only for Friends" ), "", 0, this, TQT_SLOT( slotFriendsMode() ), this, "actionFriendsMode" ); - static_cast(p->friendsModeAction)->setChecked( p->forFriends ); + static_cast(p->friendsModeAction)->setChecked( p->forFriends ); } void @@ -246,12 +246,12 @@ GaduAccount::setAway( bool isAway, const TQString& awayMessage ) } -KActionMenu* +TDEActionMenu* GaduAccount::actionMenu() { kdDebug(14100) << "actionMenu() " << endl; - p->actionMenu_ = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); + p->actionMenu_ = new TDEActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); p->actionMenu_->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> " ). arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), accountId() ) ); @@ -286,23 +286,23 @@ GaduAccount::actionMenu() else { p->listFromFileAction->setEnabled( TRUE ); } - p->actionMenu_->insert( new KAction( i18n( "Go O&nline" ), + p->actionMenu_->insert( new TDEAction( i18n( "Go O&nline" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); - p->actionMenu_->insert( new KAction( i18n( "Set &Busy" ), + p->actionMenu_->insert( new TDEAction( i18n( "Set &Busy" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ), 0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); - p->actionMenu_->insert( new KAction( i18n( "Set &Invisible" ), + p->actionMenu_->insert( new TDEAction( i18n( "Set &Invisible" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ), 0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); - p->actionMenu_->insert( new KAction( i18n( "Go &Offline" ), + p->actionMenu_->insert( new TDEAction( i18n( "Go &Offline" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), 0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) ); - p->actionMenu_->insert( new KAction( i18n( "Set &Description..." ), "info", + p->actionMenu_->insert( new TDEAction( i18n( "Set &Description..." ), "info", 0, this, TQT_SLOT( slotDescription() ), this, "actionGaduDescription" ) ); p->actionMenu_->insert( p->friendsModeAction ); diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h index dd3f6c68..37e53a7b 100644 --- a/kopete/protocols/gadu/gaduaccount.h +++ b/kopete/protocols/gadu/gaduaccount.h @@ -47,7 +47,7 @@ namespace Kopete { class Protocol; } namespace Kopete { class Message; } class GaduCommand; class TQTimer; -class KActionMenu; +class TDEActionMenu; class GaduDCC; class GaduDCCTransaction; @@ -61,7 +61,7 @@ public: ~GaduAccount(); //{ void setAway( bool isAway, const TQString& awayMessage = TQString() ); - KActionMenu* actionMenu(); + TDEActionMenu* actionMenu(); void dccRequest( GaduContact* ); void sendFile( GaduContact* , TQString& ); //} diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index 9aea8fe5..e797ea40 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -190,18 +190,18 @@ GaduContact::isReachable() return account_->isConnected(); } -TQPtrList* +TQPtrList* GaduContact::customContextMenuActions() { - TQPtrList *fakeCollection = new TQPtrList(); + TQPtrList *fakeCollection = new TQPtrList(); //show profile - KAction* actionShowProfile = new KAction( i18n("Show Profile") , "info", 0, + TDEAction* actionShowProfile = new TDEAction( i18n("Show Profile") , "info", 0, this, TQT_SLOT( slotShowPublicProfile() ), this, "actionShowPublicProfile" ); fakeCollection->append( actionShowProfile ); - KAction* actionEditContact = new KAction( i18n("Edit...") , "edit", 0, + TDEAction* actionEditContact = new TDEAction( i18n("Edit...") , "edit", 0, this, TQT_SLOT( slotEditContact() ), this, "actionEditContact" ); diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h index 05d0f3b8..bcfc1b98 100644 --- a/kopete/protocols/gadu/gaducontact.h +++ b/kopete/protocols/gadu/gaducontact.h @@ -34,7 +34,7 @@ #include -class KAction; +class TDEAction; class GaduAccount; namespace Kopete { class Account; } namespace Kopete { class ChatSession; } @@ -52,7 +52,7 @@ public: virtual bool isReachable(); virtual void serialize( TQMap&, TQMap& ); - virtual TQPtrList* customContextMenuActions(); + virtual TQPtrList* customContextMenuActions(); virtual TQString identityId() const; GaduContactsList::ContactLine* contactDetails(); @@ -99,9 +99,9 @@ private: TQString parentIdentity_; GaduAccount* account_; - KAction* actionSendMessage_; - KAction* actionInfo_; - KAction* actionRemove_; + TDEAction* actionSendMessage_; + TDEAction* actionInfo_; + TDEAction* actionRemove_; TQPtrList thisContact_; diff --git a/kopete/protocols/gadu/gaduprotocol.h b/kopete/protocols/gadu/gaduprotocol.h index 0152d680..853ad5e7 100644 --- a/kopete/protocols/gadu/gaduprotocol.h +++ b/kopete/protocols/gadu/gaduprotocol.h @@ -31,8 +31,8 @@ #include "gaducommands.h" -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class TQWidget; class TQString; diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui index e747e952..5fe042ad 100644 --- a/kopete/protocols/gadu/ui/gadusearch.ui +++ b/kopete/protocols/gadu/ui/gadusearch.ui @@ -408,7 +408,7 @@ unnamed - + Status -- cgit v1.2.1