Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/csync
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2020-04-22 16:23:18 +0300
committerKevin Ottens <kevin.ottens@nextcloud.com>2020-12-15 12:59:10 +0300
commit4d615c31da8149ffb5e6eedde76f46a7f18c031e (patch)
tree21854338e7a3d69729ede29702049ab94119d702 /src/csync
parent8cbdb4451b45a704b67120e69511b12625387f91 (diff)
Rename csync_instructions_e -> SyncInsturctions
Diffstat (limited to 'src/csync')
-rw-r--r--src/csync/csync.h6
-rw-r--r--src/csync/csync_util.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/csync/csync.h b/src/csync/csync.h
index 95330c343..a57f38015 100644
--- a/src/csync/csync.h
+++ b/src/csync/csync.h
@@ -103,7 +103,7 @@ Q_ENUM_NS(csync_status_codes_e)
* Instruction enum. In the file traversal structure, it describes
* the csync state of a file.
*/
-enum csync_instructions_e {
+enum SyncInstructions {
CSYNC_INSTRUCTION_NONE = 0, /* Nothing to do (UPDATE|RECONCILE) */
CSYNC_INSTRUCTION_EVAL = 1 << 0, /* There was changed compared to the DB (UPDATE) */
CSYNC_INSTRUCTION_REMOVE = 1 << 1, /* The file need to be removed (RECONCILE) */
@@ -122,7 +122,7 @@ enum csync_instructions_e {
but without any propagation (UPDATE|RECONCILE) */
};
-Q_ENUM_NS(csync_instructions_e)
+Q_ENUM_NS(SyncInstructions)
// This enum is used with BITFIELD(3) and BITFIELD(4) in several places.
// Also, this value is stored in the database, so beware of value changes.
@@ -196,7 +196,7 @@ struct OCSYNC_EXPORT csync_file_stat_s {
CSYNC_STATUS error_status = CSYNC_STATUS_OK;
- enum csync_instructions_e instruction = CSYNC_INSTRUCTION_NONE; /* u32 */
+ SyncInstructions instruction = CSYNC_INSTRUCTION_NONE; /* u32 */
csync_file_stat_s()
: type(ItemTypeSkip)
diff --git a/src/csync/csync_util.cpp b/src/csync/csync_util.cpp
index 93bf1b36e..c134bc0f2 100644
--- a/src/csync/csync_util.cpp
+++ b/src/csync/csync_util.cpp
@@ -40,7 +40,7 @@ Q_LOGGING_CATEGORY(lcCSyncUtils, "nextcloud.sync.csync.utils", QtInfoMsg)
struct _instr_code_struct {
const char *instr_str;
- enum csync_instructions_e instr_code;
+ SyncInstructions instr_code;
};
struct csync_memstat_s {