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/icq/icqaccount.cpp | 12 ++++++------ kopete/protocols/oscar/icq/icqaccount.h | 4 ++-- kopete/protocols/oscar/icq/icqcontact.cpp | 18 +++++++++--------- kopete/protocols/oscar/icq/icqcontact.h | 20 ++++++++++---------- kopete/protocols/oscar/icq/ui/icqsearchbase.ui | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) (limited to 'kopete/protocols/oscar/icq') diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 9ca3baae..7627648c 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -120,24 +120,24 @@ ICQ::Presence ICQAccount::presence() } -KActionMenu* ICQAccount::actionMenu() +TDEActionMenu* ICQAccount::actionMenu() { - KActionMenu* actionMenu = Kopete::Account::actionMenu(); + TDEActionMenu* actionMenu = Kopete::Account::actionMenu(); actionMenu->popupMenu()->insertSeparator(); - KToggleAction* actionInvisible = - new KToggleAction( i18n( "In&visible" ), + TDEToggleAction* actionInvisible = + new TDEToggleAction( i18n( "In&visible" ), ICQ::Presence( presence().type(), ICQ::Presence::Invisible ).toOnlineStatus().iconFor( this ), 0, this, TQT_SLOT( slotToggleInvisible() ), this ); actionInvisible->setChecked( presence().visibility() == ICQ::Presence::Invisible ); actionMenu->insert( actionInvisible ); actionMenu->popupMenu()->insertSeparator(); - actionMenu->insert( new KToggleAction( i18n( "Set Visibility..." ), 0, 0, + actionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0, this, TQT_SLOT( slotSetVisiblility() ), this, "ICQAccount::mActionSetVisibility") ); - //actionMenu->insert( new KToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQT_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") ); + //actionMenu->insert( new TDEToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQT_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") ); return actionMenu; } diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h index 19069529..52ab6a9c 100644 --- a/kopete/protocols/oscar/icq/icqaccount.h +++ b/kopete/protocols/oscar/icq/icqaccount.h @@ -25,7 +25,7 @@ #include "icqpresence.h" #include "oscartypeclasses.h" -class KAction; +class TDEAction; namespace Kopete { class AwayAction; } class ICQProtocol; class ICQAccount; @@ -57,7 +57,7 @@ public: ICQProtocol *protocol(); // Accessor method for the action menu - virtual KActionMenu* actionMenu(); + virtual TDEActionMenu* actionMenu(); /** Reimplementation from Kopete::Account */ void setOnlineStatus( const Kopete::OnlineStatus&, const TQString& ); diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index c54e4ffb..19d2ee7f 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -649,9 +649,9 @@ bool ICQContact::isReachable() return account()->isConnected(); } -TQPtrList *ICQContact::customContextMenuActions() +TQPtrList *ICQContact::customContextMenuActions() { - TQPtrList *actionCollection = new TQPtrList(); + TQPtrList *actionCollection = new TQPtrList(); /* TQString awTxt; TQString awIcn; @@ -684,12 +684,12 @@ TQPtrList *ICQContact::customContextMenuActions() if(actionReadAwayMessage==0) { - actionReadAwayMessage = new KAction(awTxt, awIcn, 0, + actionReadAwayMessage = new TDEAction(awTxt, awIcn, 0, this, TQT_SLOT(slotReadAwayMessage()), this, "actionReadAwayMessage"); */ - actionRequestAuth = new KAction(i18n("&Request Authorization"), "mail_reply", 0, + actionRequestAuth = new TDEAction(i18n("&Request Authorization"), "mail_reply", 0, this, TQT_SLOT(slotRequestAuth()), this, "actionRequestAuth"); - actionSendAuth = new KAction(i18n("&Grant Authorization"), "mail_forward", 0, + actionSendAuth = new TDEAction(i18n("&Grant Authorization"), "mail_forward", 0, this, TQT_SLOT(slotSendAuth()), this, "actionSendAuth"); /* } @@ -700,11 +700,11 @@ TQPtrList *ICQContact::customContextMenuActions() } */ - m_actionIgnore = new KToggleAction(i18n("&Ignore"), "", 0, + m_actionIgnore = new TDEToggleAction(i18n("&Ignore"), "", 0, this, TQT_SLOT(slotIgnore()), this, "actionIgnore"); - 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(); @@ -716,7 +716,7 @@ TQPtrList *ICQContact::customContextMenuActions() actionSendAuth->setEnabled(on); - m_selectEncoding = new KAction( i18n( "Select Encoding..." ), "charset", 0, + m_selectEncoding = new TDEAction( i18n( "Select Encoding..." ), "charset", 0, this, TQT_SLOT( changeContactEncoding() ), this, "changeEncoding" ); /* diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h index be8e064f..c3176028 100644 --- a/kopete/protocols/oscar/icq/icqcontact.h +++ b/kopete/protocols/oscar/icq/icqcontact.h @@ -23,8 +23,8 @@ #include "userdetails.h" class OscarEncodingSelectionDialog; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; namespace Kopete { class ChatSession; } namespace Kopete { class OnlineStatus; } class ICQProtocol; @@ -60,7 +60,7 @@ public: * Returns a set of custom menu items for * the context menu */ - virtual TQPtrList *customContextMenuActions(); + virtual TQPtrList *customContextMenuActions(); /** Return whether or not this contact is reachable. */ virtual bool isReachable(); @@ -96,15 +96,15 @@ private: ICQUserInfoWidget* m_infoWidget; /* ICQReadAway *awayMessageDialog; - KAction *actionReadAwayMessage; + TDEAction *actionReadAwayMessage; */ - KAction *actionRequestAuth; - KAction *actionSendAuth; - KAction *m_selectEncoding; + TDEAction *actionRequestAuth; + TDEAction *actionSendAuth; + TDEAction *m_selectEncoding; - KToggleAction *m_actionIgnore; - KToggleAction *m_actionVisibleTo; - KToggleAction *m_actionInvisibleTo; + TDEToggleAction *m_actionIgnore; + TDEToggleAction *m_actionVisibleTo; + TDEToggleAction *m_actionInvisibleTo; /* bool mInvisible; diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui index 161444f6..a027985f 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui +++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui @@ -355,7 +355,7 @@ - + UIN -- cgit v1.2.1