Skip to content
Permalink
Browse files
This should of gone in with r5681
git-svn-id: http://svn.osgeo.org/qgis/trunk@5684 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Aug 10, 2006
1 parent 3dd4fe4 commit 5fb61d3b1607e7e9324d6429cd42193aa934bde8
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/gui/qgsattributeaction.cpp
@@ -111,7 +111,7 @@ QgsAttributeAction::aIter QgsAttributeAction::retrieveAction(unsigned int index)
if (index >= 0 && index < mActions.size())
{
a_iter = mActions.begin();
for (int i = 0; i < index; ++i, ++a_iter)
for (unsigned int i = 0; i < index; ++i, ++a_iter)
{}
}
return a_iter;
@@ -136,12 +136,12 @@ QString QgsAttributeAction::expandAction(QString action, const std::vector<std::
// for the actual substitutions.

QString expanded_action;
if (clickedOnValue >= 0 && clickedOnValue < values.size())
if (clickedOnValue >= 0 && clickedOnValue < static_cast<unsigned int>(values.size()))
expanded_action = action.replace("%%", values[clickedOnValue].second);
else
expanded_action = action;

for (int i = 0; i < values.size(); ++i)
for (unsigned int i = 0; i < values.size(); ++i)
{
QString to_replace = "%" + values[i].first;
expanded_action = expanded_action.replace(to_replace, values[i].second);

0 comments on commit 5fb61d3

Please sign in to comment.