Fix includes

akregator/src/mainwindow.cpp

@@ -28,8 +28,8 @@
 #include "trayicon.h"
 
 #include "Libkdepim/BroadcastStatus"
-#include "Libkdepim/ProgressStatusBarWidget"
-#include "Libkdepim/StatusbarProgressWidget"
+#include <Libkdepim/ProgressStatusBarWidget>
+#include <Libkdepim/StatusbarProgressWidget>
 
 #include <KActionCollection>
 #include <KConfig>

blogilo/src/mainwindow.cpp

@@ -42,8 +42,8 @@
 #include "ui_editorsettingsbase.h"
 
 #include "Libkdepim/ProgressDialog"
-#include "Libkdepim/StatusbarProgressWidget"
-#include "Libkdepim/ProgressStatusBarWidget"
+#include <Libkdepim/StatusbarProgressWidget>
+#include <Libkdepim/ProgressStatusBarWidget>
 
 #include <qtabwidget.h>
 #include <KStatusNotifierItem>

kmail/agents/sendlateragent/sendlaterjob.cpp

@@ -19,9 +19,9 @@
 #include "sendlaterinfo.h"
 
 #include "MessageComposer/AkonadiSender"
-#include "MessageComposer/Util"
+#include <MessageComposer/Util>
 #include "messagecore/messagehelpers.h"
-#include "MessageCore/StringUtil"
+#include <MessageCore/StringUtil>
 
 #include <MailTransport/mailtransport/transportattribute.h>
 #include <MailTransport/mailtransport/sentbehaviourattribute.h>

kmail/agents/sendlateragent/sendlatermanager.cpp

@@ -21,7 +21,7 @@
 #include "sendlaterjob.h"
 
 #include "MessageComposer/AkonadiSender"
-#include "MessageComposer/Util"
+#include <MessageComposer/Util>
 
 #include <KSharedConfig>
 #include <KConfigGroup>

kmail/src/editor/kmcomposerwin.cpp

@@ -35,8 +35,8 @@
 #include "KPIMTextEdit/RichTextComposerControler"
 #include "MessageComposer/RichTextComposerSignatures"
 #include <KPIMTextEdit/RichTextComposerActions>
-#include "KPIMTextEdit/RichTextComposerImages"
-#include "KPIMTextEdit/RichTextExternalComposer"
+#include <KPIMTextEdit/RichTextComposerImages>
+#include <KPIMTextEdit/RichTextExternalComposer>
 #include <KPIMTextEdit/RichTextEditorWidget>
 #include "kmkernel.h"
 #include "settings/kmailsettings.h"
@@ -45,7 +45,7 @@
 #include "mailcomposeradaptor.h" // TODO port all D-Bus stuff...
 #include "messageviewer/stl_util.h"
 #include "messagecomposer/util.h"
-#include "MessageCore/StringUtil"
+#include <MessageCore/StringUtil>
 #include "util.h"
 #include "editor/widgets/snippetwidget.h"
 #include "templatesconfiguration_kfg.h"
@@ -69,17 +69,15 @@
 #include "widgets/kactionmenutransport.h"
 #include "pimcommon/kactionmenuchangecase.h"
 
-#include "Libkdepim/StatusbarProgressWidget"
-#include "Libkdepim/ProgressStatusBarWidget"
+#include <Libkdepim/StatusbarProgressWidget>
+#include <Libkdepim/ProgressStatusBarWidget>
 
 #include "KPIMTextEdit/EditorUtil"
-#include "PimCommon/StorageServiceManager"
-#include "PimCommon/StorageServiceProgressManager"
 #include "plugineditorinterface.h"
 #include "editor/plugininterface/kmailplugineditormanagerinterface.h"
 #include "editor/plugininterface/kmailplugineditorcheckbeforesendmanagerinterface.h"
 #include <MessageComposer/PluginEditorCheckBeforeSendParams>
-#include "MessageComposer/Util"
+#include <MessageComposer/Util>
 
 #include <kcontacts/vcardconverter.h>
 #include "SendLater/SendLaterUtil"
@@ -1354,7 +1352,7 @@ void KMComposerWin::changeCryptoAction()
 
 void KMComposerWin::setupStatusBar(QWidget *w)
 {
-    KPIM::ProgressStatusBarWidget *progressStatusBarWidget = new KPIM::ProgressStatusBarWidget(statusBar(), this, PimCommon::StorageServiceProgressManager::progressTypeValue());
+    //KPIM::ProgressStatusBarWidget *progressStatusBarWidget = new KPIM::ProgressStatusBarWidget(statusBar(), this, PimCommon::StorageServiceProgressManager::progressTypeValue());
     statusBar()->addWidget(w);
     QLabel *lab = new QLabel(this);
     lab->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
@@ -1381,7 +1379,7 @@ void KMComposerWin::setupStatusBar(QWidget *w)
     statusBar()->addPermanentWidget(mStatusBarLabelSpellCheckingChangeMode, 0);
     connect(mStatusBarLabelSpellCheckingChangeMode, &StatusBarLabelToggledState::toggleModeChanged, this, &KMComposerWin::slotAutoSpellCheckingToggled);
 
-    statusBar()->addPermanentWidget(progressStatusBarWidget->littleProgress());
+    //statusBar()->addPermanentWidget(progressStatusBarWidget->littleProgress());
 
 }
 

kmail/src/identity/identitydialog.cpp

@@ -53,7 +53,7 @@
 
 #include "job/addressvalidationjob.h"
 #include "MessageComposer/Kleo_Util"
-#include "MessageCore/StringUtil"
+#include <MessageCore/StringUtil>
 #include "TemplateParser/TemplatesConfiguration"
 #include "templatesconfiguration_kfg.h"
 // other kdepim headers:

kmail/src/kmkernel.cpp

@@ -17,7 +17,7 @@ using KPIM::RecentAddresses;
 #include "configuredialog/configuredialog.h"
 #include "kmcommands.h"
 #include "kmsystemtray.h"
-#include "MessageCore/StringUtil"
+#include <MessageCore/StringUtil>
 #include "mailcommon/mailutil.h"
 #include "pop3settings.h"
 #include "MailCommon/FolderTreeView"

kmail/src/kmmainwin.cpp

@@ -20,8 +20,8 @@
 
 #include "kmmainwin.h"
 #include "kmmainwidget.h"
-#include "Libkdepim/ProgressStatusBarWidget"
-#include "Libkdepim/StatusbarProgressWidget"
+#include <Libkdepim/ProgressStatusBarWidget>
+#include <Libkdepim/StatusbarProgressWidget>
 #include "libkdepim/broadcaststatus.h"
 #include "util.h"
 #include "tag/tagactionmanager.h"

kmail/src/kmreaderwin.cpp

@@ -44,7 +44,7 @@
 #include "MessageViewer/CSSHelper"
 using MessageViewer::CSSHelper;
 #include "util.h"
-#include "MessageCore/StringUtil"
+#include <MessageCore/StringUtil>
 #include <QCryptographicHash>
 #include <kmime/kmime_mdn.h>
 #include <akonadi/kmime/messageflags.h>

kmail/src/searchdialog/kmsearchmessagemodel.cpp

@@ -29,7 +29,7 @@
 #include "MailCommon/MailUtil"
 #include "messagelist/messagelistutil.h"
 
-#include "MessageCore/StringUtil"
+#include <MessageCore/StringUtil>
 
 #include <AkonadiCore/itemfetchscope.h>
 #include <AkonadiCore/monitor.h>

kmail/src/util.cpp

@@ -38,7 +38,7 @@
 #include "util.h"
 #include "kmkernel.h"
 
-#include "MessageCore/StringUtil"
+#include <MessageCore/StringUtil>
 #include "MessageComposer/MessageHelper"
 
 #include "TemplateParser/TemplateParser"

korganizer/src/korganizer.cpp

@@ -36,8 +36,8 @@
 #include "impl/korganizerifaceimpl.h"
 #include "plugininterface/korganizerplugininterface.h"
 
-#include "Libkdepim/ProgressStatusBarWidget"
-#include "Libkdepim/StatusbarProgressWidget"
+#include <Libkdepim/ProgressStatusBarWidget>
+#include <Libkdepim/StatusbarProgressWidget>
 
 #include <KActionCollection>
 #include "korganizer_debug.h"

storageservicemanager/src/storageservicemanagermainwindow.cpp

@@ -31,8 +31,8 @@
 
 #include "PimCommon/StorageServiceSettings"
 
-#include "Libkdepim/ProgressStatusBarWidget"
-#include "Libkdepim/StatusbarProgressWidget"
+#include <Libkdepim/ProgressStatusBarWidget>
+#include <Libkdepim/StatusbarProgressWidget>
 
 #include <KStandardAction>
 #include <KLocalizedString>