summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-22 19:52:20 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-22 19:52:20 +0300
commit66d3d5fca48269a778e81c3ed7747edc2e56c862 (patch)
tree2b8b1cce4881bc4ff90fb159f28e3f510657192d
parenta54ff6d4104a9b382c1419c00cc83684e391a445 (diff)
downloadmanaverse-66d3d5fca48269a778e81c3ed7747edc2e56c862.tar.gz
manaverse-66d3d5fca48269a778e81c3ed7747edc2e56c862.tar.bz2
manaverse-66d3d5fca48269a778e81c3ed7747edc2e56c862.tar.xz
manaverse-66d3d5fca48269a778e81c3ed7747edc2e56c862.zip
Remove default parameters from textdialog.
-rw-r--r--src/gui/popups/popupmenu.cpp8
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp4
-rw-r--r--src/gui/widgets/tabs/socialguildtab.h4
-rw-r--r--src/gui/widgets/tabs/socialpartytab.h4
-rw-r--r--src/gui/windows/charselectdialog.cpp6
-rw-r--r--src/gui/windows/skilldialog.cpp12
-rw-r--r--src/gui/windows/textdialog.h4
7 files changed, 30 insertions, 12 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 752caff72..802586f4c 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1283,7 +1283,9 @@ void PopupMenu::handleLink(const std::string &link,
_("Rename map sign "),
// TRANSLATORS: label
// TRANSLATORS: number of chars in string should be near original
- _("Name: "));
+ _("Name: "),
+ nullptr,
+ false);
mRenameListener.setDialog(mDialog);
mDialog->setText(mMapItem->getComment());
mDialog->setActionEventId("ok");
@@ -1301,7 +1303,9 @@ void PopupMenu::handleLink(const std::string &link,
_("Player comment "),
// TRANSLATORS: label
// TRANSLATORS: number of chars in string should be near original
- _("Comment: "));
+ _("Comment: "),
+ nullptr,
+ false);
mPlayerListener.setDialog(dialog);
mPlayerListener.setNick(mName);
mPlayerListener.setType(mType);
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index b5b74e2b9..17f74bf83 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -389,7 +389,9 @@ void Setup_Video::action(const ActionEvent &event)
// TRANSLATORS: resolution question dialog
_("Custom resolution (example: 1024x768)"),
// TRANSLATORS: resolution question dialog
- _("Enter new resolution: "));
+ _("Enter new resolution: "),
+ nullptr,
+ false);
mDialog->setActionEventId("videomode");
mDialog->addActionListener(this);
return;
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index c994f3188..433823ff4 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -124,7 +124,9 @@ class SocialGuildTab final : public SocialTab,
_("Member Invite to Guild"),
// TRANSLATORS: guild invite message
strprintf(_("Who would you like to invite to guild %s?"),
- mGuild->getName().c_str()), socialWindow);
+ mGuild->getName().c_str()),
+ socialWindow,
+ false);
mInviteDialog->setActionEventId("do invite");
mInviteDialog->addActionListener(this);
}
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index a77cd16e1..f151f9e62 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -125,7 +125,9 @@ class SocialPartyTab final : public SocialTab,
_("Member Invite to Party"),
// TRANSLATORS: party invite message
strprintf(_("Who would you like to invite to party %s?"),
- mParty->getName().c_str()), socialWindow);
+ mParty->getName().c_str()),
+ socialWindow,
+ false);
mInviteDialog->setActionEventId("do invite");
mInviteDialog->addActionListener(this);
}
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 5a0a02acb..fb759eb96 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -459,7 +459,8 @@ void CharSelectDialog::askPasswordForDeletion(const int index)
_("Enter your email for deleting character"),
// TRANSLATORS: email label.
_("Enter email:"),
- this, false);
+ this,
+ false);
}
else
{
@@ -468,7 +469,8 @@ void CharSelectDialog::askPasswordForDeletion(const int index)
_("Enter password for deleting character"),
// TRANSLATORS: email label.
_("Enter password:"),
- this, true);
+ this,
+ true);
}
mDeleteDialog->setActionEventId("try delete character");
mDeleteDialog->addActionListener(this);
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 9f11605ef..114937b0b 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -1136,7 +1136,9 @@ void SkillDialog::useSkillTarget(const SkillInfo *const info,
strprintf(_("Add text to skill %s"),
data->name.c_str()),
// TRANSLATORS: text skill dialog field
- _("Text: "));
+ _("Text: "),
+ nullptr,
+ false);
dialog->setModal(Modal_true);
textSkillListener.setDialog(dialog);
dialog->setActionEventId("ok");
@@ -1200,7 +1202,9 @@ void SkillDialog::useSkillPosition(const SkillInfo *const info,
strprintf(_("Add text to skill %s"),
data->name.c_str()),
// TRANSLATORS: text skill dialog field
- _("Text: "));
+ _("Text: "),
+ nullptr,
+ false);
dialog->setModal(Modal_true);
textSkillListener.setDialog(dialog);
dialog->setActionEventId("ok");
@@ -1319,7 +1323,9 @@ void SkillDialog::useSkillDefault(const SkillInfo *const info,
strprintf(_("Add text to skill %s"),
data->name.c_str()),
// TRANSLATORS: text skill dialog field
- _("Text: "));
+ _("Text: "),
+ nullptr,
+ false);
dialog->setModal(Modal_true);
textSkillListener.setDialog(dialog);
dialog->setActionEventId("ok");
diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h
index a2901e04e..3a7311e32 100644
--- a/src/gui/windows/textdialog.h
+++ b/src/gui/windows/textdialog.h
@@ -47,8 +47,8 @@ class TextDialog final : public Window,
*/
TextDialog(const std::string &restrict title,
const std::string &restrict msg,
- Window *const parent = nullptr,
- const bool isPassword = false);
+ Window *const parent,
+ const bool isPassword);
A_DELETE_COPY(TextDialog)