[niepce: 18/22] C++11 the selection controller.
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce: 18/22] C++11 the selection controller.
- Date: Tue, 29 Jul 2014 08:07:00 +0000 (UTC)
commit 7c4cd0ae5ae2cc99d9fb69a72866dd8d7735abac
Author: Hubert Figuière <hub figuiere net>
Date: Sun Jul 27 11:33:39 2014 +0200
C++11 the selection controller.
src/fwk/base/propertybag.hpp | 1 +
src/niepce/ui/selectioncontroller.cpp | 26 +++++++++++++-------------
2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/src/fwk/base/propertybag.hpp b/src/fwk/base/propertybag.hpp
index 5f62031..e741909 100644
--- a/src/fwk/base/propertybag.hpp
+++ b/src/fwk/base/propertybag.hpp
@@ -61,6 +61,7 @@ public:
typedef std::shared_ptr<PropertyBag> Ptr;
typedef std::map<PropertyIndex, PropertyValue> _Map;
typedef _Map::const_iterator const_iterator;
+ typedef _Map::value_type value_type;
bool empty() const
{
diff --git a/src/niepce/ui/selectioncontroller.cpp b/src/niepce/ui/selectioncontroller.cpp
index 75449fa..cf7d2ba 100644
--- a/src/niepce/ui/selectioncontroller.cpp
+++ b/src/niepce/ui/selectioncontroller.cpp
@@ -125,7 +125,7 @@ eng::library_id_t SelectionController::get_selection() const
eng::LibFile::Ptr SelectionController::get_file(eng::library_id_t id) const
{
- Gtk::TreeIter iter = m_imageliststore->get_iter_from_id(id);
+ auto iter = m_imageliststore->get_iter_from_id(id);
if(iter) {
return (*iter)[m_imageliststore->columns().m_libfile];
}
@@ -183,7 +183,7 @@ void SelectionController::select_next()
void SelectionController::rotate(int angle)
{
DBG_OUT("angle = %d", angle);
- eng::library_id_t selection = get_selection();
+ auto selection = get_selection();
if(selection >= 0) {
Gtk::TreeIter iter = m_imageliststore->get_iter_from_id(selection);
if(iter) {
@@ -193,9 +193,9 @@ void SelectionController::rotate(int angle)
}
-bool SelectionController::_set_metadata(const std::string & undo_label,
+bool SelectionController::_set_metadata(const std::string & undo_label,
const eng::LibFile::Ptr & file,
- fwk::PropertyIndex meta,
+ fwk::PropertyIndex meta,
int old_value, int new_value)
{
fwk::UndoTransaction *undo = fwk::Application::app()->begin_undo(undo_label);
@@ -209,27 +209,27 @@ bool SelectionController::_set_metadata(const std::string & undo_label,
return true;
}
-bool SelectionController::_set_metadata(const std::string & undo_label,
+bool SelectionController::_set_metadata(const std::string & undo_label,
const eng::LibFile::Ptr & file,
const fwk::PropertyBag & props,
const fwk::PropertyBag & old)
{
- fwk::UndoTransaction *undo = fwk::Application::app()->begin_undo(undo_label);
- for(fwk::PropertyBag::const_iterator iter = props.begin();
- iter != props.end(); ++iter) {
-
+ auto undo = fwk::Application::app()->begin_undo(undo_label);
+ for(auto iter : props) {
fwk::PropertyValue value;
- old.get_value_for_property(iter->first, value);
+ old.get_value_for_property(iter.first, value);
if(value.type() != typeid(fwk::EmptyValue)) {
- DBG_ASSERT(value.type() == iter->second.type(), "Value type mismatch");
+ DBG_ASSERT(value.type() == iter.second.type(),
+ "Value type mismatch");
}
undo->new_command<void>(
std::bind(&libraryclient::LibraryClient::setMetadata,
- getLibraryClient(), file->id(), iter->first, iter->second),
+ getLibraryClient(), file->id(),
+ iter.first, iter.second),
std::bind(&libraryclient::LibraryClient::setMetadata,
- getLibraryClient(), file->id(), iter->first, value)
+ getLibraryClient(), file->id(), iter.first, value)
);
}
undo->execute();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]