[niepce] importer: coding style adjustments

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

commit 8a4c2953e27e5b3128f92bb74a7fc51ef49be735
Author: Hubert Figuière <hub figuiere net>
Date:   Mon May 15 23:26:53 2017 -0400

    importer: coding style adjustments

 src/engine/importer/directoryimporter.cpp |    8 ++++----
 src/engine/importer/directoryimporter.hpp |   10 +++++-----
 src/engine/importer/iimporter.hpp         |    8 ++++----
 src/niepce/ui/dialogs/importdialog.cpp    |   22 +++++++++++-----------
 src/niepce/ui/dialogs/importdialog.hpp    |   10 +++++-----
 src/niepce/ui/niepcewindow.cpp            |   27 ++++++++++++++-------------
 6 files changed, 43 insertions(+), 42 deletions(-)
---
diff --git a/src/engine/importer/directoryimporter.cpp b/src/engine/importer/directoryimporter.cpp
index 2807786..95e85fd 100644
--- a/src/engine/importer/directoryimporter.cpp
+++ b/src/engine/importer/directoryimporter.cpp
@@ -59,8 +59,8 @@ std::string DirectoryImporter::name() const
   return _("Directory");
 }
 
-bool DirectoryImporter::listSourceContent(const std::string & source,
-                                          const SourceContentReady& callback)
+bool DirectoryImporter::list_source_content(const std::string & source,
+                                            const SourceContentReady& callback)
 {
   auto files =
     fwk::FileList::getFilesFromDirectory(source,
@@ -88,8 +88,8 @@ bool DirectoryImporter::get_previews_for(const std::string& source,
   return true;
 }
 
-bool DirectoryImporter::doImport(const std::string& source,
-                                 const FileImporter& callback)
+bool DirectoryImporter::do_import(const std::string& source,
+                                  const FileImporter& callback)
 {
   // pretty trivial, we have the source path.
   callback(source, false);
diff --git a/src/engine/importer/directoryimporter.hpp b/src/engine/importer/directoryimporter.hpp
index a20348c..65aefff 100644
--- a/src/engine/importer/directoryimporter.hpp
+++ b/src/engine/importer/directoryimporter.hpp
@@ -37,14 +37,14 @@ public:
 
   std::string name() const override;
 
-  bool listSourceContent(const std::string & source,
-                         const SourceContentReady& callback) override;
-  bool get_previews_for(const std::string & source,
+  bool list_source_content(const std::string & source,
+                           const SourceContentReady& callback) override;
+  bool get_previews_for(const std::string& source,
                         const std::list<std::string>& paths,
                         const PreviewReady& callback) override;
 
-  bool doImport(const std::string & source,
-                const FileImporter & importer) override;
+  bool do_import(const std::string & source,
+                 const FileImporter & importer) override;
 
 };
 
diff --git a/src/engine/importer/iimporter.hpp b/src/engine/importer/iimporter.hpp
index 03746a6..0ed963b 100644
--- a/src/engine/importer/iimporter.hpp
+++ b/src/engine/importer/iimporter.hpp
@@ -43,8 +43,8 @@ public:
   /** Source content is ready */
   typedef std::function<void (std::list<ImportedFile::Ptr>&&)> SourceContentReady;
   /** list the source content and store it. */
-  virtual bool listSourceContent(const std::string & source,
-                                 const SourceContentReady& callback) = 0;
+  virtual bool list_source_content(const std::string& source,
+                                   const SourceContentReady& callback) = 0;
 
   typedef std::function<void (const std::string& path,
                               const fwk::Thumbnail&)> PreviewReady;
@@ -55,8 +55,8 @@ public:
   /** file importer callback */
   typedef std::function<void (const std::string&, bool)> FileImporter;
   /** perform import from source */
-  virtual bool doImport(const std::string & source,
-                        const FileImporter & importer) = 0;
+  virtual bool do_import(const std::string& source,
+                        const FileImporter& importer) = 0;
 
 };
 
diff --git a/src/niepce/ui/dialogs/importdialog.cpp b/src/niepce/ui/dialogs/importdialog.cpp
index 3d2eb11..a67a3bc 100644
--- a/src/niepce/ui/dialogs/importdialog.cpp
+++ b/src/niepce/ui/dialogs/importdialog.cpp
@@ -51,8 +51,8 @@ ImportDialog::ImportDialog()
     , m_ufraw_import_check(nullptr)
     , m_rawstudio_import_check(nullptr)
     , m_directory_name(nullptr)
-    , m_destinationFolder(nullptr)
-    , m_attributesScrolled(nullptr)
+    , m_destination_folder(nullptr)
+    , m_attributes_scrolled(nullptr)
     , m_images_list_scrolled(nullptr)
 {
 }
@@ -72,19 +72,19 @@ void ImportDialog::setup_widget()
 
     a_builder->get_widget("select_directories", select_directories);
     select_directories->signal_clicked().connect(
-        sigc::mem_fun(*this, &ImportDialog::doSelectDirectories));
+        sigc::mem_fun(*this, &ImportDialog::do_select_directories));
     a_builder->get_widget("date_tz_combo", m_date_tz_combo);
     a_builder->get_widget("ufraw_import_check", m_ufraw_import_check);
     a_builder->get_widget("rawstudio_import_check", m_rawstudio_import_check);
     a_builder->get_widget("directory_name", m_directory_name);
-    a_builder->get_widget("destinationFolder", m_destinationFolder);
+    a_builder->get_widget("destinationFolder", m_destination_folder);
 
     // Metadata pane.
-    a_builder->get_widget("attributes_scrolled", m_attributesScrolled);
+    a_builder->get_widget("attributes_scrolled", m_attributes_scrolled);
     m_metadata_pane = MetaDataPaneController::Ptr(new MetaDataPaneController);
     auto w = m_metadata_pane->buildWidget();
     add(m_metadata_pane);
-    m_attributesScrolled->add(*w);
+    m_attributes_scrolled->add(*w);
     w->show_all();
 
     // Gridview of previews.
@@ -108,7 +108,7 @@ void ImportDialog::setup_widget()
 }
 
 // XXX doesn't belong here
-void ImportDialog::doSelectDirectories()
+void ImportDialog::do_select_directories()
 {
   Configuration & cfg = Application::app()->config();
 
@@ -137,12 +137,12 @@ void ImportDialog::doSelectDirectories()
     }
   }
   if (!filename.empty()) {
-    setToImport(filename);
+    set_to_import(filename);
   }
 }
 
 // XXX doesn't belong here. Or must be deeply modified to deal with the Importer
-void ImportDialog::setToImport(const Glib::ustring & f)
+void ImportDialog::set_to_import(const Glib::ustring & f)
 {
     if (!m_importer) {
         // FIXME this should be the right kind
@@ -163,11 +163,11 @@ void ImportDialog::setToImport(const Glib::ustring & f)
     auto source_content =
       std::async(std::launch::async,
                  [f, importer, source_content_ready] () {
-                   return importer->listSourceContent(f, source_content_ready);
+                   return importer->list_source_content(f, source_content_ready);
                  });
 
     m_folder_path_source = f;
-    m_destinationFolder->set_text(fwk::path_basename(f));
+    m_destination_folder->set_text(fwk::path_basename(f));
     m_directory_name->set_text(f);
 }
 
diff --git a/src/niepce/ui/dialogs/importdialog.hpp b/src/niepce/ui/dialogs/importdialog.hpp
index 2ae942d..387d0ff 100644
--- a/src/niepce/ui/dialogs/importdialog.hpp
+++ b/src/niepce/ui/dialogs/importdialog.hpp
@@ -77,15 +77,15 @@ public:
 
 //  const std::list<std::string> & to_import() const
 //      { return m_list_to_import; }
-    const Glib::ustring & sourcePath() const
+    const Glib::ustring & source_path() const
         { return m_folder_path_source; }
-    void setToImport(const Glib::ustring & f);
+    void set_to_import(const Glib::ustring & f);
     const std::shared_ptr<eng::IImporter>& importer() const
         { return m_importer; }
 private:
     class ImportParam;
 
-    void doSelectDirectories();
+    void do_select_directories();
     void append_files_to_import();
     void preview_received();
 
@@ -96,8 +96,8 @@ private:
     Gtk::CheckButton *m_ufraw_import_check;
     Gtk::CheckButton *m_rawstudio_import_check;
     Gtk::Label *m_directory_name;
-    Gtk::Entry *m_destinationFolder;
-    Gtk::ScrolledWindow *m_attributesScrolled;
+    Gtk::Entry *m_destination_folder;
+    Gtk::ScrolledWindow *m_attributes_scrolled;
     Gtk::ScrolledWindow *m_images_list_scrolled;
     PreviewGridModel m_grid_columns;
     Glib::RefPtr<Gtk::ListStore> m_images_list_model;
diff --git a/src/niepce/ui/niepcewindow.cpp b/src/niepce/ui/niepcewindow.cpp
index 24b2f42..1613aca 100644
--- a/src/niepce/ui/niepcewindow.cpp
+++ b/src/niepce/ui/niepcewindow.cpp
@@ -259,19 +259,20 @@ void NiepceWindow::on_action_file_import()
     {
         // import
         // XXX change the API to provide more details.
-        Glib::ustring source = import_dialog->sourcePath();
-        if(!source.empty()) {
-            cfg.setValue("last_import_location", source);
-
-            auto importer = import_dialog->importer();
-            DBG_ASSERT(!!importer, "Import can't be null if we clicked import");
-            if (importer) {
-                importer->doImport(
-                    source,
-                    [this] (const std::string & path, bool manage) {
-                        m_libClient->importFromDirectory(path, manage);
-                    });
-            }
+        Glib::ustring source = import_dialog->source_path();
+        if(source.empty()) {
+            return;
+        }
+        cfg.setValue("last_import_location", source);
+
+        auto importer = import_dialog->importer();
+        DBG_ASSERT(!!importer, "Import can't be null if we clicked import");
+        if (importer) {
+            importer->do_import(
+                source,
+                [this] (const std::string & path, bool manage) {
+                    m_libClient->importFromDirectory(path, manage);
+                });
         }
         break;
     }