1 files changed, 19 insertions, 20 deletions

diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 05748000..1451e71e 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2008  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -69,9 +68,9 @@ static const char *RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
 class PlayerRelationListModel : public gcn::ListModel
 {
 public:
-    virtual ~PlayerRelationListModel(void) { }
+    virtual ~PlayerRelationListModel() { }
 
-    virtual int getNumberOfElements(void)
+    virtual int getNumberOfElements()
     {
         return PlayerRelation::RELATIONS_NR;
     }
@@ -87,30 +86,30 @@ public:
 class PlayerTableModel : public TableModel
 {
 public:
-    PlayerTableModel(void) :
+    PlayerTableModel() :
         mPlayers(NULL)
     {
         playerRelationsUpdated();
     }
 
-    virtual ~PlayerTableModel(void)
+    virtual ~PlayerTableModel()
     {
         freeWidgets();
         if (mPlayers)
             delete mPlayers;
     }
 
-    virtual int getRows(void)
+    virtual int getRows()
     {
         return mPlayers->size();
     }
 
-    virtual int getColumns(void)
+    virtual int getColumns()
     {
         return COLUMNS_NR;
     }
 
-    virtual int getRowHeight(void)
+    virtual int getRowHeight()
     {
         return ROW_HEIGHT;
     }
@@ -123,7 +122,7 @@ public:
             return RELATION_CHOICE_COLUMN_WIDTH;
     }
 
-    virtual void playerRelationsUpdated(void)
+    virtual void playerRelationsUpdated()
     {
         signalBeforeUpdate();
 
@@ -139,10 +138,10 @@ public:
             std::string name = (*player_names)[r];
             gcn::Widget *widget = new Label(name);
             mWidgets.push_back(widget);
-            gcn::ListModel *playerRelation = new PlayerRelationListModel();
+            gcn::ListModel *playerRelation = new PlayerRelationListModel;
 
             gcn::DropDown *choicebox = new DropDown(playerRelation,
-                                                    new ScrollArea(),
+                                                    new ScrollArea,
                                                     new ListBox(playerRelation),
                                                     false);
             choicebox->setSelected(player_relations.getRelation(name));
@@ -167,7 +166,7 @@ public:
         return mWidgets[WIDGET_AT(row, column)];
     }
 
-    virtual void freeWidgets(void)
+    virtual void freeWidgets()
     {
         if (mPlayers)
             delete mPlayers;
@@ -198,9 +197,9 @@ protected:
 class IgnoreChoicesListModel : public gcn::ListModel
 {
 public:
-    virtual ~IgnoreChoicesListModel(void) { }
+    virtual ~IgnoreChoicesListModel() { }
 
-    virtual int getNumberOfElements(void)
+    virtual int getNumberOfElements()
     {
         return player_relations.getPlayerIgnoreStrategies()->size();
     }
@@ -220,7 +219,7 @@ public:
 
 Setup_Players::Setup_Players():
     mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
-    mPlayerTableModel(new PlayerTableModel()),
+    mPlayerTableModel(new PlayerTableModel),
     mPlayerTable(new GuiTable(mPlayerTableModel)),
     mPlayerTitleTable(new GuiTable(mPlayerTableTitleModel)),
     mPlayerScrollArea(new ScrollArea(mPlayerTable)),
@@ -240,8 +239,8 @@ Setup_Players::Setup_Players():
                                            RELATION_CHOICE_COLUMN_WIDTH);
     mPlayerTitleTable->setBackgroundColor(gcn::Color(0xbf, 0xbf, 0xbf));
 
-    gcn::ListModel *ignoreChoices = new IgnoreChoicesListModel();
-    mIgnoreActionChoicesBox = new DropDown(ignoreChoices, new ScrollArea(),
+    gcn::ListModel *ignoreChoices = new IgnoreChoicesListModel;
+    mIgnoreActionChoicesBox = new DropDown(ignoreChoices, new ScrollArea,
                                            new ListBox(ignoreChoices), false);
 
     for (int i = 0; i < COLUMNS_NR; i++)
@@ -294,7 +293,7 @@ Setup_Players::Setup_Players():
     setDimension(gcn::Rectangle(0, 0, 325, 280));
 }
 
-Setup_Players::~Setup_Players(void)
+Setup_Players::~Setup_Players()
 {
     player_relations.removeListener(this);
 }