summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-15 07:46:41 +0200
committerMontel Laurent <[email protected]>2017-09-15 07:46:41 +0200
commitf0752f8c872c758f0ae7a50c0e9fe866f3ae972c (patch)
tree9da534fbf58f180f7dcac03d39afbadc3748f976
parenteb92d75732716f1c6d02a2b9c10fbf5ae1df0f3b (diff)
Fix includes
-rw-r--r--src/commands/genrevokecommand.h1
-rw-r--r--src/commands/importpaperkeycommand.cpp1
-rw-r--r--src/conf/configuredialog.cpp3
-rw-r--r--src/conf/cryptooperationsconfigwidget.cpp1
-rw-r--r--src/conf/dirservconfigpage.cpp2
-rw-r--r--src/crypto/autodecryptverifyfilescontroller.cpp1
-rw-r--r--src/crypto/autodecryptverifyfilescontroller.h1
-rw-r--r--src/crypto/gui/certificatelineedit.cpp4
-rw-r--r--src/crypto/gui/certificatelineedit.h1
-rw-r--r--src/crypto/gui/resultitemwidget.cpp1
-rw-r--r--src/crypto/gui/signencryptemailconflictdialog.cpp4
-rw-r--r--src/crypto/gui/signencryptfileswizard.cpp1
-rw-r--r--src/crypto/gui/signencryptwidget.h1
-rw-r--r--src/crypto/gui/signingcertificateselectiondialog.cpp3
-rw-r--r--src/dialogs/certificatedetailswidget.cpp1
-rw-r--r--src/dialogs/expirydialog.cpp1
-rw-r--r--src/dialogs/exportcertificatesdialog.cpp1
-rw-r--r--src/dialogs/ownertrustdialog.cpp1
-rw-r--r--src/kleopatraapplication.cpp2
-rw-r--r--src/mainwindow.cpp6
-rw-r--r--src/selftest/enginecheck.cpp1
-rw-r--r--src/smartcard/netkeycard.h1
-rw-r--r--src/smartcard/openpgpcard.cpp1
-rw-r--r--src/smartcard/readerstatus.cpp1
-rw-r--r--src/uiserver/importfilescommand.cpp1
-rw-r--r--src/utils/gui-helper.cpp1
-rw-r--r--src/utils/kuniqueservice.cpp1
-rw-r--r--src/utils/validation.cpp1
-rw-r--r--src/view/smartcardwidget.cpp1
-rw-r--r--tests/test.data1
-rw-r--r--tests/test_verify.cpp1
31 files changed, 5 insertions, 43 deletions
diff --git a/src/commands/genrevokecommand.h b/src/commands/genrevokecommand.h
index a775aa6..edd4eb6 100644
--- a/src/commands/genrevokecommand.h
+++ b/src/commands/genrevokecommand.h
@@ -37,7 +37,6 @@
#include <commands/gnupgprocesscommand.h>
#include <QString>
-#include <QProcess>
class QWidget;
diff --git a/src/commands/importpaperkeycommand.cpp b/src/commands/importpaperkeycommand.cpp
index 564e86f..7e2f430 100644
--- a/src/commands/importpaperkeycommand.cpp
+++ b/src/commands/importpaperkeycommand.cpp
@@ -48,7 +48,6 @@
#include <KLocalizedString>
#include <KMessageBox>
-#include <QProcess>
#include <QFileDialog>
#include <QTextStream>
diff --git a/src/conf/configuredialog.cpp b/src/conf/configuredialog.cpp
index a3cfbc5..056d4b0 100644
--- a/src/conf/configuredialog.cpp
+++ b/src/conf/configuredialog.cpp
@@ -43,9 +43,8 @@
#include <KLocalizedString>
#include <KConfigGroup>
#include <KSharedConfig>
-
-#include <QApplication>
#include <QIcon>
+#include <QApplication>
#if HAVE_KCMUTILS
# include <KCMultiDialog>
diff --git a/src/conf/cryptooperationsconfigwidget.cpp b/src/conf/cryptooperationsconfigwidget.cpp
index 59cbd7f..f54a5d6 100644
--- a/src/conf/cryptooperationsconfigwidget.cpp
+++ b/src/conf/cryptooperationsconfigwidget.cpp
@@ -57,7 +57,6 @@
#include <QCheckBox>
#include <QComboBox>
#include <QDir>
-#include <QLayout>
#include <QGroupBox>
#include <QHBoxLayout>
#include <QPushButton>
diff --git a/src/conf/dirservconfigpage.cpp b/src/conf/dirservconfigpage.cpp
index ecbf2b6..a927cbd 100644
--- a/src/conf/dirservconfigpage.cpp
+++ b/src/conf/dirservconfigpage.cpp
@@ -42,14 +42,12 @@
#include <KLocalizedString>
#include "kleopatra_debug.h"
#include <kconfig.h>
-#include <QDialog>
#include <QSpinBox>
#include <QLabel>
#include <qdatetimeedit.h>
#include <QCheckBox>
#include <QLayout>
-#include <KConfigGroup>
using namespace Kleo;
diff --git a/src/crypto/autodecryptverifyfilescontroller.cpp b/src/crypto/autodecryptverifyfilescontroller.cpp
index cc76471..1c2718d 100644
--- a/src/crypto/autodecryptverifyfilescontroller.cpp
+++ b/src/crypto/autodecryptverifyfilescontroller.cpp
@@ -59,7 +59,6 @@
#include <QDir>
#include <QFile>
#include <QFileInfo>
-#include <QPointer>
#include <QTimer>
#include <QFileDialog>
#include <QTemporaryDir>
diff --git a/src/crypto/autodecryptverifyfilescontroller.h b/src/crypto/autodecryptverifyfilescontroller.h
index 4d71eaf..0006a1a 100644
--- a/src/crypto/autodecryptverifyfilescontroller.h
+++ b/src/crypto/autodecryptverifyfilescontroller.h
@@ -39,7 +39,6 @@
#include <utils/types.h>
-#include <QMetaType>
#include <memory>
#include <vector>
diff --git a/src/crypto/gui/certificatelineedit.cpp b/src/crypto/gui/certificatelineedit.cpp
index 8aa0704..7988fe5 100644
--- a/src/crypto/gui/certificatelineedit.cpp
+++ b/src/crypto/gui/certificatelineedit.cpp
@@ -32,13 +32,9 @@
#include "certificatelineedit.h"
-#include <QHBoxLayout>
-#include <QComboBox>
#include <QLineEdit>
#include <QCompleter>
#include <QFontMetrics>
-#include <QSortFilterProxyModel>
-#include <QLabel>
#include <QPushButton>
#include <QAction>
#include <QSignalBlocker>
diff --git a/src/crypto/gui/certificatelineedit.h b/src/crypto/gui/certificatelineedit.h
index 0b0b9a5..37bc10b 100644
--- a/src/crypto/gui/certificatelineedit.h
+++ b/src/crypto/gui/certificatelineedit.h
@@ -33,7 +33,6 @@
#define CRYPTO_GUI_CERTIFICATELINEEDIT_H
#include <QLineEdit>
-#include <QString>
#include <gpgme++/key.h>
diff --git a/src/crypto/gui/resultitemwidget.cpp b/src/crypto/gui/resultitemwidget.cpp
index 53c329f..e1d9979 100644
--- a/src/crypto/gui/resultitemwidget.cpp
+++ b/src/crypto/gui/resultitemwidget.cpp
@@ -53,7 +53,6 @@
#include "kleopatra_debug.h"
#include <QHBoxLayout>
#include <QLabel>
-#include <QStringList>
#include <QUrl>
#include <QVBoxLayout>
#include <KGuiItem>
diff --git a/src/crypto/gui/signencryptemailconflictdialog.cpp b/src/crypto/gui/signencryptemailconflictdialog.cpp
index ba1e2cb..c884e81 100644
--- a/src/crypto/gui/signencryptemailconflictdialog.cpp
+++ b/src/crypto/gui/signencryptemailconflictdialog.cpp
@@ -54,10 +54,7 @@
#include <KColorScheme>
#include <QLabel>
-#include <QComboBox>
#include <QLayout>
-#include <QStackedWidget>
-#include <QToolButton>
#include <QGroupBox>
#include <QDialogButtonBox>
#include <QCheckBox>
@@ -65,6 +62,7 @@
#include <QPushButton>
#include <QPointer>
#include <QSignalBlocker>
+#include <QToolButton>
#include <algorithm>
#include <iterator>
diff --git a/src/crypto/gui/signencryptfileswizard.cpp b/src/crypto/gui/signencryptfileswizard.cpp
index 6f44ac4..ef6188b 100644
--- a/src/crypto/gui/signencryptfileswizard.cpp
+++ b/src/crypto/gui/signencryptfileswizard.cpp
@@ -56,7 +56,6 @@
#include <QIcon>
#include <QCheckBox>
-#include <QPointer>
#include <gpgme++/key.h>
diff --git a/src/crypto/gui/signencryptwidget.h b/src/crypto/gui/signencryptwidget.h
index 1d706c3..29f4f29 100644
--- a/src/crypto/gui/signencryptwidget.h
+++ b/src/crypto/gui/signencryptwidget.h
@@ -34,7 +34,6 @@
#include <QWidget>
#include <QVector>
-#include <QMap>
#include <gpgme++/key.h>
class QGridLayout;
diff --git a/src/crypto/gui/signingcertificateselectiondialog.cpp b/src/crypto/gui/signingcertificateselectiondialog.cpp
index 32c416a..415e66b 100644
--- a/src/crypto/gui/signingcertificateselectiondialog.cpp
+++ b/src/crypto/gui/signingcertificateselectiondialog.cpp
@@ -37,8 +37,7 @@
#include <KLocalizedString>
-#include <KConfigGroup>
-
+#include <QMap>
#include <QVBoxLayout>
#include <QDialogButtonBox>
#include <QPushButton>
diff --git a/src/dialogs/certificatedetailswidget.cpp b/src/dialogs/certificatedetailswidget.cpp
index f2da7b9..b919b18 100644
--- a/src/dialogs/certificatedetailswidget.cpp
+++ b/src/dialogs/certificatedetailswidget.cpp
@@ -35,7 +35,6 @@
#include <gpgme++/key.h>
#include <gpgme++/tofuinfo.h>
-#include <QStandardItemModel>
#include <QToolTip>
#include <QDateTime>
#include <QDialogButtonBox>
diff --git a/src/dialogs/expirydialog.cpp b/src/dialogs/expirydialog.cpp
index 7d0edd7..9915d77 100644
--- a/src/dialogs/expirydialog.cpp
+++ b/src/dialogs/expirydialog.cpp
@@ -38,7 +38,6 @@
#include <QDate>
-#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QVBoxLayout>
diff --git a/src/dialogs/exportcertificatesdialog.cpp b/src/dialogs/exportcertificatesdialog.cpp
index a6bce78..0ca8a05 100644
--- a/src/dialogs/exportcertificatesdialog.cpp
+++ b/src/dialogs/exportcertificatesdialog.cpp
@@ -42,7 +42,6 @@
#include <QFormLayout>
#include <QLabel>
#include <QPushButton>
-#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QVBoxLayout>
diff --git a/src/dialogs/ownertrustdialog.cpp b/src/dialogs/ownertrustdialog.cpp
index ec00f47..62ad6cb 100644
--- a/src/dialogs/ownertrustdialog.cpp
+++ b/src/dialogs/ownertrustdialog.cpp
@@ -41,7 +41,6 @@
#include <QPushButton>
-#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QVBoxLayout>
diff --git a/src/kleopatraapplication.cpp b/src/kleopatraapplication.cpp
index 0adc74a..22936e2 100644
--- a/src/kleopatraapplication.cpp
+++ b/src/kleopatraapplication.cpp
@@ -71,12 +71,10 @@
#include "kleopatra_debug.h"
#include <KMessageBox>
#include <KWindowSystem>
-#include <QUrl>
#include <QFile>
#include <QDir>
#include <QPointer>
-#include <QCommandLineOption>
#include <memory>
#include <KSharedConfig>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9d1a193..92c1d31 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -58,6 +58,8 @@
#include <KXMLGUIFactory>
#include <QApplication>
+#include <QLineEdit>
+#include <KActionMenu>
#include <KActionCollection>
#include <KLocalizedString>
#include <KStandardAction>
@@ -67,10 +69,7 @@
#include <KStandardGuiItem>
#include <KShortcutsDialog>
#include <KEditToolBar>
-#include <KAboutApplicationDialog>
#include "kleopatra_debug.h"
-#include <QLineEdit>
-#include <KActionMenu>
#include <KConfigGroup>
#include <QAbstractItemView>
@@ -81,7 +80,6 @@
#include <QVBoxLayout>
#include <QMimeData>
#include <QDesktopServices>
-#include <QDesktopWidget>
#include <QDir>
#include <QStatusBar>
#include <QLabel>
diff --git a/src/selftest/enginecheck.cpp b/src/selftest/enginecheck.cpp
index 66bb76e..cb21c05 100644
--- a/src/selftest/enginecheck.cpp
+++ b/src/selftest/enginecheck.cpp
@@ -47,7 +47,6 @@
#include "kleopatra_debug.h"
#include <QFile>
-#include <QRegExp>
#include <algorithm>
diff --git a/src/smartcard/netkeycard.h b/src/smartcard/netkeycard.h
index d5bb527..7788d2a 100644
--- a/src/smartcard/netkeycard.h
+++ b/src/smartcard/netkeycard.h
@@ -31,7 +31,6 @@
your version.
*/
-#include <QMap>
#include "card.h"
diff --git a/src/smartcard/openpgpcard.cpp b/src/smartcard/openpgpcard.cpp
index 5c4860e..f4c3c7f 100644
--- a/src/smartcard/openpgpcard.cpp
+++ b/src/smartcard/openpgpcard.cpp
@@ -45,7 +45,6 @@
#include "kleopatra_debug.h"
-#include <QStringList>
using namespace Kleo;
using namespace Kleo::SmartCard;
diff --git a/src/smartcard/readerstatus.cpp b/src/smartcard/readerstatus.cpp
index 9156ea1..d9d88aa 100644
--- a/src/smartcard/readerstatus.cpp
+++ b/src/smartcard/readerstatus.cpp
@@ -50,7 +50,6 @@
#include "netkeycard.h"
#include <QStringList>
-#include <QDir>
#include <QFileInfo>
#include <QMutex>
#include <QWaitCondition>
diff --git a/src/uiserver/importfilescommand.cpp b/src/uiserver/importfilescommand.cpp
index 85a018a..cb5c309 100644
--- a/src/uiserver/importfilescommand.cpp
+++ b/src/uiserver/importfilescommand.cpp
@@ -42,7 +42,6 @@
#include <gpg-error.h>
-#include <QStringList>
#include <string>
#include <algorithm>
diff --git a/src/utils/gui-helper.cpp b/src/utils/gui-helper.cpp
index d49b902..e78c2bf 100644
--- a/src/utils/gui-helper.cpp
+++ b/src/utils/gui-helper.cpp
@@ -31,7 +31,6 @@
#include "gui-helper.h"
#include <QWidget>
-#include <QDesktopWidget>
#ifdef Q_OS_WIN
#include <windows.h>
diff --git a/src/utils/kuniqueservice.cpp b/src/utils/kuniqueservice.cpp
index 997b3a9..d896598 100644
--- a/src/utils/kuniqueservice.cpp
+++ b/src/utils/kuniqueservice.cpp
@@ -32,7 +32,6 @@
*/
#include <config-kleopatra.h>
-#include <QtGlobal>
// Includes the real implementation
diff --git a/src/utils/validation.cpp b/src/utils/validation.cpp
index b65da50..84f2900 100644
--- a/src/utils/validation.cpp
+++ b/src/utils/validation.cpp
@@ -41,7 +41,6 @@
#include "kleopatra_debug.h"
#include <QRegExp>
-#include <QUrl>
using namespace Kleo;
diff --git a/src/view/smartcardwidget.cpp b/src/view/smartcardwidget.cpp
index adb9c69..257ac24 100644
--- a/src/view/smartcardwidget.cpp
+++ b/src/view/smartcardwidget.cpp
@@ -45,7 +45,6 @@
#include <QVBoxLayout>
#include <KLocalizedString>
-#include <KMessageBox>
using namespace Kleo;
using namespace Kleo::SmartCard;
diff --git a/tests/test.data b/tests/test.data
index b4bce1a..562184a 100644
--- a/tests/test.data
+++ b/tests/test.data
@@ -39,7 +39,6 @@
#include "../uiserver/kleo-assuan.h"
#include <gpg-error.h>
-#include <QtCore>
#include <unistd.h>
#include <sys/types.h>
diff --git a/tests/test_verify.cpp b/tests/test_verify.cpp
index 8546df3..bec1a21 100644
--- a/tests/test_verify.cpp
+++ b/tests/test_verify.cpp
@@ -37,7 +37,6 @@
#include <QGpgME/KeyListJob>
#include <QGpgME/DecryptVerifyJob>
-#include <KAboutData>
#include <gpgme++/error.h>
#include <gpgme++/verificationresult.h>