0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mostly code cleanups resulting from refactoring issues.

Browse source
This commit is contained in:
Fabian Müller 2012-03-20 20:27:56 +00:00
parent 31c30a7777
commit 32d70d0301
4 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/editor/action/mouse/mouse_action.cpp
View file

@ -15,7 +15,7 @@
#define GETTEXT_DOMAIN "wesnoth-editor"
#include "editor/action/action.hpp"
#include "editor/palette/brush.hpp"
#include "editor/toolkit/brush.hpp"
#include "../../editor_display.hpp"
#include "mouse_action.hpp"
@ -282,7 +282,7 @@ editor_action* mouse_action_paint::click_perform_left(
{
if (has_ctrl_modifier()) return NULL;
return new editor_action_chain(new editor_action_paint_area(
hexes, terrain_palette_->selected_fg_item(), has_shift_modifier()));
hexes, terrain_palette_.selected_fg_item(), has_shift_modifier()));
}
editor_action* mouse_action_paint::click_perform_right(
@ -290,13 +290,13 @@ editor_action* mouse_action_paint::click_perform_right(
{
if (has_ctrl_modifier()) return NULL;
return new editor_action_chain(new editor_action_paint_area(
hexes, terrain_palette_->selected_bg_item(), has_shift_modifier()));
hexes, terrain_palette_.selected_bg_item(), has_shift_modifier()));
}
void mouse_action_paint::set_mouse_overlay(editor_display& disp)
{
set_terrain_mouse_overlay(disp, terrain_palette_->selected_fg_item(),
terrain_palette_->selected_bg_item());
set_terrain_mouse_overlay(disp, terrain_palette_.selected_fg_item(),
terrain_palette_.selected_bg_item());
}
@ -392,7 +392,7 @@ editor_action* mouse_action_fill::click_left(editor_display& disp, int x, int y)
} else {
//TODO only take the base terrain into account when searching for contiguous terrain when painting base only
//or use a different key modifier for that
editor_action_fill* a = new editor_action_fill(hex, terrain_palette_->selected_fg_item(),
editor_action_fill* a = new editor_action_fill(hex, terrain_palette_.selected_fg_item(),
has_shift_modifier());
return a;
}
@ -408,7 +408,7 @@ editor_action* mouse_action_fill::click_right(editor_display& disp, int x, int y
} else {
//TODO only take the base terrain into account when searching for contiguous terrain when painting base only
//or use a different key modifier for that
editor_action_fill* a = new editor_action_fill(hex, terrain_palette_->selected_bg_item(),
editor_action_fill* a = new editor_action_fill(hex, terrain_palette_.selected_bg_item(),
has_shift_modifier());
return a;
}
@ -416,8 +416,8 @@ editor_action* mouse_action_fill::click_right(editor_display& disp, int x, int y
void mouse_action_fill::set_mouse_overlay(editor_display& disp)
{
set_terrain_mouse_overlay(disp, terrain_palette_->selected_fg_item(),
terrain_palette_->selected_bg_item());
set_terrain_mouse_overlay(disp, terrain_palette_.selected_fg_item(),
terrain_palette_.selected_bg_item());
}
editor_action* mouse_action_starting_position::up_left(editor_display& disp, int x, int y)

36
src/editor/action/mouse/mouse_action.hpp
View file

@ -37,7 +37,7 @@ namespace editor {
class mouse_action
{
public:
mouse_action(const CKey& key, common_palette* const palette)
mouse_action(common_palette& palette, const CKey& key)
: previous_move_hex_()
, key_(key)
, toolbar_button_(NULL)
@ -113,9 +113,9 @@ public:
const theme::menu* toolbar_button() const { return toolbar_button_; }
/**
* Getter for the (possibly NULL) associated palette.
* Getter for the associated palette.
*/
common_palette* get_palette() { return palette_; }
common_palette& get_palette() { return palette_; }
/**
* Set the mouse overlay for this action. Defaults to an empty overlay.
@ -153,7 +153,7 @@ private:
/**
* Pointer to an associated palette, if such exists
*/
common_palette* const palette_;
common_palette& palette_;
};
/**
@ -162,8 +162,8 @@ private:
class brush_drag_mouse_action : public mouse_action
{
public:
brush_drag_mouse_action(const brush* const * const brush, const CKey& key, common_palette* const palette)
: mouse_action(key, palette)
brush_drag_mouse_action(common_palette& palette, const brush* const * const brush, const CKey& key)
: mouse_action(palette, key)
, previous_drag_hex_()
, brush_(brush)
{
@ -247,8 +247,8 @@ class mouse_action_paint : public brush_drag_mouse_action
{
public:
mouse_action_paint(
const brush* const * const brush, const CKey& key, terrain_palette* const palette)
: brush_drag_mouse_action(brush, key, palette)
const brush* const * const brush, const CKey& key, terrain_palette& palette)
: brush_drag_mouse_action(palette, brush, key)
, terrain_palette_(palette)
{
}
@ -277,7 +277,7 @@ public:
protected:
terrain_palette* const terrain_palette_;
const terrain_palette& terrain_palette_;
//t_translation::t_terrain& terrain_left_;
//t_translation::t_terrain& terrain_right_;
@ -289,8 +289,8 @@ protected:
class mouse_action_select : public brush_drag_mouse_action
{
public:
mouse_action_select(const brush* const * const brush, const CKey& key, empty_palette* const palette)
: brush_drag_mouse_action(brush, key, palette)
mouse_action_select(const brush* const * const brush, const CKey& key, empty_palette& palette)
: brush_drag_mouse_action(palette, brush, key)
{
}
@ -323,8 +323,8 @@ public:
class mouse_action_paste : public mouse_action
{
public:
mouse_action_paste(const map_fragment& paste, const CKey& key, common_palette* const palette)
: mouse_action(key, palette), paste_(paste)
mouse_action_paste(const map_fragment& paste, const CKey& key, common_palette& palette)
: mouse_action(palette, key), paste_(paste)
{
}
@ -362,8 +362,8 @@ class mouse_action_fill : public mouse_action
public:
mouse_action_fill(
// t_translation::t_terrain& terrain_left, t_translation::t_terrain& terrain_right,
const CKey& key, terrain_palette* const terrain_palette)
: mouse_action(key, terrain_palette)
const CKey& key, terrain_palette& terrain_palette)
: mouse_action(terrain_palette, key)
, terrain_palette_(terrain_palette)
// , terrain_left_(terrain_left)
// , terrain_right_(terrain_right)
@ -388,7 +388,7 @@ public:
virtual void set_mouse_overlay(editor_display& disp);
protected:
terrain_palette* terrain_palette_;
const terrain_palette& terrain_palette_;
//t_translation::t_terrain& terrain_left_;
//t_translation::t_terrain& terrain_right_;
};
@ -399,8 +399,8 @@ protected:
class mouse_action_starting_position : public mouse_action
{
public:
mouse_action_starting_position(const CKey& key, empty_palette* const palette)
: mouse_action(key, palette), click_(false)
mouse_action_starting_position(const CKey& key, empty_palette& palette)
: mouse_action(palette, key), click_(false)
{
}

4
src/editor/action/mouse/mouse_action_map_label.hpp
View file

@ -29,8 +29,8 @@ namespace editor {
class mouse_action_map_label : public mouse_action
{
public:
mouse_action_map_label(const CKey& key, empty_palette* const pallete)
: mouse_action(key, pallete), click_(false), clicked_on_(), last_draged_(), tmp_label_(NULL)
mouse_action_map_label(const CKey& key, empty_palette& palette)
: mouse_action(palette, key), click_(false), clicked_on_(), last_draged_(), tmp_label_(NULL)
{
}

4
src/editor/action/mouse/mouse_action_unit.hpp
View file

@ -29,8 +29,8 @@ namespace editor {
class mouse_action_unit : public mouse_action
{
public:
mouse_action_unit(const CKey& key, unit_palette* const palette)
: mouse_action(key, palette), click_(false), start_hex_()
mouse_action_unit(const CKey& key, unit_palette& palette)
: mouse_action(palette, key), click_(false), start_hex_()
{
}