Rename SyncFileStatus::STATUS_SYNC to STATUS_UPTODATE

Also use STATUS_UPDATED instead to match SyncFileItem::Success in the SocketAPI.

diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index b9eb7cd5a12b8438d36b4929d5736b92e3bbecbd..505adae48c633f6962fed482ee6f2dffdfe11255 100644 (file)
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -379,7 +379,7 @@ void SocketApi::command_SHARE(const QString& localFile, QIODevice* socket)
         SyncFileStatus fileStatus = this->fileStatus(shareFolder, file);
 
         // Verify the file is on the server (to our knowledge of course)
-        if (fileStatus.tag() != SyncFileStatus::STATUS_SYNC &&
+        if (fileStatus.tag() != SyncFileStatus::STATUS_UPTODATE &&
             fileStatus.tag() != SyncFileStatus::STATUS_UPDATED) {
             const QString message = QLatin1String("SHARE:NOTSYNCED:")+QDir::toNativeSeparators(localFile);
             sendMessage(socket, message);
@@ -435,7 +435,7 @@ void SocketApi::command_SHARE_STATUS(const QString &localFile, QIODevice *socket
         SyncFileStatus fileStatus = this->fileStatus(shareFolder, file);
 
         // Verify the file is on the server (to our knowledge of course)
-        if (fileStatus.tag() != SyncFileStatus::STATUS_SYNC &&
+        if (fileStatus.tag() != SyncFileStatus::STATUS_UPTODATE &&
             fileStatus.tag() != SyncFileStatus::STATUS_UPDATED) {
             const QString message = QLatin1String("SHARE_STATUS:NOTSYNCED:")+QDir::toNativeSeparators(localFile);
             sendMessage(socket, message);
@@ -621,7 +621,7 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
 
         case SyncResult::Success:
         case SyncResult::Problem:
-            status.set(SyncFileStatus::STATUS_SYNC);
+            status.set(SyncFileStatus::STATUS_UPTODATE);
             return status;
 
         case SyncResult::Error:
@@ -636,7 +636,7 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
         }
     } else if (type == CSYNC_FTW_TYPE_DIR) {
         if (rec.isValid()) {
-            status.set(SyncFileStatus::STATUS_SYNC);
+            status.set(SyncFileStatus::STATUS_UPTODATE);
         } else {
             qDebug() << "Could not determine state for folder" << fileName << "will set STATUS_NEW";
             status.set(SyncFileStatus::STATUS_NEW);
@@ -644,7 +644,7 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
     } else if (type == CSYNC_FTW_TYPE_FILE) {
         if (rec.isValid()) {
             if( FileSystem::getModTime(fi.absoluteFilePath()) == Utility::qDateTimeToTime_t(rec._modtime) ) {
-                status.set(SyncFileStatus::STATUS_SYNC);
+                status.set(SyncFileStatus::STATUS_UPTODATE);
             } else {
                 if (rec._remotePerm.isNull() || rec._remotePerm.contains("W") ) {
                     status.set(SyncFileStatus::STATUS_EVAL);

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index e5312e72729d5bd750859017d5f546dda75074a4..c71ad4a8511f65495aaacdea0924a996954c9a49 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -1231,7 +1231,7 @@ bool SyncEngine::estimateState(QString fn, csync_ftw_type_e t, SyncFileStatus* s
             else if (item->_status == SyncFileItem::FileIgnored)
                 s->set(SyncFileStatus::STATUS_IGNORE);
             else if (item->_status == SyncFileItem::Success)
-                s->set(SyncFileStatus::STATUS_SYNC);
+                s->set(SyncFileStatus::STATUS_UPDATED);
             else
                 s->set(SyncFileStatus::STATUS_EVAL);
             qDebug() << Q_FUNC_INFO << "Setting" << fn << "to" << s->toSocketAPIString();

diff --git a/src/libsync/syncfilestatus.cpp b/src/libsync/syncfilestatus.cpp
index 21776ec49fa7373812d012a118941fc266f8c19d..313be6d517209843d1c8debab07678e67c3ad5c1 100644 (file)
--- a/src/libsync/syncfilestatus.cpp
+++ b/src/libsync/syncfilestatus.cpp
@@ -65,7 +65,7 @@ QString SyncFileStatus::toSocketAPIString() const
     case STATUS_IGNORE:
         statusString = QLatin1String("IGNORE");
         break;
-    case STATUS_SYNC:
+    case STATUS_UPTODATE:
     case STATUS_UPDATED:
         statusString = QLatin1String("OK");
         break;

diff --git a/src/libsync/syncfilestatus.h b/src/libsync/syncfilestatus.h
index 2f54b16f63c0286e41049f5c11f34624d3f9a5ec..28cb67fe53e9c038df3563b23c192f94359fb349 100644 (file)
--- a/src/libsync/syncfilestatus.h
+++ b/src/libsync/syncfilestatus.h
@@ -36,7 +36,7 @@ public:
         STATUS_NEW,
         STATUS_CONFLICT,
         STATUS_IGNORE,
-        STATUS_SYNC,
+        STATUS_UPTODATE,
         STATUS_STAT_ERROR,
         STATUS_ERROR,
         STATUS_UPDATED