Fix clash with std header

src/gui/accountsettings.cpp

@@ -25,7 +25,6 @@
 #include "configfile.h"
 #include "creds/abstractcredentials.h"
 #include "creds/httpcredentialsgui.h"
-#include "filesystem.h"
 #include "folderman.h"
 #include "folderstatusdelegate.h"
 #include "folderstatusmodel.h"
@@ -35,6 +34,8 @@
 #include "theme.h"
 #include "tooltipupdater.h"
 
+#include "libsync/filesystemutil.h"
+
 #include "folderwizard/folderwizard.h"
 
 #include <math.h>

src/gui/folder.cpp

@@ -26,7 +26,6 @@
 #include "configfile.h"
 #include "creds/abstractcredentials.h"
 #include "csync_exclude.h"
-#include "filesystem.h"
 #include "folder.h"
 #include "folderman.h"
 #include "localdiscoverytracker.h"
@@ -39,6 +38,8 @@
 #include "syncrunfilelog.h"
 #include "theme.h"
 
+#include "libsync/filesystemutil.h"
+
 #include <QTimer>
 #include <QUrl>
 #include <QDir>

src/gui/folderman.cpp

@@ -19,7 +19,6 @@
 #include "application.h"
 #include "common/asserts.h"
 #include "configfile.h"
-#include "filesystem.h"
 #include "folder.h"
 #include "lockwatcher.h"
 #include "selectivesyncdialog.h"
@@ -28,6 +27,8 @@
 #include "theme.h"
 #include <syncengine.h>
 
+#include "libsync/filesystemutil.h"
+
 #ifdef Q_OS_MAC
 #include <CoreServices/CoreServices.h>
 #endif

src/gui/folderwatcher.cpp

@@ -33,7 +33,8 @@
 #endif
 
 #include "folder.h"
-#include "filesystem.h"
+
+#include "libsync/filesystemutil.h"
 
 using namespace std::chrono_literals;
 

src/gui/folderwatcher_win.cpp

@@ -18,7 +18,9 @@
 
 #include "common/asserts.h"
 #include "common/utility.h"
-#include "filesystem.h"
+
+#include "libsync/filesystemutil.h"
+
 #include "folderwatcher.h"
 #include "folderwatcher_win.h"
 

src/gui/lockwatcher.cpp

@@ -13,7 +13,8 @@
  */
 
 #include "lockwatcher.h"
-#include "filesystem.h"
+
+#include "libsync/filesystemutil.h"
 
 #include <QLoggingCategory>
 #include <QTimer>

src/gui/lockwatcher.h

@@ -15,7 +15,8 @@
 #pragma once
 
 #include "config.h"
-#include "filesystem.h"
+
+#include "libsync/filesystemutil.h"
 
 #include <QList>
 #include <QObject>

src/gui/socketapi/socketapi.cpp

@@ -28,7 +28,6 @@
 #include "common/version.h"
 #include "config.h"
 #include "configfile.h"
-#include "filesystem.h"
 #include "folder.h"
 #include "folderman.h"
 #include "guiutility.h"
@@ -37,6 +36,8 @@
 #include "syncfileitem.h"
 #include "theme.h"
 
+#include "libsync/filesystemutil.h"
+
 #include <array>
 #include <QBitArray>
 #include <QUrl>

src/gui/syncrunfilelog.cpp

@@ -17,8 +17,10 @@
 
 #include "syncrunfilelog.h"
 #include "common/utility.h"
-#include "filesystem.h"
-#include <qfileinfo.h>
+
+#include "libsync/filesystemutil.h"
+
+#include <QFileInfo>
 
 namespace {
 auto dateTimeStr(const QDateTime &dt = QDateTime::currentDateTimeUtc())

src/libsync/CMakeLists.txt

@@ -18,7 +18,7 @@ set(libsync_SRCS
     cookiejar.cpp
     discovery.cpp
     discoveryphase.cpp
-    filesystem.cpp
+    filesystemutil.cpp
     httplogger.cpp
     jobqueue.cpp
     logger.cpp

src/libsync/filesystem.cpp → src/libsync/filesystemutil.cpp

@@ -12,14 +12,14 @@
  * for more details.
  */
 
-#include "filesystem.h"
+#include "filesystemutil.h"
 
 #include "common/utility.h"
-#include <QFile>
-#include <QFileInfo>
+#include <QCoreApplication>
 #include <QDir>
 #include <QDirIterator>
-#include <QCoreApplication>
+#include <QFile>
+#include <QFileInfo>
 
 #include "csync.h"
 #include "vio/csync_vio_local.h"
@@ -50,7 +50,7 @@ bool FileSystem::fileEquals(const QString &fn1, const QString &fn2)
     QByteArray buffer1(BufferSize, 0);
     QByteArray buffer2(BufferSize, 0);
     // the files have the same size, compare all of it
-    while(!f1.atEnd()){
+    while (!f1.atEnd()) {
         f1.read(buffer1.data(), BufferSize);
         f2.read(buffer2.data(), BufferSize);
         if (buffer1 != buffer2) {

src/libsync/filesystem.h → src/libsync/filesystemutil.h

@@ -14,10 +14,7 @@
 
 #pragma once
 
-#include "config.h"
-
 #include <QString>
-#include <ctime>
 #include <functional>
 
 #include <owncloudlib.h>

src/libsync/owncloudpropagator.cpp

@@ -20,7 +20,7 @@
 #include "common/syncjournalfilerecord.h"
 #include "common/utility.h"
 #include "discoveryphase.h"
-#include "filesystem.h"
+#include "filesystemutil.h"
 #include "propagatedownload.h"
 #include "propagateremotedelete.h"
 #include "propagateremotemkdir.h"
@@ -29,6 +29,7 @@
 #include "propagateuploadtus.h"
 #include "propagatorjobs.h"
 
+
 #ifdef Q_OS_WIN
 #include <winbase.h>
 #include <windef.h>

src/libsync/propagatedownload.cpp

@@ -12,19 +12,19 @@
  * for more details.
  */
 
-#include "config.h"
-#include "owncloudpropagator_p.h"
 #include "propagatedownload.h"
-#include "networkjobs.h"
 #include "account.h"
+#include "common/asserts.h"
+#include "common/checksums.h"
 #include "common/syncjournaldb.h"
 #include "common/syncjournalfilerecord.h"
 #include "common/utility.h"
-#include "filesystem.h"
-#include "propagatorjobs.h"
-#include "common/checksums.h"
-#include "common/asserts.h"
 #include "common/vfs.h"
+#include "config.h"
+#include "filesystemutil.h"
+#include "networkjobs.h"
+#include "owncloudpropagator_p.h"
+#include "propagatorjobs.h"
 
 #include <QDir>
 #include <QFileInfo>

src/libsync/propagateremotemove.cpp

@@ -13,15 +13,15 @@
  */
 
 #include "propagateremotemove.h"
-#include "propagatorjobs.h"
-#include "owncloudpropagator_p.h"
 #include "account.h"
-#include "common/syncjournalfilerecord.h"
-#include "filesystem.h"
 #include "common/asserts.h"
+#include "common/syncjournalfilerecord.h"
+#include "filesystemutil.h"
+#include "owncloudpropagator_p.h"
+#include "propagatorjobs.h"
+#include <QDir>
 #include <QFile>
 #include <QStringList>
-#include <QDir>
 
 namespace OCC {
 

src/libsync/propagateupload.cpp

@@ -12,20 +12,20 @@
  * for more details.
  */
 
-#include "config.h"
 #include "propagateupload.h"
-#include "owncloudpropagator_p.h"
-#include "networkjobs.h"
 #include "account.h"
+#include "common/asserts.h"
+#include "common/checksums.h"
 #include "common/syncjournaldb.h"
 #include "common/syncjournalfilerecord.h"
 #include "common/utility.h"
-#include "filesystem.h"
+#include "config.h"
+#include "filesystemutil.h"
+#include "networkjobs.h"
+#include "owncloudpropagator_p.h"
+#include "propagateremotedelete.h"
 #include "propagatorjobs.h"
-#include "common/checksums.h"
 #include "syncengine.h"
-#include "propagateremotedelete.h"
-#include "common/asserts.h"
 
 #include <QNetworkAccessManager>
 #include <QFileInfo>

src/libsync/propagateuploadng.cpp

@@ -12,20 +12,20 @@
  * for more details.
  */
 
-#include "config.h"
-#include "propagateupload.h"
-#include "owncloudpropagator_p.h"
-#include "networkjobs.h"
 #include "account.h"
+#include "common/asserts.h"
 #include "common/syncjournaldb.h"
 #include "common/syncjournalfilerecord.h"
 #include "common/utility.h"
-#include "filesystem.h"
+#include "config.h"
+#include "filesystemutil.h"
+#include "networkjobs.h"
+#include "owncloudpropagator_p.h"
+#include "propagateremotedelete.h"
+#include "propagateremotemove.h"
+#include "propagateupload.h"
 #include "propagatorjobs.h"
 #include "syncengine.h"
-#include "propagateremotemove.h"
-#include "propagateremotedelete.h"
-#include "common/asserts.h"
 
 #include <QDir>
 #include <QFileInfo>

src/libsync/propagateuploadtus.cpp

@@ -20,7 +20,7 @@
 #include "common/syncjournaldb.h"
 #include "common/syncjournalfilerecord.h"
 #include "common/utility.h"
-#include "filesystem.h"
+#include "filesystemutil.h"
 #include "httplogger.h"
 #include "networkjobs.h"
 #include "owncloudpropagator_p.h"

src/libsync/propagateuploadv1.cpp

@@ -12,20 +12,20 @@
  * for more details.
  */
 
-#include "config.h"
-#include "propagateupload.h"
-#include "owncloudpropagator_p.h"
-#include "networkjobs.h"
 #include "account.h"
+#include "common/asserts.h"
+#include "common/checksums.h"
 #include "common/syncjournaldb.h"
 #include "common/syncjournalfilerecord.h"
 #include "common/utility.h"
-#include "filesystem.h"
+#include "config.h"
+#include "filesystemutil.h"
+#include "networkjobs.h"
+#include "owncloudpropagator_p.h"
+#include "propagateremotedelete.h"
+#include "propagateupload.h"
 #include "propagatorjobs.h"
-#include "common/checksums.h"
 #include "syncengine.h"
-#include "propagateremotedelete.h"
-#include "common/asserts.h"
 
 #include <QDir>
 #include <QFileInfo>

src/libsync/propagatorjobs.cpp

@@ -14,21 +14,21 @@
  */
 
 #include "propagatorjobs.h"
+#include "common/syncjournaldb.h"
+#include "common/syncjournalfilerecord.h"
+#include "common/utility.h"
+#include "filesystemutil.h"
 #include "owncloudpropagator.h"
 #include "owncloudpropagator_p.h"
 #include "propagateremotemove.h"
-#include "common/utility.h"
-#include "common/syncjournaldb.h"
-#include "common/syncjournalfilerecord.h"
-#include "filesystem.h"
-#include <qfile.h>
+#include <QCoreApplication>
+#include <QDateTime>
 #include <qdir.h>
 #include <qdiriterator.h>
-#include <qtemporaryfile.h>
+#include <qfile.h>
 #include <qsavefile.h>
-#include <QDateTime>
 #include <qstack.h>
-#include <QCoreApplication>
+#include <qtemporaryfile.h>
 
 #include <time.h>
 

src/libsync/syncengine.cpp

@@ -15,19 +15,19 @@
 
 #include "syncengine.h"
 #include "account.h"
-#include "owncloudpropagator.h"
+#include "common/asserts.h"
+#include "common/syncfilestatus.h"
 #include "common/syncjournaldb.h"
 #include "common/syncjournalfilerecord.h"
-#include "discoveryphase.h"
+#include "common/vfs.h"
 #include "creds/abstractcredentials.h"
-#include "common/syncfilestatus.h"
 #include "csync_exclude.h"
-#include "filesystem.h"
-#include "propagateremotedelete.h"
-#include "propagatedownload.h"
-#include "common/asserts.h"
 #include "discovery.h"
-#include "common/vfs.h"
+#include "discoveryphase.h"
+#include "filesystemutil.h"
+#include "owncloudpropagator.h"
+#include "propagatedownload.h"
+#include "propagateremotedelete.h"
 
 #ifdef Q_OS_WIN
 #include <windows.h>

src/libsync/syncfileitem.cpp

@@ -15,7 +15,7 @@
 #include "syncfileitem.h"
 #include "common/syncjournalfilerecord.h"
 #include "common/utility.h"
-#include "filesystem.h"
+#include "filesystemutil.h"
 
 #include "csync/vio/csync_vio_local.h"