summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius Štikonas <andrius@stikonas.eu>2016-06-03 21:41:56 (GMT)
committerAndrius Štikonas <andrius@stikonas.eu>2016-06-03 21:44:03 (GMT)
commitb48925552159bc818e9cfcefea3ff7833577c2cb (patch)
treebaf2d3b2c1a992ac3a44b3c916d10a20bd53f028
parentd7aaa221b4faf99cb88c109de11618c141642ffc (diff)
Port KMenu to QMenu.
-rw-r--r--editor/kgpgeditor.cpp1
-rw-r--r--keysmanager.cpp18
-rw-r--r--keysmanager.h18
3 files changed, 18 insertions, 19 deletions
diff --git a/editor/kgpgeditor.cpp b/editor/kgpgeditor.cpp
index 0f1e665..9ec91c2 100644
--- a/editor/kgpgeditor.cpp
+++ b/editor/kgpgeditor.cpp
@@ -37,7 +37,6 @@
#include <KFindDialog>
#include <KIcon>
#include <KLocale>
-#include <KMenuBar>
#include <KMessageBox>
#include <KRecentFilesAction>
#include <KShortcut>
diff --git a/keysmanager.cpp b/keysmanager.cpp
index d1b7487..1cdd04c 100644
--- a/keysmanager.cpp
+++ b/keysmanager.cpp
@@ -67,7 +67,6 @@
#include <KGlobal>
#include <KLineEdit>
#include <KLocale>
-#include <KMenu>
#include <KMessageBox>
#include <KMimeTypeTrader>
#include <KProcess>
@@ -92,6 +91,7 @@
#include <QKeySequence>
#include <QLabel>
#include <QList>
+#include <QMenu>
#include <QMetaObject>
#include <QPainter>
#include <QPrintDialog>
@@ -349,7 +349,7 @@ KeysManager::KeysManager(QWidget *parent)
slotSetTrustFilter(psize);
slotShowLongId(KGpgSettings::showLongKeyId());
- m_popuppub = new KMenu(this);
+ m_popuppub = new QMenu(this);
m_popuppub->addAction(exportPublicKey);
m_popuppub->addAction(m_sendEmail);
m_popuppub->addAction(signMailUid);
@@ -364,7 +364,7 @@ KeysManager::KeysManager(QWidget *parent)
m_popuppub->addSeparator();
m_popuppub->addAction(importAllSignKeys);
- m_popupsec = new KMenu(this);
+ m_popupsec = new QMenu(this);
m_popupsec->addAction(exportPublicKey);
m_popupsec->addAction(m_sendEmail);
m_popupsec->addAction(signKey);
@@ -383,33 +383,33 @@ KeysManager::KeysManager(QWidget *parent)
m_popupsec->addAction(exportSecretKey);
m_popupsec->addAction(deleteKeyPair);
- m_popupgroup = new KMenu(this);
+ m_popupgroup = new QMenu(this);
m_popupgroup->addAction(editCurrentGroup);
m_popupgroup->addAction(m_groupRename);
m_popupgroup->addAction(delGroup);
m_popupgroup->addAction(refreshKey);
- m_popupout = new KMenu(this);
+ m_popupout = new QMenu(this);
m_popupout->addAction(importKey);
- m_popupsig = new KMenu();
+ m_popupsig = new QMenu();
m_popupsig->addAction(importSignatureKey);
m_popupsig->addAction(delSignKey);
- m_popupphoto = new KMenu(this);
+ m_popupphoto = new QMenu(this);
m_popupphoto->addAction(openPhoto);
m_popupphoto->addAction(signUid);
m_popupphoto->addAction(signMailUid);
m_popupphoto->addAction(deletePhoto);
- m_popupuid = new KMenu(this);
+ m_popupuid = new QMenu(this);
m_popupuid->addAction(m_sendEmail);
m_popupuid->addAction(signMailUid);
m_popupuid->addAction(signUid);
m_popupuid->addAction(delUid);
m_popupuid->addAction(setPrimUid);
- m_popuporphan = new KMenu(this);
+ m_popuporphan = new QMenu(this);
m_popuporphan->addAction(regeneratePublic);
m_popuporphan->addAction(deleteKeyPair);
diff --git a/keysmanager.h b/keysmanager.h
index 318c0fd..a1df8eb 100644
--- a/keysmanager.h
+++ b/keysmanager.h
@@ -33,7 +33,7 @@ class KJob;
class QEvent;
class KSelectAction;
-class KMenu;
+class QMenu;
class KLineEdit;
class QAction;
class KJob;
@@ -245,14 +245,14 @@ private:
QClipboard::Mode m_clipboardmode;
- KMenu *m_popuppub; // popup on a public key
- KMenu *m_popupsec; // popup on a secret key
- KMenu *m_popupgroup; // popup on a group
- KMenu *m_popupout; // popup there is no key or when the user don't right-click on a key
- KMenu *m_popupsig; // popup on a signature
- KMenu *m_popupphoto; // popup on a photo
- KMenu *m_popupuid; // popup on an user id
- KMenu *m_popuporphan; // popup on an orphan key
+ QMenu *m_popuppub; // popup on a public key
+ QMenu *m_popupsec; // popup on a secret key
+ QMenu *m_popupgroup; // popup on a group
+ QMenu *m_popupout; // popup there is no key or when the user don't right-click on a key
+ QMenu *m_popupsig; // popup on a signature
+ QMenu *m_popupphoto; // popup on a photo
+ QMenu *m_popupuid; // popup on an user id
+ QMenu *m_popuporphan; // popup on an orphan key
KLineEdit *m_listviewsearch;
KDialog *addUidWidget;