diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-22 15:17:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-22 15:21:50 +0300 |
| commit | bf3c7384ad1b1fce8beac97f8715eb054158f72e (patch) | |
| tree | db38eb13a8d20329c410fdb97c1ad204f41c4eb9 | |
| parent | 23ca69dbf704cd289d58f023689289fcab515464 (diff) | |
| download | manaplus-bf3c7384ad1b1fce8beac97f8715eb054158f72e.tar.gz manaplus-bf3c7384ad1b1fce8beac97f8715eb054158f72e.tar.bz2 manaplus-bf3c7384ad1b1fce8beac97f8715eb054158f72e.tar.xz manaplus-bf3c7384ad1b1fce8beac97f8715eb054158f72e.zip | |
Move selldialog from window into widgets.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gui/dialogsmanager.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/selldialog.cpp (renamed from src/gui/windows/selldialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/widgets/selldialog.h (renamed from src/gui/windows/selldialog.h) | 6 | ||||
| -rw-r--r-- | src/gui/windows/npcselldialog.h | 2 | ||||
| -rw-r--r-- | src/gui/windows/shopselldialog.h | 2 | ||||
| -rw-r--r-- | src/input/inputmanager.cpp | 3 |
8 files changed, 14 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8bd4bf57a..548383039 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -409,8 +409,8 @@ SET(SRCS gui/windows/registerdialog.h gui/sdlinput.cpp gui/sdlinput.h - gui/windows/selldialog.cpp - gui/windows/selldialog.h + gui/widgets/selldialog.cpp + gui/widgets/selldialog.h gui/windows/serverdialog.cpp gui/windows/serverdialog.h gui/windows/setupwindow.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 3179d5c13..b8f7569d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -531,8 +531,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/windows/registerdialog.h \ gui/sdlinput.cpp \ gui/sdlinput.h \ - gui/windows/selldialog.cpp \ - gui/windows/selldialog.h \ + gui/widgets/selldialog.cpp \ + gui/widgets/selldialog.h \ gui/windows/serverdialog.cpp \ gui/windows/serverdialog.h \ gui/windows/setupwindow.cpp \ diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp index 6af34bef4..28c3ae616 100644 --- a/src/gui/dialogsmanager.cpp +++ b/src/gui/dialogsmanager.cpp @@ -27,12 +27,13 @@ #include "gui/dialogtype.h" +#include "gui/widgets/selldialog.h" + #include "gui/windows/confirmdialog.h" #include "gui/windows/buyselldialog.h" #include "gui/windows/buydialog.h" #include "gui/windows/npcdialog.h" #include "gui/windows/okdialog.h" -#include "gui/windows/selldialog.h" #include "gui/windows/updaterwindow.h" #include "net/inventoryhandler.h" diff --git a/src/gui/windows/selldialog.cpp b/src/gui/widgets/selldialog.cpp index 4d4c4d8df..85eda5f43 100644 --- a/src/gui/windows/selldialog.cpp +++ b/src/gui/widgets/selldialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/windows/selldialog.h" +#include "gui/widgets/selldialog.h" #include "shopitem.h" #include "units.h" diff --git a/src/gui/windows/selldialog.h b/src/gui/widgets/selldialog.h index b97cb13dc..8ae2168d0 100644 --- a/src/gui/windows/selldialog.h +++ b/src/gui/widgets/selldialog.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WINDOWS_SELLDIALOG_H -#define GUI_WINDOWS_SELLDIALOG_H +#ifndef GUI_WIDGETS_SELLDIALOG_H +#define GUI_WIDGETS_SELLDIALOG_H #include "gui/widgets/window.h" @@ -139,4 +139,4 @@ class SellDialog notfinal : public Window, int mAmountItems; }; -#endif // GUI_WINDOWS_SELLDIALOG_H +#endif // GUI_WIDGETS_SELLDIALOG_H diff --git a/src/gui/windows/npcselldialog.h b/src/gui/windows/npcselldialog.h index 02df1e143..7f0e43506 100644 --- a/src/gui/windows/npcselldialog.h +++ b/src/gui/windows/npcselldialog.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_NPCSELLDIALOG_H #define GUI_WINDOWS_NPCSELLDIALOG_H -#include "gui/windows/selldialog.h" +#include "gui/widgets/selldialog.h" /** * The sell dialog. diff --git a/src/gui/windows/shopselldialog.h b/src/gui/windows/shopselldialog.h index 8ae90d903..9fb8c1635 100644 --- a/src/gui/windows/shopselldialog.h +++ b/src/gui/windows/shopselldialog.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_SHOPSELLDIALOG_H #define GUI_WINDOWS_SHOPSELLDIALOG_H -#include "gui/windows/selldialog.h" +#include "gui/widgets/selldialog.h" /** * The sell dialog. diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index 3a7f1be9c..4405b0c0a 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -37,6 +37,8 @@ #include "gui/gui.h" #include "gui/sdlinput.h" +#include "gui/widgets/selldialog.h" + #include "gui/widgets/tabs/setup_input.h" #include "gui/windows/buydialog.h" @@ -44,7 +46,6 @@ #include "gui/windows/inventorywindow.h" #include "gui/windows/npcdialog.h" #include "gui/windows/npcpostdialog.h" -#include "gui/windows/selldialog.h" #include "gui/windows/setupwindow.h" #include "gui/windows/textdialog.h" #include "gui/windows/tradewindow.h" |