diff options
-rw-r--r-- | common/clientapi.cpp | 5 | ||||
-rw-r--r-- | common/clientapi.h | 3 | ||||
-rw-r--r-- | 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) | |||
51 | return Akonadi2::resourceName(instanceIdentifier); | 51 | return Akonadi2::resourceName(instanceIdentifier); |
52 | } | 52 | } |
53 | 53 | ||
54 | QList<QByteArray> Store::getResources(const QList<QByteArray> &resourceFilter, const QByteArray &type) | 54 | static QList<QByteArray> getResources(const QList<QByteArray> &resourceFilter, const QByteArray &type) |
55 | { | 55 | { |
56 | //Return the global resource (signified by an empty name) for types that don't eblong to a specific resource | 56 | //Return the global resource (signified by an empty name) for types that don't eblong to a specific resource |
57 | if (type == "akonadiresource") { | 57 | if (type == "akonadiresource") { |
58 | qWarning() << "Global resource"; | ||
59 | return QList<QByteArray>() << ""; | 58 | return QList<QByteArray>() << ""; |
60 | } | 59 | } |
61 | QList<QByteArray> resources; | 60 | QList<QByteArray> resources; |
@@ -74,7 +73,7 @@ QList<QByteArray> Store::getResources(const QList<QByteArray> &resourceFilter, c | |||
74 | } | 73 | } |
75 | } | 74 | } |
76 | } | 75 | } |
77 | qWarning() << "Found resources: " << resources; | 76 | Trace() << "Found resources: " << resources; |
78 | return resources; | 77 | return resources; |
79 | } | 78 | } |
80 | 79 | ||
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 { | |||
36 | * Store interface used in the client API. | 36 | * Store interface used in the client API. |
37 | */ | 37 | */ |
38 | class Store { | 38 | class Store { |
39 | private: | ||
40 | static QList<QByteArray> getResources(const QList<QByteArray> &resourceFilter, const QByteArray &type); | ||
41 | |||
42 | public: | 39 | public: |
43 | static QString storageLocation(); | 40 | static QString storageLocation(); |
44 | static QByteArray resourceName(const QByteArray &instanceIdentifier); | 41 | 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 | |||
39 | auto settings = getSettings(); | 39 | auto settings = getSettings(); |
40 | settings->beginGroup(QString::fromLatin1(identifier)); | 40 | settings->beginGroup(QString::fromLatin1(identifier)); |
41 | settings->setValue("type", type); | 41 | settings->setValue("type", type); |
42 | settings->setValue("enabled", true); | ||
43 | settings->endGroup(); | 42 | settings->endGroup(); |
44 | settings->sync(); | 43 | settings->sync(); |
45 | } | 44 | } |