1 files changed, 25 insertions, 26 deletions

diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 17d8bfbf..ec5b0480 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2008  The Mana World Development Team
  *
- *  This file is part of Aethyra derived from original code
- *  from Guichan.
+ *  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
@@ -38,7 +37,7 @@ class GuiTableActionListener : public gcn::ActionListener
 public:
     GuiTableActionListener(GuiTable *_table, gcn::Widget *_widget, int _row, int _column);
 
-    virtual ~GuiTableActionListener(void);
+    virtual ~GuiTableActionListener();
 
     virtual void action(const gcn::ActionEvent& actionEvent);
 
@@ -63,7 +62,7 @@ GuiTableActionListener::GuiTableActionListener(GuiTable *table, gcn::Widget *wid
     }
 }
 
-GuiTableActionListener::~GuiTableActionListener(void)
+GuiTableActionListener::~GuiTableActionListener()
 {
     if (mWidget)
     {
@@ -97,13 +96,13 @@ GuiTable::GuiTable(TableModel *initial_model, gcn::Color background,
     addKeyListener(this);
 }
 
-GuiTable::~GuiTable(void)
+GuiTable::~GuiTable()
 {
     uninstallActionListeners();
     delete mModel;
 }
 
-TableModel* GuiTable::getModel(void) const
+TableModel *GuiTable::getModel() const
 {
     return mModel;
 }
@@ -126,7 +125,7 @@ void GuiTable::setModel(TableModel *new_model)
     }
 }
 
-void GuiTable::recomputeDimensions(void)
+void GuiTable::recomputeDimensions()
 {
     int rows_nr = mModel->getRows();
     int columns_nr = mModel->getColumns();
@@ -154,12 +153,12 @@ void GuiTable::setSelected(int row, int column)
     mSelectedRow = row;
 }
 
-int GuiTable::getSelectedRow(void)
+int GuiTable::getSelectedRow()
 {
     return mSelectedRow;
 }
 
-int GuiTable::getSelectedColumn(void)
+int GuiTable::getSelectedColumn()
 {
     return mSelectedColumn;
 }
@@ -169,7 +168,7 @@ void GuiTable::setLinewiseSelection(bool linewise)
     mLinewiseMode = linewise;
 }
 
-int GuiTable::getRowHeight(void)
+int GuiTable::getRowHeight()
 {
     if (mModel)
         return mModel->getRowHeight() + 1; // border
@@ -201,7 +200,7 @@ void GuiTable::setSelectedRow(int selected)
         {
             mSelectedRow = 0;
         }
-        else if ((selected >= mModel->getRows() && !mWrappingEnabled) || 
+        else if ((selected >= mModel->getRows() && !mWrappingEnabled) ||
                  (selected < 0 && mWrappingEnabled))
         {
             mSelectedRow = mModel->getRows() - 1;
@@ -226,7 +225,7 @@ void GuiTable::setSelectedColumn(int selected)
         {
             mSelectedColumn = 0;
         }
-        else if ((selected >= mModel->getColumns() && !mWrappingEnabled) || 
+        else if ((selected >= mModel->getColumns() && !mWrappingEnabled) ||
                  (selected < 0 && mWrappingEnabled))
         {
             mSelectedColumn = mModel->getColumns() - 1;
@@ -240,11 +239,11 @@ void GuiTable::setSelectedColumn(int selected)
 
 void GuiTable::uninstallActionListeners(void)
 {
-    delete_all(action_listeners);
-    action_listeners.clear();
+    delete_all(mActionListeners);
+    mActionListeners.clear();
 }
 
-void GuiTable::installActionListeners(void)
+void GuiTable::installActionListeners()
 {
     if (!mModel)
         return;
@@ -256,7 +255,7 @@ void GuiTable::installActionListeners(void)
         for (int column = 0; column < columns; ++column)
         {
             gcn::Widget *widget = mModel->getElementAt(row, column);
-            action_listeners.push_back(new GuiTableActionListener(this, widget,
+            mActionListeners.push_back(new GuiTableActionListener(this, widget,
                                                                   row, column));
         }
 
@@ -290,7 +289,7 @@ void GuiTable::draw(gcn::Graphics* graphics)
     int max_rows_nr = mModel->getRows() - first_row; // clip if neccessary:
     if (max_rows_nr < rows_nr)
         rows_nr = max_rows_nr;
- 
+
     // Now determine the first and last column
     // Take the easy way out; these are usually bounded and all visible.
     int first_column = 0;
@@ -338,7 +337,6 @@ void GuiTable::draw(gcn::Graphics* graphics)
                 graphics->pushClipArea(bounds);
                 widget->draw(graphics);
                 graphics->popClipArea();
-
             }
 
             x_offset += width;
@@ -369,7 +367,7 @@ void GuiTable::moveToBottom(gcn::Widget *widget)
         mTopWidget = NULL;
 }
 
-gcn::Rectangle GuiTable::getChildrenArea(void)
+gcn::Rectangle GuiTable::getChildrenArea()
 {
     return gcn::Rectangle(0, 0, getWidth(), getHeight());
 }
@@ -459,7 +457,7 @@ void GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
         mouseEvent.consume();
     }
 }
-        
+
 void GuiTable::mouseDragged(gcn::MouseEvent& mouseEvent)
 {
 }
@@ -479,7 +477,7 @@ void GuiTable::modelUpdated(bool completed)
     }
 }
 
-gcn::Widget* GuiTable::getWidgetAt(int x, int y)
+gcn::Widget *GuiTable::getWidgetAt(int x, int y)
 {
     int row = getRowForY(y);
     int column = getColumnForX(x);
@@ -531,12 +529,13 @@ void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler)
 {
     gcn::Widget::_setFocusHandler(focusHandler);
 
-    if (mModel)
-        for (int r = 0; r < mModel->getRows(); ++r)
-            for (int c = 0; c < mModel->getColumns(); ++c)
-            {
+    if (mModel) {
+        for (int r = 0; r < mModel->getRows(); ++r) {
+            for (int c = 0; c < mModel->getColumns(); ++c) {
                 gcn::Widget *w = mModel->getElementAt(r, c);
                 if (w)
                     w->_setFocusHandler(focusHandler);
             }
+        }
+    }
 }