equal
deleted
inserted
replaced
123 // set according color iterator |
123 // set according color iterator |
124 pOurFrameTeams->currentColor=std::find(pOurFrameTeams->availableColors.begin(), |
124 pOurFrameTeams->currentColor=std::find(pOurFrameTeams->availableColors.begin(), |
125 pOurFrameTeams->availableColors.end(), color); |
125 pOurFrameTeams->availableColors.end(), color); |
126 if(pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) { |
126 if(pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) { |
127 // error condition |
127 // error condition |
128 throw; |
|
129 pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin(); |
128 pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin(); |
130 } |
129 } |
131 } |
130 } |
132 |
131 |
133 QPalette newPalette = palette(); |
132 QPalette newPalette = palette(); |