summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:03 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:03 -0600
commit9c9412b30c54468adc9e506cc76c5d113fbf5056 (patch)
tree68a0c0d5bc770fc58596b8c5624cdf33d8625027 /kopete/protocols/oscar
parent2e53bd0b77676f879fad7baeecea5879bf496a7d (diff)
downloadtdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.tar.gz
tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kopete/protocols/oscar')
-rw-r--r--kopete/protocols/oscar/aim/aimaccount.cpp16
-rw-r--r--kopete/protocols/oscar/aim/aimaccount.h4
-rw-r--r--kopete/protocols/oscar/aim/aimcontact.cpp10
-rw-r--r--kopete/protocols/oscar/aim/aimcontact.h8
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.cpp12
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.h4
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.cpp18
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.h20
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchbase.ui2
-rw-r--r--kopete/protocols/oscar/oscaraccount.h2
-rw-r--r--kopete/protocols/oscar/oscarcontact.h2
-rw-r--r--kopete/protocols/oscar/oscarmyselfcontact.h2
12 files changed, 50 insertions, 50 deletions
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<KAction> *AIMContact::customContextMenuActions()
+TQPtrList<TDEAction> *AIMContact::customContextMenuActions()
{
- TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>();
+ TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
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<KAction> *customContextMenuActions();
+ TQPtrList<TDEAction> *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;
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<KAction> *ICQContact::customContextMenuActions()
+TQPtrList<TDEAction> *ICQContact::customContextMenuActions()
{
- TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>();
+ TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
/*
TQString awTxt;
TQString awIcn;
@@ -684,12 +684,12 @@ TQPtrList<KAction> *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<KAction> *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<KAction> *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<KAction> *customContextMenuActions();
+ virtual TQPtrList<TDEAction> *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 @@
</grid>
</widget>
</widget>
- <widget class="KListView" row="1" column="0" rowspan="7" colspan="1">
+ <widget class="TDEListView" row="1" column="0" rowspan="7" colspan="1">
<column>
<property name="text">
<string>UIN</string>
diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h
index a3290506..2a657d06 100644
--- a/kopete/protocols/oscar/oscaraccount.h
+++ b/kopete/protocols/oscar/oscaraccount.h
@@ -73,7 +73,7 @@ public:
/**
* Accessor method for the action menu
*/
- virtual KActionMenu* actionMenu() = 0;
+ virtual TDEActionMenu* actionMenu() = 0;
/** Set the server address */
void setServerAddress( const TQString& server );
diff --git a/kopete/protocols/oscar/oscarcontact.h b/kopete/protocols/oscar/oscarcontact.h
index b115f7a1..4245961a 100644
--- a/kopete/protocols/oscar/oscarcontact.h
+++ b/kopete/protocols/oscar/oscarcontact.h
@@ -35,7 +35,7 @@ class OnlineStatus;
class OscarAccount;
class TQTimer;
class TQTextCodec;
-class KToggleAction;
+class TDEToggleAction;
/**
* Contact for oscar protocol
diff --git a/kopete/protocols/oscar/oscarmyselfcontact.h b/kopete/protocols/oscar/oscarmyselfcontact.h
index 3434d3e3..395c6e6c 100644
--- a/kopete/protocols/oscar/oscarmyselfcontact.h
+++ b/kopete/protocols/oscar/oscarmyselfcontact.h
@@ -28,7 +28,7 @@ class OnlineStatus;
class OscarAccount;
class TQTimer;
-class KToggleAction;
+class TDEToggleAction;
/**
* myself() contact for oscar protocol