Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit b73101d8 authored by Laurent Montel's avatar Laurent Montel 😁

kdelibs4support--

parent 4061d3ef
......@@ -77,7 +77,7 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
// virtual QList<KAction*> *customContextMenuActions () = 0;
// virtual QList<QAction *> *customContextMenuActions () = 0;
/**
* Serialize contact
......
......@@ -20,7 +20,7 @@
#include <kdebug.h>
#include <kaction.h>
#include <QAction>
#include <kselectaction.h>
#include <KLocalizedString>
#include <QIcon>
......@@ -128,7 +128,7 @@ void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid)
m_conferencesJID += jid.full();
}
KAction * JabberBookmarks::bookmarksAction(QObject * /*parent*/)
QAction * JabberBookmarks::bookmarksAction(QObject * /*parent*/)
{
KSelectAction *groupchatBM = new KSelectAction( this );
groupchatBM->setIcon( QIcon::fromTheme( QLatin1String( "jabber_group" )) );
......
......@@ -25,7 +25,7 @@
namespace XMPP { class Jid; }
class JabberAccount;
class KAction;
class QAction;
/**
* This is a class that hanlde the bookmark collection (JEP-0048)
......@@ -51,7 +51,7 @@ class JabberBookmarks : public QObject
/**
* return an action that will be added in the jabber popup menu
*/
KAction *bookmarksAction(QObject * parent);
QAction *bookmarksAction(QObject * parent);
private slots:
void accountConnected();
void slotReceivedBookmarks();
......
......@@ -35,7 +35,7 @@
#include <KLocalizedString>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <kaction.h>
#include <QAction>
#include <kactionmenu.h>
#include <QIcon>
#include <kstandarddirs.h>
......@@ -129,30 +129,30 @@ JabberContact::~JabberContact()
kDebug(JABBER_DEBUG_GLOBAL) << contactId() << " is destroyed - " << this;
}
QList<KAction*> *JabberContact::customContextMenuActions ()
QList<QAction *> *JabberContact::customContextMenuActions ()
{
QList<KAction*> *actionCollection = new QList<KAction*>();
QList<QAction *> *actionCollection = new QList<QAction*>();
KActionMenu *actionAuthorization = new KActionMenu ( QIcon::fromTheme( QLatin1String( "network-connect"), i18n ("Authorization" )), this);
KAction *resendAuthAction, *requestAuthAction, *removeAuthAction;
QAction *resendAuthAction, *requestAuthAction, *removeAuthAction;
resendAuthAction = new KAction( this );
resendAuthAction = new QAction( this );
resendAuthAction->setIcon( (QIcon::fromTheme( QLatin1String( "mail-forward" )) ) );
resendAuthAction->setText( i18n ("(Re)send Authorization To") );
resendAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::To || mRosterItem.subscription().type() == XMPP::Subscription::None );
connect(resendAuthAction, SIGNAL(triggered(bool)), SLOT(slotSendAuth()));
actionAuthorization->addAction(resendAuthAction);
requestAuthAction = new KAction( this );
requestAuthAction = new QAction( this );
requestAuthAction->setIcon( (QIcon::fromTheme( QLatin1String( "mail-reply-sender" )) ) );
requestAuthAction->setText( i18n ("(Re)request Authorization From") );
requestAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::From || mRosterItem.subscription().type() == XMPP::Subscription::None );
connect(requestAuthAction, SIGNAL(triggered(bool)), SLOT(slotRequestAuth()));
actionAuthorization->addAction(requestAuthAction);
removeAuthAction = new KAction( this );
removeAuthAction = new QAction( this );
removeAuthAction->setIcon( (QIcon::fromTheme( QLatin1String( "edit-delete" )) ) );
removeAuthAction->setText( i18n ("Remove Authorization From") );
removeAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::Both || mRosterItem.subscription().type() == XMPP::Subscription::From );
......@@ -162,7 +162,7 @@ QList<KAction*> *JabberContact::customContextMenuActions ()
KActionMenu *actionSetAvailability = new KActionMenu ( QIcon::fromTheme( QLatin1String( "user-identity", 0, QStringList() << QString() << "user-online"), i18n ("Set Availability" )), this );
#define KACTION(status, text, name, slot) \
{ KAction *tmp = new KAction(this); \
{ QAction *tmp = new QAction(this); \
tmp->setIcon( QIcon::fromTheme(QIcon((status).iconFor(this)))); \
tmp->setText( text ); \
connect(tmp, SIGNAL(triggered(bool)), (slot));\
......@@ -214,7 +214,7 @@ QList<KAction*> *JabberContact::customContextMenuActions ()
{
if( i == activeItem )
{
KAction *tmp = new KAction( this );
QAction *tmp = new QAction( this );
tmp->setIcon( QIcon::fromTheme( QLatin1String( "dialog-ok" )) );
tmp->setText( str);
connect(tmp, SIGNAL(triggered(bool)), SLOT(slotSelectResource()));
......@@ -229,7 +229,7 @@ QList<KAction*> *JabberContact::customContextMenuActions ()
QIcon iconSet ( !i ?
protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(str) ).iconFor ( account () ));
KAction *tmp = new KAction(this);
QAction *tmp = new QAction(this);
tmp->setIcon( QIcon::fromTheme(iconSet) );
tmp->setText( str );
connect(tmp, SIGNAL(triggered(bool)), SLOT(slotSelectResource()));
......@@ -247,7 +247,7 @@ QList<KAction*> *JabberContact::customContextMenuActions ()
#ifdef SUPPORT_JINGLE
KAction *actionVoiceCall = new KAction( (i18n ("Voice call"), "voicecall", 0, this, SLOT (voiceCall()), 0, "jabber_voicecall");
QAction *actionVoiceCall = new QAction( (i18n ("Voice call"), "voicecall", 0, this, SLOT (voiceCall()), 0, "jabber_voicecall");
actionVoiceCall->setEnabled( false );
actionCollection->append( actionVoiceCall );
......@@ -1096,7 +1096,7 @@ void JabberContact::sendSubscription ( const QString& subType )
void JabberContact::slotSelectResource ()
{
int currentItem = QString ( static_cast<const KAction *>( sender() )->objectName () ).toUInt ();
int currentItem = QString ( static_cast<const QAction *>( sender() )->objectName () ).toUInt ();
/*
* Warn the user if there is already an active chat window.
......@@ -1122,7 +1122,7 @@ void JabberContact::slotSelectResource ()
}
else
{
QString selectedResource = static_cast<const KAction *>(sender())->text();
QString selectedResource = static_cast<const QAction *>(sender())->text();
kDebug (JABBER_DEBUG_GLOBAL) << "Moving to resource " << selectedResource;
......
......@@ -44,7 +44,7 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
// QList<KAction*> *customContextMenuActions ();
// QList<QAction *> *customContextMenuActions ();
/**
* Start a rename request.
......
......@@ -22,7 +22,7 @@
#include <KLocalizedString>
#include <kfiledialog.h>
#include <kinputdialog.h>
#include <kaction.h>
#include <QAction>
#include "jabberprotocol.h"
#include "jabberaccount.h"
......@@ -111,11 +111,11 @@ JabberGroupContact::~JabberGroupContact ()
}
}
QList<KAction*> *JabberGroupContact::customContextMenuActions ()
QList<QAction *> *JabberGroupContact::customContextMenuActions ()
{
QList<KAction*> *actionCollection = new QList<KAction*>();
QList<QAction *> *actionCollection = new QList<QAction*>();
KAction *actionSetNick = new KAction(this);
QAction *actionSetNick = new QAction(this);
actionSetNick->setText( i18n ("Change nickname") );
actionSetNick->setIcon( KIcon( QLatin1String( "jabber_changenick" )) );
connect(actionSetNick, SIGNAL(triggered(bool)), this, SLOT(slotChangeNick()));
......
......@@ -41,7 +41,7 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
// QList<KAction*> *customContextMenuActions ();
// QList<QAction *> *customContextMenuActions ();
/**
* Deal with an incoming message for this contact.
......
......@@ -56,7 +56,7 @@ JabberGroupMemberContact::~JabberGroupMemberContact ()
}
}
QList<KAction*> *JabberGroupMemberContact::customContextMenuActions ()
QList<QAction *> *JabberGroupMemberContact::customContextMenuActions ()
{
return 0;
......
......@@ -39,7 +39,7 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
QList<KAction*> *customContextMenuActions ();
QList<QAction *> *customContextMenuActions ();
/**
* Return message manager for this instance.
......
......@@ -33,7 +33,6 @@
#include <QXmlStreamReader>
#include <kstandarddirs.h>
#include <kglobal.h>
#include <KLocalizedString>
#include "ksirkskineditor_debug.h"
#include <kmessagebox.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment