From f067332d0ff5c78541f5cb31c4cdff47f83e61cb Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Tue, 23 Feb 2016 17:46:33 -0500 Subject: [PATCH] fix spelling --- src/gui/dialogs/synced_choice_wait.cpp | 2 +- src/hotkey/command_executor.cpp | 2 +- src/quit_confirmation.cpp | 4 ++-- src/quit_confirmation.hpp | 8 +++----- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/gui/dialogs/synced_choice_wait.cpp b/src/gui/dialogs/synced_choice_wait.cpp index 53a16adef0eb..4285c556e8a6 100644 --- a/src/gui/dialogs/synced_choice_wait.cpp +++ b/src/gui/dialogs/synced_choice_wait.cpp @@ -99,7 +99,7 @@ void tsynced_choice_wait::handle_generic_event(const std::string& event_name) void tsynced_choice_wait::on_btn_quit_game(CVideo&) { - if (quit_confirmation::default_promt()) { + if (quit_confirmation::default_prompt()) { throw_quit_game_exception(); } } diff --git a/src/hotkey/command_executor.cpp b/src/hotkey/command_executor.cpp index 8938bc4a8669..220149465719 100644 --- a/src/hotkey/command_executor.cpp +++ b/src/hotkey/command_executor.cpp @@ -698,7 +698,7 @@ void command_executor_default::map_screenshot() } void command_executor_default::quit_to_main_menu() { - if(quit_confirmation::default_promt()) { + if(quit_confirmation::default_prompt()) { throw_quit_game_exception(); } } diff --git a/src/quit_confirmation.cpp b/src/quit_confirmation.cpp index 1d054afce529..409d56bc9978 100644 --- a/src/quit_confirmation.cpp +++ b/src/quit_confirmation.cpp @@ -29,7 +29,7 @@ void quit_confirmation::quit() open_ = true; BOOST_REVERSE_FOREACH(quit_confirmation* blocker, blockers_) { - if(!blocker->promt_()) { + if(!blocker->prompt_()) { open_ = false; return; } @@ -39,7 +39,7 @@ void quit_confirmation::quit() throw CVideo::quit(); } -bool quit_confirmation::default_promt() +bool quit_confirmation::default_prompt() { return gui2::show_message(CVideo::get_singleton(), _("Quit"), _("Do you really want to quit?"), gui2::tmessage::yes_no_buttons) != gui2::twindow::CANCEL; diff --git a/src/quit_confirmation.hpp b/src/quit_confirmation.hpp index 11aa044b5b07..1c8c39fe9f6e 100644 --- a/src/quit_confirmation.hpp +++ b/src/quit_confirmation.hpp @@ -31,9 +31,7 @@ class CVideo; class quit_confirmation { public: - quit_confirmation(const boost::function& promt = &quit_confirmation::default_promt) - : promt_(promt) { blockers_.push_back(this); } - + quit_confirmation(const boost::function& prompt = &quit_confirmation::default_prompt) : prompt_(prompt) { blockers_.push_back(this); } ~quit_confirmation() { blockers_.pop_back(); } /** @@ -43,7 +41,7 @@ class quit_confirmation * displayed. */ static void quit(); - static bool default_promt(); + static bool default_prompt(); private: //noncopyable quit_confirmation( const quit_confirmation& ); @@ -51,7 +49,7 @@ class quit_confirmation static std::vector blockers_; static bool open_; - boost::function promt_; + boost::function prompt_; }; #endif