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/dialogsmanager.cpp | 3 ++-
src/gui/widgets/itemlinkhandler.cpp | 6 ++++--
src/gui/widgets/tabs/socialguildtab.h | 6 +++++-
src/gui/widgets/tabs/socialpartytab.h | 6 +++++-
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 +++-
src/net/ea/traderecv.cpp | 4 +++-
src/net/eathena/familyrecv.cpp | 4 +++-
11 files changed, 35 insertions(+), 15 deletions(-)
(limited to 'src')
diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp
index f24352a43..409b9c34b 100644
--- a/src/gui/dialogsmanager.cpp
+++ b/src/gui/dialogsmanager.cpp
@@ -129,7 +129,8 @@ Window *DialogsManager::openErrorDialog(const std::string &header,
_("Do you want to open support page?")),
SOUND_ERROR,
false,
- modal);
+ modal,
+ nullptr);
return dialog;
}
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 403573daf..0991be6d4 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -88,7 +88,8 @@ void ItemLinkHandler::handleCommandLink(const std::string &link,
strprintf("/%s %s", cmd.c_str(), args.c_str()),
SOUND_REQUEST,
false,
- Modal_true);
+ Modal_true,
+ nullptr);
confirmDlg->addActionListener(&inputActionRemoteListener);
}
}
@@ -119,7 +120,8 @@ void ItemLinkHandler::handleHttpLink(const std::string &link,
url,
SOUND_REQUEST,
false,
- Modal_true);
+ Modal_true,
+ nullptr);
confirmDlg->addActionListener(&listener);
}
else if (button == MouseButton::RIGHT)
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index b2ea74d10..c994f3188 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -136,7 +136,11 @@ class SocialGuildTab final : public SocialTab,
_("Leave Guild?"),
// TRANSLATORS: guild leave message
strprintf(_("Are you sure you want to leave guild %s?"),
- mGuild->getName().c_str()), SOUND_REQUEST, socialWindow);
+ mGuild->getName().c_str()),
+ SOUND_REQUEST,
+ false,
+ Modal_false,
+ socialWindow);
mConfirmDialog->addActionListener(this);
}
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index d3ed6d9d8..a77cd16e1 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -137,7 +137,11 @@ class SocialPartyTab final : public SocialTab,
_("Leave Party?"),
// TRANSLATORS: party leave message
strprintf(_("Are you sure you want to leave party %s?"),
- mParty->getName().c_str()), SOUND_REQUEST, socialWindow);
+ mParty->getName().c_str()),
+ SOUND_REQUEST,
+ false,
+ Modal_false,
+ socialWindow);
mConfirmDialog->addActionListener(this);
}
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);
}
}
diff --git a/src/net/ea/traderecv.cpp b/src/net/ea/traderecv.cpp
index d47fc256b..bcae47af0 100644
--- a/src/net/ea/traderecv.cpp
+++ b/src/net/ea/traderecv.cpp
@@ -165,7 +165,9 @@ void TradeRecv::processTradeRequestContinue(const std::string &partner)
strprintf(_("%s wants to trade with you, do"
" you accept?"), tradePartnerName.c_str()),
SOUND_REQUEST,
- true);
+ true,
+ Modal_false,
+ nullptr);
confirmDlg->addActionListener(&listener);
}
else
diff --git a/src/net/eathena/familyrecv.cpp b/src/net/eathena/familyrecv.cpp
index f9f7b2fd8..8c9d63b3e 100644
--- a/src/net/eathena/familyrecv.cpp
+++ b/src/net/eathena/familyrecv.cpp
@@ -75,7 +75,9 @@ void FamilyRecv::processAskForChild(Net::MessageIn &msg)
strprintf(_("Do you accept %s and %s as parents?"),
name1.c_str(), name2.c_str()),
SOUND_REQUEST,
- false);
+ false,
+ Modal_false,
+ nullptr);
confirmDlg->addActionListener(&listener);
}
}
--
cgit v1.2.3-70-g09d2