Clean up includes

messageviewer/autotests/rendertest.cpp

@@ -28,7 +28,6 @@
 #include <KMime/Message>
 
 #include <QDir>
-#include <QObject>
 #include <QProcess>
 #include <QTest>
 

messageviewer/autotests/viewertest.cpp

@@ -20,8 +20,6 @@
 #include "messageviewer/viewer.h"
 #include <qtestmouse.h>
 #include <KActionCollection>
-#include <KToggleAction>
-#include <QUrl>
 
 ViewerTest::ViewerTest()
 {

messageviewer/src/adblock/adblockblockableitemsdialog.cpp

@@ -20,10 +20,8 @@
 
 #include <KLocalizedString>
 #include <KTreeWidgetSearchLine>
-#include <QMenu>
 
 #include <QVBoxLayout>
-#include <QTreeWidget>
 #include <QWebFrame>
 #include <KSharedConfig>
 #include <QDialogButtonBox>

messageviewer/src/adblock/adblockblockableitemswidget.cpp

@@ -38,7 +38,6 @@
 #include <QClipboard>
 #include <QApplication>
 #include <QFile>
-#include <QPainter>
 
 using namespace MessageViewer;
 

messageviewer/src/adblock/adblockmanager.cpp

@@ -42,9 +42,7 @@
 #include <KLocalizedString>
 // Qt Includes
 #include <QUrl>
-#include <QTimer>
 #include <QWebElement>
-#include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QtConcurrent/QtConcurrentRun>
 #include <QFile>

messageviewer/src/adblock/adblockmanager.h

@@ -126,7 +126,6 @@
 // Qt Includes
 #include <QObject>
 #include <QStringList>
-#include <QByteArray>
 
 // Forward Includes
 class QNetworkRequest;

messageviewer/src/adblock/adblockrulefallbackimpl.cpp

@@ -30,8 +30,8 @@
 
 // Qt Includes
 #include <QWebFrame>
-#include <QNetworkReply>
 #include <QStringList>
+#include <QNetworkRequest>
 
 using namespace MessageViewer;
 static inline bool isRegExpFilter(const QString &filter)

messageviewer/src/adblock/common/adblockaddsubscriptiondialog.cpp

@@ -25,7 +25,6 @@
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QDialogButtonBox>
-#include <KConfigGroup>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QToolButton>

messageviewer/src/adblock/common/adblockcreatefilterdialog.h

@@ -21,7 +21,6 @@
 #include "adblock/adblockblockableitemswidget.h"
 
 #include <QDialog>
-#include <KConfigGroup>
 namespace Ui
 {
 class AdBlockCreateFilterWidget;

messageviewer/src/adblock/common/adblockshowlistdialog.cpp

@@ -28,7 +28,6 @@
 #include <KSharedConfig>
 #include <QUrl>
 
-#include <QHBoxLayout>
 
 #include <QDialogButtonBox>
 #include <KConfigGroup>

messageviewer/src/adblock/common/adblocksyntaxhighlighter.h

@@ -19,7 +19,6 @@
 #define ADBLOCKSYNTAXHIGHLIGHTER_H
 
 #include <KPIMTextEdit/SyntaxHighlighterBase>
-#include <QList>
 
 namespace MessageViewer
 {

messageviewer/src/adblock/tests/adblockblockableitemdialog_gui.cpp

@@ -22,7 +22,6 @@
 #include <KLocalizedString>
 #include <QUrl>
 
-#include <QPointer>
 #include <QVBoxLayout>
 #include <QWebView>
 #include <QWebPage>

messageviewer/src/adblock/tests/adblocksettingsdialog_gui.cpp

@@ -21,7 +21,6 @@
 #include <KLocalizedString>
 #include <QCommandLineParser>
 #include <QDialogButtonBox>
-#include <KConfigGroup>
 #include <QStandardPaths>
 #include "adblock/common/adblocksettingwidget.h"
 

messageviewer/src/antispam/antispamconfig.cpp

@@ -36,7 +36,6 @@
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
-#include <QCoreApplication>
 
 namespace MessageViewer
 {

messageviewer/src/findbar/findbarbase.cpp

@@ -25,10 +25,10 @@
 #include <klineedit.h>
 #include <KColorScheme>
 
+#include <QHBoxLayout>
 #include <QPushButton>
 #include <QTimer>
 #include <QLabel>
-#include <QLayout>
 #include <QMenu>
 #include <QToolButton>
 #include <QEvent>

messageviewer/src/findbar/findbarsourceview.cpp

@@ -18,7 +18,6 @@
 #include "findbarsourceview.h"
 #include "PimCommon/LineEditWithCompleter"
 
-#include <KLocalizedString>
 #include <QPlainTextEdit>
 #include <QAction>
 

messageviewer/src/findbar/findbarwebengineview.cpp

@@ -19,9 +19,8 @@
 #include "findbarwebengineview.h"
 #include "PimCommon/LineEditWithCompleter"
 #include <QWebEngineView>
+#include <QAction>
 
-#include <KLocalizedString>
-#include <QMenu>
 using namespace MessageViewer;
 
 class MessageViewer::FindBarWebEngineViewPrivate

messageviewer/src/header/headerstyle.cpp

@@ -34,7 +34,6 @@
 #include "headerstyle.h"
 #include "messageviewer_debug.h"
 
-#include <KLocalizedString>
 
 using namespace MessageViewer;
 // #####################

messageviewer/src/header/headerstylemenumanager.cpp

@@ -27,7 +27,6 @@
 #include <KActionMenu>
 #include <KActionCollection>
 #include <KLocalizedString>
-#include <KToggleAction>
 
 
 using namespace MessageViewer;

messageviewer/src/header/kxface.cpp

@@ -29,7 +29,6 @@
 #include <QImage>
 #include <QRegExp>
 #include <QString>
-#include <QPainter>
 
 #include <stdlib.h>
 #include <string.h>

messageviewer/src/htmlwriter/filehtmlwriter.cpp

@@ -33,7 +33,6 @@
 
 #include "messageviewer_debug.h"
 
-#include <QTextStream>
 
 namespace MessageViewer
 {

messageviewer/src/htmlwriter/webkitparthtmlwriter.cpp

@@ -39,9 +39,8 @@
 #include <cassert>
 #include <QByteArray>
 #include <QWebView>
-#include <QWebPage>
-#include <QWebFrame>
 #include <QWebElement>
+#include <QWebFrame>
 
 using namespace MessageViewer;
 

messageviewer/src/job/kleojobexecutor.cpp

@@ -23,7 +23,6 @@
 #include <Libkleo/VerifyDetachedJob>
 #include <Libkleo/VerifyOpaqueJob>
 
-#include <QBuffer>
 #include <QEventLoop>
 
 #include <cassert>

messageviewer/src/scamdetection/scamcheckshorturl.cpp

@@ -20,10 +20,8 @@
 #include "scamexpandurljob.h"
 #include "messageviewer_debug.h"
 
-#include <KLocalizedString>
 
 #include <QFile>
-#include <QVariantMap>
 
 #include <QStandardPaths>
 #include <QJsonDocument>

messageviewer/src/scamdetection/scamdetection.cpp

@@ -25,6 +25,7 @@
 #include <QRegularExpression>
 #include <QWebElement>
 #include <QWebFrame>
+#include <QPointer>
 
 using namespace MessageViewer;
 static QString addWarningColor(const QString &url)

messageviewer/src/scamdetection/scamdetection.h

@@ -20,7 +20,6 @@
 
 #include "messageviewer_export.h"
 #include <QObject>
-#include <QPointer>
 
 class QWebElement;
 class QWebFrame;

messageviewer/src/scamdetection/tests/scamdetection_gui.cpp

@@ -23,10 +23,8 @@
 
 #include <QUrl>
 #include <QStandardPaths>
-#include <QPointer>
 #include <QVBoxLayout>
 #include <QWebView>
-#include <QWebPage>
 #include <QPushButton>
 #include <QFileDialog>
 #include <QApplication>

messageviewer/src/utils/messageviewerutil.cpp

@@ -65,12 +65,9 @@
 #include <QIcon>
 #include <QTemporaryFile>
 #include <QFileDialog>
-#include <QTextCodec>
 #include <QWidget>
-#include <QDBusInterface>
 #include <QDBusConnectionInterface>
 #include <QActionGroup>
-#include <QPointer>
 
 using namespace MessageViewer;
 

messageviewer/src/utils/messageviewerutil.h

@@ -41,7 +41,6 @@
 #include "messageviewer_export.h"
 #include "mimetype.h"
 #include "kmime/kmime_content.h"
-#include <QString>
 #include <KService>
 #include <AkonadiCore/Item>
 class QUrl;

messageviewer/src/viewer/bodypartformatterbasefactory.cpp

@@ -37,7 +37,6 @@
 
 // Qt
 #include <QString>
-#include <QStringList>
 
 #include <assert.h>
 

messageviewer/src/viewer/csshelperbase.cpp

@@ -34,7 +34,6 @@
 #include <QApplication>
 #include <QPaintDevice>
 #include <QPalette>
-#include <QFontDatabase>
 
 namespace MessageViewer
 {

messageviewer/src/viewer/memento/decryptverifybodypartmemento.h

@@ -23,8 +23,6 @@
 #include <gpgme++/verificationresult.h>
 #include <gpgme++/decryptionresult.h>
 
-#include <QObject>
-#include <QString>
 #include <QPointer>
 
 #include "interfaces/bodypart.h"

messageviewer/src/viewer/memento/verifydetachedbodypartmemento.h

@@ -22,7 +22,6 @@
 #include <gpgme++/verificationresult.h>
 #include <gpgme++/key.h>
 
-#include <QObject>
 #include <QString>
 #include <QPointer>
 

messageviewer/src/viewer/memento/verifyopaquebodypartmemento.h

@@ -23,7 +23,6 @@
 #include <gpgme++/decryptionresult.h>
 #include <gpgme++/key.h>
 
-#include <QObject>
 #include <QString>
 #include <QPointer>
 

messageviewer/src/viewer/objecttreeparser.cpp

@@ -80,24 +80,14 @@
 // KDE includes
 
 #include <KLocalizedString>
-#include <QTemporaryFile>
 
-#include <KCodecs>
 
-#include <KEmailAddress>
 #include <KTextToHTML>
 
 // Qt includes
-#include <QApplication>
-#include <QTextDocument>
-#include <QDir>
 #include <QFile>
 #include <QTextCodec>
 #include <QByteArray>
-#include <QBuffer>
-#include <QPixmap>
-#include <QPainter>
-#include <QPointer>
 
 // other includes
 #include <sstream>

messageviewer/src/viewer/objecttreeparser.h

@@ -42,7 +42,6 @@
 #include <Libkleo/CryptoBackend>
 #include <gpgme++/verificationresult.h>
 
-#include <QList>
 #include "objecttreeemptysource.h"
 
 class QString;

messageviewer/src/viewer/pluginloaderbase.cpp

@@ -28,7 +28,6 @@
 #include <KPluginLoader>
 
 #include <QDir>
-#include <QFile>
 #include <QStringList>
 
 PluginLoaderBase::PluginLoaderBase() : d(0) {}

messageviewer/src/viewer/viewer.cpp

@@ -44,9 +44,6 @@
 
 #include <KLocalizedString>
 
-#include <QWebView>
-#include <QWebPage>
-#include <QWebFrame>
 #include <QAction>
 
 namespace MessageViewer

messageviewer/src/viewer/viewer_p.cpp

@@ -40,6 +40,7 @@
 #include "job/attachmenteditjob.h"
 #include "job/modifymessagedisplayformatjob.h"
 #include "viewerplugins/viewerplugintoolmanager.h"
+#include <KContacts/VCardConverter>
 #ifdef MESSAGEVIEWER_READER_HTML_DEBUG
 #include "htmlwriter/filehtmlwriter.h"
 #include "htmlwriter/teehtmlwriter.h"
@@ -53,9 +54,7 @@
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KCharsets>
-#include <KGuiItem>
 #include <QWebView>
-#include <QWebPage>
 #include <QWebFrame>
 #include <QMenu>
 #include <KMessageBox>
@@ -69,11 +68,8 @@
 #include <KToggleAction>
 #include <QIcon>
 #include <kfileitemactions.h>
-#include <KFileItemListProperties>
 #include <KLocalizedString>
 #include <QMimeData>
-#include <KContacts/Addressee>
-#include <KContacts/VCardConverter>
 #include <KEmailAddress>
 #include <AkonadiCore/ItemModifyJob>
 #include <AkonadiCore/ItemCreateJob>
@@ -93,7 +89,6 @@
 #include <QTreeView>
 #include <QPrinter>
 #include <QPrintDialog>
-#include <QHeaderView>
 #include <QMimeDatabase>
 #include <QWheelEvent>
 

messageviewer/src/viewer/viewer_p.h

@@ -36,7 +36,6 @@
 
 #include <QObject>
 #include <QTimer>
-#include <QWebElement>
 
 namespace KIO
 {

messageviewer/src/viewer/webview/mailwebview.cpp

@@ -28,14 +28,11 @@
 #include "webviewaccesskey.h"
 
 #include <KActionCollection>
-#include <QAction>
-
+#include <QPointer>
 #include <QCoreApplication>
 #include <QContextMenuEvent>
 #include <QWebFrame>
 #include <QWebElement>
-#include <QLabel>
-#include <QToolTip>
 
 #include <limits>
 #include <cassert>

messageviewer/src/viewerplugins/viewerplugininterface.cpp

@@ -16,8 +16,7 @@
 */
 
 #include "viewerplugininterface.h"
-
-#include <KToggleAction>
+#include <QAction>
 using namespace MessageViewer;
 
 class MessageViewer::ViewerPluginInterfacePrivate

messageviewer/src/webengine/urlinterceptor/networkurlinterceptormanager.cpp

@@ -18,7 +18,6 @@
 #include "networkurlinterceptormanager.h"
 #include "networkurlinterceptorpluginmanager.h"
 
-#include <QWebEngineProfile>
 
 using namespace MessageViewer;
 

messageviewer/src/webengine/webhittestresult.h

@@ -36,7 +36,6 @@
 #define WebHitTestResult_H
 
 #include "messageviewer_export.h"
-#include <QObject>
 #include <QUrl>
 #include <QRect>
 #include <QString>

messageviewer/src/widgets/attachmentdialog.cpp

@@ -27,7 +27,6 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <KGuiItem>
-#include <QVBoxLayout>
 using namespace MessageViewer;
 
 //---------------------------------------------------------------------

messageviewer/src/widgets/configurewidget.cpp

@@ -26,7 +26,6 @@
 
 #include "MessageCore/MessageCoreSettings"
 
-#include <KConfigDialogManager>
 #include <KLocalizedString>
 
 using namespace MessageViewer;

messageviewer/src/widgets/mailsourceviewer.cpp

@@ -41,9 +41,6 @@
 #include <KLocalizedString>
 #include <kwindowsystem.h>
 #include <QTabWidget>
-#include <KMessageBox>
-#include <QAction>
-#include <QIcon>
 #include <KIconTheme>
 
 #include <QRegExp>

messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp

@@ -42,22 +42,17 @@
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <kwindowsystem.h>
-#include <QTabWidget>
-#include <KMessageBox>
 #include <QAction>
 #include <QIcon>
 #include <KIconTheme>
 
 #include <QRegExp>
-#include <QApplication>
 #include <QShortcut>
 #include <QVBoxLayout>
 #include <QContextMenuEvent>
 
 #include <QMenu>
 #include <QFontDatabase>
-#include <KConfigGroup>
-#include <QDialogButtonBox>
 #include <QPushButton>
 
 using namespace MessageViewer;

messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h

@@ -34,8 +34,6 @@
 
 #include <QSyntaxHighlighter>
 #include <QPlainTextEdit>
-#include <QDialog>
-#include <KConfigGroup>
 namespace KPIMTextEdit
 {
 class SlideContainer;

messageviewer/src/widgets/mailsourcewebengineviewer.cpp

@@ -27,19 +27,14 @@ using namespace MessageViewer;
 #include "PimCommon/PimUtil"
 #include <kiconloader.h>
 #include <KLocalizedString>
-#include <KStandardAction>
 #include <kwindowsystem.h>
 #include <QTabWidget>
-#include <KMessageBox>
-#include <QAction>
-#include <QIcon>
 #include <QApplication>
 
 #include <QRegExp>
 #include <QShortcut>
 #include <QVBoxLayout>
 
-#include <QMenu>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QWebEnginePage>