Skip to content

Commit

Permalink
Remove unneeded ; at end of functions
Browse files Browse the repository at this point in the history
  • Loading branch information
GregoryLundberg committed Jul 25, 2017
1 parent 23e972c commit ea00539
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/actions/undo_action.hpp
Expand Up @@ -97,7 +97,7 @@ namespace actions {
{
}
virtual const char* get_type() const { return "dummy"; }
virtual ~undo_dummy_action () {};
virtual ~undo_dummy_action () {}
/// Undoes this action.
virtual bool undo(int)
{
Expand Down
2 changes: 1 addition & 1 deletion src/actions/undo_dismiss_action.hpp
Expand Up @@ -38,7 +38,7 @@ struct dismiss_action : undo_action
{
}
virtual const char* get_type() const { return "dismiss"; }
virtual ~dismiss_action() {};
virtual ~dismiss_action() {}

/// Writes this into the provided config.
virtual void write(config & cfg) const;
Expand Down
12 changes: 6 additions & 6 deletions src/ai/default/recruitment.hpp
Expand Up @@ -141,9 +141,9 @@ struct recruit_job : public component {
}
return cfg;
}
std::string get_id() const {return id;};
std::string get_name() const {return "recruit_job";};
std::string get_engine() const {return "cpp";};
std::string get_id() const {return id;}
std::string get_name() const {return "recruit_job";}
std::string get_engine() const {return "cpp";}
};

struct recruit_limit : public component {
Expand All @@ -164,9 +164,9 @@ struct recruit_limit : public component {
}
return cfg;
}
std::string get_id() const {return id;};
std::string get_name() const {return "recruit_limit";};
std::string get_engine() const {return "cpp";};
std::string get_id() const {return id;}
std::string get_name() const {return "recruit_limit";}
std::string get_engine() const {return "cpp";}
};

class recruitment_aspect : public standard_aspect<config> {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/dialogs/multiplayer/mp_staging.hpp
Expand Up @@ -72,7 +72,7 @@ class mp_staging : public modal_dialog, private plugin_executor
void set_state_changed()
{
state_changed_ = true;
};
}

ng::connect_engine& connect_engine_;

Expand Down
6 changes: 3 additions & 3 deletions src/gui/dialogs/wml_message.hpp
Expand Up @@ -31,9 +31,9 @@ class wml_message_option {
, description_(description)
, image_(image)
{}
std::string label() const {return label_;};
std::string description() const {return description_;};
std::string image() const {return image_;};
std::string label() const {return label_;}
std::string description() const {return description_;}
std::string image() const {return image_;}
private:
std::string label_, description_, image_;
};
Expand Down
2 changes: 1 addition & 1 deletion src/gui/widgets/chatbox.hpp
Expand Up @@ -66,7 +66,7 @@ class chatbox : public container_base, public events::chat_handler
virtual bool get_active() const override;

/** See @ref styled_widget::get_state. */
virtual unsigned get_state() const override { return 0; };
virtual unsigned get_state() const override { return 0; }

void send_to_server(const ::config& cfg) override;

Expand Down
6 changes: 3 additions & 3 deletions src/play_controller.hpp
Expand Up @@ -332,8 +332,8 @@ class play_controller : public controller_base, public events::observer, public
std::unique_ptr<game_display> gui_;
const std::unique_ptr<unit_experience_accelerator> xp_mod_;
const std::unique_ptr<const statistics::scenario_context> statistics_context_;
actions::undo_list& undo_stack() { return *gamestate().undo_stack_; };
const actions::undo_list& undo_stack() const { return *gamestate().undo_stack_; };
actions::undo_list& undo_stack() { return *gamestate().undo_stack_; }
const actions::undo_list& undo_stack() const { return *gamestate().undo_stack_; }
std::unique_ptr<replay> replay_;

bool skip_replay_;
Expand Down Expand Up @@ -361,7 +361,7 @@ class play_controller : public controller_base, public events::observer, public
protected:
mutable bool ignore_replay_errors_;
bool player_type_changed_;
virtual void sync_end_turn() {};
virtual void sync_end_turn() {}
virtual void check_time_over();
virtual void update_viewing_player() = 0;
void play_turn();
Expand Down
4 changes: 2 additions & 2 deletions src/replay_controller.hpp
Expand Up @@ -32,7 +32,7 @@ class replay_controller : public events::observer
virtual bool should_stop() { return true; }
virtual ~replay_stop_condition(){}
};
static void nop() {};
static void nop() {}
replay_controller(play_controller& controller, bool control_view, const std::shared_ptr<config>& reset_state, const std::function<void()>& on_end_replay = nop);
~replay_controller();

Expand All @@ -49,7 +49,7 @@ class replay_controller : public events::observer
bool can_execute_command(const hotkey::hotkey_command& cmd, int index) const;
bool is_controlling_view() const { return vision_.is_initialized(); }
bool allow_reset_replay() const { return reset_state_.get() != nullptr; }
const std::shared_ptr<config>& get_reset_state() const { return reset_state_; };
const std::shared_ptr<config>& get_reset_state() const { return reset_state_; }
void return_to_play_side(bool r = true) { return_to_play_side_ = r; }
void replay_show_everything();
void replay_show_each();
Expand Down
2 changes: 1 addition & 1 deletion src/synced_context.hpp
Expand Up @@ -133,7 +133,7 @@ class synced_context
class server_choice
{
public:
virtual ~server_choice(){};
virtual ~server_choice(){}
/// We are in a game with no mp server and need to do this choice locally
virtual config local_choice() const = 0;
/// the request which is sended to the mp server.
Expand Down

0 comments on commit ea00539

Please sign in to comment.