diff -r 7d7c16ed5056 -r 3dd031a8b395 QTfrontend/frameTeam.cpp --- a/QTfrontend/frameTeam.cpp Sat Sep 18 01:50:29 2010 +0200 +++ b/QTfrontend/frameTeam.cpp Sat Sep 18 12:35:58 2010 +0200 @@ -35,12 +35,9 @@ mainLayout.setSpacing(1); mainLayout.setContentsMargins(4, 4, 4, 4); - availableColors.push_back(*color1); - availableColors.push_back(*color2); - availableColors.push_back(*color3); - availableColors.push_back(*color4); - availableColors.push_back(*color5); - availableColors.push_back(*color6); + int i = 0; + while(colors[i]) + availableColors.push_back(*colors[i++]); resetColors(); } @@ -57,7 +54,7 @@ void FrameTeams::resetColors() { - currentColor=availableColors.begin(); + currentColor=availableColors.end() - 1; // ensure next color is the first one } QColor FrameTeams::getNextColor() const