diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2012-04-11 15:59:00 +0200 |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2012-04-11 16:54:46 +0200 |
| commit | 6b7df60a752422b1f6ff07bb2682c21e18a43985 (patch) | |
| tree | 3e56bd3f4ee34a228777d00ff328ef1c53cb1df1 /src/daemon/jsondbephemeralpartition.cpp | |
| parent | 20549eedb5b5e852c0e384cd76bfbff14168dbda (diff) | |
| parent | 7ef36e3c5a88560eb4e3a81c2c9f14059739108b (diff) | |
Merge remote-tracking branch 'gerrit/master' into hbtreehbtree
Conflicts:
src/daemon/daemon.pri
src/daemon/jsondbview.cpp
src/partition/jsondbindex.cpp
src/partition/jsondbindex.h
src/partition/jsondbindexquery.h
src/partition/jsondbmanagedbtree.cpp
src/partition/jsondbmanagedbtree.h
src/partition/jsondbmanagedbtreetxn.cpp
src/partition/jsondbmanagedbtreetxn.h
src/partition/jsondbobjecttable.cpp
src/partition/jsondbobjecttable.h
src/partition/jsondbpartition.cpp
src/partition/jsondbpartition.h
tests/auto/auto.pro
tests/auto/partition/testpartition.cpp
tests/benchmarks/benchmarks.pro
Change-Id: I963adefd6d32fca9b3537981306b67538c759034
Diffstat (limited to 'src/daemon/jsondbephemeralpartition.cpp')
| -rw-r--r-- | src/daemon/jsondbephemeralpartition.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/daemon/jsondbephemeralpartition.cpp b/src/daemon/jsondbephemeralpartition.cpp index 989748f..a786394 100644 --- a/src/daemon/jsondbephemeralpartition.cpp +++ b/src/daemon/jsondbephemeralpartition.cpp @@ -43,13 +43,12 @@ #include "jsondbobject.h" #include "jsondbquery.h" -#include "jsondbresponse.h" -#include "jsondb-error.h" -#include "jsondb-strings.h" +#include "jsondberrors.h" +#include "jsondbstrings.h" #include <qjsonobject.h> -QT_BEGIN_NAMESPACE_JSONDB +QT_USE_NAMESPACE_JSONDB_PARTITION JsonDbEphemeralPartition::JsonDbEphemeralPartition(const QString &name, QObject *parent) : QObject(parent) @@ -98,6 +97,7 @@ JsonDbQueryResult JsonDbEphemeralPartition::queryObjects(const JsonDbOwner *owne JsonDbWriteResult JsonDbEphemeralPartition::updateObjects(const JsonDbOwner *owner, const JsonDbObjectList &objects, JsonDbPartition::WriteMode mode) { + Q_UNUSED(mode); JsonDbWriteResult result; QList<JsonDbUpdate> updated; @@ -149,5 +149,3 @@ JsonDbWriteResult JsonDbEphemeralPartition::updateObjects(const JsonDbOwner *own emit objectsUpdated(updated); return result; } - -QT_END_NAMESPACE_JSONDB |