Commit 133e46f6 authored by cfouard's avatar cfouard
Browse files

FIXED QMap<something, something<else>> did not compile on GCC / MinGW (thanks...

FIXED QMap<something, something<else>> did not compile on GCC / MinGW (thanks Dashboard !). Replaced by QMap<something, something<else > >.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@400 ec899d31-69d1-42ba-9299-647d76f65fb3
parent eeb2ce33
......@@ -68,7 +68,7 @@ ActionTransition * ActionState::addActionTransition(QString buttonText, QAbstrac
for (QVector<Action::ApplyStatus>::const_iterator it = disableConditions.begin();
it != disableConditions.end(); it++) {
Action::ApplyStatus status = (*it);
QMap<Action::ApplyStatus, QVector<QPushButton *>>::iterator buts = conditionalButtons.find(status);
QMap<Action::ApplyStatus, QVector<QPushButton * > >::iterator buts = conditionalButtons.find(status);
if (buts != conditionalButtons.end()) {
buts.value().append(button);
}
......@@ -225,7 +225,7 @@ void ActionState::setPreviousActionStatus(camitk::Action::ApplyStatus status) {
}
// Inhibate/Re-enable proper buttons
for (QMap<Action::ApplyStatus, QVector<QPushButton *>>::const_iterator it = conditionalButtons.begin();
for (QMap<Action::ApplyStatus, QVector<QPushButton * > >::const_iterator it = conditionalButtons.begin();
it != conditionalButtons.end(); it++) {
Action::ApplyStatus itStatus = it.key();
QVector<QPushButton *> itButtons = it.value();
......
......@@ -73,7 +73,7 @@ protected:
QMap<QString, QString> outputComponentNames;
/// Buttons that should be disabled if the previous aciton state did not happen correctly
QMap<Action::ApplyStatus, QVector<QPushButton *>> conditionalButtons;
QMap<Action::ApplyStatus, QVector<QPushButton * > > conditionalButtons;
//// Descriptions that should be displaied if the previous action state did not happen correctly
QMap<Action::ApplyStatus, QString> conditionalDescriptions;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment