From 69c5ac205e405f2304ba9abe08427feec4624a37 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 11 Aug 2016 22:53:02 +0200
Subject: [PATCH] Debug-- Remove includes

---
 akregator/export/akregatorstorageexporter.cpp                  | 2 +-
 akregator/src/formatter/grantleeviewformatter.cpp              | 1 -
 akregator/src/frame/mainframe.cpp                              | 1 -
 akregator/src/job/downloadarticlejob.cpp                       | 5 +++--
 kmail/agents/followupreminderagent/followupremindermanager.cpp | 3 ++-
 korganizer/src/views/collectionview/controller.cpp             | 1 -
 pimsettingexporter/console/main.cpp                            | 1 -
 pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp     | 1 -
 8 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/akregator/export/akregatorstorageexporter.cpp b/akregator/export/akregatorstorageexporter.cpp
index b295b8ba22..f9c211275c 100644
--- a/akregator/export/akregatorstorageexporter.cpp
+++ b/akregator/export/akregatorstorageexporter.cpp
@@ -34,12 +34,12 @@
 #include <QStringList>
 #include <QXmlStreamWriter>
 #include <QVariant>
-#include <QDebug>
 
 #include <KPluginLoader>
 #include <KService>
 #include <KServiceTypeTrader>
 #include <QUrl>
+#include <QDebug>
 
 #include <iostream>
 
diff --git a/akregator/src/formatter/grantleeviewformatter.cpp b/akregator/src/formatter/grantleeviewformatter.cpp
index 7f733b2872..9abb77d3fc 100644
--- a/akregator/src/formatter/grantleeviewformatter.cpp
+++ b/akregator/src/formatter/grantleeviewformatter.cpp
@@ -29,7 +29,6 @@
 #include <QApplication>
 #include <QDateTime>
 #include <QVariantList>
-#include <QDebug>
 #include <folder.h>
 #include <feed.h>
 
diff --git a/akregator/src/frame/mainframe.cpp b/akregator/src/frame/mainframe.cpp
index 06872c1935..79026f44fd 100644
--- a/akregator/src/frame/mainframe.cpp
+++ b/akregator/src/frame/mainframe.cpp
@@ -22,7 +22,6 @@
 #include "mainframe.h"
 
 #include <QGridLayout>
-#include <QDebug>
 
 using namespace Akregator;
 
diff --git a/akregator/src/job/downloadarticlejob.cpp b/akregator/src/job/downloadarticlejob.cpp
index 8f797b7b97..7b0a02b4ff 100644
--- a/akregator/src/job/downloadarticlejob.cpp
+++ b/akregator/src/job/downloadarticlejob.cpp
@@ -12,6 +12,7 @@
 */
 
 #include "downloadarticlejob.h"
+#include "akregator_debug.h"
 #include <QTemporaryFile>
 #include <QDesktopServices>
 #include <kio/job.h>
@@ -54,7 +55,7 @@ void DownloadArticleJob::start()
         return;
     }
     if (mTemporaryFile) {
-        qDebug() << " There is a problem as we call start twice";
+        qCDebug(AKREGATOR_LOG) << " There is a problem as we call start twice";
         return;
     }
     mTemporaryFile = new QTemporaryFile(this);
@@ -79,7 +80,7 @@ void DownloadArticleJob::slotUrlSaveResult(KJob *job)
         if (kiojob && kiojob->ui()) {
             kiojob->ui()->showErrorMessage();
         } else {
-            qWarning() << "There is no GUI delegate set for a kjob, and it failed with error:" << job->errorString();
+            qCWarning(AKREGATOR_LOG) << "There is no GUI delegate set for a kjob, and it failed with error:" << job->errorString();
         }
     } else {
         sendAttachment();
diff --git a/kmail/agents/followupreminderagent/followupremindermanager.cpp b/kmail/agents/followupreminderagent/followupremindermanager.cpp
index 654f72389c..dde860a62a 100644
--- a/kmail/agents/followupreminderagent/followupremindermanager.cpp
+++ b/kmail/agents/followupreminderagent/followupremindermanager.cpp
@@ -18,6 +18,7 @@
 */
 
 #include "followupremindermanager.h"
+#include "followupreminderagent_debug.h"
 #include "FollowupReminder/FollowUpReminderInfo"
 #include "FollowupReminder/FollowUpReminderUtil"
 #include "followupremindernoanswerdialog.h"
@@ -121,7 +122,7 @@ void FollowUpReminderManager::checkFollowUp(const Akonadi::Item &item, const Ako
 void FollowUpReminderManager::slotCheckFollowUpFinished(const QString &messageId, Akonadi::Item::Id id)
 {
     Q_FOREACH (FollowUpReminderInfo *info, mFollowUpReminderInfoList) {
-        qDebug() << "FollowUpReminderManager::slotCheckFollowUpFinished info:" << info;
+        qCDebug(FOLLOWUPREMINDERAGENT_LOG) << "FollowUpReminderManager::slotCheckFollowUpFinished info:" << info;
         if (!info) {
             continue;
         }
diff --git a/korganizer/src/views/collectionview/controller.cpp b/korganizer/src/views/collectionview/controller.cpp
index ad250ae576..082a67c534 100644
--- a/korganizer/src/views/collectionview/controller.cpp
+++ b/korganizer/src/views/collectionview/controller.cpp
@@ -41,7 +41,6 @@
 #include <KLocalizedString>
 
 #include <QIcon>
-#include <QDebug>
 
 CollectionNode::CollectionNode(ReparentingModel &personModel, const Akonadi::Collection &col)
     : Node(personModel),
diff --git a/pimsettingexporter/console/main.cpp b/pimsettingexporter/console/main.cpp
index 118289bda0..c378c21ca1 100644
--- a/pimsettingexporter/console/main.cpp
+++ b/pimsettingexporter/console/main.cpp
@@ -26,7 +26,6 @@
 #include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QCommandLineOption>
-#include <QDebug>
 
 #include <QtCore/qtimer.h>
 
diff --git a/pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp b/pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp
index 1198443eeb..9afdf02b6f 100644
--- a/pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp
+++ b/pimsettingexporter/gui/widgets/selectiontypetreewidget.cpp
@@ -300,7 +300,6 @@ void SelectionTypeTreeWidget::saveAsDefaultTemplate()
     QString ret = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/pimsettingexporter/");
     QFileInfo fileInfo(ret);
     QDir().mkpath(fileInfo.absolutePath());
-    qDebug() << " ret :" << ret;
 
     PimCommon::Util::saveToFile(ret + QStringLiteral("defaulttemplate.xml"), templateStr);
 }
-- 
2.11.4.GIT