From fe27804afbd47e524732b79b252ef1179b1f50c0 Mon Sep 17 00:00:00 2001
From: Christian Kamm <mail@ckamm.de>
Date: Mon, 21 Jan 2019 11:13:17 +0100
Subject: [PATCH] Move SyncFileStatus to libcommon

It'll be needed in vfs plugins so they can connect to the data coming
out of SyncFileStatusTracker.
---
 src/common/common.cmake                    | 1 +
 src/{libsync => common}/syncfilestatus.cpp | 0
 src/{libsync => common}/syncfilestatus.h   | 4 ++--
 src/gui/socketapi.h                        | 2 +-
 src/libsync/CMakeLists.txt                 | 1 -
 src/libsync/syncengine.cpp                 | 2 +-
 src/libsync/syncfilestatustracker.h        | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{libsync => common}/syncfilestatus.cpp (100%)
 rename src/{libsync => common}/syncfilestatus.h (95%)

diff --git a/src/common/common.cmake b/src/common/common.cmake
index f47e7745e..aaaed36af 100644
--- a/src/common/common.cmake
+++ b/src/common/common.cmake
@@ -11,6 +11,7 @@ set(common_SOURCES
     ${CMAKE_CURRENT_LIST_DIR}/remotepermissions.cpp
     ${CMAKE_CURRENT_LIST_DIR}/vfs.cpp
     ${CMAKE_CURRENT_LIST_DIR}/plugin.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/syncfilestatus.cpp
 )
 
 configure_file(${CMAKE_CURRENT_LIST_DIR}/vfspluginmetadata.json.in ${CMAKE_CURRENT_BINARY_DIR}/vfspluginmetadata.json)
diff --git a/src/libsync/syncfilestatus.cpp b/src/common/syncfilestatus.cpp
similarity index 100%
rename from src/libsync/syncfilestatus.cpp
rename to src/common/syncfilestatus.cpp
diff --git a/src/libsync/syncfilestatus.h b/src/common/syncfilestatus.h
similarity index 95%
rename from src/libsync/syncfilestatus.h
rename to src/common/syncfilestatus.h
index f778c89e8..cea595f82 100644
--- a/src/libsync/syncfilestatus.h
+++ b/src/common/syncfilestatus.h
@@ -19,7 +19,7 @@
 #include <QObject>
 #include <QString>
 
-#include "owncloudlib.h"
+#include "ocsynclib.h"
 
 namespace OCC {
 
@@ -27,7 +27,7 @@ namespace OCC {
  * @brief The SyncFileStatus class
  * @ingroup libsync
  */
-class OWNCLOUDSYNC_EXPORT SyncFileStatus
+class OCSYNC_EXPORT SyncFileStatus
 {
 public:
     enum SyncFileStatusTag {
diff --git a/src/gui/socketapi.h b/src/gui/socketapi.h
index d23c3df52..6ef89f3ee 100644
--- a/src/gui/socketapi.h
+++ b/src/gui/socketapi.h
@@ -17,7 +17,7 @@
 #define SOCKETAPI_H
 
 #include "syncfileitem.h"
-#include "syncfilestatus.h"
+#include "common/syncfilestatus.h"
 #include "sharedialog.h" // for the ShareDialogStartPage
 #include "common/syncjournalfilerecord.h"
 
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 353acf3d7..9824f988d 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -47,7 +47,6 @@ set(libsync_SRCS
     propagatedownloadencrypted.cpp
     syncengine.cpp
     syncfileitem.cpp
-    syncfilestatus.cpp
     syncfilestatustracker.cpp
     localdiscoverytracker.cpp
     syncresult.cpp
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 550f1347d..a10edb7b2 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -20,7 +20,7 @@
 #include "common/syncjournalfilerecord.h"
 #include "discoveryphase.h"
 #include "creds/abstractcredentials.h"
-#include "syncfilestatus.h"
+#include "common/syncfilestatus.h"
 #include "csync_exclude.h"
 #include "filesystem.h"
 #include "propagateremotedelete.h"
diff --git a/src/libsync/syncfilestatustracker.h b/src/libsync/syncfilestatustracker.h
index 4a6b89f0d..362c4143c 100644
--- a/src/libsync/syncfilestatustracker.h
+++ b/src/libsync/syncfilestatustracker.h
@@ -18,7 +18,7 @@
 
 // #include "ownsql.h"
 #include "syncfileitem.h"
-#include "syncfilestatus.h"
+#include "common/syncfilestatus.h"
 #include <map>
 #include <QSet>