[niepce] c++: remote auto from lambda parameter



commit f04f17ea2a2e1d772d9d750294296f97daac6027
Author: Hubert Figuière <hub figuiere net>
Date:   Mon Feb 19 22:25:07 2018 -0500

    c++: remote auto from lambda parameter

 src/engine/importer/cameraimporter.cpp   | 2 +-
 src/engine/library/thumbnailcache.cpp    | 2 +-
 src/fwk/toolkit/controller.cpp           | 4 ++--
 src/fwk/toolkit/metadatawidget.cpp       | 2 +-
 src/fwk/toolkit/undo.cpp                 | 4 ++--
 src/fwk/utils/modulemanager.cpp          | 2 +-
 src/niepce/ui/metadatapanecontroller.cpp | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/engine/importer/cameraimporter.cpp b/src/engine/importer/cameraimporter.cpp
index 8dbdb99..81eb893 100644
--- a/src/engine/importer/cameraimporter.cpp
+++ b/src/engine/importer/cameraimporter.cpp
@@ -107,7 +107,7 @@ bool CameraImporter::do_import(const std::string& source, const std::string& des
                                const FileImporter & importer)
 {
     // XXX we shouldn't have to do that.
-    list_source_content(source, [this, dest_dir, importer] (auto file_list) {
+    list_source_content(source, [this, dest_dir, importer] (std::list<ImportedFilePtr>&& file_list) {
             auto tmp_dir_path = dest_dir.empty() ?
                 fwk::make_tmp_dir("niepce-camera-import-XXXXXX") :
                 dest_dir;
diff --git a/src/engine/library/thumbnailcache.cpp b/src/engine/library/thumbnailcache.cpp
index cdddd1e..2bd426c 100644
--- a/src/engine/library/thumbnailcache.cpp
+++ b/src/engine/library/thumbnailcache.cpp
@@ -48,7 +48,7 @@ void ThumbnailCache::request(const LibFileList& fl)
 {
     clear();
     std::for_each(fl.begin(), fl.end(),
-                  [this] (const auto& f) {
+                  [this] (const LibFilePtr& f) {
                       ThumbnailTask::Ptr task(new ThumbnailTask(f, 160, 160));
                       this->schedule(task);
                   });
diff --git a/src/fwk/toolkit/controller.cpp b/src/fwk/toolkit/controller.cpp
index dff43cc..e70efc1 100644
--- a/src/fwk/toolkit/controller.cpp
+++ b/src/fwk/toolkit/controller.cpp
@@ -62,7 +62,7 @@ void Controller::terminate()
 {
     DBG_OUT("terminating controller");
     std::for_each(m_subs.cbegin(), m_subs.cend(),
-                  [] (const auto& ctrl) {
+                  [] (const Ptr& ctrl) {
                     ctrl->terminate();
                   });
     clearParent();
@@ -76,7 +76,7 @@ void Controller::_added()
 void Controller::_ready()
 {
     std::for_each(m_subs.cbegin(), m_subs.cend(),
-                  [] (const auto& ctrl) {
+                  [] (const Ptr& ctrl) {
                     ctrl->_ready();
                   });
     on_ready();
diff --git a/src/fwk/toolkit/metadatawidget.cpp b/src/fwk/toolkit/metadatawidget.cpp
index 4e9b9c4..ce38485 100644
--- a/src/fwk/toolkit/metadatawidget.cpp
+++ b/src/fwk/toolkit/metadatawidget.cpp
@@ -227,7 +227,7 @@ void MetaDataWidget::set_data_source(const fwk::PropertyBagPtr& properties)
     m_current_data = properties;
     if(!m_data_map.empty()) {
         std::for_each(m_data_map.cbegin(), m_data_map.cend(),
-                      [this] (const auto& p) {
+                      [this] (const decltype(m_data_map)::value_type& p) {
                           this->clear_widget(p);
                       });
     }
diff --git a/src/fwk/toolkit/undo.cpp b/src/fwk/toolkit/undo.cpp
index cac6d4e..39a34f1 100644
--- a/src/fwk/toolkit/undo.cpp
+++ b/src/fwk/toolkit/undo.cpp
@@ -47,7 +47,7 @@ void UndoTransaction::undo()
 {
     DBG_OUT("undo transaction %lu cmd", (unsigned long)m_operations.size());
     std::for_each(m_operations.rbegin(), m_operations.rend(),
-                  [] (auto cmd) {
+                  [] (const std::shared_ptr<Command>& cmd) {
                       cmd->undo();
                   });
 }
@@ -56,7 +56,7 @@ void UndoTransaction::redo()
 {
     DBG_OUT("redo transaction %lu cmd", (unsigned long)m_operations.size());
     std::for_each(m_operations.begin(), m_operations.end(),
-                  [] (auto cmd) {
+                  [] (const std::shared_ptr<Command>& cmd) {
                       cmd->redo();
                   });
 }
diff --git a/src/fwk/utils/modulemanager.cpp b/src/fwk/utils/modulemanager.cpp
index b1f4a0a..2f99f16 100644
--- a/src/fwk/utils/modulemanager.cpp
+++ b/src/fwk/utils/modulemanager.cpp
@@ -65,7 +65,7 @@ namespace fwk {
         iter != m_dirs.cend(); ++iter) {
 
       fwk::FileList::Ptr l;
-      l = FileList::getFilesFromDirectory(*iter, [ext] (const auto& f) {
+      l = FileList::getFilesFromDirectory(*iter, [ext] (const Glib::RefPtr<Gio::FileInfo>& f) {
           return fwk::filter_ext(f, ext);
       });
 
diff --git a/src/niepce/ui/metadatapanecontroller.cpp b/src/niepce/ui/metadatapanecontroller.cpp
index fb8fb5f..760bb22 100644
--- a/src/niepce/ui/metadatapanecontroller.cpp
+++ b/src/niepce/ui/metadatapanecontroller.cpp
@@ -153,7 +153,7 @@ void MetaDataPaneController::display(eng::library_id_t file_id, const eng::LibMe
         properties = eng::libmetadata_to_properties(meta, *propset);
     }
     std::for_each(m_widgets.begin(), m_widgets.end(),
-                  [properties] (auto w) {
+                  [properties] (decltype(m_widgets)::value_type w) {
                       w->set_data_source(properties);
                   });
 }


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