diff -r 6482875b0d97 -r 171da01bd04d QTfrontend/hwform.h --- a/QTfrontend/hwform.h Fri Nov 30 18:19:52 2012 +0400 +++ b/QTfrontend/hwform.h Tue Dec 04 09:15:55 2012 +0400 @@ -61,7 +61,6 @@ HWForm(QWidget *parent = 0, QString styleSheet = ""); Ui_HWForm ui; static GameUIConfig * config; - static QSettings * gameSettings; // Same file GameUIConfig points to but without the baggage. Needs sync() calls if you want to get GameUIConfig changes though void updateXfire(); void PlayDemoQuick(const QString & demofilename); void exit(); @@ -146,7 +145,7 @@ private: void _NetConnect(const QString & hostName, quint16 port, QString nick); - void UpdateTeamsLists(const QStringList* editable_teams=0); + void UpdateTeamsLists(); void CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo); void closeEvent(QCloseEvent *event); void CustomizePalettes(); @@ -178,8 +177,8 @@ ID_PAGE_DRAWMAP , ID_PAGE_DATADOWNLOAD , ID_PAGE_FEEDBACK , - ID_PAGE_VIDEOS, - MAX_PAGE + ID_PAGE_VIDEOS , + MAX_PAGE }; QPointer game; QPointer pnetserver;