[niepce: 4/12] Import: some code style fixes



commit 817ab94bc21da8b3a9ec2cd1ccc85b8cecf0192e
Author: Hubert Figuière <hub figuiere net>
Date:   Sat Feb 7 12:09:03 2015 -0500

    Import: some code style fixes

 src/niepce/ui/dialogs/importdialog.cpp |   11 ++++++-----
 src/niepce/ui/dialogs/importdialog.hpp |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/niepce/ui/dialogs/importdialog.cpp b/src/niepce/ui/dialogs/importdialog.cpp
index bf21897..85bd7f4 100644
--- a/src/niepce/ui/dialogs/importdialog.cpp
+++ b/src/niepce/ui/dialogs/importdialog.cpp
@@ -91,10 +91,10 @@ void ImportDialog::setup_widget()
 
     // Gridview of previews.
     a_builder->get_widget("images_list_scrolled", m_images_list_scrolled);
-    m_imagesListModel = Gtk::ListStore::create(m_grid_columns);
+    m_images_list_model = Gtk::ListStore::create(m_grid_columns);
     m_gridview = Gtk::manage(
         new Gtk::IconView(
-            Glib::RefPtr<Gtk::TreeModel>::cast_dynamic(m_imagesListModel)));
+            Glib::RefPtr<Gtk::TreeModel>::cast_dynamic(m_images_list_model)));
     m_gridview->set_pixbuf_column(m_grid_columns.pixbuf);
     m_gridview->set_text_column(m_grid_columns.filename);
     m_gridview->show();
@@ -102,7 +102,7 @@ void ImportDialog::setup_widget()
     m_is_setup = true;
 }
 
-
+// XXX doesn't belong here
 void ImportDialog::doSelectDirectories()
 {
     Configuration & cfg = Application::app()->config();
@@ -130,6 +130,7 @@ void ImportDialog::doSelectDirectories()
     }
 }
 
+// XXX doesn't belong here. Or must be deeply modified to deal with the Importer
 void ImportDialog::setToImport(const Glib::ustring & f)
 {
     if (!m_importer) {
@@ -146,14 +147,14 @@ void ImportDialog::setToImport(const Glib::ustring & f)
     m_destinationFolder->set_text(fwk::path_basename(f));
     m_directory_name->set_text(f);
 
-    m_imagesListModel->clear();
+    m_images_list_model->clear();
 
     if(target_content.get()) {
         auto list_to_import = m_importer->getTargetContent();
 
         for(const auto & f : list_to_import) {
             DBG_OUT("selected %s", f->name().c_str());
-            Gtk::TreeIter iter = m_imagesListModel->append();
+            Gtk::TreeIter iter = m_images_list_model->append();
             iter->set_value(m_grid_columns.filename, Glib::ustring(f->name()));
             iter->set_value(m_grid_columns.file, std::move(f));
         }
diff --git a/src/niepce/ui/dialogs/importdialog.hpp b/src/niepce/ui/dialogs/importdialog.hpp
index d7601f3..e3ed25e 100644
--- a/src/niepce/ui/dialogs/importdialog.hpp
+++ b/src/niepce/ui/dialogs/importdialog.hpp
@@ -96,7 +96,7 @@ private:
     Gtk::ScrolledWindow *m_attributesScrolled;
     Gtk::ScrolledWindow *m_images_list_scrolled;
     PreviewGridModel m_grid_columns;
-    Glib::RefPtr<Gtk::ListStore> m_imagesListModel;
+    Glib::RefPtr<Gtk::ListStore> m_images_list_model;
 
     Gtk::IconView *m_gridview;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]