summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber')
-rw-r--r--kopete/protocols/jabber/jabberaccount.cpp14
-rw-r--r--kopete/protocols/jabber/jabberaccount.h4
-rw-r--r--kopete/protocols/jabber/jabberbasecontact.h2
-rw-r--r--kopete/protocols/jabber/jabberbookmarks.cpp4
-rw-r--r--kopete/protocols/jabber/jabberbookmarks.h4
-rw-r--r--kopete/protocols/jabber/jabberchatsession.cpp4
-rw-r--r--kopete/protocols/jabber/jabbercontact.cpp40
-rw-r--r--kopete/protocols/jabber/jabbercontact.h2
-rw-r--r--kopete/protocols/jabber/jabbergroupcontact.cpp6
-rw-r--r--kopete/protocols/jabber/jabbergroupcontact.h2
-rw-r--r--kopete/protocols/jabber/jabbergroupmembercontact.cpp2
-rw-r--r--kopete/protocols/jabber/jabbergroupmembercontact.h2
-rw-r--r--kopete/protocols/jabber/jabbertransport.cpp18
-rw-r--r--kopete/protocols/jabber/jabbertransport.h2
14 files changed, 53 insertions, 53 deletions
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 23f947fc..5d1caae1 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -170,15 +170,15 @@ void JabberAccount::setS5BServerPort ( int port )
}
-KActionMenu *JabberAccount::actionMenu ()
+TDEActionMenu *JabberAccount::actionMenu ()
{
- KActionMenu *m_actionMenu = Kopete::Account::actionMenu();
+ TDEActionMenu *m_actionMenu = Kopete::Account::actionMenu();
m_actionMenu->popupMenu()->insertSeparator();
- KAction *action;
+ TDEAction *action;
- action = new KAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat");
+ action = new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat");
m_actionMenu->insert(action);
action->setEnabled( isConnected() );
@@ -189,17 +189,17 @@ KActionMenu *JabberAccount::actionMenu ()
m_actionMenu->popupMenu()->insertSeparator();
- action = new KAction ( i18n ("Services..."), "jabber_serv_on", 0,
+ action = new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0,
this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices");
action->setEnabled( isConnected() );
m_actionMenu->insert ( action );
- action = new KAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0,
+ action = new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0,
this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ;
action->setEnabled( isConnected() );
m_actionMenu->insert ( action );
- action = new KAction ( i18n ("Edit User Info..."), "identity", 0,
+ action = new TDEAction ( i18n ("Edit User Info..."), "identity", 0,
this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ;
action->setEnabled( isConnected() );
m_actionMenu->insert ( action );
diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h
index 05bb5f42..ebd4bff5 100644
--- a/kopete/protocols/jabber/jabberaccount.h
+++ b/kopete/protocols/jabber/jabberaccount.h
@@ -35,7 +35,7 @@
class TQString;
class TQStringList;
-class KActionMenu;
+class TDEActionMenu;
class JabberResourcePool;
class JabberContact;
class JabberContactPool;
@@ -64,7 +64,7 @@ public:
~JabberAccount ();
/* Returns the action menu for this account. */
- virtual KActionMenu *actionMenu ();
+ virtual TDEActionMenu *actionMenu ();
/* Return the resource of the client */
const TQString resource () const;
diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h
index bb430f11..494a479c 100644
--- a/kopete/protocols/jabber/jabberbasecontact.h
+++ b/kopete/protocols/jabber/jabberbasecontact.h
@@ -78,7 +78,7 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
- virtual TQPtrList<KAction> *customContextMenuActions () = 0;
+ virtual TQPtrList<TDEAction> *customContextMenuActions () = 0;
/**
* Serialize contact
diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp
index 661f0974..54a17943 100644
--- a/kopete/protocols/jabber/jabberbookmarks.cpp
+++ b/kopete/protocols/jabber/jabberbookmarks.cpp
@@ -127,9 +127,9 @@ void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid)
m_conferencesJID += jid.full();
}
-KAction * JabberBookmarks::bookmarksAction(TQObject *parent)
+TDEAction * JabberBookmarks::bookmarksAction(TQObject *parent)
{
- KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" );
+ TDESelectAction *groupchatBM = new TDESelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" );
groupchatBM->setItems(m_conferencesJID);
TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&)));
return groupchatBM;
diff --git a/kopete/protocols/jabber/jabberbookmarks.h b/kopete/protocols/jabber/jabberbookmarks.h
index f60f1ccf..16014e6d 100644
--- a/kopete/protocols/jabber/jabberbookmarks.h
+++ b/kopete/protocols/jabber/jabberbookmarks.h
@@ -26,7 +26,7 @@ namespace XMPP { class Jid; }
class JabberAccount;
class JabberProtocol;
-class KAction;
+class TDEAction;
/**
* This is a class that hanlde the bookmark collection (JEP-0048)
@@ -53,7 +53,7 @@ class JabberBookmarks : public TQObject
/**
* return an action that will be added in the jabber popup menu
*/
- KAction *bookmarksAction(TQObject * parent);
+ TDEAction *bookmarksAction(TQObject * parent);
private slots:
void accountConnected();
void slotReceivedBookmarks();
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index cbfc0eab..71b2c7d6 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -65,7 +65,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas
slotUpdateDisplayName ();
#ifdef SUPPORT_JINGLE
- KAction *jabber_voicecall = new KAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQT_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" );
+ TDEAction *jabber_voicecall = new TDEAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQT_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" );
setInstance(protocol->instance());
jabber_voicecall->setEnabled( false );
@@ -85,7 +85,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas
#endif
- new KAction( i18n( "Send File" ), "attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" );
+ new TDEAction( i18n( "Send File" ), "attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" );
setXMLFile("jabberchatui.rc");
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 1d7d2e3f..708d9f16 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -127,46 +127,46 @@ JabberContact::~JabberContact()
kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << contactId() << " is destroyed - " << this << endl;
}
-TQPtrList<KAction> *JabberContact::customContextMenuActions ()
+TQPtrList<TDEAction> *JabberContact::customContextMenuActions ()
{
- TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>();
+ TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
- KActionMenu *actionAuthorization = new KActionMenu ( i18n ("Authorization"), "connect_established", this, "jabber_authorization");
+ TDEActionMenu *actionAuthorization = new TDEActionMenu ( i18n ("Authorization"), "connect_established", this, "jabber_authorization");
- KAction *resendAuthAction, *requestAuthAction, *removeAuthAction;
+ TDEAction *resendAuthAction, *requestAuthAction, *removeAuthAction;
- resendAuthAction = new KAction (i18n ("(Re)send Authorization To"), "mail_forward", 0,
+ resendAuthAction = new TDEAction (i18n ("(Re)send Authorization To"), "mail_forward", 0,
this, TQT_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth");
resendAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::To || mRosterItem.subscription().type() == XMPP::Subscription::None );
actionAuthorization->insert(resendAuthAction);
- requestAuthAction = new KAction (i18n ("(Re)request Authorization From"), "mail_reply", 0,
+ requestAuthAction = new TDEAction (i18n ("(Re)request Authorization From"), "mail_reply", 0,
this, TQT_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth");
requestAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::From || mRosterItem.subscription().type() == XMPP::Subscription::None );
actionAuthorization->insert(requestAuthAction);
- removeAuthAction = new KAction (i18n ("Remove Authorization From"), "mail_delete", 0,
+ removeAuthAction = new TDEAction (i18n ("Remove Authorization From"), "mail_delete", 0,
this, TQT_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth");
removeAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::Both || mRosterItem.subscription().type() == XMPP::Subscription::From );
actionAuthorization->insert(removeAuthAction);
- KActionMenu *actionSetAvailability = new KActionMenu (i18n ("Set Availability"), "kopeteavailable", this, "jabber_online");
+ TDEActionMenu *actionSetAvailability = new TDEActionMenu (i18n ("Set Availability"), "kopeteavailable", this, "jabber_online");
- actionSetAvailability->insert(new KAction (i18n ("Online"), protocol()->JabberKOSOnline.iconFor(this),
+ actionSetAvailability->insert(new TDEAction (i18n ("Online"), protocol()->JabberKOSOnline.iconFor(this),
0, this, TQT_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline"));
- actionSetAvailability->insert(new KAction (i18n ("Free to Chat"), protocol()->JabberKOSChatty.iconFor(this),
+ actionSetAvailability->insert(new TDEAction (i18n ("Free to Chat"), protocol()->JabberKOSChatty.iconFor(this),
0, this, TQT_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty"));
- actionSetAvailability->insert(new KAction (i18n ("Away"), protocol()->JabberKOSAway.iconFor(this),
+ actionSetAvailability->insert(new TDEAction (i18n ("Away"), protocol()->JabberKOSAway.iconFor(this),
0, this, TQT_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway"));
- actionSetAvailability->insert(new KAction (i18n ("Extended Away"), protocol()->JabberKOSXA.iconFor(this),
+ actionSetAvailability->insert(new TDEAction (i18n ("Extended Away"), protocol()->JabberKOSXA.iconFor(this),
0, this, TQT_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA"));
- actionSetAvailability->insert(new KAction (i18n ("Do Not Disturb"), protocol()->JabberKOSDND.iconFor(this),
+ actionSetAvailability->insert(new TDEAction (i18n ("Do Not Disturb"), protocol()->JabberKOSDND.iconFor(this),
0, this, TQT_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND"));
- actionSetAvailability->insert(new KAction (i18n ("Invisible"), protocol()->JabberKOSInvisible.iconFor(this),
+ actionSetAvailability->insert(new TDEAction (i18n ("Invisible"), protocol()->JabberKOSInvisible.iconFor(this),
0, this, TQT_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible"));
- KActionMenu *actionSelectResource = new KActionMenu (i18n ("Select Resource"), "connect_no", this, "actionSelectResource");
+ TDEActionMenu *actionSelectResource = new TDEActionMenu (i18n ("Select Resource"), "connect_no", this, "actionSelectResource");
// if the contact is online, display the resources we have for it,
// otherwise disable the menu
@@ -203,7 +203,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions ()
{
if( i == activeItem )
{
- actionSelectResource->insert ( new KAction( ( *it ), "button_ok", 0, this, TQT_SLOT( slotSelectResource() ),
+ actionSelectResource->insert ( new TDEAction( ( *it ), "button_ok", 0, this, TQT_SLOT( slotSelectResource() ),
actionSelectResource, TQString::number( i ).latin1() ) );
}
else
@@ -215,7 +215,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions ()
TQIconSet iconSet ( !i ?
protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () ));
- actionSelectResource->insert ( new KAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ),
+ actionSelectResource->insert ( new TDEAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ),
actionSelectResource, TQString::number( i ).latin1() ) );
}
@@ -230,7 +230,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions ()
#ifdef SUPPORT_JINGLE
- KAction *actionVoiceCall = new KAction (i18n ("Voice call"), "voicecall", 0, this, TQT_SLOT (voiceCall ()), this, "jabber_voicecall");
+ TDEAction *actionVoiceCall = new TDEAction (i18n ("Voice call"), "voicecall", 0, this, TQT_SLOT (voiceCall ()), this, "jabber_voicecall");
actionVoiceCall->setEnabled( false );
actionCollection->append( actionVoiceCall );
@@ -1075,7 +1075,7 @@ void JabberContact::sendSubscription ( const TQString& subType )
void JabberContact::slotSelectResource ()
{
- int currentItem = TQString ( static_cast<const KAction *>( sender() )->name () ).toUInt ();
+ int currentItem = TQString ( static_cast<const TDEAction *>( sender() )->name () ).toUInt ();
/*
* Warn the user if there is already an active chat window.
@@ -1101,7 +1101,7 @@ void JabberContact::slotSelectResource ()
}
else
{
- TQString selectedResource = static_cast<const KAction *>(sender())->text();
+ TQString selectedResource = static_cast<const TDEAction *>(sender())->text();
kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Moving to resource " << selectedResource << endl;
diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h
index 4dcb6f8b..472360ab 100644
--- a/kopete/protocols/jabber/jabbercontact.h
+++ b/kopete/protocols/jabber/jabbercontact.h
@@ -47,7 +47,7 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
- TQPtrList<KAction> *customContextMenuActions ();
+ TQPtrList<TDEAction> *customContextMenuActions ();
/**
* Start a rename request.
diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp
index 96ab9bcd..b110b521 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupcontact.cpp
@@ -109,11 +109,11 @@ JabberGroupContact::~JabberGroupContact ()
}
}
-TQPtrList<KAction> *JabberGroupContact::customContextMenuActions ()
+TQPtrList<TDEAction> *JabberGroupContact::customContextMenuActions ()
{
- TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>();
+ TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
- KAction *actionSetNick = new KAction (i18n ("Change nick name"), 0, 0, this, TQT_SLOT (slotChangeNick()), this, "jabber_changenick");
+ TDEAction *actionSetNick = new TDEAction (i18n ("Change nick name"), 0, 0, this, TQT_SLOT (slotChangeNick()), this, "jabber_changenick");
actionCollection->append( actionSetNick );
return actionCollection;
diff --git a/kopete/protocols/jabber/jabbergroupcontact.h b/kopete/protocols/jabber/jabbergroupcontact.h
index 07ae6f40..899ba96a 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.h
+++ b/kopete/protocols/jabber/jabbergroupcontact.h
@@ -40,7 +40,7 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
- TQPtrList<KAction> *customContextMenuActions ();
+ TQPtrList<TDEAction> *customContextMenuActions ();
/**
* Deal with an incoming message for this contact.
diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
index e1bbd04a..3bbc7a94 100644
--- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
@@ -56,7 +56,7 @@ JabberGroupMemberContact::~JabberGroupMemberContact ()
}
}
-TQPtrList<KAction> *JabberGroupMemberContact::customContextMenuActions ()
+TQPtrList<TDEAction> *JabberGroupMemberContact::customContextMenuActions ()
{
return 0;
diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.h b/kopete/protocols/jabber/jabbergroupmembercontact.h
index 49dd9417..1202f1f7 100644
--- a/kopete/protocols/jabber/jabbergroupmembercontact.h
+++ b/kopete/protocols/jabber/jabbergroupmembercontact.h
@@ -41,7 +41,7 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
- TQPtrList<KAction> *customContextMenuActions ();
+ TQPtrList<TDEAction> *customContextMenuActions ();
/**
* Return message manager for this instance.
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index adc53b01..6b658b2c 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -121,43 +121,43 @@ JabberTransport::~JabberTransport ()
m_account->removeTransport( myself()->contactId() );
}
-KActionMenu *JabberTransport::actionMenu ()
+TDEActionMenu *JabberTransport::actionMenu ()
{
- KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this );
+ TDEActionMenu *menu = new TDEActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this );
TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString();
menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick )
);
- TQPtrList<KAction> *customActions = myself()->customContextMenuActions( );
+ TQPtrList<TDEAction> *customActions = myself()->customContextMenuActions( );
if( customActions && !customActions->isEmpty() )
{
menu->popupMenu()->insertSeparator();
- for( KAction *a = customActions->first(); a; a = customActions->next() )
+ for( TDEAction *a = customActions->first(); a; a = customActions->next() )
a->plug( menu->popupMenu() );
}
delete customActions;
return menu;
-/* KActionMenu *m_actionMenu = Kopete::Account::actionMenu();
+/* TDEActionMenu *m_actionMenu = Kopete::Account::actionMenu();
m_actionMenu->popupMenu()->insertSeparator();
- m_actionMenu->insert(new KAction (i18n ("Join Groupchat..."), "jabber_group", 0,
+ m_actionMenu->insert(new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0,
this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat"));
m_actionMenu->popupMenu()->insertSeparator();
- m_actionMenu->insert ( new KAction ( i18n ("Services..."), "jabber_serv_on", 0,
+ m_actionMenu->insert ( new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0,
this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices") );
- m_actionMenu->insert ( new KAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0,
+ m_actionMenu->insert ( new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0,
this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") );
- m_actionMenu->insert ( new KAction ( i18n ("Edit User Info..."), "identity", 0,
+ m_actionMenu->insert ( new TDEAction ( i18n ("Edit User Info..."), "identity", 0,
this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") );
return m_actionMenu;*/
diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h
index 8ed1360f..83f5e502 100644
--- a/kopete/protocols/jabber/jabbertransport.h
+++ b/kopete/protocols/jabber/jabbertransport.h
@@ -61,7 +61,7 @@ public:
~JabberTransport ();
/** Returns the action menu for this account. */
- virtual KActionMenu *actionMenu ();
+ virtual TDEActionMenu *actionMenu ();
/** the parent account */
JabberAccount *account() const
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 05:49:16 +0000