Commit b4f96462 authored by Laurent Montel's avatar Laurent Montel 😁

Use unique file here

parent ecb14437
......@@ -7,7 +7,7 @@
#include "settings.h"
#include "messageviewer/viewer/viewer.h"
#include "messageviewer/viewer/attachmentstrategy.h"
#include <messageviewer/settings/globalsettings.h>
#include <messageviewer/settings/messageviewersettings.h>
#include <KXmlGuiWindow>
#include <KConfigDialog>
......
......@@ -34,11 +34,11 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "mailcommon/mailcommonsettings_base.h"
#include "messageviewer/widgets/configurewidget.h"
#include "messageviewer/settings/globalsettings.h"
#include "messageviewer/settings/messageviewersettings.h"
#include "messagelist/core/settings.h"
#include "messagelist/messagelistutil.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include "settings/globalsettings.h"
#include "mailcommon/util/mailutil.h"
......
......@@ -24,7 +24,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "pimcommon/autocorrection/autocorrectionwidget.h"
#include "messagecomposer/imagescaling/imagescalingwidget.h"
#include "messagecomposer/settings/messagecomposersettings.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include "settings/globalsettings.h"
#include "configuredialog/configuredialoglistview.h"
#include "pimcommon/widgets/simplestringlisteditor.h"
......
......@@ -24,7 +24,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include <mailcommon/folder/folderrequester.h>
#include "messageviewer/widgets/invitationsettings.h"
#include "messageviewer/widgets/printingsettings.h"
#include "messageviewer/settings/globalsettings.h"
#include "messageviewer/settings/messageviewersettings.h"
#include <KCModuleProxy>
#include <KCModuleInfo>
......
......@@ -18,7 +18,7 @@
#include "configuresecuritypage.h"
#include "pimcommon/widgets/configureimmutablewidgetutils.h"
using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "messageviewer/settings/globalsettings.h"
#include "messageviewer/settings/messageviewersettings.h"
#include "messagecomposer/settings/messagecomposersettings.h"
#include "messageviewer/adblock/adblocksettingwidget.h"
#include "mailcommon/folder/foldercollection.h"
......
......@@ -28,7 +28,7 @@
#include <QCheckBox>
#include "widgets/kactionmenuchangecase.h"
#include <KPIMTextEdit/EMailQuoteHighlighter>
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include <Sonnet/ConfigDialog>
#include <composer-ng/richtextcomposeremailquotehighlighter.h>
......
......@@ -100,7 +100,7 @@
#include <messageviewer/viewer/objecttreeparser.h>
#include <messageviewer/viewer/nodehelper.h>
#include <messageviewer/settings/globalsettings.h>
#include <messageviewer/settings/messageviewersettings.h>
#include <messagecomposer/composer/composer.h>
#include <messagecomposer/part/globalpart.h>
#include <messagecomposer/part/infopart.h>
......@@ -111,7 +111,7 @@
#include <messagecomposer/job/inserttextfilejob.h>
#include <messagecomposer/composer/composerlineedit.h>
#include <messagecore/attachment/attachmentpart.h>
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include <templateparser.h>
#include <templatesconfiguration.h>
#include "messagecore/helpers/nodehelper.h"
......
......@@ -16,7 +16,7 @@
*/
#include "cryptostateindicatorwidget.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include <KColorScheme>
#include <KLocalizedString>
......
......@@ -95,8 +95,8 @@ using KMail::SecondaryWindow;
#include "settings/globalsettings.h"
#include "utils/stringutil.h"
#include "messageviewer/utils/autoqpointer.h"
#include "messageviewer/settings/globalsettings.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messageviewer/settings/messageviewersettings.h"
#include "messagecore/settings/messagecoresettings.h"
#include <AkonadiCore/itemmovejob.h>
#include <AkonadiCore/itemcopyjob.h>
......
......@@ -45,10 +45,10 @@ using KPIM::RecentAddresses;
using KMail::MailServiceImpl;
#include "job/jobscheduler.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include "messagelist/core/settings.h"
#include "messagelist/messagelistutil.h"
#include "messageviewer/settings/globalsettings.h"
#include "messageviewer/settings/messageviewersettings.h"
#include "messagecomposer/sender/akonadisender.h"
#include "settings/messagecomposersettings.h"
#include "messagecomposer/helper/messagehelper.h"
......
......@@ -80,7 +80,7 @@ using KSieveUi::SieveDebugDialog;
#include "kdepim-version.h"
#include "messageviewer/utils/autoqpointer.h"
#include "messageviewer/settings/globalsettings.h"
#include "messageviewer/settings/messageviewersettings.h"
#include "messageviewer/viewer/viewer.h"
#include "messageviewer/viewer/attachmentstrategy.h"
#include "messageviewer/header/headerstrategy.h"
......@@ -94,7 +94,7 @@ using KSieveUi::SieveDebugDialog;
#include "templateparser.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include "messagecore/misc/mailinglist.h"
#include "messagecore/helpers/messagehelpers.h"
......
......@@ -42,7 +42,7 @@
#include "messageviewer/header/headerstyle.h"
#include "messageviewer/viewer/mailwebview.h"
#include "messageviewer/utils/markmessagereadhandler.h"
#include "messageviewer/settings/globalsettings.h"
#include "messageviewer/settings/messageviewersettings.h"
#include "messageviewer/viewer/csshelper.h"
using MessageViewer::CSSHelper;
#include "util.h"
......@@ -53,7 +53,7 @@ using MessageViewer::CSSHelper;
#include "messageviewer/viewer/viewer.h"
using namespace MessageViewer;
#include <messagecore/settings/globalsettings_messagecore_impl.h>
#include <messagecore/settings/messagecoresettings.h>
#include "messageviewer/viewer/attachmentstrategy.h"
#include "messagecomposer/sender/messagesender.h"
......
......@@ -29,11 +29,11 @@
#include "pimcommon/widgets/annotationdialog.h"
#include "pimcommon/webshortcut/webshortcutmenumanager.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include "messagecore/misc/mailinglist.h"
#include "messagecore/helpers/messagehelpers.h"
#include "messageviewer/viewer/csshelper.h"
#include "messageviewer/settings/globalsettings.h"
#include "messageviewer/settings/messageviewersettings.h"
#include <AkonadiCore/itemfetchjob.h>
#include <Akonadi/KMime/MessageParts>
......
......@@ -51,7 +51,7 @@
#include <calendarsupport/kcalprefs.h>
#include <calendarsupport/utils.h>
#include <incidenceeditor-ng/globalsettings.h>
#include <incidenceeditor-ng/incidenceeditorsettings.h>
#include <AkonadiCore/EntityDisplayAttribute>
#include <AkonadiWidgets/EntityTreeView>
......
......@@ -51,7 +51,7 @@
#include "kocheckableproxymodel.h"
#include "akonadicollectionview.h"
#include "korganizer_debug.h"
#include <incidenceeditor-ng/globalsettings.h>
#include <incidenceeditor-ng/incidenceeditorsettings.h>
#include <KHolidays/HolidayRegion>
#include <calendarsupport/collectiongeneralpage.h>
......
......@@ -34,7 +34,7 @@
#include <calendarsupport/kcalprefs.h>
#include <calendarsupport/categoryconfig.h>
#include <incidenceeditor-ng/globalsettings.h>
#include <incidenceeditor-ng/incidenceeditorsettings.h>
#include <widgets/tagselectioncombo.h>
#include <widgets/tagwidgets.h>
......
......@@ -28,7 +28,7 @@
#include <messagecomposer/helper/messagefactory.h>
#include <messagecomposer/sender/messagesender.h>
#include <messagecore/helpers/messagehelpers.h>
#include <messageviewer/settings/globalsettings.h>
#include <messageviewer/settings/messageviewersettings.h>
#include <KLocalizedString>
......
......@@ -26,7 +26,7 @@
#include <messagecomposer/helper/messagefactory.h>
using MessageComposer::MessageFactory;
#include <messageviewer/settings/globalsettings.h>
#include <messageviewer/settings/messageviewersettings.h>
#ifndef QT_NO_CURSOR
#include <mailcommon/util/kcursorsaver.h>
#endif
......
......@@ -30,9 +30,9 @@
#include <AkonadiCore/statisticsproxymodel.h>
#include <messageviewer/settings/globalsettings.h>
#include <messageviewer/settings/messageviewersettings.h>
#include <messagecore/settings/globalsettings_messagecore_impl.h>
#include <messagecore/settings/messagecoresettings.h>
#include <AttributeFactory>
#include <ChangeRecorder>
......
......@@ -22,7 +22,7 @@
#include "kernel/mailkernel.h"
#include "util/mailutil.h"
#include <messagecore/settings/globalsettings_messagecore_impl.h>
#include <messagecore/settings/messagecoresettings.h>
#include <AgentInstance>
#include <AgentManager>
......
......@@ -28,7 +28,7 @@
#include <messagecomposer/helper/messagefactory.h>
#include <messagecomposer/sender/messagesender.h>
#include <messagecore/helpers/messagehelpers.h>
#include <messageviewer/settings/globalsettings.h>
#include <messageviewer/settings/messageviewersettings.h>
#include <Collection>
#include <Item>
......
......@@ -20,7 +20,7 @@
#include "kernel/mailkernel.h"
#include "mailcommonsettings_base.h"
#include <messagecore/settings/globalsettings_messagecore_impl.h>
#include <messagecore/settings/messagecoresettings.h>
#include <KLocalizedString>
#include <KXMLGUIClient>
......
......@@ -40,7 +40,7 @@ set(messagecore_LIB_SRCS
${messagecore_attachment_LIB_SRCS}
${messagecore_misc_LIB_SRCS}
${messagecore_helper_LIB_SRCS}
settings/globalsettings_messagecore_impl.cpp
settings/messagecoresettings.cpp
utils/stringutil.cpp
)
......
......@@ -18,7 +18,7 @@
#include "attachmentfromfolderjob.h"
#include "attachmentfromurljob.h"
#include "attachmentfromurlutils.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include "messagecore_debug.h"
#include <QMimeDatabase>
......
......@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
#include "globalsettings_messagecore_impl.h"
#include "messagecoresettings.h"
using namespace MessageCore;
......
......@@ -19,7 +19,7 @@
#include "stringutil.h"
#include "config-enterprise.h"
#include "settings/globalsettings_messagecore_impl.h"
#include "settings/messagecoresettings.h"
#include <kmime/kmime_header_parsing.h>
#include <kmime/kmime_headers.h>
......
......@@ -34,7 +34,7 @@
#include "utils/configurethemesdialog.h"
#include "utils/configurethemesdialog_p.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include "messagelistutil.h"
......
......@@ -19,7 +19,7 @@
#include "storagemodel.h"
#include <messagecore/utils/stringutil.h>
#include <messagecore/settings/globalsettings_messagecore_impl.h>
#include <messagecore/settings/messagecoresettings.h>
#include <messagecore/helpers/nodehelper.h>
#include <attributefactory.h>
......
......@@ -203,7 +203,7 @@ set(libmessageviewer_SRCS
${libmessageviewer_htmlwriter_SRCS}
${libmessageviewer_antispam_SRCS}
${libmessageviewer_job_SRCS}
settings/globalsettings.cpp
settings/messageviewersettings.cpp
${_mailwebview_cpp}
${libmessageviewer_gravatar_SRCS}
)
......
......@@ -17,7 +17,7 @@
#include "adblockblockableitemswidget.h"
#include "adblockcreatefilterdialog.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "adblock/adblockmanager.h"
#include "pimcommon/widgets/customtreeview.h"
#include "messageviewer_debug.h"
......
......@@ -27,7 +27,7 @@
// Self Includes
#include "adblockmanager.h"
#include "messageviewer_debug.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "adblock/adblockutil.h"
#include "webpage.h"
......
......@@ -28,7 +28,7 @@
// Self Includes
#include "adblocksettingwidget.h"
#include "messageviewer_debug.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "adblockaddsubscriptiondialog.h"
#include "adblockmanager.h"
#include "adblockshowlistdialog.h"
......
......@@ -20,7 +20,7 @@
#include "networkaccessmanager.h"
#include "messageviewer_debug.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "adblockmanager.h"
#include <KLocalizedString>
......
......@@ -17,7 +17,7 @@
#include "gravatarconfiguresettingsdialog.h"
#include "pimcommon/gravatar/gravatarcache.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "pimcommon/widgets/configureimmutablewidgetutils.h"
#include <KLocalizedString>
......
......@@ -23,7 +23,7 @@
#include <QCheckBox>
#include <QPushButton>
#include <QPointer>
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "pimcommon/widgets/configureimmutablewidgetutils.h"
using namespace MessageViewer;
......
......@@ -20,7 +20,7 @@
#include "messageviewer_debug.h"
#include "pimcommon/gravatar/gravatarresolvurljob.h"
#include "pimcommon/util/networkutil.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include <Akonadi/Contact/ContactSearchJob>
#include <kio/transferjob.h>
......
......@@ -17,7 +17,7 @@
#include "customheadersettingwidget.h"
#include "pimcommon/widgets/simplestringlisteditor.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include <KConfig>
#include <KConfigGroup>
......
......@@ -19,7 +19,7 @@
#include "header/headerstyle_util.h"
#include "header/headerstrategy.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "viewer/nodehelper.h"
#include <messagecore/utils/stringutil.h>
......
......@@ -22,7 +22,7 @@
#include "header/headerstrategy.h"
#include <KTextToHTML>
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "viewer/nodehelper.h"
#include <messagecore/utils/stringutil.h>
......
......@@ -18,7 +18,7 @@
#include "grantleeheaderformatter.h"
#include "grantleeheaderstyle.h"
#include "headerstyle_util.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "config-messageviewer.h"
#include <messagecore/utils/stringutil.h>
......
......@@ -32,7 +32,7 @@
*/
#include "headerstrategy_p.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
namespace MessageViewer
{
......
......@@ -42,7 +42,7 @@
#include <KLocalizedString>
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
using namespace MessageCore;
......
......@@ -21,8 +21,8 @@
#include "messageviewer_debug.h"
#include <messagecore/utils/stringutil.h>
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "settings/globalsettings.h"
#include "messagecore/settings/messagecoresettings.h"
#include "settings/messageviewersettings.h"
#include <KLocalizedString>
......
......@@ -18,7 +18,7 @@
#include "attachmentencryptwithchiasmusjob.h"
#include "viewer/chiasmuskeyselector.h"
#include "utils/util.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "utils/autoqpointer.h"
#include <gpgme++/error.h>
......
......@@ -18,7 +18,7 @@
#include "scamdetection.h"
#include "scamdetectiondetailsdialog.h"
#include "scamcheckshorturl.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include <KLocalizedString>
......
......@@ -17,7 +17,7 @@
#include "scamdetectiondetailsdialog.h"
#include "messageviewer_debug.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "utils/autoqpointer.h"
#include "pimcommon/texteditor/richtexteditor/richtexteditorwidget.h"
......
......@@ -16,7 +16,7 @@
*/
#include "scamdetectionwarningwidget.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include <KLocalizedString>
#include <QAction>
......
......@@ -21,7 +21,7 @@
without including the source code for Qt in the source distribution.
*/
#include "globalsettings.h"
#include "messageviewersettings.h"
#include <QTimer>
using namespace MessageViewer;
......
......@@ -21,7 +21,7 @@
#include "markmessagereadhandler.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include <AkonadiCore/itemmodifyjob.h>
#include <Akonadi/KMime/MessageFlags>
......
......@@ -41,7 +41,7 @@
#include "utils/iconnamecache.h"
#include "viewer/nodehelper.h"
#include "messageviewer_debug.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include "messagecore/helpers/nodehelper.h"
#include "messagecore/utils/stringutil.h"
......
......@@ -30,9 +30,9 @@
*/
#include "csshelper.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include <kconfig.h>
#include <kconfiggroup.h>
......
......@@ -29,7 +29,7 @@
your version.
*/
#include <messagecore/settings/globalsettings_messagecore_impl.h>
#include <messagecore/settings/messagecoresettings.h>
#include "csshelperbase.h"
#include <KColorScheme>
......
......@@ -19,7 +19,7 @@
*/
#include "htmlquotecolorer.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#ifndef KDEPIM_NO_WEBKIT
#include <QWebPage>
......
......@@ -20,7 +20,7 @@
#ifndef MESSAGEVIEWER_MAILWEBVIEW_H
#define MESSAGEVIEWER_MAILWEBVIEW_H
#include "messageviewer/settings/globalsettings.h"
#include "messageviewer/settings/messageviewersettings.h"
#ifdef KDEPIM_NO_WEBKIT
# include <QTextBrowser>
......
......@@ -17,7 +17,7 @@
#include "mimeparttreeview.h"
#include "mimetreemodel.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include <KMime/Content>
......
......@@ -20,7 +20,7 @@
#include "nodehelper.h"
#include "messageviewer_debug.h"
#include "utils/iconnamecache.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "partmetadata.h"
#include "interfaces/bodypart.h"
#include "utils/util.h"
......@@ -28,7 +28,7 @@
#include <messagecore/helpers/nodehelper.h>
#include <messagecore/utils/stringutil.h>
#include "messagecore/settings/globalsettings_messagecore_impl.h"
#include "messagecore/settings/messagecoresettings.h"
#include <kmime/kmime_content.h>
#include <kmime/kmime_message.h>
......
......@@ -51,7 +51,7 @@
#include "viewer/bodypartformatterfactory.h"
#include "viewer/partnodebodypart.h"
#include "interfaces/bodypartformatter.h"
#include "settings/globalsettings.h"
#include "settings/messageviewersettings.h"
#include "utils/util.h"
#include "job/kleojobexecutor.h"
#include "viewer/nodehelper.h"
......
......@@ -28,7 +28,7 @@
#include "viewer_p.h"
#include "widgets/configurewidget.h"