Removed underscores from some non-conforming filenames

We don't use underscores in the filenames generally, and let's be
consistent on that matter.

34 files changed, 40 insertions, 37 deletions

diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index 0955ffca..798c172e 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -26,7 +26,7 @@
 #include "logindata.h"
 
 #include "gui/register.h"
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index 403d9afc..42854896 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -26,7 +26,7 @@
 #include "logindata.h"
 
 #include "gui/register.h"
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/passwordfield.h"
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index dc982e21..8513d573 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -21,9 +21,9 @@
 
 #include "gui/charcreatedialog.h"
 
-#include "gui/char_select.h"
-#include "gui/confirm_dialog.h"
-#include "gui/ok_dialog.h"
+#include "gui/charselectdialog.h"
+#include "gui/confirmdialog.h"
+#include "gui/okdialog.h"
 #include "gui/playerbox.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/char_select.cpp b/src/gui/charselectdialog.cpp
index ddcc62a5..afc349ea 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -19,11 +19,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/char_select.h"
+#include "gui/charselectdialog.h"
 
 #include "gui/charcreatedialog.h"
-#include "gui/confirm_dialog.h"
-#include "gui/ok_dialog.h"
+#include "gui/confirmdialog.h"
+#include "gui/okdialog.h"
 #include "gui/playerbox.h"
 
 #ifdef TMWSERV_SUPPORT
diff --git a/src/gui/char_select.h b/src/gui/charselectdialog.h
index 75a98465..75a98465 100644
--- a/src/gui/char_select.h
+++ b/src/gui/charselectdialog.h
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirmdialog.cpp
index 7caa4580..19c32999 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirmdialog.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/confirm_dialog.h"
+#include "gui/confirmdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/textbox.h"
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirmdialog.h
index 38ea2abd..38ea2abd 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirmdialog.h
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index a6bcb690..6dc86e13 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/guildwindow.h"
 
-#include "gui/confirm_dialog.h"
+#include "gui/confirmdialog.h"
 #include "gui/guildlistbox.h"
 #include "gui/textdialog.h"
 
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 33115f96..2b397ed7 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/inventorywindow.h"
 
-#include "gui/item_amount.h"
+#include "gui/itemamount.h"
 #include "gui/itemcontainer.h"
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
diff --git a/src/gui/item_amount.cpp b/src/gui/itemamount.cpp
index d259481e..518eb761 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/itemamount.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/item_amount.h"
+#include "gui/itemamount.h"
 
 #ifdef EATHENA_SUPPORT
 #include "gui/storagewindow.h"
diff --git a/src/gui/item_amount.h b/src/gui/itemamount.h
index 94ca8dc2..94ca8dc2 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/itemamount.h
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 021f8d4b..8391a5c4 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/login.h"
 
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index 2a04acd2..41b6985c 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/npcintegerdialog.h"
 
-#include "gui/npc_text.h"
+#include "gui/npctextdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/inttextfield.h"
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 97f9fdb7..65e4263e 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/npclistdialog.h"
 
-#include "gui/npc_text.h"
+#include "gui/npctextdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 446078e8..e5767c5f 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/npcstringdialog.h"
 
-#include "gui/npc_text.h"
+#include "gui/npctextdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
diff --git a/src/gui/npc_text.cpp b/src/gui/npctextdialog.cpp
index 770683eb..849c94ec 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npctextdialog.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/npc_text.h"
+#include "gui/npctextdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/layout.h"
diff --git a/src/gui/npc_text.h b/src/gui/npctextdialog.h
index ad32fdf4..ad32fdf4 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npctextdialog.h
diff --git a/src/gui/ok_dialog.cpp b/src/gui/okdialog.cpp
index fc8c81db..9da070eb 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/okdialog.cpp
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "gui/gui.h"
 
diff --git a/src/gui/ok_dialog.h b/src/gui/okdialog.h
index 5df2fb4f..5df2fb4f 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/okdialog.h
diff --git a/src/gui/partywindow.h b/src/gui/partywindow.h
index 63646008..c915d9ce 100644
--- a/src/gui/partywindow.h
+++ b/src/gui/partywindow.h
@@ -22,7 +22,7 @@
 #ifndef PARTYWINDOW_H
 #define PARTYWINDOW_H
 
-#include "gui/confirm_dialog.h"
+#include "gui/confirmdialog.h"
 
 #include "gui/widgets/avatar.h"
 #include "gui/widgets/window.h"
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 2c820bab..c76a9065 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -23,18 +23,18 @@
 
 #include "gui/chat.h"
 #include "gui/inventorywindow.h"
-#include "gui/item_amount.h"
+#include "gui/itemamount.h"
 
 #include "gui/widgets/browserbox.h"
 
 #include "being.h"
 #include "beingmanager.h"
-#include "floor_item.h"
+#include "flooritem.h"
 #include "graphics.h"
 #include "item.h"
 #include "localplayer.h"
 #include "npc.h"
-#include "player_relations.h"
+#include "playerrelations.h"
 
 #include "net/adminhandler.h"
 #include "net/net.h"
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 04da656b..dabf98fd 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -27,7 +27,7 @@
 #include "main.h"
 
 #include "gui/login.h"
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 9fb6b6a2..f3b0739a 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/serverdialog.h"
 
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 05a9eaa2..9417ad68 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/setup_audio.h"
 
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 9e43b322..0c15a1ee 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/setup_keyboard.h"
 
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/layouthelper.h"
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 367d21a2..01a99567 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/setup_players.h"
 
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 #include "gui/table.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index c2e6a682..d7507d19 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -26,7 +26,7 @@
 
 #include "gui/setuptab.h"
 
-#include "player_relations.h"
+#include "playerrelations.h"
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 4cae18ba..bf20658c 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/setup_video.h"
 
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index df6df65a..aada0bb2 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -20,8 +20,9 @@
  */
 
 #include "gui/storagewindow.h"
+
 #include "gui/inventorywindow.h"
-#include "gui/item_amount.h"
+#include "gui/itemamount.h"
 #include "gui/itemcontainer.h"
 #include "gui/viewport.h"
 
diff --git a/src/gui/table.h b/src/gui/table.h
index d73cf340..42fbab0e 100644
--- a/src/gui/table.h
+++ b/src/gui/table.h
@@ -22,13 +22,13 @@
 #ifndef TABLE_H
 #define TABLE_H
 
-#include <vector>
+#include "tablemodel.h"
 
 #include <guichan/keylistener.hpp>
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
 
-#include "table_model.h"
+#include <vector>
 
 class GuiTableActionListener;
 
diff --git a/src/gui/table_model.cpp b/src/gui/tablemodel.cpp
index 4fa13bae..e362a314 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/tablemodel.cpp
@@ -19,11 +19,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widget.hpp>
+#include "tablemodel.h"
 
-#include "table_model.h"
+#include "utils/dtor.h"
 
-#include "../utils/dtor.h"
+#include <guichan/widget.hpp>
 
 void TableModel::installListener(TableModelListener *listener)
 {
diff --git a/src/gui/table_model.h b/src/gui/tablemodel.h
index 9ca36120..a884932f 100644
--- a/src/gui/table_model.h
+++ b/src/gui/tablemodel.h
@@ -22,6 +22,8 @@
 #ifndef TABLE_MODEL_H
 #define TABLE_MODEL_H
 
+#include <guichanfwd.h>
+
 #include <set>
 #include <vector>
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 95e5dc47..9e39645d 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -27,7 +27,7 @@
 #include "units.h"
 
 #include "gui/inventorywindow.h"
-#include "gui/item_amount.h"
+#include "gui/itemamount.h"
 #include "gui/itemcontainer.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index b51d199e..c0959cc9 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -25,7 +25,7 @@
 #include "log.h"
 #include "logindata.h"
 
-#include "gui/ok_dialog.h"
+#include "gui/okdialog.h"
 #include "gui/register.h"
 
 #include "gui/widgets/button.h"