Fix includes

9 years ago · f94304e92c
parent 307a453bbb
commit f94304e92c
58 changed files with 4 additions and 90 deletions
--- a/agents/archivemailagent/addarchivemaildialog.cpp
+++ b/agents/archivemailagent/addarchivemaildialog.cpp
@ -25,7 +25,6 @@
 #include <Collection>

 #include <KLocalizedString>
-#include <QComboBox>
 #include <KUrlRequester>
 #include <QSpinBox>
 #include <KSeparator>
--- a/agents/archivemailagent/archivemailagent.cpp
+++ b/agents/archivemailagent/archivemailagent.cpp
@ -24,7 +24,6 @@
 #include "archivemailagentsettings.h"
 #include <AkonadiCore/ServerManager>

-#include <KLocalizedString>
 #include <MailCommon/MailKernel>
 #include <kdbusconnectionpool.h>
 #include <Monitor>
--- a/agents/archivemailagent/archivemaildialog.cpp
+++ b/agents/archivemailagent/archivemaildialog.cpp
@ -34,7 +34,6 @@
 #include <QDialogButtonBox>
 #include <KConfigGroup>
 #include <QPushButton>
-#include <QLocale>

 namespace {
 inline QString archiveMailCollectionPattern()
--- a/agents/archivemailagent/archivemailwidget.cpp
+++ b/agents/archivemailagent/archivemailwidget.cpp
@ -32,7 +32,6 @@
 #include <QMenu>
 #include <KRun>

-#include <QHBoxLayout>

 namespace {
 inline QString archiveMailCollectionPattern()
--- a/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
+++ b/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
@ -21,7 +21,6 @@
 #include "followupreminderagent_debug.h"
 #include <QDBusConnection>
 #include <QDBusInterface>
-#include <QDBusReply>
 #include <QDBusConnectionInterface>
 #include <ktoolinvocation.h>

--- a/agents/mailfilteragent/configuredialog.cpp
+++ b/agents/mailfilteragent/configuredialog.cpp
@ -18,7 +18,6 @@
 */
 #include "configuredialog.h"
 #include "configurewidget.h"
-#include <KLocalizedString>
 #include <QDialogButtonBox>
 #include <QVBoxLayout>
 #include <kconfiggroup.h>
--- a/agents/mailfilteragent/filterlogdialog.cpp
+++ b/agents/mailfilteragent/filterlogdialog.cpp
@ -38,7 +38,6 @@
 #include <kmessagebox.h>
 #include <QVBoxLayout>
 #include <QIcon>
-#include <QUrl>

 #include <QCheckBox>
 #include <QLabel>
--- a/agents/mailfilteragent/filtermanager.cpp
+++ b/agents/mailfilteragent/filtermanager.cpp
@ -44,7 +44,6 @@
 #include <MailCommon/MailFilter>
 #include <MailCommon/MailKernel>

-#include <QTimer>

 // other headers
 #include <algorithm>
--- a/agents/mailfilteragent/mailfilteragent.cpp
+++ b/agents/mailfilteragent/mailfilteragent.cpp
@ -48,7 +48,6 @@
 #include <AttributeFactory>
 #include <KConfigGroup>

-#include <QVector>
 #include <QTimer>
 #include <KSharedConfig>

--- a/agents/sendlateragent/sendlaterconfiguredialog.cpp
+++ b/agents/sendlateragent/sendlaterconfiguredialog.cpp
@ -27,9 +27,8 @@
 #include <KHelpMenu>
 #include <QMenu>
 #include <kaboutdata.h>
-#include <KMessageBox>
 #include <QIcon>
-
+#include <QDialogButtonBox>
 #include <QApplication>

 SendLaterConfigureDialog::SendLaterConfigureDialog(QWidget *parent)
--- a/agents/sendlateragent/sendlaterconfigurewidget.cpp
+++ b/agents/sendlateragent/sendlaterconfigurewidget.cpp
@ -24,7 +24,6 @@

 #include <KConfigGroup>
 #include <KLocalizedString>
-#include <KHelpMenu>
 #include <QMenu>
 #include <KMessageBox>
 #include <QIcon>
--- a/src/autotests/kmcommandstest.cpp
+++ b/src/autotests/kmcommandstest.cpp
@ -27,7 +27,6 @@

 #include <KMime/Message>

-#include <QDebug>
 #include <QEventLoop>
 #include <QLabel>
 #include <QStandardPaths>
--- a/src/autotests/tagselectdialogtest.cpp
+++ b/src/autotests/tagselectdialogtest.cpp
@ -19,7 +19,6 @@
 #include "tag/tagselectdialog.h"
 #include <KListWidgetSearchLine>
 #include <QListWidget>
-#include <QLineEdit>
 #include <qtest.h>
 #include <QStandardPaths>

--- a/src/collectionpage/collectionmailinglistpage.cpp
+++ b/src/collectionpage/collectionmailinglistpage.cpp
@ -35,7 +35,6 @@
 #include <QVBoxLayout>

 #include <KComboBox>
-#include <QDialog>
 #include <KLineEdit>
 #include <KEditListWidget>
 #include <KLocalizedString>
--- a/src/collectionpage/collectionquotawidget.cpp
+++ b/src/collectionpage/collectionquotawidget.cpp
@ -33,13 +33,11 @@
 #include "collectionquotawidget.h"

 #include <KLocalizedString>
-#include <QDialog>

 #include <QLabel>
 #include <qlayout.h>
 #include <qprogressbar.h>
 #include <KFormat>
-#include <KConfigGroup>

 CollectionQuotaWidget::CollectionQuotaWidget(QWidget *parent)
    : QWidget(parent)
--- a/src/collectionpage/collectionshortcutpage.cpp
+++ b/src/collectionpage/collectionshortcutpage.cpp
@ -26,11 +26,9 @@
 #include <QSpacerItem>
 #include <QVBoxLayout>

-#include <QDialog>
 #include <QHBoxLayout>
 #include <KLocalizedString>
 #include <KKeySequenceWidget>
-#include <KConfigGroup>

 using namespace MailCommon;

--- a/src/collectionpage/collectiontemplatespage.cpp
+++ b/src/collectionpage/collectiontemplatespage.cpp
@ -27,9 +27,7 @@

 #include <KLocalizedString>
 #include <QPushButton>
-#include <QDialog>
 #include <QCheckBox>
-#include <KConfigGroup>

 using namespace Akonadi;
 using namespace MailCommon;
--- a/src/collectionpage/collectionviewpage.cpp
+++ b/src/collectionpage/collectionviewpage.cpp
@ -32,7 +32,6 @@
 #include <QVBoxLayout>
 #include <KLocalizedString>
 #include <KIconButton>
-#include <KConfigGroup>
 #include <QRadioButton>
 #include "kmail_debug.h"

--- a/src/configuredialog/configurecomposerpage.cpp
+++ b/src/configuredialog/configurecomposerpage.cpp
@ -41,10 +41,8 @@ using KPIM::RecentAddresses;
 #include <KLocalizedString>
 #include <KSeparator>
 #include <KCharsets>
-#include <KUrlRequester>
 #include <QHBoxLayout>
 #include <KMessageBox>
-#include <KFile>
 #include <QSpinBox>
 #include <KPluralHandlingSpinBox>
 #include "kmail_debug.h"
--- a/src/configuredialog/configuredialog.cpp
+++ b/src/configuredialog/configuredialog.cpp
@ -29,7 +29,6 @@
 #include <KWindowSystem>
 #include <KIconLoader>
 #include <QPushButton>
-#include <KHelpClient>

 ConfigureDialog::ConfigureDialog(QWidget *parent, bool modal)
    : KCMultiDialog(parent)
--- a/src/configuredialog/configuredialog_p.cpp
+++ b/src/configuredialog/configuredialog_p.cpp
@ -15,7 +15,6 @@
 #include <QVBoxLayout>

 // Other headers:
-#include <KConfigGroup>

 ConfigModuleWithTabs::ConfigModuleWithTabs(QWidget *parent)
    : ConfigModule(parent)
--- a/src/configuredialog/configuremiscpage.cpp
+++ b/src/configuredialog/configuremiscpage.cpp
@ -27,10 +27,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;

 #include "MessageViewer/PrintingSettings"

-#include <KCModuleProxy>
-#include <KCModuleInfo>
 #include <KLocalizedString>
-#include <KConfigGroup>
 #include <QHBoxLayout>

 #include <WebEngineViewer/NetworkPluginUrlInterceptorConfigureWidget>
--- a/src/configuredialog/configurepluginpage.cpp
+++ b/src/configuredialog/configurepluginpage.cpp
@ -19,7 +19,6 @@
 #include "configureplugins/configurepluginslistwidget.h"
 #include <PimCommon/ConfigurePluginsWidget>

-#include <KLocalizedString>
 #include <QHBoxLayout>

 ConfigurePluginPage::ConfigurePluginPage(QWidget *parent)
--- a/src/configuredialog/configureplugins/configurepluginslistwidget.cpp
+++ b/src/configuredialog/configureplugins/configurepluginslistwidget.cpp
@ -28,15 +28,10 @@
 #include <PimCommon/GenericPluginManager>
 #include <AkonadiCore/ServerManager>
 #include <PimCommon/PluginUtil>
-#include <KConfigGroup>
 #include <KSharedConfig>
 #include <KLocalizedString>
 #include <MessageComposer/PluginEditorManager>

-#include <QHBoxLayout>
-#include <QLabel>
-#include <QTreeWidget>
-#include <QDebug>
 #include <QDBusInterface>
 #include <QDBusReply>
 #include <MessageComposer/PluginEditorInit>
--- a/src/dialog/archivefolderdialog.cpp
+++ b/src/dialog/archivefolderdialog.cpp
@ -37,7 +37,6 @@
 #include <QGridLayout>
 #include <QStandardPaths>
 #include <QMimeDatabase>
-#include <KConfigGroup>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QVBoxLayout>
--- a/src/dialog/archivefolderdialog.h
+++ b/src/dialog/archivefolderdialog.h
@ -20,7 +20,6 @@
 #define ARCHIVEFOLDERDIALOG_H

 #include <QDialog>
-#include <KConfigGroup>

 class QCheckBox;
 class KUrlRequester;
--- a/src/dialog/kmknotify.cpp
+++ b/src/dialog/kmknotify.cpp
@ -21,13 +21,11 @@
 #include "kmkernel.h"

 #include <QVBoxLayout>
-#include <QHBoxLayout>
 #include <KComboBox>
 #include <KNotifyConfigWidget>
 #include <KLocalizedString>
 #include <KConfig>
 #include <KSeparator>
-#include <KIconLoader>
 #include <QStandardPaths>
 #include <QDialogButtonBox>
 #include <KConfigGroup>
--- a/src/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp
+++ b/src/editor/potentialphishingemail/autotests/potentialphishingdetaildialogtest.cpp
@ -21,8 +21,6 @@
 #include "potentialphishingdetaildialogtest.h"
 #include "../potentialphishingdetaildialog.h"
 #include "../potentialphishingdetailwidget.h"
-#include <QLabel>
-#include <QListWidget>
 #include <qtest.h>
 #include <QStandardPaths>
 PotentialPhishingDetailDialogTest::PotentialPhishingDetailDialogTest(QObject *parent)
--- a/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
+++ b/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
@ -23,7 +23,6 @@
 #include <qtest.h>
 #include <QStringList>
 #include <QSignalSpy>
-#include <QDebug>

 PotentialPhishingEmailJobTest::PotentialPhishingEmailJobTest(QObject *parent)
    : QObject(parent)
--- a/src/identity/identityaddvcarddialog.cpp
+++ b/src/identity/identityaddvcarddialog.cpp
@ -27,7 +27,6 @@
 #include <QRadioButton>
 #include <QLabel>
 #include <QDialogButtonBox>
-#include <KConfigGroup>
 #include <QPushButton>

 IdentityAddVcardDialog::IdentityAddVcardDialog(const QStringList &shadowIdentities, QWidget *parent)
--- a/src/identity/identitydialog.cpp
+++ b/src/identity/identitydialog.cpp
@ -36,6 +36,8 @@
 #include "identityinvalidfolder.h"
 #include "identityfolderrequester.h"

+#include <QGpgME/Protocol>
+#include <QGpgME/Job>
 #include "MessageComposer/MessageComposerSettings"

 #include <KIdentityManagement/kidentitymanagement/identitymanager.h>
@ -70,8 +72,6 @@
 #include <Libkleo/DefaultKeyGenerationJob>
 #include <Libkleo/ProgressDialog>

-#include <QGpgME/Protocol>
-#include <QGpgME/Job>

 // gpgme++
 #include <gpgme++/keygenerationresult.h>
@ -94,7 +94,6 @@ using MailTransport::TransportManager;
 #include <QTabWidget>
 #include <QIcon>
 #include <sonnet/dictionarycombobox.h>
-#include <KHelpClient>

 // Qt headers:
 #include <QLabel>
@ -115,7 +114,6 @@ using MailTransport::TransportManager;
 #include <AkonadiCore/entitydisplayattribute.h>
 #include <AkonadiCore/collectionmodifyjob.h>
 #include <QStandardPaths>
-#include <KConfigGroup>
 #include <QDialogButtonBox>

 using namespace KPIM;
--- a/src/identity/identityeditvcarddialog.cpp
+++ b/src/identity/identityeditvcarddialog.cpp
@ -24,9 +24,7 @@
 #include <KMessageBox>
 #include <QStandardPaths>

-#include <QHBoxLayout>
 #include <QFileInfo>
-#include <KConfigGroup>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QVBoxLayout>
--- a/src/identity/identityinvalidfolder.cpp
+++ b/src/identity/identityinvalidfolder.cpp
@ -16,7 +16,6 @@
 */

 #include "identityinvalidfolder.h"
-#include <KLocalizedString>

 using namespace KMail;

--- a/src/identity/newidentitydialog.cpp
+++ b/src/identity/newidentitydialog.cpp
@ -39,8 +39,6 @@

 #include <assert.h>
 #include <QDialogButtonBox>
-#include <KConfigGroup>
-#include <KHelpClient>
 #include <QPushButton>

 using namespace KMail;
--- a/src/identity/xfaceconfigurator.cpp
+++ b/src/identity/xfaceconfigurator.cpp
@ -39,7 +39,6 @@
 #include "kpimtextedit/plaintexteditorwidget.h"
 #include <messageviewer/kxface.h>

-#include <KConfigGroup>
 #include <KJobWidgets>
 #include <kcombobox.h>
 #include <KLocalizedString>
@ -47,7 +46,6 @@
 #include <KIO/StoredTransferJob>

 #include <QCheckBox>
-#include <QDialog>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
--- a/src/job/createforwardmessagejob.cpp
+++ b/src/job/createforwardmessagejob.cpp
@ -26,7 +26,6 @@
 #include <KEmailAddress>
 #include <MailCommon/MailUtil>

-#include <QUrl>

 CreateForwardMessageJob::CreateForwardMessageJob(QObject *parent)
    : QObject(parent)
--- a/src/job/createreplymessagejob.cpp
+++ b/src/job/createreplymessagejob.cpp
@ -26,8 +26,6 @@
 #include <KMime/Message>
 #include <KEmailAddress>
 #include <MailCommon/MailUtil>
-#include <QUrl>
-#include <QDebug>

 CreateReplyMessageJob::CreateReplyMessageJob(QObject *parent)
    : QObject(parent)
--- a/src/job/opencomposerhiddenjob.cpp
+++ b/src/job/opencomposerhiddenjob.cpp
@ -24,7 +24,6 @@

 #include <KMime/Message>
 #include <MessageComposer/MessageHelper>
-#include <KStartupInfo>

 #include <TemplateParser/TemplateParserJob>

--- a/src/job/opencomposerjob.cpp
+++ b/src/job/opencomposerjob.cpp
@ -32,7 +32,6 @@
 #include <QFile>
 #include <KMessageBox>
 #include <KLocalizedString>
-#include <KStartupInfo>

 OpenComposerJob::OpenComposerJob(QObject *parent)
    : QObject(parent)
--- a/src/job/saveasfilejob.cpp
+++ b/src/job/saveasfilejob.cpp
@ -23,7 +23,6 @@
 #include <QFileDialog>
 #include <qpointer.h>
 #include <qtextdocumentwriter.h>
-#include <QUrl>
 #include <KLocalizedString>
 #include <QTextDocument>

--- a/src/kmail_part.h
+++ b/src/kmail_part.h
@ -29,7 +29,6 @@
 #include <kparts/readonlypart.h>

 #include <QWidget>
-#include <QPixmap>

 class KMMainWidget;

--- a/src/kmcommands.cpp
+++ b/src/kmcommands.cpp
@ -116,7 +116,6 @@

 #include <KBookmarkManager>

-#include <KDBusServiceStarter>
 #include <KEmailAddress>
 #include <KFileWidget>
 #include <KJobWidgets>
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@ -44,8 +44,8 @@ using KPIM::RecentAddresses;
 #include <mailtransport/transportmanager.h>
 #include <mailtransportakonadi/dispatcherinterface.h>
 #include <AkonadiCore/servermanager.h>
-#include <KSieveUi/SieveImapInstanceInterfaceManager>

+#include <KSieveUi/SieveImapInstanceInterfaceManager>
 #include "mailserviceimpl.h"
 using KMail::MailServiceImpl;
 #include "mailcommon/jobscheduler.h"
@ -100,7 +100,6 @@ using KMail::MailServiceImpl;
 #include <QWidget>
 #include <QFileInfo>
 #include <QtDBus/QtDBus>
-#include <QMimeDatabase>

 #include <MailCommon/ResourceReadConfigFile>

--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@ -184,13 +184,9 @@ using KSieveUi::SieveDebugDialog;
 #include <QVBoxLayout>
 #include <QShortcut>
 #include <QProcess>
-#include <QDBusConnection>
-#include <QTextDocument>
-#include <QDir>
 #include <WebEngineViewer/WebHitTestResult>
 // System includes
 #include <AkonadiWidgets/standardactionmanager.h>
-#include <KHelpClient>
 #include <QStandardPaths>

 #include "PimCommonAkonadi/ManageServerSideSubscriptionJob"
--- a/src/kmmainwin.cpp
+++ b/src/kmmainwin.cpp
@ -27,13 +27,11 @@
 #include "tag/tagactionmanager.h"

 #include <QTimer>
-#include <QAction>
 #include <QStatusBar>
 #include <QApplication>

 #include <KConfigGui>
 #include <QMenuBar>
-#include <KToggleAction>
 #include <KConfigGui>
 #include <KLocalizedString>
 #include <kedittoolbar.h>
--- a/src/kmreadermainwin.cpp
+++ b/src/kmreadermainwin.cpp
@ -36,8 +36,6 @@
 #include <ktoggleaction.h>
 #include <ktoolbar.h>
 #include "kmail_debug.h"
-#include <KFontAction>
-#include <KFontSizeAction>
 #include <QStatusBar>
 #include <KMessageBox>
 #include <KAcceleratorManager>
--- a/src/kmsystemtray.cpp
+++ b/src/kmsystemtray.cpp
@ -32,10 +32,7 @@
 #include <QMenu>
 #include <KLocalizedString>
 #include <QAction>
-#include <KActionMenu>
 #include "widgets/kactionmenutransport.h"
-#include <KActionCollection>
-#include <QPainter>

 #include <AkonadiCore/ChangeRecorder>
 #include <AkonadiCore/EntityTreeModel>
--- a/src/kontactplugin/kmail/kcmkmailsummary.cpp
+++ b/src/kontactplugin/kmail/kcmkmailsummary.cpp
@ -32,11 +32,9 @@
 #include <KAboutData>
 #include <KAcceleratorManager>
 #include "kmailplugin_debug.h"
-#include <QDialog>
 #include <KLocalizedString>
 #include <KSharedConfig>
 #include <KConfig>
-#include <QLineEdit>

 #include <QCheckBox>
 #include <QTreeView>
--- a/src/kontactplugin/summary/summaryview_part.cpp
+++ b/src/kontactplugin/summary/summaryview_part.cpp
@ -39,7 +39,6 @@ using KPIM::BroadcastStatus;
 #include <KActionCollection>
 #include <KCMultiDialog>
 #include <KConfigGroup>
-#include <QDialog>
 #include <QIcon>
 #include <KLocalizedString>
 #include <KParts/PartActivateEvent>
--- a/src/messageactions.cpp
+++ b/src/messageactions.cpp
@ -53,7 +53,6 @@
 #include <KRun>
 #include <QMenu>
 #include <KUriFilter>
-#include <KStringHandler>
 #include <QIcon>

 #include <QVariant>
--- a/src/plugininterface/kmailplugininterface.cpp
+++ b/src/plugininterface/kmailplugininterface.cpp
@ -18,7 +18,6 @@
 */

 #include "kmailplugininterface.h"
-#include <KActionCollection>
 #include <kmmainwidget.h>
 #include "kmail_debug.h"

--- a/src/searchdialog/kmsearchmessagemodel.cpp
+++ b/src/searchdialog/kmsearchmessagemodel.cpp
@ -41,7 +41,6 @@
 #include <QColor>
 #include <QApplication>
 #include <QPalette>
-#include <QTextDocument>
 #include "kmail_debug.h"
 #include <KLocalizedString>
 #include <KFormat>
--- a/src/searchdialog/searchwindow.cpp
+++ b/src/searchdialog/searchwindow.cpp
@ -65,7 +65,6 @@
 #include <QKeyEvent>
 #include <QMenu>
 #include <QVBoxLayout>
-#include <KConfigGroup>
 #include <QDialogButtonBox>
 #include <QPushButton>

--- a/src/secondarywindow.cpp
+++ b/src/secondarywindow.cpp
@ -32,7 +32,6 @@
 #include "secondarywindow.h"
 #include "kmkernel.h"

-#include <QApplication>
 #include <KLocalizedString>

 #include <QCloseEvent>
--- a/src/tag/tagselectdialog.cpp
+++ b/src/tag/tagselectdialog.cpp
@ -30,7 +30,6 @@
 #include <KLocalizedString>
 #include <QIcon>

-#include <QGridLayout>
 #include <QListWidget>
 #include <AkonadiCore/TagFetchJob>
 #include <AkonadiCore/TagFetchScope>
--- a/src/util.cpp
+++ b/src/util.cpp
@ -44,12 +44,8 @@

 #include <kmime/kmime_message.h>
 #include <kmessagebox.h>
-#include <KLocalizedString>
-#include <KProcess>
 #include "kmail_debug.h"

-#include <QProcess>
-#include <QFileInfo>
 #include <QAction>
 #include <QStandardPaths>

--- a/src/util.h
+++ b/src/util.h
@ -38,7 +38,6 @@
 #ifndef KMAILUTIL_H
 #define KMAILUTIL_H

-#include <QWidget>
 #include <AkonadiCore/item.h>
 #include <AkonadiCore/Collection>
 #include <MailCommon/FolderSettings>
--- a/src/widgets/statusbarlabeltoggledstate.cpp
+++ b/src/widgets/statusbarlabeltoggledstate.cpp
@ -18,7 +18,6 @@
 */

 #include "statusbarlabeltoggledstate.h"
-#include <KLocalizedString>
 #include "kmail_debug.h"

 StatusBarLabelToggledState::StatusBarLabelToggledState(QWidget *parent)