summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius Štikonas <andrius@stikonas.eu>2016-09-07 20:22:56 (GMT)
committerAndrius Štikonas <andrius@stikonas.eu>2016-09-07 20:22:56 (GMT)
commita81ba38a2f0eaaf94eaa891f70f37795b4fda468 (patch)
treed2d4ece77b9cd2a55ea7f4997872925b2de853ad
parent7aaf8b4b99a7b39214b12ad4cacbf8ae058bc73d (diff)
drop KDELibs4Support
-rw-r--r--CMakeLists.txt4
-rw-r--r--caff.cpp4
-rw-r--r--core/KGpgGroupNode.cpp4
-rw-r--r--gpgproc.cpp5
-rw-r--r--keysmanager.cpp4
-rw-r--r--kgpgoptions.cpp4
-rw-r--r--model/kgpgsearchresultmodel.cpp4
-rw-r--r--transactions/kgpggeneraterevoke.cpp5
-rw-r--r--transactions/kgpgimport.cpp3
-rw-r--r--transactions/kgpgtextorfiletransaction.cpp4
-rw-r--r--transactions/kgpgtransaction.cpp4
-rw-r--r--transactions/kgpgtransactionprivate.cpp10
12 files changed, 28 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7fa693..3fd82c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,9 +41,9 @@ find_package(KF5 5.23 REQUIRED
IconThemes
JobWidgets
KIO
- KDELibs4Support
Notifications
Service
+ TextWidgets
XmlGui
WidgetsAddons
WindowSystem
@@ -246,12 +246,12 @@ target_link_libraries(kgpg
KF5::I18n
KF5::IconThemes
KF5::JobWidgets
- KF5::KDELibs4Support
KF5::KIOCore
KF5::KIOFileWidgets
KF5::KIOWidgets
KF5::Notifications
KF5::Service
+ KF5::TextWidgets
KF5::XmlGui
KF5::WidgetsAddons
KF5::WindowSystem
diff --git a/caff.cpp b/caff.cpp
index bd23a73..b1cdbeb 100644
--- a/caff.cpp
+++ b/caff.cpp
@@ -14,6 +14,7 @@
#include "caff.h"
#include "caff_p.h"
+#include "kgpg_debug.h"
#include "kgpginterface.h"
#include "kgpgsettings.h"
#include "core/KGpgKeyNode.h"
@@ -25,11 +26,10 @@
#include "transactions/kgpgsignuid.h"
#include "gpgproc.h"
-#include <QDebug>
-#include "kgpg_debug.h"
#include <KLocalizedString>
#include <KMessageBox>
+#include <QDebug>
#include <QDesktopServices>
#include <QDir>
#include <QFileInfo>
diff --git a/core/KGpgGroupNode.cpp b/core/KGpgGroupNode.cpp
index 535d307..2a0cb2b 100644
--- a/core/KGpgGroupNode.cpp
+++ b/core/KGpgGroupNode.cpp
@@ -18,14 +18,14 @@
*/
#include "KGpgGroupNode.h"
+#include "kgpg_debug.h"
#include "KGpgGroupMemberNode.h"
#include "KGpgRootNode.h"
#include "kgpgsettings.h"
-#include <QDebug>
-#include "kgpg_debug.h"
#include <KLocalizedString>
+#include <QDebug>
#include <QFile>
#include <QStringList>
#include <QTextStream>
diff --git a/gpgproc.cpp b/gpgproc.cpp
index 2944592..6fba481 100644
--- a/gpgproc.cpp
+++ b/gpgproc.cpp
@@ -14,12 +14,11 @@
#include "gpgproc.h"
#include "kgpgsettings.h"
-
-#include <QDebug>
#include "kgpg_debug.h"
+
#include <KProcess>
-#include <KStandardDirs>
+#include <QDebug>
#include <QDir>
#include <QFileInfo>
#include <QStringList>
diff --git a/keysmanager.cpp b/keysmanager.cpp
index c09c119..8cf6eb0 100644
--- a/keysmanager.cpp
+++ b/keysmanager.cpp
@@ -27,6 +27,7 @@
#include "keyinfodialog.h"
#include "keyservers.h"
#include "keytreeview.h"
+#include "kgpg_debug.h"
#include "kgpg.h"
#include "kgpgchangekey.h"
#include "kgpgkeygenerate.h"
@@ -61,8 +62,6 @@
#include <akonadi/contact/contacteditordialog.h>
#include <akonadi/contact/contactsearchjob.h>
#include <KActionCollection>
-#include <QDebug>
-#include "kgpg_debug.h"
#include <KLocalizedString>
#include <KMessageBox>
#include <KMimeTypeTrader>
@@ -82,6 +81,7 @@
#include <QApplication>
#include <QClipboard>
#include <QDBusConnection>
+#include <QDebug>
#include <QDesktopServices>
#include <QDir>
#include <QEvent>
diff --git a/kgpgoptions.cpp b/kgpgoptions.cpp
index 41ff7ac..0ba7907 100644
--- a/kgpgoptions.cpp
+++ b/kgpgoptions.cpp
@@ -14,6 +14,7 @@
#include "kgpgoptions.h"
+#include "kgpg_debug.h"
#include "kgpgsettings.h"
#include "kgpginterface.h"
#include "conf_encryption.h"
@@ -24,8 +25,6 @@
#include <KConfig>
#include <KConfigGroup>
-#include <QDebug>
-#include "kgpg_debug.h"
#include <KDesktopFile>
#include <KFontChooser>
#include <KLocalizedString>
@@ -34,6 +33,7 @@
#include <QUrl>
#include <QCheckBox>
+#include <QDebug>
#include <QFile>
#include <QFileDialog>
#include <QInputDialog>
diff --git a/model/kgpgsearchresultmodel.cpp b/model/kgpgsearchresultmodel.cpp
index a85272d..ad416e7 100644
--- a/model/kgpgsearchresultmodel.cpp
+++ b/model/kgpgsearchresultmodel.cpp
@@ -13,11 +13,11 @@
***************************************************************************/
#include "kgpgsearchresultmodel.h"
-
-#include <QDebug>
#include "kgpg_debug.h"
+
#include <KLocalizedString>
+#include <QDebug>
#include <QDateTime>
#include <QScopedPointer>
#include <QString>
diff --git a/transactions/kgpggeneraterevoke.cpp b/transactions/kgpggeneraterevoke.cpp
index 5408e1a..26b93b0 100644
--- a/transactions/kgpggeneraterevoke.cpp
+++ b/transactions/kgpggeneraterevoke.cpp
@@ -12,10 +12,11 @@
***************************************************************************/
#include "kgpggeneraterevoke.h"
-
-#include <QDebug>
#include "kgpg_debug.h"
+
#include <KLocalizedString>
+
+#include <QDebug>
#include <QFile>
KGpgGenerateRevoke::KGpgGenerateRevoke(QObject *parent, const QString &keyID, const QUrl &revokeUrl, const int reason, const QString &description)
diff --git a/transactions/kgpgimport.cpp b/transactions/kgpgimport.cpp
index 7725af0..bbc9370 100644
--- a/transactions/kgpgimport.cpp
+++ b/transactions/kgpgimport.cpp
@@ -12,12 +12,13 @@
***************************************************************************/
#include "kgpgimport.h"
+#include "kgpg_debug.h"
#include "model/kgpgitemmodel.h"
#include "core/KGpgKeyNode.h"
#include <QDebug>
-#include "kgpg_debug.h"
+
#include <KLocalizedString>
KGpgImport::KGpgImport(QObject *parent, const QString &text)
diff --git a/transactions/kgpgtextorfiletransaction.cpp b/transactions/kgpgtextorfiletransaction.cpp
index 28e0dec..ce7c3fc 100644
--- a/transactions/kgpgtextorfiletransaction.cpp
+++ b/transactions/kgpgtextorfiletransaction.cpp
@@ -12,13 +12,13 @@
***************************************************************************/
#include "kgpgtextorfiletransaction.h"
+#include "kgpg_debug.h"
#include "gpgproc.h"
-#include <QDebug>
-#include "kgpg_debug.h"
#include <KIO/Job>
+#include <QDebug>
#include <QRegExp>
#include <QTemporaryFile>
diff --git a/transactions/kgpgtransaction.cpp b/transactions/kgpgtransaction.cpp
index 149a329..24866cc 100644
--- a/transactions/kgpgtransaction.cpp
+++ b/transactions/kgpgtransaction.cpp
@@ -12,19 +12,19 @@
***************************************************************************/
#include "kgpgtransaction.h"
+#include "kgpg_debug.h"
#include "kgpgtransactionprivate.h"
#include "gpgproc.h"
#include "kgpginterface.h"
#include <QByteArray>
+#include <QDebug>
#include <QStringList>
#include <QUrl>
#include <QWidget>
#include <KConfigGroup>
-#include <QDebug>
-#include "kgpg_debug.h"
#include <KNewPasswordDialog>
#include <KLocalizedString>
#include <KPasswordDialog>
diff --git a/transactions/kgpgtransactionprivate.cpp b/transactions/kgpgtransactionprivate.cpp
index 252f7d3..a16f604 100644
--- a/transactions/kgpgtransactionprivate.cpp
+++ b/transactions/kgpgtransactionprivate.cpp
@@ -11,18 +11,18 @@
* *
***************************************************************************/
+#include "kgpgtransactionprivate.h"
+#include "kgpgtransaction.h"
+#include "kgpg_debug.h"
+
+#include <QDebug>
#include <QPointer>
#include <QWeakPointer>
#include <QWidget>
-#include <QDebug>
-#include "kgpg_debug.h"
#include <KLocalizedString>
#include <KIO/RenameDialog>
-#include "kgpgtransaction.h"
-#include "kgpgtransactionprivate.h"
-
KGpgTransactionPrivate::KGpgTransactionPrivate(KGpgTransaction *parent, bool allowChaining)
: m_parent(parent),
m_process(new GPGProc()),