summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2015-07-07 00:09:15 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2015-07-07 00:09:15 +0200
commit724a0380b7709a64a433dff0cc8fba26aea1df98 (patch)
tree98472fbd2b41809f7c2a253d85f70710f322235d
parentef8fcadb0c0ad4af055262a4dd9c37d4905cc0fa (diff)
downloadsink-724a0380b7709a64a433dff0cc8fba26aea1df98.tar.gz
sink-724a0380b7709a64a433dff0cc8fba26aea1df98.zip
Fixed all warnings
-rw-r--r--common/domain/event.h4
-rw-r--r--common/entitybuffer.h2
-rw-r--r--common/genericresource.cpp4
-rw-r--r--common/resourceaccess.cpp2
-rw-r--r--common/resourceaccess.h2
-rw-r--r--common/resultset.h11
6 files changed, 13 insertions, 12 deletions
diff --git a/common/domain/event.h b/common/domain/event.h
index 68c684a..38020f8 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -33,8 +33,8 @@ namespace Akonadi2 {
33 33
34namespace ApplicationDomain { 34namespace ApplicationDomain {
35 namespace Buffer { 35 namespace Buffer {
36 class Event; 36 struct Event;
37 class EventBuilder; 37 struct EventBuilder;
38 } 38 }
39 39
40/** 40/**
diff --git a/common/entitybuffer.h b/common/entitybuffer.h
index 82152c9..dd7588e 100644
--- a/common/entitybuffer.h
+++ b/common/entitybuffer.h
@@ -4,7 +4,7 @@
4#include <flatbuffers/flatbuffers.h> 4#include <flatbuffers/flatbuffers.h>
5 5
6namespace Akonadi2 { 6namespace Akonadi2 {
7class Entity; 7struct Entity;
8 8
9class EntityBuffer { 9class EntityBuffer {
10public: 10public:
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index fdc8b14..b6485d7 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -157,8 +157,8 @@ GenericResource::GenericResource(const QByteArray &resourceInstanceIdentifier)
157 : Akonadi2::Resource(), 157 : Akonadi2::Resource(),
158 mUserQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", "org.kde." + resourceInstanceIdentifier + ".userqueue"), 158 mUserQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", "org.kde." + resourceInstanceIdentifier + ".userqueue"),
159 mSynchronizerQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", "org.kde." + resourceInstanceIdentifier + ".synchronizerqueue"), 159 mSynchronizerQueue(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", "org.kde." + resourceInstanceIdentifier + ".synchronizerqueue"),
160 mError(0), 160 mResourceInstanceIdentifier(resourceInstanceIdentifier),
161 mResourceInstanceIdentifier(resourceInstanceIdentifier) 161 mError(0)
162{ 162{
163} 163}
164 164
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 249dd55..038e240 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -41,7 +41,7 @@
41namespace Akonadi2 41namespace Akonadi2
42{ 42{
43 43
44class QueuedCommand 44struct QueuedCommand
45{ 45{
46public: 46public:
47 QueuedCommand(int commandId, const std::function<void(int, const QString &)> &callback) 47 QueuedCommand(int commandId, const std::function<void(int, const QString &)> &callback)
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index b779db9..de58525 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -31,7 +31,7 @@
31namespace Akonadi2 31namespace Akonadi2
32{ 32{
33 33
34class QueuedCommand; 34struct QueuedCommand;
35 35
36class ResourceAccess : public QObject 36class ResourceAccess : public QObject
37{ 37{
diff --git a/common/resultset.h b/common/resultset.h
index 33f3c68..1a19100 100644
--- a/common/resultset.h
+++ b/common/resultset.h
@@ -32,15 +32,15 @@ class ResultSet {
32 32
33 33
34 ResultSet(const std::function<bool(std::function<void(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &)>)> &generator) 34 ResultSet(const std::function<bool(std::function<void(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &)>)> &generator)
35 : mValueGenerator(generator), 35 : mIt(nullptr),
36 mIt(nullptr) 36 mValueGenerator(generator)
37 { 37 {
38 38
39 } 39 }
40 40
41 ResultSet(const std::function<QByteArray()> &generator) 41 ResultSet(const std::function<QByteArray()> &generator)
42 : mGenerator(generator), 42 : mIt(nullptr),
43 mIt(nullptr) 43 mGenerator(generator)
44 { 44 {
45 45
46 } 46 }
@@ -64,6 +64,7 @@ class ResultSet {
64 } 64 }
65 return mIt != mResultSet.constEnd(); 65 return mIt != mResultSet.constEnd();
66 } 66 }
67 return false;
67 } 68 }
68 69
69 bool next(std::function<bool(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value)> callback) 70 bool next(std::function<bool(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value)> callback)
@@ -84,7 +85,7 @@ class ResultSet {
84 } 85 }
85 return mIt != mResultSet.constEnd(); 86 return mIt != mResultSet.constEnd();
86 } 87 }
87 88 return false;
88 } 89 }
89 90
90 QByteArray id() 91 QByteArray id()