From d56d5a4d34b7fc18c070f6f5de802ac286959df8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 22 Dec 2017 20:00:14 +0300 Subject: Remove default parameters from shortcutwindow. --- src/game.cpp | 3 ++- src/gui/windows/shortcutwindow.h | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 0457271b5..99f33b7f2 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -262,7 +262,8 @@ static void createGuiWindows() CREATEWIDGETV(dropShortcutWindow, ShortcutWindow, "DropShortcut", new VirtShortcutContainer(nullptr, dropShortcut), - "drops.xml"); + "drops.xml", + 0, 0); CREATEWIDGETV(spellShortcutWindow, ShortcutWindow, "SpellShortcut", "spells.xml", diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h index f21c505c5..8d77f9a5d 100644 --- a/src/gui/windows/shortcutwindow.h +++ b/src/gui/windows/shortcutwindow.h @@ -42,12 +42,14 @@ class ShortcutWindow final : public Window */ ShortcutWindow(const std::string &restrict title, ShortcutContainer *restrict const content, - const std::string &restrict skinFile = "", - int width = 0, int height = 0); + const std::string &restrict skinFile, + int width, + int height); - explicit ShortcutWindow(const std::string &restrict title, - const std::string &restrict skinFile = "", - const int width = 0, const int height = 0); + ShortcutWindow(const std::string &restrict title, + const std::string &restrict skinFile, + const int width, + const int height); A_DELETE_COPY(ShortcutWindow) -- cgit v1.2.3-60-g2f50