From 776bbbf7b16ba2e30ad4de265d856445caf01e16 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Fri, 15 Dec 2017 11:07:53 +0100
Subject: Don't include sqlite3.h from headers

So that sqlite is not part of the public interface of csync
(and that the sqlite include path don't need to be passed when compiling
libsync or gui)
---
 src/common/ownsql.cpp                         | 1 +
 src/common/ownsql.h                           | 5 +++--
 src/common/syncjournaldb.cpp                  | 1 +
 src/csync/csync_private.h                     | 1 -
 src/gui/socketapi.cpp                         | 2 --
 test/csync/csync_tests/check_csync_update.cpp | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/common/ownsql.cpp b/src/common/ownsql.cpp
index c4277a130..bcd9dd6b0 100644
--- a/src/common/ownsql.cpp
+++ b/src/common/ownsql.cpp
@@ -26,6 +26,7 @@
 #include "ownsql.h"
 #include "common/utility.h"
 #include "common/asserts.h"
+#include <sqlite3.h>
 
 #define SQLITE_SLEEP_TIME_USEC 100000
 #define SQLITE_REPEAT_COUNT 20
diff --git a/src/common/ownsql.h b/src/common/ownsql.h
index bfff4b65d..1ad7e93b7 100644
--- a/src/common/ownsql.h
+++ b/src/common/ownsql.h
@@ -19,13 +19,14 @@
 #ifndef OWNSQL_H
 #define OWNSQL_H
 
-#include <sqlite3.h>
-
 #include <QObject>
 #include <QVariant>
 
 #include "ocsynclib.h"
 
+struct sqlite3;
+struct sqlite3_stmt;
+
 namespace OCC {
 
 /**
diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
index a40149d3a..63d2f7ef4 100644
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -23,6 +23,7 @@
 #include <QElapsedTimer>
 #include <QUrl>
 #include <QDir>
+#include <sqlite3.h>
 
 #include "common/syncjournaldb.h"
 #include "version.h"
diff --git a/src/csync/csync_private.h b/src/csync/csync_private.h
index 5463b7e40..f73a1b2d5 100644
--- a/src/csync/csync_private.h
+++ b/src/csync/csync_private.h
@@ -36,7 +36,6 @@
 #include <QHash>
 #include <stdint.h>
 #include <stdbool.h>
-#include <sqlite3.h>
 #include <map>
 #include <set>
 #include <functional>
diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index 0cdc9f0de..cc889b8f3 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -48,8 +48,6 @@
 
 #include <QClipboard>
 
-#include <sqlite3.h>
-
 #include <QStandardPaths>
 
 
diff --git a/test/csync/csync_tests/check_csync_update.cpp b/test/csync/csync_tests/check_csync_update.cpp
index 01681b7de..504ea2096 100644
--- a/test/csync/csync_tests/check_csync_update.cpp
+++ b/test/csync/csync_tests/check_csync_update.cpp
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "csync_update.cpp"
+#include <sqlite3.h>
 
 #include "torture.h"
 
-- 
cgit v1.2.3