← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~hjd/widelands/class-rendertarget into lp:widelands

 

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/class-rendertarget into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/class-rendertarget/+merge/141518

Consistently refer to RenderTarget as a class. Most places using it was referring to it as a struct, which triggered lots of mismatched-tags warnings in Clang. Since it is defined as a class when created, I simply updated the other references.
-- 
https://code.launchpad.net/~hjd/widelands/class-rendertarget/+merge/141518
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/class-rendertarget into lp:widelands.
=== modified file 'src/graphic/font_handler.h'
--- src/graphic/font_handler.h	2012-12-18 18:41:45 +0000
+++ src/graphic/font_handler.h	2012-12-31 11:21:24 +0000
@@ -25,7 +25,7 @@
 #include "point.h"
 #include "ui_basic/align.h"
 
-struct RenderTarget;
+class RenderTarget;
 
 namespace UI {
 

=== modified file 'src/graphic/font_handler1.h'
--- src/graphic/font_handler1.h	2012-12-18 18:41:45 +0000
+++ src/graphic/font_handler1.h	2012-12-31 11:21:24 +0000
@@ -28,7 +28,7 @@
 
 #include "ui_basic/align.h"
 
-struct RenderTarget;
+class RenderTarget;
 struct FileSystem;
 
 class IPicture;

=== modified file 'src/graphic/graphic.h'
--- src/graphic/graphic.h	2012-12-15 12:04:36 +0000
+++ src/graphic/graphic.h	2012-12-31 11:21:24 +0000
@@ -36,7 +36,7 @@
 
 namespace UI {struct ProgressWindow;}
 
-struct RenderTarget;
+class RenderTarget;
 struct Road_Textures;
 struct SDL_Rect;
 struct SDL_Surface;

=== modified file 'src/graphic/richtext.h'
--- src/graphic/richtext.h	2012-02-15 21:25:34 +0000
+++ src/graphic/richtext.h	2012-12-31 11:21:24 +0000
@@ -29,7 +29,7 @@
 #include "rgbcolor.h"
 
 
-struct RenderTarget;
+class RenderTarget;
 
 namespace UI {
 

=== modified file 'src/graphic/wordwrap.h'
--- src/graphic/wordwrap.h	2012-02-15 21:25:34 +0000
+++ src/graphic/wordwrap.h	2012-12-31 11:21:24 +0000
@@ -25,7 +25,7 @@
 #include "point.h"
 #include "ui_basic/align.h"
 
-struct RenderTarget;
+class RenderTarget;
 
 namespace UI {
 

=== modified file 'src/logic/instances.h'
--- src/logic/instances.h	2012-09-21 21:36:07 +0000
+++ src/logic/instances.h	2012-12-31 11:21:24 +0000
@@ -35,7 +35,7 @@
 
 
 struct DirAnimations;
-struct RenderTarget;
+class RenderTarget;
 namespace UI {struct Tab_Panel;}
 
 namespace Widelands {

=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2012-12-16 14:29:46 +0000
+++ src/ui_basic/panel.h	2012-12-31 11:21:24 +0000
@@ -34,7 +34,7 @@
 #include <string>
 #include <cstring>
 
-struct RenderTarget;
+class RenderTarget;
 
 namespace UI {
 

=== modified file 'src/ui_fsmenu/loadgame.h'
--- src/ui_fsmenu/loadgame.h	2012-02-15 21:25:34 +0000
+++ src/ui_fsmenu/loadgame.h	2012-12-31 11:21:24 +0000
@@ -36,7 +36,7 @@
 struct Map;
 struct Map_Loader;
 };
-struct RenderTarget;
+class RenderTarget;
 struct GameController;
 struct GameSettingsProvider;