summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-01-20 21:32:47 +0100
committerMontel Laurent <[email protected]>2015-01-20 21:32:47 +0100
commitb73101d8720a862b6221dd41869bb2f10febc62a (patch)
tree9d705b4a6c889f11fffb6849938bd3d3dedb9e9e
parent4061d3ef1a784124282be8fee50193953f49083f (diff)
kdelibs4support--
-rw-r--r--ksirk/Jabber/jabberbasecontact.h2
-rw-r--r--ksirk/Jabber/jabberbookmarks.cpp4
-rw-r--r--ksirk/Jabber/jabberbookmarks.h4
-rw-r--r--ksirk/Jabber/jabbercontact.cpp26
-rw-r--r--ksirk/Jabber/jabbercontact.h2
-rw-r--r--ksirk/Jabber/jabbergroupcontact.cpp8
-rw-r--r--ksirk/Jabber/jabbergroupcontact.h2
-rw-r--r--ksirk/Jabber/jabbergroupmembercontact.cpp2
-rw-r--r--ksirk/Jabber/jabbergroupmembercontact.h2
-rw-r--r--ksirkskineditor/onu.cpp1
10 files changed, 26 insertions, 27 deletions
diff --git a/ksirk/Jabber/jabberbasecontact.h b/ksirk/Jabber/jabberbasecontact.h
index 1cb5bcf..c0e011f 100644
--- a/ksirk/Jabber/jabberbasecontact.h
+++ b/ksirk/Jabber/jabberbasecontact.h
@@ -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
diff --git a/ksirk/Jabber/jabberbookmarks.cpp b/ksirk/Jabber/jabberbookmarks.cpp
index a133d6b..c0d1054 100644
--- a/ksirk/Jabber/jabberbookmarks.cpp
+++ b/ksirk/Jabber/jabberbookmarks.cpp
@@ -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" )) );
diff --git a/ksirk/Jabber/jabberbookmarks.h b/ksirk/Jabber/jabberbookmarks.h
index cfed0c3..14c257b 100644
--- a/ksirk/Jabber/jabberbookmarks.h
+++ b/ksirk/Jabber/jabberbookmarks.h
@@ -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();
diff --git a/ksirk/Jabber/jabbercontact.cpp b/ksirk/Jabber/jabbercontact.cpp
index 5b7c665..7458fdb 100644
--- a/ksirk/Jabber/jabbercontact.cpp
+++ b/ksirk/Jabber/jabbercontact.cpp
@@ -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;
diff --git a/ksirk/Jabber/jabbercontact.h b/ksirk/Jabber/jabbercontact.h
index 8e05b61..29d5c29 100644
--- a/ksirk/Jabber/jabbercontact.h
+++ b/ksirk/Jabber/jabbercontact.h
@@ -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.
diff --git a/ksirk/Jabber/jabbergroupcontact.cpp b/ksirk/Jabber/jabbergroupcontact.cpp
index 155a64c..2cafdf9 100644
--- a/ksirk/Jabber/jabbergroupcontact.cpp
+++ b/ksirk/Jabber/jabbergroupcontact.cpp
@@ -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()));
diff --git a/ksirk/Jabber/jabbergroupcontact.h b/ksirk/Jabber/jabbergroupcontact.h
index b9d2baf..312e6a9 100644
--- a/ksirk/Jabber/jabbergroupcontact.h
+++ b/ksirk/Jabber/jabbergroupcontact.h
@@ -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.
diff --git a/ksirk/Jabber/jabbergroupmembercontact.cpp b/ksirk/Jabber/jabbergroupmembercontact.cpp
index e25f2cf..b5df565 100644
--- a/ksirk/Jabber/jabbergroupmembercontact.cpp
+++ b/ksirk/Jabber/jabbergroupmembercontact.cpp
@@ -56,7 +56,7 @@ JabberGroupMemberContact::~JabberGroupMemberContact ()
}
}
-QList<KAction*> *JabberGroupMemberContact::customContextMenuActions ()
+QList<QAction *> *JabberGroupMemberContact::customContextMenuActions ()
{
return 0;
diff --git a/ksirk/Jabber/jabbergroupmembercontact.h b/ksirk/Jabber/jabbergroupmembercontact.h
index 0b50920..c5f30ef 100644
--- a/ksirk/Jabber/jabbergroupmembercontact.h
+++ b/ksirk/Jabber/jabbergroupmembercontact.h
@@ -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.
diff --git a/ksirkskineditor/onu.cpp b/ksirkskineditor/onu.cpp
index 85d425e..8b01371 100644
--- a/ksirkskineditor/onu.cpp
+++ b/ksirkskineditor/onu.cpp
@@ -33,7 +33,6 @@
#include <QXmlStreamReader>
#include <kstandarddirs.h>
-#include <kglobal.h>
#include <KLocalizedString>
#include "ksirkskineditor_debug.h"
#include <kmessagebox.h>