summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-22 15:17:04 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-22 15:21:50 +0300
commitbf3c7384ad1b1fce8beac97f8715eb054158f72e (patch)
treedb38eb13a8d20329c410fdb97c1ad204f41c4eb9 /src/gui
parent23ca69dbf704cd289d58f023689289fcab515464 (diff)
downloadmv-bf3c7384ad1b1fce8beac97f8715eb054158f72e.tar.gz
mv-bf3c7384ad1b1fce8beac97f8715eb054158f72e.tar.bz2
mv-bf3c7384ad1b1fce8beac97f8715eb054158f72e.tar.xz
mv-bf3c7384ad1b1fce8beac97f8715eb054158f72e.zip
Move selldialog from window into widgets.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/dialogsmanager.cpp3
-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.h2
-rw-r--r--src/gui/windows/shopselldialog.h2
5 files changed, 8 insertions, 7 deletions
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.