liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Morgan Hardwood
2016-07-09 23:49:31 +02:00
parent 93360770e1 3b734e4a7a
commit 040962c1b7
49 changed files with 418 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/exifpanel.cc
View File

@@ -294,7 +294,7 @@ void ExifPanel::delIt (Gtk::TreeModel::iterator iter)
}
if (recursiveOp)
for (Gtk::TreeModel::iterator i = iter->children().begin(); i != iter->children().end(); i++) {
for (Gtk::TreeModel::iterator i = iter->children().begin(); i != iter->children().end(); ++i) {
delIt (i);
}
}
@@ -325,7 +325,7 @@ void ExifPanel::keepIt (Gtk::TreeModel::iterator iter)
}
if (recursiveOp)
for (Gtk::TreeModel::iterator i = iter->children().begin(); i != iter->children().end(); i++) {
for (Gtk::TreeModel::iterator i = iter->children().begin(); i != iter->children().end(); ++i) {
keepIt (i);
}
}
@@ -491,7 +491,7 @@ void ExifPanel::editTag (Gtk::TreeModel::Children root, Glib::ustring name, Glib
// look up first segment of the path
Gtk::TreeModel::iterator iter;
for (iter = root.begin(); iter != root.end(); iter++)
for (iter = root.begin(); iter != root.end(); ++iter)
if (iter->get_value (exifColumns.field_nopango) == fseg) {
break;
}
@@ -600,7 +600,7 @@ void ExifPanel::updateChangeList (Gtk::TreeModel::Children root, std::string pre
Gtk::TreeModel::iterator iter;
for (iter = root.begin(); iter != root.end(); iter++) {
for (iter = root.begin(); iter != root.end(); ++iter) {
if (iter->get_value (exifColumns.edited) == true) {
changeList[ prefix + iter->get_value (exifColumns.field_nopango) ] = iter->get_value (exifColumns.value_nopango);
} else if (iter->get_value (exifColumns.action) == AC_WRITE && iter->get_value (exifColumns.icon) == delicon) {
@@ -625,7 +625,7 @@ void ExifPanel::updateChangeList ()
void ExifPanel::applyChangeList ()
{
for (rtengine::procparams::ExifPairs::iterator i = changeList.begin(); i != changeList.end(); i++) {
for (rtengine::procparams::ExifPairs::iterator i = changeList.begin(); i != changeList.end(); ++i) {
editTag (exifTreeModel->children(), i->first, i->second);
}
}