Commit 10a295b9 authored by Laurent Montel's avatar Laurent Montel 😁 Committed by Pali Rohár

Port to qaction

parent 64deb093
......@@ -77,13 +77,13 @@ public:
KFileDialog* saveListDialog;
KFileDialog* loadListDialog;
KAction* searchAction;
KAction* listPutAction;
KAction* listGetAction;
KAction* listDeleteAction;
KAction* listToFileAction;
KAction* listFromFileAction;
KAction* friendsModeAction;
QAction * searchAction;
QAction * listPutAction;
QAction * listGetAction;
QAction * listDeleteAction;
QAction * listToFileAction;
QAction * listFromFileAction;
QAction * friendsModeAction;
bool connectWithSSL;
......@@ -196,26 +196,26 @@ void
GaduAccount::initActions()
{
p->searchAction = new KAction( i18n( "&Search for Friends" ), this );
p->searchAction = new QAction( i18n( "&Search for Friends" ), this );
QObject::connect( p->searchAction, SIGNAL(triggered(bool)), this, SLOT(search()) );
p->listPutAction = new KAction( i18n( "Export Contacts to Server" ), this );
p->listPutAction = new QAction( i18n( "Export Contacts to Server" ), this );
p->listPutAction->setIcon ( QIcon::fromTheme(QStringLiteral("document-export")) );
QObject::connect( p->listPutAction, SIGNAL(triggered(bool)), this, SLOT(slotExportContactsList()) );
p->listGetAction = new KAction( i18n( "Import Contacts from Server" ), this );
p->listGetAction = new QAction( i18n( "Import Contacts from Server" ), this );
p->listGetAction->setIcon ( QIcon::fromTheme(QStringLiteral("document-import")) );
QObject::connect( p->listGetAction, SIGNAL(triggered(bool)), this, SLOT(slotImportContactsList()) );
p->listDeleteAction = new KAction( i18n( "Delete Contacts from Server" ), this );
p->listDeleteAction = new QAction( i18n( "Delete Contacts from Server" ), this );
p->listDeleteAction->setIcon ( QIcon::fromTheme(QStringLiteral("document-close")) );
QObject::connect( p->listDeleteAction, SIGNAL(triggered(bool)), this, SLOT(slotDeleteContactsList()) );
p->listToFileAction = new KAction( i18n( "Export Contacts to File..." ), this );
p->listToFileAction = new QAction( i18n( "Export Contacts to File..." ), this );
p->listToFileAction->setIcon ( QIcon::fromTheme(QStringLiteral("document-save")) );
QObject::connect( p->listToFileAction, SIGNAL(triggered(bool)), this, SLOT(slotExportContactsListToFile()) );
p->listFromFileAction = new KAction( i18n( "Import Contacts from File..." ), this );
p->listFromFileAction = new QAction( i18n( "Import Contacts from File..." ), this );
p->listFromFileAction->setIcon ( QIcon::fromTheme(QStringLiteral("document-open")) );
QObject::connect( p->listFromFileAction, SIGNAL(triggered(bool)), this, SLOT(slotImportContactsFromFile()) );
......@@ -320,35 +320,35 @@ GaduAccount::fillActionMenu( KActionMenu *actionMenu )
p->listFromFileAction->setEnabled( true );
}
KAction* action = new KAction(
QAction * action = new QAction(
QIcon::fromTheme(QIcon(GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ))),
i18n("Go O&nline"), this );
//, "actionGaduConnect" );
QObject::connect( action, SIGNAL(triggered(bool)), this, SLOT(slotGoOnline()));
actionMenu->addAction( action );
action = new KAction(
action = new QAction(
QIcon::fromTheme(QIcon(GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ))),
i18n( "Set &Busy" ), this );
//, "actionGaduConnect" );
QObject::connect( action, SIGNAL(triggered(bool)), this, SLOT(slotGoBusy()) );
actionMenu->addAction( action );
action = new KAction(
action = new QAction(
QIcon::fromTheme(QIcon(GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ))),
i18n( "Set &Invisible" ), this );
//, "actionGaduConnect" );
QObject::connect( action, SIGNAL(triggered(bool)), this, SLOT(slotGoInvisible()) );
actionMenu->addAction( action );
action = new KAction(
action = new QAction(
QIcon::fromTheme(QIcon(GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ))),
i18n( "Go &Offline" ), this );
//, "actionGaduConnect" );
QObject::connect( action, SIGNAL(triggered(bool)), this, SLOT(slotGoOffline()) );
actionMenu->addAction( action );
action = new KAction( QIcon::fromTheme(QStringLiteral("edit-rename")), i18n( "Set &Description..." ), this );
action = new QAction( QIcon::fromTheme(QStringLiteral("edit-rename")), i18n( "Set &Description..." ), this );
//, "actionGaduDescription" );
QObject::connect( action, SIGNAL(triggered(bool)), this, SLOT(slotDescription()) );
actionMenu->addAction( action );
......@@ -380,7 +380,7 @@ GaduAccount::fillActionMenu( KActionMenu *actionMenu )
actionMenu->addAction( listMenuAction );
KAction *propertiesAction = new KAction( QIcon::fromTheme(QStringLiteral("configure")), i18n("Properties"), actionMenu );
QAction *propertiesAction = new QAction( QIcon::fromTheme(QStringLiteral("configure")), i18n("Properties"), actionMenu );
QObject::connect( propertiesAction, SIGNAL(triggered(bool)), this, SLOT(editAccount()) );
actionMenu->addAction( propertiesAction );
......
......@@ -35,7 +35,7 @@
#include <qhostaddress.h>
#include <qmap.h>
#include <qstring.h>
#include <kaction.h>
#include <QAction>
#include <kfiledialog.h>
class GaduAccountPrivate;
......
......@@ -23,7 +23,7 @@
#include "gaducontact.h"
#include <klocale.h>
#include <kaction.h>
#include <QAction>
#include <kdebug.h>
#include <kfiledialog.h>
#include <kmessagebox.h>
......@@ -183,18 +183,18 @@ GaduContact::isReachable()
return account_->isConnected();
}
QList<KAction*>*
QList<QAction *>*
GaduContact::customContextMenuActions()
{
QList<KAction*> *fakeCollection = new QList<KAction*>();
QList<QAction *> *fakeCollection = new QList<QAction*>();
//show profile
KAction* actionShowProfile = new KAction( QIcon::fromTheme(QStringLiteral("help-about")), i18n("Show Profile"), this );
QAction * actionShowProfile = new QAction( QIcon::fromTheme(QStringLiteral("help-about")), i18n("Show Profile"), this );
//, "actionShowPublicProfile" );
connect( actionShowProfile, SIGNAL(triggered(bool)), this, SLOT(slotShowPublicProfile()) );
fakeCollection->append( actionShowProfile );
KAction* actionEditContact = new KAction( QIcon::fromTheme(QStringLiteral("document-properties")), i18n("Edit..."), this );
QAction * actionEditContact = new QAction( QIcon::fromTheme(QStringLiteral("document-properties")), i18n("Edit..."), this );
//, "actionEditContact" );
connect( actionEditContact, SIGNAL(triggered(bool)), this, SLOT(slotEditContact()) );
......
......@@ -35,7 +35,7 @@
#include <libgadu.h>
class KAction;
class QAction;
class GaduAccount;
namespace Kopete { class Account; }
namespace Kopete { class ChatSession; }
......@@ -51,7 +51,7 @@ public:
virtual bool isReachable();
virtual void serialize( QMap<QString, QString>&, QMap<QString, QString>& );
virtual QList<KAction*>* customContextMenuActions();
virtual QList<QAction *>* customContextMenuActions();
using Kopete::Contact::customContextMenuActions;
virtual QString identityId() const;
......
......@@ -32,7 +32,7 @@
#include "gaducommands.h"
class KAction;
class QAction;
class QWidget;
class QString;
......
......@@ -357,7 +357,7 @@ private:
* @internal
* An action that selects an OnlineStatus and provides a status message, but not using Kopete::Away, because the status message relates only to this status.
*/
/*class OnlineStatusMessageAction : public KAction
/*class OnlineStatusMessageAction : public QAction
{
Q_OBJECT
public:
......
......@@ -88,8 +88,8 @@ public:
QMap<QString, QString> customCtcp;
Kopete::ChatSession *commandSource;
KAction *joinChannelAction;
KAction *searchChannelAction;
QAction *joinChannelAction;
QAction *searchChannelAction;
QString motd;
};
......@@ -185,9 +185,9 @@ IRCAccount::IRCAccount(const QString &accountId, const QString &autoChan, const
#ifdef __GNUC__
#warning spurus slot calls for now
#endif
d->joinChannelAction = new KAction(i18n("Join Channel..."), this);
d->joinChannelAction = new QAction(i18n("Join Channel..."), this);
QObject::connect(d->joinChannelAction, SIGNAL(triggered()), this, SLOT(slotJoinChannel()));
d->searchChannelAction = new KAction(i18n("Search Channels..."), this);
d->searchChannelAction = new QAction(i18n("Search Channels..."), this);
QObject::connect(d->searchChannelAction, SIGNAL(triggered()), this, SLOT(slotSearchChannels()));
}
......@@ -468,11 +468,11 @@ void IRCAccount::fillActionMenu( KActionMenu *actionMenu )
actionMenu->addAction(d->joinChannelAction);
actionMenu->addAction(d->searchChannelAction);
/*
actionMenu->insert( new KAction ( i18n("Show Server Window"), QString(), 0, this, SLOT(slotShowServerWindow()), actionMenu ) );
actionMenu->insert( new QAction ( i18n("Show Server Window"), QString(), 0, this, SLOT(slotShowServerWindow()), actionMenu ) );
// if (d->client->isConnected() && d->client->useSSL())
{
actionMenu->insert( new KAction ( i18n("Show Security Information"), "", 0, d->client,
actionMenu->insert( new QAction ( i18n("Show Security Information"), "", 0, d->client,
SLOT(showInfoDialog()), actionMenu ) );
}
*/
......
......@@ -43,7 +43,7 @@ class ChatSession;
class MetaContact;
}
class KAction;
class QAction;
class KActionMenu;
class IRCAccount
......
......@@ -54,10 +54,10 @@ public:
// QList<Kopete::Contact *> mMyself;
Kopete::Message::MessageDirection execDir;
QList<KAction *> actions;
QList<KAction *> serverActions;
QList<KAction *> channelActions;
QList<KAction *> userActions;
QList<QAction *> actions;
QList<QAction *> serverActions;
QList<QAction *> channelActions;
QList<QAction *> userActions;
};
IRCContact::IRCContact(IRCAccount *account, const KIrc::EntityPtr &entity, MetaContact *metac, const QString& icon)
......
......@@ -521,20 +521,20 @@ bool IRCChannelContact::modeEnabled( QChar mode, QString *value )
return false;
}
QPtrList<KAction> *IRCChannelContact::customContextMenuActions()
QPtrList<QAction> *IRCChannelContact::customContextMenuActions()
{
// KAction stuff
QPtrList<KAction> *mCustomActions = new QPtrList<KAction>();
// QAction stuff
QPtrList<QAction> *mCustomActions = new QPtrList<QAction>();
if( !actionJoin )
{
actionJoin = new KAction(i18n("&Join"), 0, this, SLOT(join()), this, "actionJoin");
actionPart = new KAction(i18n("&Part"), 0, this, SLOT(part()), this, "actionPart");
actionTopic = new KAction(i18n("Change &Topic..."), 0, this, SLOT(setTopic()), this, "actionTopic");
actionJoin = new QAction(i18n("&Join"), 0, this, SLOT(join()), this, "actionJoin");
actionPart = new QAction(i18n("&Part"), 0, this, SLOT(part()), this, "actionPart");
actionTopic = new QAction(i18n("Change &Topic..."), 0, this, SLOT(setTopic()), this, "actionTopic");
actionModeMenu = new KActionMenu(i18n("Channel Modes"), 0, this, "actionModeMenu");
if( !property(m_protocol->propHomepage).value().isNull() )
{
actionHomePage = new KAction( i18n("Visit &Homepage"), 0, this,
actionHomePage = new QAction( i18n("Visit &Homepage"), 0, this,
SLOT(slotHomepage()), this, "actionHomepage");
}
else if( actionHomePage )
......
......@@ -22,7 +22,7 @@
#include "irccontact.h"
#include <QList>
class KAction;
class QAction;
class KActionMenu;
class KCodecAction;
class KToggleAction;
......@@ -70,7 +70,7 @@ public:
bool modeEnabled( QChar mode, QString *value = 0 );
// Kopete::Contact stuff
virtual QList<KAction*> *customContextMenuActions();
virtual QList<QAction *> *customContextMenuActions();
virtual const QString caption() const;
//Methods handled by the signal mapper
......@@ -124,11 +124,11 @@ private slots:
void slotChannelListed(const QString &channel, uint members, const QString &topic);
private:
// KAction stuff:
KAction *actionJoin;
KAction *actionPart;
KAction *actionTopic;
KAction *actionHomePage;
// QAction stuff:
QAction *actionJoin;
QAction *actionPart;
QAction *actionTopic;
QAction *actionHomePage;
KActionMenu *actionModeMenu;
KCodecAction *codecAction;
......
......@@ -23,7 +23,7 @@
#include "kopetechatsessionmanager.h"
#include "kopeteview.h"
#include <kaction.h>
#include <QAction>
#include <kdebug.h>
#include <klocale.h>
......
......@@ -27,7 +27,7 @@
#include <qvaluelist.h>
#include <qlist.h>
class KAction;
class QAction;
class KopeteView;
class IRCContactManager;
......
......@@ -22,7 +22,7 @@
#include "kopetemetacontact.h"
#include "kopeteview.h"
#include <kaction.h>
#include <QAction>
#include <kdebug.h>
#include <kfiledialog.h>
#include <klocale.h>
......@@ -420,11 +420,11 @@ void IRCUserContact::newWhoReply( const QString &channel, const QString &user, c
}
}
QPtrList<KAction> *IRCUserContact::customContextMenuActions( Kopete::ChatSession *manager )
QPtrList<QAction> *IRCUserContact::customContextMenuActions( Kopete::ChatSession *manager )
{
if( manager )
{
QPtrList<KAction> *mCustomActions = new QPtrList<KAction> ();
QPtrList<QAction> *mCustomActions = new QPtrList<QAction> ();
mActiveManager = manager;
Kopete::ContactPtrList members = mActiveManager->members();
IRCChannelContact *isChannel = dynamic_cast<IRCChannelContact*>( members.first() );
......@@ -432,33 +432,33 @@ QPtrList<KAction> *IRCUserContact::customContextMenuActions( Kopete::ChatSession
if( !actionCtcpMenu )
{
actionCtcpMenu = new KActionMenu(i18n("C&TCP"), 0, this );
actionCtcpMenu->insert( new KAction(i18n("&Version"), 0, this,
actionCtcpMenu->insert( new QAction(i18n("&Version"), 0, this,
SLOT(slotCtcpVersion()), actionCtcpMenu) );
actionCtcpMenu->insert( new KAction(i18n("&Ping"), 0, this,
actionCtcpMenu->insert( new QAction(i18n("&Ping"), 0, this,
SLOT(slotCtcpPing()), actionCtcpMenu) );
actionModeMenu = new KActionMenu(i18n("&Modes"), 0, this, "actionModeMenu");
actionModeMenu->insert( new KAction(i18n("&Op"), 0, this,
actionModeMenu->insert( new QAction(i18n("&Op"), 0, this,
SLOT(slotOp()), actionModeMenu, "actionOp") );
actionModeMenu->insert( new KAction(i18n("&Deop"), 0, this,
actionModeMenu->insert( new QAction(i18n("&Deop"), 0, this,
SLOT(slotDeop()), actionModeMenu, "actionDeop") );
actionModeMenu->insert( new KAction(i18n("&Voice"), 0, this,
actionModeMenu->insert( new QAction(i18n("&Voice"), 0, this,
SLOT(slotVoice()), actionModeMenu, "actionVoice") );
actionModeMenu->insert( new KAction(i18n("Devoice"), 0, this,
actionModeMenu->insert( new QAction(i18n("Devoice"), 0, this,
SLOT(slotDevoice()), actionModeMenu, "actionDevoice") );
actionModeMenu->setEnabled( false );
actionKick = new KAction(i18n("&Kick"), 0, this, SLOT(slotKick()), this);
actionKick = new QAction(i18n("&Kick"), 0, this, SLOT(slotKick()), this);
actionKick->setEnabled( false );
actionBanMenu = new KActionMenu(i18n("&Ban"), 0, this, "actionBanMenu");
actionBanMenu->insert( new KAction(i18n("Ban *!*@*.host"), 0, this,
actionBanMenu->insert( new QAction(i18n("Ban *!*@*.host"), 0, this,
SLOT(slotBanHost()), actionBanMenu ) );
actionBanMenu->insert( new KAction(i18n("Ban *!*@domain"), 0, this,
actionBanMenu->insert( new QAction(i18n("Ban *!*@domain"), 0, this,
SLOT(slotBanDomain()), actionBanMenu ) );
actionBanMenu->insert( new KAction(i18n("Ban *!*user@*.host"), 0, this,
actionBanMenu->insert( new QAction(i18n("Ban *!*user@*.host"), 0, this,
SLOT(slotBanUserHost()), actionBanMenu ) );
actionBanMenu->insert( new KAction(i18n("Ban *!*user@domain"), 0, this,
actionBanMenu->insert( new QAction(i18n("Ban *!*user@domain"), 0, this,
SLOT(slotBanUserDomain()), actionBanMenu ) );
actionBanMenu->setEnabled( false );
......
......@@ -26,7 +26,7 @@
class QTimer;
class KAction;
class QAction;
class KActionMenu;
class KCodecAction;
......@@ -64,7 +64,7 @@ public:
IRCUserContact(IRCContactManager *, const QString &nickname, Kopete::MetaContact *mc);
// Kopete::Contact stuff
virtual QList<KAction*> *customContextMenuActions( Kopete::ChatSession *manager );
virtual QList<QAction *> *customContextMenuActions( Kopete::ChatSession *manager );
virtual const QString caption() const;
void setAway(bool isAway);
......@@ -118,7 +118,7 @@ private:
KActionMenu *actionModeMenu;
KActionMenu *actionCtcpMenu;
KAction *actionKick;
QAction *actionKick;
KActionMenu *actionBanMenu;
KCodecAction *codecAction;
Kopete::ChatSession *mActiveManager;
......
......@@ -22,7 +22,7 @@
#include "kopetechatsession.h"
#include <kaction.h>
#include <QAction>
#include <kdebug.h>
#include <klocale.h>
......@@ -51,8 +51,8 @@ IRCGUIClient::IRCGUIClient(Kopete::ChatSession *parent)
QDomDocument doc = domDocument();
QDomNode menu = doc.documentElement().firstChild().firstChild();
QList<KAction *> *actions = m_contact->customContextMenuActions( parent );
for( KAction *actions, m_contact->customContextMenuActions( parent ))
QList<QAction *> *actions = m_contact->customContextMenuActions( parent );
for( QAction *actions, m_contact->customContextMenuActions( parent ))
{
actionCollection()->insert(action);
QDomElement newNode = doc.createElement( "Action" );
......
......@@ -41,7 +41,7 @@
#include "kopeteuiglobal.h"
#include <kaboutdata.h>
#include <kaction.h>
#include <QAction>
#include <kcharsets.h>
#include <kdebug.h>
#include <kgenericfactory.h>
......@@ -447,7 +447,7 @@ void IRCProtocol::slotMessageFilter(Message &msg)
}
}
/*
QList<KAction *> *IRCProtocol::customChatWindowPopupActions(const Message &m, DOM::Node &n)
QList<QAction *> *IRCProtocol::customChatWindowPopupActions(const Message &m, DOM::Node &n)
{
DOM::HTMLElement e = n;
......
......@@ -86,7 +86,7 @@ public:
virtual Kopete::Account* createNewAccount(const QString &accountId);
// virtual QList<KAction *> *customChatWindowPopupActions(const Kopete::Message &, DOM::Node &);
// virtual QList<QAction *> *customChatWindowPopupActions(const Kopete::Message &, DOM::Node &);
Kopete::OnlineStatus onlineStatusFor(KIrc::EntityPtr entity);
......
......@@ -32,7 +32,7 @@
#include "kopeteview.h"
#include "kopeteuiglobal.h"
#include <kaction.h>
#include <QAction>
#include <kcharsets.h>
#include <kdebug.h>
#include <kgenericfactory.h>
......
......@@ -25,7 +25,7 @@
#include "kopetecontactlist.h"
#include "kopetepassword.h"
#include <kaction.h>
#include <QAction>
#include <kactionmenu.h>
#include <QMenu>
#include <klocale.h>
......@@ -139,7 +139,7 @@ void MeanwhileAccount::fillActionMenu( KActionMenu *actionMenu )
actionMenu->menu()->addSeparator();
#if 0
actionMenu->insert(new KAction(i18n("&Change Status Message"), QString(), 0,
actionMenu->insert(new QAction(i18n("&Change Status Message"), QString(), 0,
this, SLOT(meanwhileChangeStatus()), this,
"meanwhileChangeStatus"));
//infoPlugin->addCustomMenus(theMenu);
......
......@@ -17,7 +17,7 @@
#include "meanwhilecontact.h"
#include <kaction.h>
#include <QAction>
#include <kdebug.h>
#include <klocale.h>
#include <QList>
......
......@@ -22,7 +22,7 @@
#include "kopetemessage.h"
#include "meanwhileaccount.h"
class KAction;
class QAction;
namespace Kopete { class Account; }
namespace Kopete { class ChatSession; }
namespace Kopete { class MetaContact; }
......
......@@ -278,7 +278,7 @@ void QQChatSession::dequeueMessagesAndInvites()
void QQChatSession::slotActionInviteAboutToShow()
{
// We can't simply insert KAction in this menu bebause we don't know when to delete them.
// We can't simply insert QAction in this menu bebause we don't know when to delete them.
// items inserted with insert items are automatically deleted when we call clear
qDeleteAll(m_inviteActions);
......
......@@ -21,7 +21,7 @@
class QLabel;
class KAction;
class QAction;
class KActionMenu;
class KDialog;
class QQAccount;
......
......@@ -923,37 +923,37 @@ void SkypeAccount::fillActionMenu( KActionMenu *actionMenu ) {
if (d->protocol)
{
KAction *setOnline = new KAction( QIcon::fromTheme(QIcon(d->protocol->Online.iconFor(this))), i18n("Online"), this );
QAction *setOnline = new QAction( QIcon::fromTheme(QIcon(d->protocol->Online.iconFor(this))), i18n("Online"), this );
QObject::connect( setOnline, SIGNAL(triggered(bool)), &d->skype, SLOT(setOnline()) );
actionMenu->addAction(setOnline);
KAction *setOffline = new KAction( QIcon::fromTheme(QIcon(d->protocol->Offline.iconFor(this))), i18n("Offline"), this );
QAction *setOffline = new QAction( QIcon::fromTheme(QIcon(d->protocol->Offline.iconFor(this))), i18n("Offline"), this );
QObject::connect( setOffline, SIGNAL(triggered(bool)), &d->skype, SLOT(setOffline()) );
actionMenu->addAction(setOffline);
KAction *setAway = new KAction( QIcon::fromTheme(QIcon(d->protocol->Away.iconFor(this))), i18n("Away"), this );
QAction *setAway = new QAction( QIcon::fromTheme(QIcon(d->protocol->Away.iconFor(this))), i18n("Away"), this );
QObject::connect( setAway, SIGNAL(triggered(bool)), &d->skype, SLOT(setAway()) );
actionMenu->addAction(setAway);
KAction *setNotAvailable = new KAction( QIcon::fromTheme(QIcon(d->protocol->NotAvailable.iconFor(this))), i18n("Not Available"), this );
QAction *setNotAvailable = new QAction( QIcon::fromTheme(QIcon(d->protocol->NotAvailable.iconFor(this))), i18n("Not Available"), this );
QObject::connect( setNotAvailable, SIGNAL(triggered(bool)), &d->skype, SLOT(setNotAvailable()) );
actionMenu->addAction(setNotAvailable);
KAction *setDND = new KAction( QIcon::fromTheme(QIcon(d->protocol->DoNotDisturb.iconFor(this))), i18n("Do Not Disturb"), this );
QAction *setDND = new QAction( QIcon::fromTheme(QIcon(d->protocol->DoNotDisturb.iconFor(this))), i18n("Do Not Disturb"), this );
QObject::connect( setDND, SIGNAL(triggered(bool)), &d->skype, SLOT(setDND()) );
actionMenu->addAction(setDND);
KAction *setInvisible = new KAction( QIcon::fromTheme(QIcon(d->protocol->Invisible.iconFor(this))), i18n("Invisible"), this );
QAction *setInvisible = new QAction( QIcon::fromTheme(QIcon(d->protocol->Invisible.iconFor(this))), i18n("Invisible"), this );
QObject::connect( setInvisible, SIGNAL(triggered(bool)), &d->skype, SLOT(setInvisible()) );
actionMenu->addAction(setInvisible);
KAction *setSkypeMe = new KAction( QIcon::fromTheme(QIcon(d->protocol->SkypeMe.iconFor(this))), i18n("Skype Me"), this );
QAction *setSkypeMe = new QAction( QIcon::fromTheme(QIcon(d->protocol->SkypeMe.iconFor(this))), i18n("Skype Me"), this );
QObject::connect( setSkypeMe, SIGNAL(triggered(bool)), &d->skype, SLOT(setSkypeMe()) );
actionMenu->addAction(setSkypeMe);
actionMenu->addSeparator();
KAction *makeTestCall = new KAction( QIcon::fromTheme(QStringLiteral("voicecall")), i18n("Make Test Call"), this );
QAction *makeTestCall = new QAction( QIcon::fromTheme(QStringLiteral("voicecall")), i18n("Make Test Call"), this );
QObject::connect( makeTestCall, SIGNAL(triggered(bool)), this, SLOT(makeTestCall()) );
const Kopete::OnlineStatus &myStatus = (myself()) ? myself()->onlineStatus() : protocol()->Offline;
......@@ -965,7 +965,7 @@ void SkypeAccount::fillActionMenu( KActionMenu *actionMenu ) {
actionMenu->addSeparator();
KAction *properties = new KAction( i18n("Properties"), this );
QAction *properties = new QAction( i18n("Properties"), this );
QObject::connect( properties, SIGNAL(triggered(bool)), this, SLOT(editAccount()) );
actionMenu->addAction(properties);
}
......
......@@ -28,7 +28,7 @@
#include <kopetemetacontact.h>
#include <kopetecontactaction.h>
#include <qstring.h>
#include <kaction.h>
#include <QAction>
#include <kactionmenu.h>
#include <kactioncollection.h>
#include <klocale.h>
......@@ -81,7 +81,7 @@ class SkypeChatSessionPrivate {
}
};
///The action to call the user(s)
KAction *callAction;
QAction *callAction;
///The action to invite the user
KActionMenu *inviteAction;
///The contact if any (and one)
......@@ -110,7 +110,7 @@ SkypeChatSession::SkypeChatSession(SkypeAccount *account, SkypeContact *contact)
account->prepareChatSession(this);
d->isMulti = false;
d->callAction = new KAction(this);
d->callAction = new QAction(this);
d->callAction->setText(i18n("Call"));
d->callAction->setIcon(QIcon::fromTheme(QStringLiteral("voicecall")));
connect(d->callAction, SIGNAL(triggered()), SLOT(callChatSession()));
......@@ -151,7 +151,7 @@ SkypeChatSession::SkypeChatSession(SkypeAccount *account, const QString &session
d->chatId = session;
emit updateChatId("", session, this);
d->callAction = new KAction(this);
d->callAction = new QAction(this);
d->callAction->setText(i18n("Call"));
d->callAction->setIcon(QIcon::fromTheme(QStringLiteral("voicecall")));
connect(d->callAction, SIGNAL(triggered()), SLOT(callChatSession()));
......@@ -292,7 +292,7 @@ void SkypeChatSession::showInviteMenu() {
QHash <QString, Kopete::Contact *> contactList = account()->contacts();
for ( QHash <QString, Kopete::Contact *>::Iterator it = contactList.begin(); it != contactList.end(); ++it ) {
if ( ! members().contains(it.value()) && it.value()->isOnline() && it.value()->onlineStatus().status() != Kopete::OnlineStatus::Offline ) {
KAction *a = new Kopete::UI::ContactAction(it.value(), actionCollection());
QAction *a = new Kopete::UI::ContactAction(it.value(), actionCollection());
connect( a, SIGNAL(triggered(QString,bool)), this, SLOT(inviteContact(QString)) );
d->inviteAction->addAction(a);
}
......
......@@ -30,7 +30,7 @@
#include <kopetechatsessionmanager.h>
#include <kopeteproperty.h>
#include <kopetemetacontact.h>
#include <kaction.h>
#include <QAction>
#include <klocale.h>
#include <kmessagebox.h>
......@@ -65,13 +65,13 @@ class SkypeContactPrivate {
///The chat session
SkypeChatSession *session;
///The action to call the user
KAction *callContactAction;
QAction *callContactAction;
///Authorization action
KAction *authorizeAction;
QAction *authorizeAction;
///Remove authorization action
KAction *disAuthorAction;
QAction *disAuthorAction;
///Block user action
KAction *blockAction;