summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-06 08:14:22 +0200
committerPali Roh├ír <[email protected]>2017-12-22 09:10:29 +0100
commit5154ce3c0e95f3bfab6c6c8a4dca3ed0a1d79306 (patch)
tree72db82356ecc91ee1f10a62bb2d7b710ac237901
parent8630f98d8064d157f90c715c830e9fbb68c21787 (diff)
Port to QIcon
-rw-r--r--plugins/cryptography/cryptographyguiclient.cpp6
-rw-r--r--plugins/cryptography/cryptographyplugin.cpp6
-rw-r--r--plugins/cryptography/exportkeys.cpp2
-rw-r--r--protocols/jabber/jabbercontact.cpp2
-rw-r--r--protocols/oscar/aim/aimaccount.cpp2
-rw-r--r--protocols/oscar/icq/icqaccount.cpp2
-rw-r--r--protocols/winpopup/wpaccount.cpp4
7 files changed, 12 insertions, 12 deletions
diff --git a/plugins/cryptography/cryptographyguiclient.cpp b/plugins/cryptography/cryptographyguiclient.cpp
index b5cde2b..e1ac26f 100644
--- a/plugins/cryptography/cryptographyguiclient.cpp
+++ b/plugins/cryptography/cryptographyguiclient.cpp
@@ -35,7 +35,7 @@
#include <QAction>
#include <klocalizedstring.h>
#include <kaboutdata.h>
-#include <kicon.h>
+#include <qicon.h>
#include <kiconloader.h>
#include <kmessagebox.h>
@@ -79,9 +79,9 @@ CryptographyGUIClient::CryptographyGUIClient (Kopete::ChatSession *parent)
}
}
- m_encAction = new KToggleAction(KIcon("document-encrypt"), i18nc("@action toggle action", "Encrypt Messages"), this);
+ m_encAction = new KToggleAction(QIcon::fromTheme("document-encrypt"), i18nc("@action toggle action", "Encrypt Messages"), this);
actionCollection()->addAction("encryptionToggle", m_encAction);
- m_signAction = new KToggleAction(KIcon("document-sign"), i18nc("@action toggle action", "Sign Messages"), this);
+ m_signAction = new KToggleAction(QIcon::fromTheme("document-sign"), i18nc("@action toggle action", "Sign Messages"), this);
actionCollection()->addAction("signToggle", m_signAction);
m_exportAction = new QAction(i18nc("@action toggle action", "Export Contacts' Keys to Address Book"), this);
actionCollection()->addAction("export", m_exportAction);
diff --git a/plugins/cryptography/cryptographyplugin.cpp b/plugins/cryptography/cryptographyplugin.cpp
index 523d28c..a64b4b0 100644
--- a/plugins/cryptography/cryptographyplugin.cpp
+++ b/plugins/cryptography/cryptographyplugin.cpp
@@ -90,13 +90,13 @@ CryptographyPlugin::CryptographyPlugin (QObject *parent, const QVariantList & /*
SLOT(slotOutgoingMessage(Kopete::Message&)));
// actions in the contact list
- QAction *action = new QAction(KIcon("document-encrypt"), i18nc("@action", "&Select Public Key..."), this);
+ QAction *action = new QAction(QIcon::fromTheme("document-encrypt"), i18nc("@action", "&Select Public Key..."), this);
actionCollection()->addAction("contactSelectKey", action);
connect(action, SIGNAL(triggered(bool)), this, SLOT(slotSelectContactKey()));
connect(Kopete::ContactList::self(), SIGNAL(metaContactSelected(bool)), action, SLOT(setEnabled(bool)));
action->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1);
- action = new QAction(KIcon("document-export-key"), i18nc("@action", "&Export Public Keys To Address Book..."), this);
+ action = new QAction(QIcon::fromTheme("document-export-key"), i18nc("@action", "&Export Public Keys To Address Book..."), this);
actionCollection()->addAction("exportKey", action);
connect(action, SIGNAL(triggered(bool)), this, SLOT(slotExportSelectedMetaContactKeys()));
connect(Kopete::ContactList::self(), SIGNAL(metaContactSelected(bool)), action, SLOT(setEnabled(bool)));
@@ -437,7 +437,7 @@ QString CryptographyPlugin::kabcKeySelector(QString displayName, QString address
ui.label->setText(i18nc("@info", "Cryptography plugin has found multiple encryption keys for %1 (%2) in your KDE address book. To use one of these keys, select it and choose OK.",
displayName, addresseeName));
for (int i = 0; i < keys.count(); i++) {
- ui.keyList->addItem(new QListWidgetItem(KIcon("application-pgp-keys"), keys[i].right(8).prepend("0x"), ui.keyList));
+ ui.keyList->addItem(new QListWidgetItem(QIcon::fromTheme("application-pgp-keys"), keys[i].right(8).prepend("0x"), ui.keyList));
}
ui.keyList->addItems(keys);
QString ret;
diff --git a/plugins/cryptography/exportkeys.cpp b/plugins/cryptography/exportkeys.cpp
index 2699cec..2da2486 100644
--- a/plugins/cryptography/exportkeys.cpp
+++ b/plugins/cryptography/exportkeys.cpp
@@ -63,7 +63,7 @@ ExportKeys::ExportKeys (QList<Kopete::MetaContact *> mcs, QWidget *parent)
// now we create the ListWidgetItem
key = key.right(8).prepend("0x");
key = key + ' ' + mc->displayName() + " (" + addressee.formattedName() + ')';
- QListWidgetItem *tmpItem = new QListWidgetItem(KIcon("document-export-key"), key, mUi->keyList);
+ QListWidgetItem *tmpItem = new QListWidgetItem(QIcon::fromTheme("document-export-key"), key, mUi->keyList);
tmpItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
tmpItem->setCheckState(Qt::Checked);
mUi->keyList->addItem(tmpItem);
diff --git a/protocols/jabber/jabbercontact.cpp b/protocols/jabber/jabbercontact.cpp
index 2d97ffa..f206033 100644
--- a/protocols/jabber/jabbercontact.cpp
+++ b/protocols/jabber/jabbercontact.cpp
@@ -184,7 +184,7 @@ QList<QAction *> *JabberContact::customContextMenuActions ()
#define QAction(status, text, name, slot) \
{ QAction *tmp = new QAction(this); \
- tmp->setIcon( KIcon(QIcon((status).iconFor(this)))); \
+ tmp->setIcon( QIcon((status).iconFor(this))); \
tmp->setText( text ); \
connect(tmp, SIGNAL(triggered(bool)), (slot));\
actionSetAvailability->addAction(tmp); }
diff --git a/protocols/oscar/aim/aimaccount.cpp b/protocols/oscar/aim/aimaccount.cpp
index 1092445..9f4841e 100644
--- a/protocols/oscar/aim/aimaccount.cpp
+++ b/protocols/oscar/aim/aimaccount.cpp
@@ -294,7 +294,7 @@ void AIMAccount::fillActionMenu( KActionMenu *actionMenu )
actionMenu->addAction( mEditInfoAction );
Oscar::Presence pres( presence().type(), presence().flags() | Oscar::Presence::Invisible );
- mActionInvisible->setIcon( KIcon( protocol()->statusManager()->onlineStatusOf( pres ).iconFor( this ) ) );
+ mActionInvisible->setIcon( QIcon( protocol()->statusManager()->onlineStatusOf( pres ).iconFor( this ) ) );
mActionInvisible->setChecked( (presence().flags() & Oscar::Presence::Invisible) == Oscar::Presence::Invisible );
actionMenu->addAction( mActionInvisible );
}
diff --git a/protocols/oscar/icq/icqaccount.cpp b/protocols/oscar/icq/icqaccount.cpp
index 9fdf33a..6e3e619 100644
--- a/protocols/oscar/icq/icqaccount.cpp
+++ b/protocols/oscar/icq/icqaccount.cpp
@@ -177,7 +177,7 @@ void ICQAccount::fillActionMenu( KActionMenu *actionMenu )
Oscar::Presence pres( presence().type(), presence().flags() | Oscar::Presence::Invisible );
pres.setXtrazStatus( presence().xtrazStatus() );
- mActionInvisible->setIcon( KIcon( protocol()->statusManager()->onlineStatusOf( pres ).iconFor( this ) ) );
+ mActionInvisible->setIcon( QIcon( protocol()->statusManager()->onlineStatusOf( pres ).iconFor( this ) ) );
mActionInvisible->setChecked( (presence().flags() & Oscar::Presence::Invisible) == Oscar::Presence::Invisible );
actionMenu->addAction( mActionInvisible );
diff --git a/protocols/winpopup/wpaccount.cpp b/protocols/winpopup/wpaccount.cpp
index 2621f34..716d0a2 100644
--- a/protocols/winpopup/wpaccount.cpp
+++ b/protocols/winpopup/wpaccount.cpp
@@ -167,13 +167,13 @@ void WPAccount::fillActionMenu(KActionMenu *actionMenu)
actionMenu->menu()->addAction(QIcon(myself()->onlineStatus().iconFor(this)), i18n("WinPopup (%1)", accountId()));
if (mProtocol) {
- QAction *goOnline = new QAction(KIcon(QIcon(mProtocol->WPOnline.iconFor(this))), i18n("Online"), this);
+ QAction *goOnline = new QAction(QIcon(mProtocol->WPOnline.iconFor(this)), i18n("Online"), this);
//, "actionGoAvailable" );
QObject::connect(goOnline, SIGNAL(triggered(bool)), this, SLOT(connect()));
goOnline->setEnabled(isConnected() && isAway());
actionMenu->addAction(goOnline);
- QAction *goAway = new QAction(KIcon(QIcon(mProtocol->WPAway.iconFor(this))), i18n("Away"), this);
+ QAction *goAway = new QAction(QIcon(mProtocol->WPAway.iconFor(this)), i18n("Away"), this);
//, "actionGoAway" );
QObject::connect(goAway, SIGNAL(triggered(bool)), this, SLOT(goAway()));
goAway->setEnabled(isConnected() && !isAway());