diff options
| author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | 2022-10-11 23:13:50 +0300 |
|---|---|---|
| committer | Matthieu Gallien <matthieu.gallien@nextcloud.com> | 2022-10-18 10:26:25 +0300 |
| commit | fb325959793c402d1c5bf4c77ceea0c502791742 (patch) | |
| tree | 5107af91eb753bc882aee55dff28cc6fe0264054 | |
| parent | fe86d072cff5904bbd52e6aed9447a0f56b07dcd (diff) | |
declare ErrorCategory enum class and declare its metatype
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
| -rw-r--r-- | src/common/pinstate.h | 5 | ||||
| -rw-r--r-- | src/libsync/discovery.cpp | 2 | ||||
| -rw-r--r-- | src/libsync/progressdispatcher.h | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/common/pinstate.h b/src/common/pinstate.h index 106d9385d..17d99bbd4 100644 --- a/src/common/pinstate.h +++ b/src/common/pinstate.h @@ -21,8 +21,7 @@ namespace OCC { -namespace PinStateEnums { -OCSYNC_EXPORT Q_NAMESPACE +Q_NAMESPACE /** Determines whether items should be available locally permanently or not * @@ -126,8 +125,6 @@ enum class VfsItemAvailability { OnlineOnly = 4, }; Q_ENUM_NS(VfsItemAvailability) -} -using namespace PinStateEnums; } diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index 57426dd8a..bc9ea621b 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -1146,7 +1146,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( // either correct availability, or a result with error if the folder is new or otherwise has no availability set yet const auto folderPlaceHolderAvailability = localEntry.isDirectory ? _discoveryData->_syncOptions._vfs->availability(path._local) : Vfs::AvailabilityResult(Vfs::AvailabilityError::NoSuchItem); - const auto folderPinState = localEntry.isDirectory ? _discoveryData->_syncOptions._vfs->pinState(path._local) : Optional<PinStateEnums::PinState>(PinState::Unspecified); + const auto folderPinState = localEntry.isDirectory ? _discoveryData->_syncOptions._vfs->pinState(path._local) : Optional<PinState>(PinState::Unspecified); if (!isFilePlaceHolder && !folderPlaceHolderAvailability.isValid() && !folderPinState.isValid()) { // not a file placeholder and not a synced folder placeholder (new local folder) diff --git a/src/libsync/progressdispatcher.h b/src/libsync/progressdispatcher.h index 3cde3916e..f330f3342 100644 --- a/src/libsync/progressdispatcher.h +++ b/src/libsync/progressdispatcher.h @@ -27,6 +27,8 @@ namespace OCC { +Q_NAMESPACE + /** * @brief The ProgressInfo class * @ingroup libsync @@ -252,6 +254,7 @@ enum class ErrorCategory { Normal, InsufficientRemoteStorage, }; +Q_ENUM_NS(OCC::ErrorCategory) /** * @file progressdispatcher.h |