diff -r 7f70f37bbf08 -r 4c2dd25630a7 QTfrontend/ui/page/pageeditteam.cpp --- a/QTfrontend/ui/page/pageeditteam.cpp Sat Apr 28 18:56:31 2012 +0200 +++ b/QTfrontend/ui/page/pageeditteam.cpp Sun Apr 29 14:00:35 2012 +0200 @@ -29,7 +29,6 @@ #include "sdlkeys.h" #include "SquareLabel.h" -#include "hats.h" #include "HWApplication.h" #include "DataManager.h" @@ -61,11 +60,12 @@ GBoxHedgehogs->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); QGridLayout * GBHLayout = new QGridLayout(GBoxHedgehogs); - HatsModel * hatsModel = new HatsModel(GBoxHedgehogs); + HatModel * hatModel = DataManager::instance().hatModel(); + for(int i = 0; i < HEDGEHOGS_PER_TEAM; i++) { HHHats[i] = new QComboBox(GBoxHedgehogs); - HHHats[i]->setModel(hatsModel); + HHHats[i]->setModel(hatModel); HHHats[i]->setIconSize(QSize(32, 37)); //HHHats[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents); //HHHats[i]->setModelColumn(1);