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

Port to QAction

parent 82866098
......@@ -71,7 +71,6 @@ endif (WITH_pipes)
if(WITH_webpresence AND LIBXML2_FOUND AND LIBXSLT_FOUND)
add_subdirectory( webpresence )
endif(WITH_webpresence AND LIBXML2_FOUND AND LIBXSLT_FOUND)
message(STATUS "otr plugin disabled")
if (WITH_otr AND LIBOTR_FOUND)
add_subdirectory ( otr )
endif (WITH_otr AND LIBOTR_FOUND)
......
......@@ -29,7 +29,7 @@
#include <qcolor.h>
#include <kdebug.h>
#include <kaction.h>
#include <qaction.h>
#include <kconfig.h>
#include <kgenericfactory.h>
#include <kselectaction.h>
......@@ -95,7 +95,7 @@ OTRPlugin::OTRPlugin ( QObject *parent, const QVariantList &/*args*/ )
otrPolicyMenu = new KSelectAction( QIcon::fromTheme("object-locked"), i18nc( "@item:inmenu", "&OTR Policy" ), this );
actionCollection()->addAction( "otr_policy", otrPolicyMenu );
KAction *separatorAction = new KAction( otrPolicyMenu );
QAction *separatorAction = new QAction( otrPolicyMenu );
separatorAction->setSeparator( true );
otrPolicyMenu->addAction( i18nc( "@item:inmenu Use the default encryption mode specified in settings dialog", "&Default") );
......
......@@ -31,7 +31,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <knotification.h>
#include <kactionmenu.h>
#include <KActionMenu>
#include <kopeteuiglobal.h>
#include <kopetecontactlist.h>
......@@ -77,15 +77,15 @@ GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const QString& ac
QObject::connect( Kopete::ContactList::self(), SIGNAL(groupRemoved(Kopete::Group*)),
SLOT(slotKopeteGroupRemoved(Kopete::Group*)) );
// m_actionBlock = new KAction( KIcon( "msn_blocked" ), label, 0, "actionBlock" );
// m_actionBlock = new QAction( KIcon( "msn_blocked" ), label, 0, "actionBlock" );
// QObject::connect( m_actionBlock, SIGNAL(triggered(bool)), SLOT(slotBlock()) );
m_actionAutoReply = new KAction ( i18n( "&Set Auto-Reply..." ), 0 );
m_actionAutoReply = new QAction ( i18n( "&Set Auto-Reply..." ), 0 );
QObject::connect( m_actionAutoReply, SIGNAL(triggered(bool)),
SLOT(slotSetAutoReply()) );
m_actionJoinChatRoom = new KAction ( i18n( "&Join Channel..." ), 0 );
m_actionJoinChatRoom = new QAction ( i18n( "&Join Channel..." ), 0 );
QObject::connect( m_actionJoinChatRoom, SIGNAL(triggered(bool)),
SLOT(slotJoinChatRoom()) );
m_actionManagePrivacy = new KAction ( i18n( "&Manage Privacy..." ), 0 );
m_actionManagePrivacy = new QAction ( i18n( "&Manage Privacy..." ), 0 );
QObject::connect( m_actionManagePrivacy, SIGNAL(triggered(bool)),
SLOT(slotPrivacy()) );
......@@ -115,7 +115,7 @@ void GroupWiseAccount::fillActionMenu( KActionMenu *actionMenu )
actionMenu->addAction( m_actionJoinChatRoom );
/* Used for debugging */
/*
theActionMenu->insert( new KAction ( "Test rtfize()", QString(), 0, this,
theActionMenu->insert( new QAction ( "Test rtfize()", QString(), 0, this,
SLOT(slotTestRTFize()), this,
"actionTestRTFize") );
*/
......
......@@ -25,7 +25,7 @@
#include <QtCore/QList>
#include <QtCrypto>
#include <kaction.h>
#include <qaction.h>
#include <kopetechatsessionmanager.h>
#include <kopetecontact.h>
......@@ -334,9 +334,9 @@ protected:
void cleanup();
private:
// action menu and its actions
KAction * m_actionAutoReply;
KAction * m_actionManagePrivacy;
KAction * m_actionJoinChatRoom;
QAction * m_actionAutoReply;
QAction * m_actionManagePrivacy;
QAction * m_actionJoinChatRoom;
// Network code
KNetworkConnector * m_connector;
QCA::Initializer m_qcaInit;
......
......@@ -20,7 +20,7 @@
#include <QTextCodec>
#include <QDateTime>
#include <kaction.h>
#include <qaction.h>
#include <kdebug.h>
#include <klocale.h>
#include <kactionmenu.h>
......@@ -131,9 +131,7 @@ void QQAccount::fillActionMenu( KActionMenu *actionMenu )
actionMenu->addSeparator();
KAction *action;
action = new KAction (KIcon("qq_showvideo"), i18n ("Show my own video..."), actionMenu );
QAction *action = new QAction (KIcon("qq_showvideo"), i18n ("Show my own video..."), actionMenu );
action->setObjectName("actionShowVideo");
QObject::connect( action, SIGNAL(triggered(bool)), this, SLOT(slotShowVideo()) );
actionMenu->addAction(action);
......
......@@ -39,8 +39,8 @@
#include <klocale.h>
#include <kconfig.h>
#include <kdebug.h>
#include <kaction.h>
#include <kactionmenu.h>
#include <QAction>
#include <KActionMenu>
#include <QMenu>
#include <kmessagebox.h>
#include <krun.h>
......@@ -91,16 +91,16 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const QString& accountId)
m_webcam = 0;
m_chatChatSession = 0;
m_openInboxAction = new KAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this );
m_openInboxAction = new QAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this );
//, "m_openInboxAction" );
QObject::connect(m_openInboxAction, SIGNAL(triggered(bool)), this, SLOT(slotOpenInbox()) );
m_openYABAction = new KAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this );
m_openYABAction = new QAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this );
//, "m_openYABAction" );
QObject::connect(m_openYABAction, SIGNAL(triggered(bool)), this, SLOT(slotOpenYAB()) );
m_editOwnYABEntry = new KAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this );
m_editOwnYABEntry = new QAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this );
//, "m_editOwnYABEntry" );
QObject::connect(m_editOwnYABEntry, SIGNAL(triggered(bool)), this, SLOT(slotEditOwnYABEntry()) );
m_joinChatAction = new KAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this );
m_joinChatAction = new QAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this );
//, "m_joinChatAction" );
QObject::connect(m_joinChatAction, SIGNAL(triggered(bool)), this, SLOT(slotJoinChatRoom()) );
......@@ -917,7 +917,7 @@ void YahooAccount::slotgotAuthorizationRequest( const QString &user, const QStri
metaContact=kc->metaContact();
Kopete::AddedInfoEvent::ShowActionOptions actions = Kopete::AddedInfoEvent::AuthorizeAction;
actions |= Kopete::AddedInfoEvent::BlockAction;
actions |= Kopete::AddedInfoEvent::BlockAction;
if( !metaContact || metaContact->isTemporary() )
actions |= Kopete::AddedInfoEvent::AddAction;
......@@ -940,7 +940,7 @@ void YahooAccount::slotAddedInfoEventActionActivated( uint actionId )
case Kopete::AddedInfoEvent::AuthorizeAction:
m_session->sendAuthReply( event->contactId(), true, QString() );
break;
case Kopete::AddedInfoEvent::BlockAction:
case Kopete::AddedInfoEvent::BlockAction:
m_session->sendAuthReply( event->contactId(), false, QString() );
break;
case Kopete::AddedInfoEvent::AddContactAction:
......
......@@ -38,7 +38,7 @@
#include "yahootypes.h"
class QColor;
class KAction;
class QAction;
class KActionMenu;
class YahooContact;
class YahooAccount;
......@@ -79,7 +79,7 @@ public:
*/
YahooContact *contact(const QString &id);
virtual void fillActionMenu( KActionMenu *actionMenu );
virtual void fillActionMenu( KActionMenu *actionMenu );
/**
* Sets the yahoo away status
......@@ -293,10 +293,10 @@ private:
YahooWebcam *m_webcam;
KAction *m_openInboxAction; // Menu item openInbox
KAction *m_openYABAction; // Menu item openYahooAddressbook
KAction *m_editOwnYABEntry; // Menu item editOwnYABEntry
KAction *m_joinChatAction; // Menu item joinChatAction
QAction *m_openInboxAction; // Menu item openInbox
QAction *m_openYABAction; // Menu item openYahooAddressbook
QAction *m_editOwnYABEntry; // Menu item editOwnYABEntry
QAction *m_joinChatAction; // Menu item joinChatAction
KYahoo::Client *m_session; // The Connection object
};
......
......@@ -28,7 +28,6 @@
#include <kurl.h>
#include <QAction>
class KAction;
class KTemporaryFile;
namespace Kopete { class ChatSession; }
......
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