diff --git a/modules/gui/pymod/export_tool.cc b/modules/gui/pymod/export_tool.cc index 73067336468023385aaa0cfd10a673be4126a2f1..946340659ba6bbf7aa8f26c161dd163adffc8124 100644 --- a/modules/gui/pymod/export_tool.cc +++ b/modules/gui/pymod/export_tool.cc @@ -45,7 +45,7 @@ struct WrappedTool : public Tool { try { return call_method<void, MouseEvent>(self, "Click", event); - } catch(error_already_set& e) { + } catch(error_already_set& ) { PyErr_Print(); } } @@ -58,7 +58,7 @@ struct WrappedTool : public Tool { try { return call_method< bool, gfx::NodePtrList >(self, "CanOperateOn", nodes); - } catch(error_already_set& e) { + } catch(error_already_set& ) { PyErr_Print(); } return false; @@ -71,7 +71,7 @@ struct WrappedTool : public Tool String loc = call_method<String>(self, "GetIconPath"); QIcon icon = QIcon(loc.c_str()); return icon; - } catch(error_already_set& e) { + } catch(error_already_set& ) { PyErr_Print(); } QIcon icon = QIcon(); diff --git a/modules/gui/src/sequence/sequence_model.cc b/modules/gui/src/sequence/sequence_model.cc index 95264958be0efc8cecece4a36551c031d31f572b..fc55fe0188f1a3bb32cf89ddf09571d55cb354a4 100644 --- a/modules/gui/src/sequence/sequence_model.cc +++ b/modules/gui/src/sequence/sequence_model.cc @@ -184,13 +184,13 @@ QModelIndexList SequenceModel::GetModelIndexes(const QString& subject, const QSt for (int i = 0; i<objects_.size(); i++){ ViewObject* object = objects_[i]; QMap<int, QList<int> > indexes = object->GetIndexesForSubject(subject,sequence_name); - QMapIterator< int, QList<int> > i(indexes); - while (i.hasNext()) { - i.next(); - int row = this->GetGlobalRow(object, i.key()); - const QList<int>& index_list = i.value(); - for(int i=0; i<index_list.size(); i++){ - list.append(this->index(row,index_list[i])); + QMapIterator< int, QList<int> > iter(indexes); + while (iter.hasNext()) { + iter.next(); + int row = this->GetGlobalRow(object, iter.key()); + const QList<int>& index_list = iter.value(); + for(int j=0; j<index_list.size(); j++){ + list.append(this->index(row,index_list[j])); } } } diff --git a/modules/io/src/formatted_line.hh b/modules/io/src/formatted_line.hh index ae3c5cafd7af9db058c3d875c3c5137a8ebaffe1..dbc573d2808ce6f944f0ae72a58bfd56294e124c 100644 --- a/modules/io/src/formatted_line.hh +++ b/modules/io/src/formatted_line.hh @@ -68,7 +68,7 @@ struct LPaddedInt { struct LPaddedFloat { LPaddedFloat(Real val, int prec) { - double rounded_val=round(val*pow(10, prec))*pow(0.1, prec); + Real rounded_val=round(val*pow(Real(10), prec))*pow(Real(0.1), prec); size_t curr=0; bool minus=rounded_val<0; rounded_val=std::abs(rounded_val);