widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

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

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #913369 in widelands: "Warnings at compile-time (clang/llvm)"
  https://bugs.launchpad.net/widelands/+bug/913369

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

>From my previous patch I got the impression classes were preferred. Therefore, here is a struct converted to class since it was referred to as both in different places. 


-- 
https://code.launchpad.net/~hjd/widelands/class-FileSystem/+merge/142364
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/class-FileSystem into lp:widelands.

=== modified file 'src/game_io/game_data_packet.h'
--- src/game_io/game_data_packet.h	2012-02-15 21:25:34 +0000
+++ src/game_io/game_data_packet.h	2013-01-08 17:39:24 +0000
@@ -22,7 +22,7 @@
 
 #include "wexception.h"
 
-struct FileSystem;
+class FileSystem;
 
 namespace Widelands {
 

=== modified file 'src/game_io/game_loader.h'
--- src/game_io/game_loader.h	2012-02-15 21:25:34 +0000
+++ src/game_io/game_loader.h	2013-01-08 17:39:24 +0000
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <string>
 
-struct FileSystem;
+class FileSystem;
 
 namespace Widelands {
 

=== modified file 'src/game_io/game_saver.h'
--- src/game_io/game_saver.h	2012-02-15 21:25:34 +0000
+++ src/game_io/game_saver.h	2013-01-08 17:39:24 +0000
@@ -22,7 +22,7 @@
 
 #include "wexception.h"
 
-struct FileSystem;
+class FileSystem;
 
 namespace Widelands {
 

=== modified file 'src/graphic/font_handler1.h'
--- src/graphic/font_handler1.h	2012-12-31 11:21:15 +0000
+++ src/graphic/font_handler1.h	2013-01-08 17:39:24 +0000
@@ -29,7 +29,7 @@
 #include "ui_basic/align.h"
 
 class RenderTarget;
-struct FileSystem;
+class FileSystem;
 
 class IPicture;
 class IGraphic;

=== modified file 'src/io/filesystem/filesystem.h'
--- src/io/filesystem/filesystem.h	2012-06-06 14:51:03 +0000
+++ src/io/filesystem/filesystem.h	2013-01-08 17:39:24 +0000
@@ -42,7 +42,8 @@
  * operations.
  * \todo const correctness
  */
-struct FileSystem {
+class FileSystem {
+public:
 	//  TODO This should be unnecessary. Make it so.
 	enum Type {
 		DIR,

=== modified file 'src/map_io/widelands_map_data_packet.h'
--- src/map_io/widelands_map_data_packet.h	2012-02-15 21:25:34 +0000
+++ src/map_io/widelands_map_data_packet.h	2013-01-08 17:39:24 +0000
@@ -23,7 +23,7 @@
 #include "wexception.h"
 #include "logic/widelands_filewrite.h"
 
-struct FileSystem;
+class FileSystem;
 
 namespace Widelands {
 

=== modified file 'src/map_io/widelands_map_loader.h'
--- src/map_io/widelands_map_loader.h	2012-02-15 21:25:34 +0000
+++ src/map_io/widelands_map_loader.h	2013-01-08 17:39:24 +0000
@@ -24,7 +24,7 @@
 #include <cstring>
 #include "map_loader.h"
 
-struct FileSystem;
+class FileSystem;
 
 namespace Widelands {
 

=== modified file 'src/map_io/widelands_map_object_packet.h'
--- src/map_io/widelands_map_object_packet.h	2012-02-15 21:25:34 +0000
+++ src/map_io/widelands_map_object_packet.h	2013-01-08 17:39:24 +0000
@@ -24,7 +24,7 @@
 
 #include <set>
 
-struct FileSystem;
+class FileSystem;
 
 namespace Widelands {
 

=== modified file 'src/map_io/widelands_map_saver.h'
--- src/map_io/widelands_map_saver.h	2012-02-15 21:25:34 +0000
+++ src/map_io/widelands_map_saver.h	2013-01-08 17:39:24 +0000
@@ -22,7 +22,7 @@
 
 #include "wexception.h"
 
-struct FileSystem;
+class FileSystem;
 
 namespace Widelands {
 

=== modified file 'src/profile/profile.h'
--- src/profile/profile.h	2012-02-15 21:25:34 +0000
+++ src/profile/profile.h	2013-01-08 17:39:24 +0000
@@ -39,7 +39,7 @@
 };
 
 extern struct Profile g_options;
-struct FileSystem;
+class FileSystem;
 
 /**
  * Represents one section inside the .ini-style file, basically as a list of