From e46079fa02c92d19d360af072362345c1341260d Mon Sep 17 00:00:00 2001
From: Jamey Hicks <jamey.hicks@nokia.com>
Date: Thu, 27 Sep 2012 13:54:09 -0400
Subject: adapt jsondb partition to windows

Change-Id: I4c5d5c2d67f1ab8c132020c5f506073becd9f35c
Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
---
 src/partition/jsondbowner.cpp       | 2 ++
 src/partition/jsondbowner.h         | 2 ++
 src/partition/jsondbpartition.cpp   | 4 ++++
 src/partition/jsondbqueryparser.cpp | 4 ++--
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/partition/jsondbowner.cpp b/src/partition/jsondbowner.cpp
index 6ef826b6..be0360b9 100644
--- a/src/partition/jsondbowner.cpp
+++ b/src/partition/jsondbowner.cpp
@@ -249,6 +249,7 @@ bool JsonDbOwner::setOwnerCapabilities(QString username, JsonDbPartition *partit
 #endif
 }
 
+#ifndef Q_OS_WIN32
 bool JsonDbOwner::setOwnerCapabilities(uid_t uid, JsonDbPartition *partition)
 {
     if (!jsondbSettings->enforceAccessControl()) {
@@ -270,6 +271,7 @@ bool JsonDbOwner::setOwnerCapabilities(uid_t uid, JsonDbPartition *partition)
     return true;
 #endif
 }
+#endif
 
 #include "moc_jsondbowner.cpp"
 
diff --git a/src/partition/jsondbowner.h b/src/partition/jsondbowner.h
index 6ba0a881..edf46eec 100644
--- a/src/partition/jsondbowner.h
+++ b/src/partition/jsondbowner.h
@@ -78,7 +78,9 @@ public:
     void setAllowAll(bool allowAll) { mAllowAll = allowAll; }
 
     bool isAllowed(JsonDbObject &object, const QString &partition, const QString &op) const;
+#ifndef Q_OS_WIN32
     bool setOwnerCapabilities(uid_t uid, JsonDbPartition *partition);
+#endif
     bool setOwnerCapabilities(QString username, JsonDbPartition *partition);
 
 private:
diff --git a/src/partition/jsondbpartition.cpp b/src/partition/jsondbpartition.cpp
index b086ada0..92f76192 100644
--- a/src/partition/jsondbpartition.cpp
+++ b/src/partition/jsondbpartition.cpp
@@ -58,7 +58,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
+#ifndef Q_OS_WIN32
 #include <sys/statvfs.h>
+#endif
 #include <errno.h>
 
 #include "jsondbstrings.h"
@@ -1961,6 +1963,7 @@ void JsonDbPartitionPrivate::removeSchema(const QString &schemaName)
 
 void JsonDbPartitionPrivate::updateSpaceStatus()
 {
+#ifndef Q_OS_WIN32
     mDiskSpaceStatus = JsonDbPartition::UnknownStatus;
     struct statvfs status;
 
@@ -1976,6 +1979,7 @@ void JsonDbPartitionPrivate::updateSpaceStatus()
         mDiskSpaceStatus = JsonDbPartition::OutOfSpace;
         return;
     }
+#endif
     mDiskSpaceStatus = JsonDbPartition::HasSpace;
 }
 
diff --git a/src/partition/jsondbqueryparser.cpp b/src/partition/jsondbqueryparser.cpp
index c3b3ed86..39eb6b81 100644
--- a/src/partition/jsondbqueryparser.cpp
+++ b/src/partition/jsondbqueryparser.cpp
@@ -43,8 +43,8 @@
 #include <QString>
 
 #include "jsondbqueryparser.h"
-#include "private/jsondbquerytokenizer_p.h"
-#include "private/jsondbutils_p.h"
+#include "jsondbquerytokenizer_p.h"
+#include "jsondbutils_p.h"
 #include "jsondbstrings.h"
 #include "jsondbsettings.h"
 
-- 
cgit v1.2.3