# HG changeset patch
# User unc0rr
# Date 1354215008 -14400
# Node ID a098374b847b6b39cd1f13661f1c58232bcdc130
# Parent  cfb228baa59897521ea9a5c1b43448bb26682538
A bit of refactoring

diff -r cfb228baa598 -r a098374b847b QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Thu Nov 29 14:02:28 2012 +1300
+++ b/QTfrontend/hwform.cpp	Thu Nov 29 22:50:08 2012 +0400
@@ -439,23 +439,16 @@
     }
 }
 
-void HWForm::UpdateTeamsLists(const QStringList* editable_teams)
+void HWForm::UpdateTeamsLists()
 {
-    QStringList teamslist;
-    if(editable_teams)
-    {
-        teamslist =* editable_teams;
-    }
-    else
-    {
-        teamslist = config->GetTeamsList();
-    }
+    QStringList teamslist = config->GetTeamsList();
 
     if(teamslist.empty())
     {
         QString currentNickName = gameSettings->value("net/nick","").toString().toUtf8();
         QString teamName;
-        if (currentNickName == "")
+
+        if (currentNickName.isEmpty())
         {
             teamName = tr("DefaultTeam");
         }
@@ -463,6 +456,7 @@
         {
             teamName = tr("%1's Team").arg(currentNickName);
         }
+
         HWTeam defaultTeam(teamName);
         defaultTeam.saveToFile();
         teamslist.push_back(teamName);
diff -r cfb228baa598 -r a098374b847b QTfrontend/hwform.h
--- a/QTfrontend/hwform.h	Thu Nov 29 14:02:28 2012 +1300
+++ b/QTfrontend/hwform.h	Thu Nov 29 22:50:08 2012 +0400
@@ -146,7 +146,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();
diff -r cfb228baa598 -r a098374b847b QTfrontend/ui/widget/teamselect.cpp
--- a/QTfrontend/ui/widget/teamselect.cpp	Thu Nov 29 14:02:28 2012 +1300
+++ b/QTfrontend/ui/widget/teamselect.cpp	Thu Nov 29 22:50:08 2012 +0400
@@ -269,7 +269,7 @@
 
     // Add notice about number of required teams.
     numTeamNotice = new QLabel("Two teams are required to play!");
-    mainLayout.addWidget((QWidget*)numTeamNotice);
+    mainLayout.addWidget(numTeamNotice);
 
     QPalette p;
     p.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));