From 9f7e50ed1b788cf407c13bc35a2021e329123c4f Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sat, 19 Dec 2015 17:01:43 +0100
Subject: Cleanup

---
 common/clientapi.cpp      | 5 ++---
 common/clientapi.h        | 3 ---
 common/resourceconfig.cpp | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/common/clientapi.cpp b/common/clientapi.cpp
index ab2af7a..ba9ad27 100644
--- a/common/clientapi.cpp
+++ b/common/clientapi.cpp
@@ -51,11 +51,10 @@ QByteArray Store::resourceName(const QByteArray &instanceIdentifier)
     return Akonadi2::resourceName(instanceIdentifier);
 }
 
-QList<QByteArray> Store::getResources(const QList<QByteArray> &resourceFilter, const QByteArray &type)
+static QList<QByteArray> getResources(const QList<QByteArray> &resourceFilter, const QByteArray &type)
 {
     //Return the global resource (signified by an empty name) for types that don't eblong to a specific resource
     if (type == "akonadiresource") {
-        qWarning() << "Global resource";
         return QList<QByteArray>() << "";
     }
     QList<QByteArray> resources;
@@ -74,7 +73,7 @@ QList<QByteArray> Store::getResources(const QList<QByteArray> &resourceFilter, c
             }
         }
     }
-    qWarning() << "Found resources: " << resources;
+    Trace() << "Found resources: " << resources;
     return resources;
 }
 
diff --git a/common/clientapi.h b/common/clientapi.h
index 3d9095d..4e55432 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -36,9 +36,6 @@ namespace Akonadi2 {
  * Store interface used in the client API.
  */
 class Store {
-private:
-    static QList<QByteArray> getResources(const QList<QByteArray> &resourceFilter, const QByteArray &type);
-
 public:
     static QString storageLocation();
     static QByteArray resourceName(const QByteArray &instanceIdentifier);
diff --git a/common/resourceconfig.cpp b/common/resourceconfig.cpp
index 99e111e..3554b76 100644
--- a/common/resourceconfig.cpp
+++ b/common/resourceconfig.cpp
@@ -39,7 +39,6 @@ void ResourceConfig::addResource(const QByteArray &identifier, const QByteArray
     auto settings = getSettings();
     settings->beginGroup(QString::fromLatin1(identifier));
     settings->setValue("type", type);
-    settings->setValue("enabled", true);
     settings->endGroup();
     settings->sync();
 }
-- 
cgit v1.2.3