Rename DropShortcutContainer into VirtShortcutContainer.

5 files changed, 27 insertions, 28 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0d19c0c7..e2d9a9905 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -175,8 +175,8 @@ SET(SRCS
     gui/widgets/itemcontainer.h
     gui/widgets/itemlinkhandler.cpp
     gui/widgets/itemlinkhandler.h
-    gui/widgets/dropshortcutcontainer.cpp
-    gui/widgets/dropshortcutcontainer.h
+    gui/widgets/virtshortcutcontainer.cpp
+    gui/widgets/virtshortcutcontainer.h
     gui/widgets/emotepage.cpp
     gui/widgets/emotepage.h
     gui/widgets/itemshortcutcontainer.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 5af667174..b73da9369 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -306,8 +306,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/itemcontainer.h \
 	      gui/widgets/itemlinkhandler.cpp \
 	      gui/widgets/itemlinkhandler.h \
-	      gui/widgets/dropshortcutcontainer.cpp \
-	      gui/widgets/dropshortcutcontainer.h \
+	      gui/widgets/virtshortcutcontainer.cpp \
+	      gui/widgets/virtshortcutcontainer.h \
 	      gui/widgets/emotepage.cpp \
 	      gui/widgets/emotepage.h \
 	      gui/widgets/itemshortcutcontainer.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 7c6dcca62..4bbaa9324 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -84,10 +84,10 @@
 
 #include "gui/widgets/tabs/battletab.h"
 
-#include "gui/widgets/dropshortcutcontainer.h"
 #include "gui/widgets/emoteshortcutcontainer.h"
 #include "gui/widgets/itemshortcutcontainer.h"
 #include "gui/widgets/spellshortcutcontainer.h"
+#include "gui/widgets/virtshortcutcontainer.h"
 
 #include "gui/widgets/tabs/gmtab.h"
 #include "gui/widgets/tabs/langtab.h"
@@ -213,7 +213,7 @@ static void createGuiWindows()
         130, 480);
     outfitWindow = new OutfitWindow();
     dropShortcutWindow = new ShortcutWindow("DropShortcut",
-        new DropShortcutContainer(nullptr, dropShortcut),
+        new VirtShortcutContainer(nullptr, dropShortcut),
         "drops.xml");
 
     spellShortcutWindow = new ShortcutWindow("SpellShortcut", "spells.xml",
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp
index 417cc2df2..2b0353148 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/virtshortcutcontainer.cpp
@@ -20,10 +20,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/dropshortcutcontainer.h"
+#include "gui/widgets/virtshortcutcontainer.h"
 
 #include "dragdrop.h"
-#include "dropshortcut.h"
 #include "shortcutbase.h"
 #include "settings.h"
 
@@ -46,7 +45,7 @@
 
 #include "debug.h"
 
-DropShortcutContainer::DropShortcutContainer(Widget2 *const widget,
+VirtShortcutContainer::VirtShortcutContainer(Widget2 *const widget,
                                              ShortcutBase *const shortcut) :
     ShortcutContainer(widget),
     mItemClicked(false),
@@ -62,11 +61,11 @@ DropShortcutContainer::DropShortcutContainer(Widget2 *const widget,
         mMaxItems = 0;
 }
 
-DropShortcutContainer::~DropShortcutContainer()
+VirtShortcutContainer::~VirtShortcutContainer()
 {
 }
 
-void DropShortcutContainer::setWidget2(const Widget2 *const widget)
+void VirtShortcutContainer::setWidget2(const Widget2 *const widget)
 {
     Widget2::setWidget2(widget);
     mEquipedColor = getThemeColor(Theme::ITEM_EQUIPPED);
@@ -75,12 +74,12 @@ void DropShortcutContainer::setWidget2(const Widget2 *const widget)
     mUnEquipedColor2 = getThemeColor(Theme::ITEM_NOT_EQUIPPED_OUTLINE);
 }
 
-void DropShortcutContainer::draw(Graphics *graphics)
+void VirtShortcutContainer::draw(Graphics *graphics)
 {
     if (!mShortcut)
         return;
 
-    BLOCK_START("DropShortcutContainer::draw")
+    BLOCK_START("VirtShortcutContainer::draw")
     if (settings.guiAlpha != mAlpha)
     {
         mAlpha = settings.guiAlpha;
@@ -93,7 +92,7 @@ void DropShortcutContainer::draw(Graphics *graphics)
     const Inventory *const inv = PlayerInfo::getInventory();
     if (!inv)
     {
-        BLOCK_END("DropShortcutContainer::draw")
+        BLOCK_END("VirtShortcutContainer::draw")
         return;
     }
 
@@ -135,10 +134,10 @@ void DropShortcutContainer::draw(Graphics *graphics)
             }
         }
     }
-    BLOCK_END("DropShortcutContainer::draw")
+    BLOCK_END("VirtShortcutContainer::draw")
 }
 
-void DropShortcutContainer::mouseDragged(MouseEvent &event)
+void VirtShortcutContainer::mouseDragged(MouseEvent &event)
 {
     if (!mShortcut)
         return;
@@ -177,7 +176,7 @@ void DropShortcutContainer::mouseDragged(MouseEvent &event)
     }
 }
 
-void DropShortcutContainer::mousePressed(MouseEvent &event)
+void VirtShortcutContainer::mousePressed(MouseEvent &event)
 {
     if (!mShortcut || !inventoryWindow)
         return;
@@ -224,7 +223,7 @@ void DropShortcutContainer::mousePressed(MouseEvent &event)
     }
 }
 
-void DropShortcutContainer::mouseReleased(MouseEvent &event)
+void VirtShortcutContainer::mouseReleased(MouseEvent &event)
 {
     if (!mShortcut)
         return;
@@ -256,7 +255,7 @@ void DropShortcutContainer::mouseReleased(MouseEvent &event)
 }
 
 // Show ItemTooltip
-void DropShortcutContainer::mouseMoved(MouseEvent &event)
+void VirtShortcutContainer::mouseMoved(MouseEvent &event)
 {
     if (!mShortcut)
         return;
@@ -289,13 +288,13 @@ void DropShortcutContainer::mouseMoved(MouseEvent &event)
     }
 }
 
-void DropShortcutContainer::mouseExited(MouseEvent &event A_UNUSED)
+void VirtShortcutContainer::mouseExited(MouseEvent &event A_UNUSED)
 {
     if (itemPopup)
         itemPopup->setVisible(false);
 }
 
-void DropShortcutContainer::widgetHidden(const Event &event A_UNUSED)
+void VirtShortcutContainer::widgetHidden(const Event &event A_UNUSED)
 {
     if (itemPopup)
         itemPopup->setVisible(false);
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/virtshortcutcontainer.h
index 23addb8c2..e740b9661 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/virtshortcutcontainer.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
-#define GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
+#ifndef GUI_WIDGETS_VIRTSHORTCUTCONTAINER_H
+#define GUI_WIDGETS_VIRTSHORTCUTCONTAINER_H
 
 #include "gui/widgets/shortcutcontainer.h"
 
@@ -33,21 +33,21 @@ class ShortcutBase;
  *
  * \ingroup GUI
  */
-class DropShortcutContainer final : public ShortcutContainer
+class VirtShortcutContainer final : public ShortcutContainer
 {
     public:
         /**
          * Constructor. Initializes the graphic.
          */
-        DropShortcutContainer(Widget2 *const widget,
+        VirtShortcutContainer(Widget2 *const widget,
                               ShortcutBase *const shortcut);
 
-        A_DELETE_COPY(DropShortcutContainer)
+        A_DELETE_COPY(VirtShortcutContainer)
 
         /**
          * Destructor.
          */
-        ~DropShortcutContainer();
+        ~VirtShortcutContainer();
 
         /**
          * Draws the items.
@@ -88,4 +88,4 @@ class DropShortcutContainer final : public ShortcutContainer
         ShortcutBase *mShortcut;
 };
 
-#endif  // GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
+#endif  // GUI_WIDGETS_VIRTSHORTCUTCONTAINER_H