Skip to content

Commit eec7b18

Browse files
author
g_j_m
committed
This should of gone in with r5681
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5684 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 377298b commit eec7b18

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/gui/qgsattributeaction.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ QgsAttributeAction::aIter QgsAttributeAction::retrieveAction(unsigned int index)
111111
if (index >= 0 && index < mActions.size())
112112
{
113113
a_iter = mActions.begin();
114-
for (int i = 0; i < index; ++i, ++a_iter)
114+
for (unsigned int i = 0; i < index; ++i, ++a_iter)
115115
{}
116116
}
117117
return a_iter;
@@ -136,12 +136,12 @@ QString QgsAttributeAction::expandAction(QString action, const std::vector<std::
136136
// for the actual substitutions.
137137

138138
QString expanded_action;
139-
if (clickedOnValue >= 0 && clickedOnValue < values.size())
139+
if (clickedOnValue >= 0 && clickedOnValue < static_cast<unsigned int>(values.size()))
140140
expanded_action = action.replace("%%", values[clickedOnValue].second);
141141
else
142142
expanded_action = action;
143143

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

0 commit comments

Comments
 (0)