From 0ef9776040d63744fb17dbb33aac0cf98d812ec4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 17:11:13 +0300 Subject: Move dialogtype.h into enums directory. --- src/gui/dialogsmanager.cpp | 2 +- src/gui/dialogtype.h | 38 -------------------------------- src/gui/widgets/tabs/setup_input.cpp | 3 ++- src/gui/widgets/tabs/setup_theme.cpp | 3 ++- src/gui/widgets/tabs/setup_video.cpp | 3 ++- src/gui/windows/changeemaildialog.cpp | 2 +- src/gui/windows/changepassworddialog.cpp | 2 +- src/gui/windows/charcreatedialog.cpp | 2 +- src/gui/windows/charselectdialog.cpp | 2 +- src/gui/windows/editserverdialog.cpp | 2 +- src/gui/windows/okdialog.cpp | 2 +- src/gui/windows/registerdialog.cpp | 2 +- src/gui/windows/socialwindow.cpp | 2 +- src/gui/windows/unregisterdialog.cpp | 2 +- 14 files changed, 16 insertions(+), 51 deletions(-) delete mode 100644 src/gui/dialogtype.h (limited to 'src/gui') diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp index 6ec6d4728..cb9381738 100644 --- a/src/gui/dialogsmanager.cpp +++ b/src/gui/dialogsmanager.cpp @@ -27,7 +27,7 @@ #include "being/attributes.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/widgets/selldialog.h" diff --git a/src/gui/dialogtype.h b/src/gui/dialogtype.h deleted file mode 100644 index 808ae0ca3..000000000 --- a/src/gui/dialogtype.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * 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. - * - * 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 this program. If not, see . - */ - -#ifndef GUI_DIALOGTYPE_H -#define GUI_DIALOGTYPE_H - -#undef ERROR - -namespace DialogType -{ - enum Type - { - OK = 0, - ERROR, - SILENCE - }; -} - -#endif // GUI_DIALOGTYPE_H diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index 9f026787a..c13c3d1ce 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -25,6 +25,8 @@ #include "configuration.h" +#include "enums/gui/dialogtype.h" + #include "input/inputmanager.h" #include "input/keyboardconfig.h" @@ -33,7 +35,6 @@ #include "input/pages/outfits.h" #include "input/pages/shortcuts.h" -#include "gui/dialogtype.h" #include "gui/gui.h" #include "gui/setupinputpages.h" diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index f983becbc..47d985a3e 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -22,7 +22,8 @@ #include "gui/widgets/tabs/setup_theme.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" + #include "gui/gui.h" #include "gui/themeinfo.h" diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index a6c8ab807..696927b6b 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -26,7 +26,8 @@ #include "graphicsmanager.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" + #include "gui/windowmanager.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index c6231d0e0..550e3c941 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -24,7 +24,7 @@ #include "client.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index 43200396b..9c2abef21 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -24,7 +24,7 @@ #include "client.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index fa52d2227..64346eabe 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -27,7 +27,7 @@ #include "input/inputaction.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index b6bc5c83e..51204bf4f 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -33,7 +33,7 @@ #include "listeners/charrenamelistener.h" #include "listeners/pincodelistener.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/windows/charcreatedialog.h" #include "gui/windows/chardeleteconfirm.h" diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index 99afa980f..7a33d9a99 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -23,7 +23,7 @@ #include "input/inputaction.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/models/typelistmodel.h" diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp index 1ff6af472..a1601dddb 100644 --- a/src/gui/windows/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -25,7 +25,7 @@ #include "soundconsts.h" #include "soundmanager.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/widgets/button.h" #include "gui/widgets/textbox.h" diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index ad9b7d9aa..fdddfec6f 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -28,7 +28,7 @@ #include "listeners/wrongdatanoticelistener.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 095681e8c..d742a0186 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -28,7 +28,7 @@ #include "being/localplayer.h" #include "being/playerrelations.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/windows/confirmdialog.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index f9bc72046..9174a0a65 100644 --- a/src/gui/windows/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -24,7 +24,7 @@ #include "client.h" -#include "gui/dialogtype.h" +#include "enums/gui/dialogtype.h" #include "gui/windows/okdialog.h" -- cgit v1.2.3-60-g2f50