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