summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-17 02:42:24 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-17 02:42:24 +0300
commitad233d01f2c63dab29a0301209196dfd97856130 (patch)
tree5afb423c4fa8b7e0fff90d5f2e80a8663d8f38e8 /src/gui
parent477e52027f123fef9cc21cd1a66617913b8e1d47 (diff)
downloadplus-ad233d01f2c63dab29a0301209196dfd97856130.tar.gz
plus-ad233d01f2c63dab29a0301209196dfd97856130.tar.bz2
plus-ad233d01f2c63dab29a0301209196dfd97856130.tar.xz
plus-ad233d01f2c63dab29a0301209196dfd97856130.zip
Fix compilation without C++11 again.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/itemcontainer.cpp6
-rw-r--r--src/gui/windows/connectiondialog.cpp2
-rw-r--r--src/gui/windows/connectiondialog.h4
-rw-r--r--src/gui/windows/equipmentwindow.cpp4
-rw-r--r--src/gui/windows/quitdialog.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 108dc8638..e17cb711e 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -575,7 +575,7 @@ void ItemContainer::mousePressed(MouseEvent &event)
if (item && mDescItems && chatWindow)
chatWindow->addItemText(item->getInfo().getName());
- DragDropSource src = DragDropSource::Empty;
+ DragDropSourceT src = DragDropSource::Empty;
switch (mInventory->getType())
{
case InventoryType::Inventory:
@@ -681,8 +681,8 @@ void ItemContainer::mouseReleased(MouseEvent &event)
}
else if (mInventory)
{
- const DragDropSource src = dragDrop.getSource();
- DragDropSource dst = DragDropSource::Empty;
+ const DragDropSourceT src = dragDrop.getSource();
+ DragDropSourceT dst = DragDropSource::Empty;
switch (mInventory->getType())
{
case InventoryType::Inventory:
diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp
index 4ccab789f..2195bbc27 100644
--- a/src/gui/windows/connectiondialog.cpp
+++ b/src/gui/windows/connectiondialog.cpp
@@ -36,7 +36,7 @@
extern bool mStatsReUpdated;
ConnectionDialog::ConnectionDialog(const std::string &text,
- const State cancelState) :
+ const StateT cancelState) :
Window("", Modal_false, nullptr, "connection.xml"),
ActionListener(),
mCancelState(cancelState)
diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h
index b7318d79f..db284db29 100644
--- a/src/gui/windows/connectiondialog.h
+++ b/src/gui/windows/connectiondialog.h
@@ -46,7 +46,7 @@ class ConnectionDialog final : public Window,
*
* @see Window::Window
*/
- ConnectionDialog(const std::string &text, const State cancelState);
+ ConnectionDialog(const std::string &text, const StateT cancelState);
A_DELETE_COPY(ConnectionDialog)
@@ -63,7 +63,7 @@ class ConnectionDialog final : public Window,
void safeDraw(Graphics *graphics) override final A_NONNULL(2);
private:
- State mCancelState;
+ StateT mCancelState;
};
#endif // GUI_WINDOWS_CONNECTIONDIALOG_H
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index b3accf9ed..54b3f2f7c 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -358,7 +358,7 @@ void EquipmentWindow::action(const ActionEvent &event)
}
else if (eventId == "playerbox")
{
- const DragDropSource src = dragDrop.getSource();
+ const DragDropSourceT src = dragDrop.getSource();
if (dragDrop.isEmpty() || (src != DragDropSource::Inventory
&& src != DragDropSource::Equipment))
{
@@ -501,7 +501,7 @@ void EquipmentWindow::mousePressed(MouseEvent& event)
void EquipmentWindow::mouseReleased(MouseEvent &event)
{
Window::mouseReleased(event);
- const DragDropSource src = dragDrop.getSource();
+ const DragDropSourceT src = dragDrop.getSource();
if (dragDrop.isEmpty() || (src != DragDropSource::Inventory
&& src != DragDropSource::Equipment))
{
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index 1f876e731..1d6290152 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -72,7 +72,7 @@ QuitDialog::QuitDialog(QuitDialog **const pointerToMe) :
addKeyListener(this);
ContainerPlacer placer = getPlacer(0, 0);
- const State state = client->getState();
+ const StateT state = client->getState();
mNeedForceQuit = (state == State::CHOOSE_SERVER
|| state == State::CONNECT_SERVER || state == State::LOGIN
|| state == State::PRE_LOGIN || state == State::LOGIN_ATTEMPT