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/oscar/aim/aimaccount.cpp | 16 ++++++++-------- kopete/protocols/oscar/aim/aimaccount.h | 4 ++-- kopete/protocols/oscar/aim/aimcontact.cpp | 10 +++++----- kopete/protocols/oscar/aim/aimcontact.h | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kopete/protocols/oscar/aim') diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index ba8d94b1..cd9e30a3 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -294,12 +294,12 @@ TQString AIMAccount::sanitizedMessage( const TQString& message ) return doc.toString(); } -KActionMenu* AIMAccount::actionMenu() +TDEActionMenu* AIMAccount::actionMenu() { // kdDebug(14152) << k_funcinfo << accountId() << ": Called." << endl; // mActionMenu is managed by Kopete::Account. It is deleted when // it is no longer shown, so we can (safely) just make a new one here. - KActionMenu *mActionMenu = new KActionMenu(accountId(), + TDEActionMenu *mActionMenu = new TDEActionMenu(accountId(), myself()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); AIMProtocol *p = AIMProtocol::protocol(); @@ -308,30 +308,30 @@ KActionMenu* AIMAccount::actionMenu() mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%2 <%1>" ).arg( accountId(), accountNick )); - mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, + mActionMenu->insert( new TDEAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); - KAction* mActionAway = new Kopete::AwayAction(i18n("Away"), p->statusAway.iconFor( this ), 0, this, + TDEAction* mActionAway = new Kopete::AwayAction(i18n("Away"), p->statusAway.iconFor( this ), 0, this, TQT_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" ); mActionAway->setEnabled( isConnected() ); mActionMenu->insert( mActionAway ); - KAction* mActionOffline = new KAction( i18n("Offline"), p->statusOffline.iconFor(this), 0, this, + TDEAction* mActionOffline = new TDEAction( i18n("Offline"), p->statusOffline.iconFor(this), 0, this, TQT_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline"); mActionMenu->insert( mActionOffline ); mActionMenu->popupMenu()->insertSeparator(); - KAction* m_joinChatAction = new KAction( i18n( "Join Chat..." ), TQString(), 0, this, + TDEAction* m_joinChatAction = new TDEAction( i18n( "Join Chat..." ), TQString(), 0, this, TQT_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" ); - mActionMenu->insert( new KToggleAction( i18n( "Set Visibility..." ), 0, 0, + mActionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0, this, TQT_SLOT( slotSetVisiblility() ), this, "AIMAccount::mActionSetVisibility") ); mActionMenu->insert( m_joinChatAction ); - KAction* m_editInfoAction = new KAction( i18n( "Edit User Info..." ), "identity", 0, + TDEAction* m_editInfoAction = new TDEAction( i18n( "Edit User Info..." ), "identity", 0, this, TQT_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo"); mActionMenu->insert( m_editInfoAction ); diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h index c7418e36..63adeac7 100644 --- a/kopete/protocols/oscar/aim/aimaccount.h +++ b/kopete/protocols/oscar/aim/aimaccount.h @@ -42,7 +42,7 @@ class Group; class ChatSession; } -class KAction; +class TDEAction; class OscarContact; class AIMContact; class AIMAccount; @@ -91,7 +91,7 @@ public: virtual ~AIMAccount(); // Accessor method for the action menu - virtual KActionMenu* actionMenu(); + virtual TDEActionMenu* actionMenu(); void setAway(bool away, const TQString &awayReason = TQString() ); diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index a92f620e..2a8b0320 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -84,17 +84,17 @@ bool AIMContact::isReachable() return true; } -TQPtrList *AIMContact::customContextMenuActions() +TQPtrList *AIMContact::customContextMenuActions() { - TQPtrList *actionCollection = new TQPtrList(); + TQPtrList *actionCollection = new TQPtrList(); if ( !m_warnUserAction ) { - m_warnUserAction = new KAction( i18n( "&Warn User" ), 0, this, TQT_SLOT( warnUser() ), this, "warnAction" ); + m_warnUserAction = new TDEAction( i18n( "&Warn User" ), 0, this, TQT_SLOT( warnUser() ), this, "warnAction" ); } - m_actionVisibleTo = new KToggleAction(i18n("Always &Visible To"), "", 0, + m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0, this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo"); - m_actionInvisibleTo = new KToggleAction(i18n("Always &Invisible To"), "", 0, + m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0, this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); bool on = account()->isConnected(); diff --git a/kopete/protocols/oscar/aim/aimcontact.h b/kopete/protocols/oscar/aim/aimcontact.h index d66c62c6..eea346ac 100644 --- a/kopete/protocols/oscar/aim/aimcontact.h +++ b/kopete/protocols/oscar/aim/aimcontact.h @@ -43,7 +43,7 @@ public: virtual ~AIMContact(); bool isReachable(); - TQPtrList *customContextMenuActions(); + TQPtrList *customContextMenuActions(); const TQString &userProfile() { return mUserProfile; } @@ -95,9 +95,9 @@ private: bool m_mobile; // Is this user mobile (i.e. do they have message forwarding on, or mobile AIM) TQDateTime m_lastAutoresponseTime; - KAction* m_warnUserAction; - KToggleAction *m_actionVisibleTo; - KToggleAction *m_actionInvisibleTo; + TDEAction* m_warnUserAction; + TDEToggleAction *m_actionVisibleTo; + TDEToggleAction *m_actionInvisibleTo; }; #endif //kate: tab-width 4; indent-mode csands; -- cgit v1.2.1