From 98ed087de210f5a5a0979b0d60b6d4b21b24ba4c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 22 Dec 2017 04:11:24 +0300
Subject: Remove default parameters from confirmdialog.h

---
 src/gui/windows/confirmdialog.h     | 8 ++++----
 src/gui/windows/inventorywindow.cpp | 3 ++-
 src/gui/windows/logindialog.cpp     | 3 ++-
 src/gui/windows/npcselldialog.cpp   | 3 ++-
 src/gui/windows/shopwindow.cpp      | 4 +++-
 5 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'src/gui/windows')

diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h
index 5d828eafb..52877bfc6 100644
--- a/src/gui/windows/confirmdialog.h
+++ b/src/gui/windows/confirmdialog.h
@@ -49,10 +49,10 @@ class ConfirmDialog notfinal : public Window,
          */
         ConfirmDialog(const std::string &restrict title,
                       const std::string &restrict msg,
-                      const std::string &restrict soundEvent = SOUND_REQUEST,
-                      const bool ignore = false,
-                      const Modal modal = Modal_false,
-                      Window *const parent = nullptr);
+                      const std::string &restrict soundEvent,
+                      const bool ignore,
+                      const Modal modal,
+                      Window *const parent);
 
         A_DELETE_COPY(ConfirmDialog)
 
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index f973f250f..aca7c583a 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -1047,7 +1047,8 @@ void InventoryWindow::combineItems(const int index1,
         item2->getName().c_str()),
         SOUND_REQUEST,
         false,
-        Modal_true);
+        Modal_true,
+        nullptr);
     insertCardListener.itemIndex = item2->getInvIndex();
     insertCardListener.cardIndex = item1->getInvIndex();
     confirmDlg->addActionListener(&insertCardListener);
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 21af69b91..1ae102b42 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -250,7 +250,8 @@ void LoginDialog::action(const ActionEvent &event)
                 url,
                 SOUND_REQUEST,
                 false,
-                Modal_true);
+                Modal_true,
+                nullptr);
             confirmDlg->addActionListener(&urlListener);
         }
     }
diff --git a/src/gui/windows/npcselldialog.cpp b/src/gui/windows/npcselldialog.cpp
index c00edda6c..be25680fe 100644
--- a/src/gui/windows/npcselldialog.cpp
+++ b/src/gui/windows/npcselldialog.cpp
@@ -76,7 +76,8 @@ void NpcSellDialog::sellAction(const ActionEvent &event)
                     info.getName().c_str()),
                 SOUND_REQUEST,
                 false,
-                Modal_true);
+                Modal_true,
+                nullptr);
             dialog->addActionListener(this);
             return;
         }
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 0e55bcca1..b044831ff 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -1026,7 +1026,9 @@ void ShopWindow::processRequest(const std::string &nick,
             _("Request for Trade"),
             msg,
             SOUND_REQUEST,
-            true);
+            true,
+            Modal_false,
+            nullptr);
         confirmDlg->addActionListener(this);
     }
 }
-- 
cgit v1.2.3-60-g2f50