Author: ilor
Date: Sun Jul 6 17:26:01 2008
New Revision: 27783
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27783&view=rev
Log:
use covariant return types in play_controller's get_display and
get_mouse_handler_base
Modified:
trunk/src/play_controller.cpp
trunk/src/play_controller.hpp
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=27783&r1=27782&r2=27783&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Sun Jul 6 17:26:01 2008
@@ -677,11 +677,11 @@
}
}
-events::mouse_handler_base& play_controller::get_mouse_handler_base() {
+events::mouse_handler& play_controller::get_mouse_handler_base() {
return mouse_handler_;
}
-display& play_controller::get_display() {
+game_display& play_controller::get_display() {
return *gui_;
}
Modified: trunk/src/play_controller.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.hpp?rev=27783&r1=27782&r2=27783&view=diff
==============================================================================
--- trunk/src/play_controller.hpp (original)
+++ trunk/src/play_controller.hpp Sun Jul 6 17:26:01 2008
@@ -76,8 +76,8 @@
void slice_before_scroll();
void slice_end();
- events::mouse_handler_base& get_mouse_handler_base();
- display& get_display();
+ events::mouse_handler& get_mouse_handler_base();
+ game_display& get_display();
bool have_keyboard_focus();
void process_keydown_event(const SDL_Event& event);
void process_keyup_event(const SDL_Event& event);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
