Merge branch 'master' of git@gitorious.org:tmw/eathena

1 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index 2146879a..7bc29b47 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -1,21 +1,21 @@
 /*
  *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  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
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -24,6 +24,8 @@
 #include <guichan/widget.hpp>
 #include <cstdlib>
 
+#include "../utils/dtor.h"
+
 void TableModel::installListener(TableModelListener *listener)
 {
     listeners.insert(listener);
@@ -62,9 +64,7 @@ StaticTableModel::StaticTableModel(int row, int column) :
 
 StaticTableModel::~StaticTableModel()
 {
-    for (std::vector<gcn::Widget *>::const_iterator it = mTableModel.begin(); it != mTableModel.end(); it++)
-        if (*it)
-            delete *it;
+    delete_all(mTableModel);
 }
 
 void StaticTableModel::resize()