[niepce: 15/29] engine: Library::Managed -> LibraryManaged

[Hubert Figuière <hub src gnome org>]

commit 9d38e960059c7c8a9211e1daf487588974d2485f
Author: Hubert Figuière <hub figuiere net>
Date:   Thu Jun 22 00:05:38 2017 -0400

    engine: Library::Managed -> LibraryManaged

 src/engine/db/library.cpp                 |    9 +++++----
 src/engine/db/library.hpp                 |   27 +++++++++++++++------------
 src/engine/importer/cameraimporter.cpp    |    2 +-
 src/engine/importer/directoryimporter.cpp |    2 +-
 src/engine/importer/iimporter.hpp         |    2 +-
 src/engine/library/commands.cpp           |    8 ++++----
 src/engine/library/commands.hpp           |    4 ++--
 src/libraryclient/clientimpl.cpp          |    6 +++---
 src/libraryclient/clientimpl.hpp          |    4 ++--
 src/libraryclient/libraryclient.cpp       |    4 ++--
 src/libraryclient/libraryclient.hpp       |    4 ++--
 src/niepce/ui/niepcewindow.cpp            |    4 ++--
 12 files changed, 40 insertions(+), 36 deletions(-)
---
diff --git a/src/engine/db/library.cpp b/src/engine/db/library.cpp
index 8e6803f..9c182ce 100644
--- a/src/engine/db/library.cpp
+++ b/src/engine/db/library.cpp
@@ -268,10 +268,11 @@ std::string Library::getFsFile(library_id_t id)
 }
 
 
-library_id_t Library::addFile(library_id_t folder_id, const std::string & file, Managed manage)
+library_id_t Library::addFile(library_id_t folder_id, const std::string & file,
+                              LibraryManaged manage)
 {
     library_id_t ret = -1;
-    DBG_ASSERT(manage == Managed::NO, "manage not supported");
+    DBG_ASSERT(manage == LibraryManaged::NO, "manage not supported");
     DBG_ASSERT(folder_id != -1, "invalid folder ID");
     try {
         int32_t rating, orientation, flag;
@@ -340,7 +341,7 @@ library_id_t Library::addFile(library_id_t folder_id, const std::string & file,
 
 library_id_t Library::addFileAndFolder(const std::string & folder,
                                        const std::string & file,
-                                       Managed manage)
+                                       LibraryManaged manage)
 {
     LibFolderPtr f;
     f = getFolder(folder);
@@ -352,7 +353,7 @@ library_id_t Library::addFileAndFolder(const std::string & folder,
 
 library_id_t Library::addBundle(library_id_t folder_id,
                                 const eng::FileBundlePtr & bundle,
-                                Managed manage)
+                                LibraryManaged manage)
 {
     library_id_t file_id = 0;
     file_id = addFile(folder_id, engine_db_filebundle_main(bundle.get()), manage);
diff --git a/src/engine/db/library.hpp b/src/engine/db/library.hpp
index e551ea4..d16c203 100644
--- a/src/engine/db/library.hpp
+++ b/src/engine/db/library.hpp
@@ -49,17 +49,17 @@ class RgbColour;
 
 namespace eng {
 
+/** Whether to import managed. */
+enum class LibraryManaged {
+    NO = 0,
+    YES
+};
+
 class Library
 {
 public:
     typedef std::shared_ptr<Library> Ptr;
 
-    /** Whether to import managed. */
-    enum class Managed {
-        NO = 0,
-        YES
-    };
-
     Library(const std::string & dir, const fwk::NotificationCenter::Ptr & nc);
     virtual ~Library();
 
@@ -80,10 +80,11 @@ public:
     /** add a file to the library
      * @param folder the path of the containing folder
      * @param file the file path
-     * @param manage pass Managed::YES if the library *manage* the file. Currently unsupported.
+     * @param manage pass LibraryManaged::YES if the library *manage* the file.
+     * Currently unsupported.
      */
     library_id_t addFileAndFolder(const std::string & folder,
-                                  const std::string & file, Managed manage);
+                                  const std::string & file, LibraryManaged manage);
 
     /** add a fs file to the library
      * @param file the file path
@@ -100,18 +101,20 @@ public:
     /** add a file to the library
      * @param folder_id the id of the containing folder
      * @param file the file path
-     * @param manage pass Managed::YES if the library *manage* the file. Currently unsupported.
+     * @param manage pass LibraryManaged::YES if the library *manage* the file.
+     * Currently unsupported.
      */
-    library_id_t addFile(library_id_t folder_id, const std::string & file, Managed manage);
+    library_id_t addFile(library_id_t folder_id, const std::string & file, LibraryManaged manage);
 
     /** add a bundle of files to the library
      * @param folder_id the id of the containing folder
      * @param bundle the bundle
-     * @param manage pass Managed::YES if the library *manage* the file. Currently unsupported.
+     * @param manage pass LibraryManaged::YES if the library *manage* the file.
+     * Currently unsupported.
      */
     library_id_t addBundle(library_id_t folder_id,
                            const eng::FileBundlePtr& bundle,
-                           Managed manage);
+                           LibraryManaged manage);
     /** add a sidecar fsfile to a bundle (file)
      * @param file_id the id of the file bundle
      * @param fsfile_id the id of the fsfile
diff --git a/src/engine/importer/cameraimporter.cpp b/src/engine/importer/cameraimporter.cpp
index 5e81054..96a49ca 100644
--- a/src/engine/importer/cameraimporter.cpp
+++ b/src/engine/importer/cameraimporter.cpp
@@ -131,7 +131,7 @@ bool CameraImporter::do_import(const std::string& source, const std::string& des
                                                   imported_camera_file->name(),
                                                   output_path)) {
                     // XXX else report error.
-                    importer(output_path, IImporter::Import::SINGLE, Library::Managed::NO);
+                    importer(output_path, IImporter::Import::SINGLE, LibraryManaged::NO);
                 }
             }
             return true;
diff --git a/src/engine/importer/directoryimporter.cpp b/src/engine/importer/directoryimporter.cpp
index a232b05..18918f6 100644
--- a/src/engine/importer/directoryimporter.cpp
+++ b/src/engine/importer/directoryimporter.cpp
@@ -94,7 +94,7 @@ bool DirectoryImporter::do_import(const std::string& source, const std::string&
                                   const FileImporter& callback)
 {
     // pretty trivial, we have the source path.
-    callback(source, IImporter::Import::DIRECTORY, Library::Managed::NO);
+    callback(source, IImporter::Import::DIRECTORY, LibraryManaged::NO);
 
     // XXX return a real error
     return true;
diff --git a/src/engine/importer/iimporter.hpp b/src/engine/importer/iimporter.hpp
index 841b63a..0c5c092 100644
--- a/src/engine/importer/iimporter.hpp
+++ b/src/engine/importer/iimporter.hpp
@@ -57,7 +57,7 @@ public:
         DIRECTORY
     };
     /** file importer callback */
-    typedef std::function<void (const std::string&, Import, Library::Managed)> FileImporter;
+    typedef std::function<void (const std::string&, Import, LibraryManaged)> FileImporter;
     /** perform import from source
      * @param source the source identified by a string.
      * @param dest_dir the suggested destination directory is the importer needs to copy
diff --git a/src/engine/library/commands.cpp b/src/engine/library/commands.cpp
index 2a2c81d..b876e3b 100644
--- a/src/engine/library/commands.cpp
+++ b/src/engine/library/commands.cpp
@@ -57,9 +57,9 @@ void Commands::cmdListAllFolders(const Library::Ptr & lib)
 
 void Commands::cmdImportFile(const Library::Ptr & lib,
                              const std::string & file_path,
-                             Library::Managed manage)
+                             LibraryManaged manage)
 {
-    DBG_ASSERT(manage == Library::Managed::NO,
+    DBG_ASSERT(manage == LibraryManaged::NO,
                "managing file is currently unsupported");
 
     FileBundlePtr bundle(filebundle_new());
@@ -80,9 +80,9 @@ void Commands::cmdImportFile(const Library::Ptr & lib,
 
 void Commands::cmdImportFiles(const Library::Ptr & lib,
                               const std::string & folder,
-                              const FileList::Ptr & files, Library::Managed manage)
+                              const FileList::Ptr & files, LibraryManaged manage)
 {
-    DBG_ASSERT(manage == Library::Managed::NO,
+    DBG_ASSERT(manage == LibraryManaged::NO,
                "managing file is currently unsupported");
 
     FileBundleListPtr bundles = filebundle_filter_bundles(files);
diff --git a/src/engine/library/commands.hpp b/src/engine/library/commands.hpp
index 0a151a1..2f99878 100644
--- a/src/engine/library/commands.hpp
+++ b/src/engine/library/commands.hpp
@@ -41,11 +41,11 @@ public:
                static void cmdListAllKeywords(const Library::Ptr & lib);
     static void cmdImportFile(const Library::Ptr & lib,
                               const std::string & path,
-                              Library::Managed manage);
+                              LibraryManaged manage);
     static void cmdImportFiles(const Library::Ptr & lib,
                                const std::string & folder,
                                const fwk::FileList::Ptr & files,
-                               Library::Managed manage);
+                               LibraryManaged manage);
                static void cmdQueryFolderContent(const Library::Ptr & lib, 
                                       library_id_t folder_id);
                static void cmdCountFolder(const Library::Ptr & lib, 
diff --git a/src/libraryclient/clientimpl.cpp b/src/libraryclient/clientimpl.cpp
index 5212b56..2f4101b 100644
--- a/src/libraryclient/clientimpl.cpp
+++ b/src/libraryclient/clientimpl.cpp
@@ -28,7 +28,7 @@
 using fwk::FileList;
 using eng::Op;
 using eng::Commands;
-using eng::Library;
+using eng::LibraryManaged;
 using eng::tid_t;
 
 namespace libraryclient {
@@ -174,14 +174,14 @@ tid_t ClientImpl::processXmpUpdateQueue(bool write_xmp)
     });
 }
 
-tid_t ClientImpl::importFile(const std::string & path, Library::Managed manage)
+tid_t ClientImpl::importFile(const std::string & path, LibraryManaged manage)
 {
     return schedule_op([path, manage](const auto& lib) {
         Commands::cmdImportFile(lib, path, manage);
     });
 }
 
-tid_t ClientImpl::importFromDirectory(const std::string & dir, Library::Managed manage)
+tid_t ClientImpl::importFromDirectory(const std::string & dir, LibraryManaged manage)
 {
     FileList::Ptr files;
 
diff --git a/src/libraryclient/clientimpl.hpp b/src/libraryclient/clientimpl.hpp
index d694999..8592c26 100644
--- a/src/libraryclient/clientimpl.hpp
+++ b/src/libraryclient/clientimpl.hpp
@@ -64,8 +64,8 @@ public:
 
     eng::tid_t processXmpUpdateQueue(bool write_xmp);
 
-    eng::tid_t importFile(const std::string & path, eng::Library::Managed manage);
-    eng::tid_t importFromDirectory(const std::string & dir, eng::Library::Managed manage);
+    eng::tid_t importFile(const std::string & path, eng::LibraryManaged manage);
+    eng::tid_t importFromDirectory(const std::string & dir, eng::LibraryManaged manage);
 
 protected:
     const fwk::Moniker m_moniker;
diff --git a/src/libraryclient/libraryclient.cpp b/src/libraryclient/libraryclient.cpp
index 4f1325b..c7955b2 100644
--- a/src/libraryclient/libraryclient.cpp
+++ b/src/libraryclient/libraryclient.cpp
@@ -136,12 +136,12 @@ eng::tid_t LibraryClient::processXmpUpdateQueue(bool write_xmp)
     return m_pImpl->processXmpUpdateQueue(write_xmp);
 }
 
-void LibraryClient::importFile(const std::string & path, eng::Library::Managed manage)
+void LibraryClient::importFile(const std::string & path, eng::LibraryManaged manage)
 {
     m_pImpl->importFile(path, manage);
 }
 
-void LibraryClient::importFromDirectory(const std::string & dir, eng::Library::Managed manage)
+void LibraryClient::importFromDirectory(const std::string & dir, eng::LibraryManaged manage)
 {
     m_pImpl->importFromDirectory(dir, manage);
 }
diff --git a/src/libraryclient/libraryclient.hpp b/src/libraryclient/libraryclient.hpp
index 27ff188..0822c29 100644
--- a/src/libraryclient/libraryclient.hpp
+++ b/src/libraryclient/libraryclient.hpp
@@ -86,13 +86,13 @@ public:
      * @param path the file path
      * @param manage true if imported file have to be managed
      */
-    void importFile(const std::string & path, eng::Library::Managed manage);
+    void importFile(const std::string & path, eng::LibraryManaged manage);
 
     /** Import files from a directory
      * @param dir the directory
      * @param manage true if imports have to be managed
      */
-    void importFromDirectory(const std::string & dir, eng::Library::Managed manage);
+    void importFromDirectory(const std::string & dir, eng::LibraryManaged manage);
 
     eng::ThumbnailCache & thumbnailCache()
         { return m_thumbnailCache; }
diff --git a/src/niepce/ui/niepcewindow.cpp b/src/niepce/ui/niepcewindow.cpp
index 5f5bf26..fe090e2 100644
--- a/src/niepce/ui/niepcewindow.cpp
+++ b/src/niepce/ui/niepcewindow.cpp
@@ -53,7 +53,7 @@ using libraryclient::LibraryClientPtr;
 using fwk::Application;
 using fwk::Configuration;
 using fwk::UndoHistory;
-using eng::Library;
+using eng::LibraryManaged;
 using eng::IImporter;
 
 namespace ui {
@@ -275,7 +275,7 @@ void NiepceWindow::on_action_file_import()
             auto dest_dir = import_dialog->get_dest_dir();
             importer->do_import(
                 source, dest_dir,
-                [this] (const std::string & path, IImporter::Import type, Library::Managed manage) {
+                [this] (const std::string & path, IImporter::Import type, LibraryManaged manage) {
                     if (type == IImporter::Import::SINGLE) {
                         m_libClient->importFile(path, manage);
                     } else {