Clean up headers

src/kleo/keyresolver.h

@@ -11,20 +11,19 @@
 
 #pragma once
 
-#include "kleo_export.h"
-
-#include <Libkleo/Enum>
-
 #include <QMap>
 #include <QObject>
 #include <QString>
-#include <QStringList>
 
 #include <gpgme++/global.h>
 
 #include <memory>
 #include <vector>
 
+#include "kleo_export.h"
+
+class QStringList;
+
 namespace GpgME
 {
 class Key;

src/kleo/keyresolvercore.cpp

@@ -16,6 +16,7 @@
 
 #include "keyresolvercore.h"
 
+#include "kleo/enum.h"
 #include "kleo/keygroup.h"
 #include "models/keycache.h"
 #include "utils/formatting.h"

src/kleo/keyresolvercore.h

@@ -13,8 +13,6 @@
 
 #include <Libkleo/KeyResolver>
 
-#include "kleo_export.h"
-
 #include <QMap>
 
 #include <gpgme++/global.h>
@@ -22,6 +20,8 @@
 #include <memory>
 #include <vector>
 
+#include "kleo_export.h"
+
 class QString;
 class QStringList;
 

src/ui/newkeyapprovaldialog.cpp

@@ -10,12 +10,14 @@
 */
 
 #include "newkeyapprovaldialog.h"
-#include "kleo/defaultkeyfilter.h"
+
 #include "keyselectioncombo.h"
 #include "progressdialog.h"
+#include "kleo/defaultkeyfilter.h"
 #include "utils/formatting.h"
 
-#include "libkleo_debug.h"
+#include <KLocalizedString>
+#include <KMessageBox>
 
 #include <QApplication>
 #include <QButtonGroup>
@@ -23,6 +25,7 @@
 #include <QDesktopWidget>
 #include <QDialogButtonBox>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QMap>
 #include <QPushButton>
@@ -32,13 +35,12 @@
 #include <QVBoxLayout>
 
 #include <QGpgME/DefaultKeyGenerationJob>
-#include <QGpgME/CryptoConfig>
-#include <QGpgME/Protocol>
+#include <QGpgME/Job>
+
 #include <gpgme++/keygenerationresult.h>
 #include <gpgme++/key.h>
 
-#include <KLocalizedString>
-#include <KMessageBox>
+#include "libkleo_debug.h"
 
 using namespace Kleo;
 using namespace GpgME;

src/ui/newkeyapprovaldialog.h

@@ -13,13 +13,11 @@
 
 #include <Libkleo/KeyResolver>
 
-#include "kleo_export.h"
-
 #include <QDialog>
 
-#include <gpgme++/key.h>
+#include <memory>
 
-#include <vector>
+#include "kleo_export.h"
 
 namespace Kleo
 {