[Wesnoth-cvs-commits] wesnoth/src builder.cpp show_dialog.cpp editor/...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/03/10 13:46:22

Modified files:
        src            : builder.cpp show_dialog.cpp 
        src/editor     : editor_palettes.hpp 
        src/tools      : exploder_utils.cpp 
        src/zipios++   : xcoll.hpp 

Log message:
        Let's write correct C++.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.cpp.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.110&tr2=1.111&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_palettes.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tools/exploder_utils.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/zipios++/xcoll.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/src/builder.cpp
diff -u wesnoth/src/builder.cpp:1.45 wesnoth/src/builder.cpp:1.46
--- wesnoth/src/builder.cpp:1.45        Thu Mar  3 21:52:39 2005
+++ wesnoth/src/builder.cpp     Thu Mar 10 13:46:21 2005
@@ -1,4 +1,4 @@
-/* $Id: builder.cpp,v 1.45 2005/03/03 21:52:39 gruikya Exp $ */
+/* $Id: builder.cpp,v 1.46 2005/03/10 13:46:21 silene Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -54,12 +54,12 @@
 terrain_builder::rule_image::rule_image(int layer, bool global_image) : 
        position(HORIZONTAL), layer(layer),
        basex(0), basey(0), global_image(global_image)
-{};
+{}
 
 terrain_builder::rule_image::rule_image(int x, int y, bool global_image) : 
        position(VERTICAL), layer(0),
        basex(x), basey(y), global_image(global_image)
-{};
+{}
 
 terrain_builder::tile::tile() : last_tod("invalid_tod")
 {
Index: wesnoth/src/editor/editor_palettes.hpp
diff -u wesnoth/src/editor/editor_palettes.hpp:1.6 
wesnoth/src/editor/editor_palettes.hpp:1.7
--- wesnoth/src/editor/editor_palettes.hpp:1.6  Fri Aug 13 21:24:33 2004
+++ wesnoth/src/editor/editor_palettes.hpp      Thu Mar 10 13:46:22 2005
@@ -66,7 +66,7 @@
 
        /// Update the size of this widget. Use if the size_specs have
        /// changed.
-       void terrain_palette::adjust_size();
+       void adjust_size();
 
 private:
        void draw_old(bool);
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.110 wesnoth/src/show_dialog.cpp:1.111
--- wesnoth/src/show_dialog.cpp:1.110   Wed Mar  9 22:58:18 2005
+++ wesnoth/src/show_dialog.cpp Thu Mar 10 13:46:21 2005
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.110 2005/03/09 22:58:18 ydirson Exp $ */
+/* $Id: show_dialog.cpp,v 1.111 2005/03/10 13:46:21 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -940,7 +940,7 @@
                return CONNECTION_CONTINUING;
        } else
                return CONTINUE_DIALOG;
-};
+}
 
 network::connection dialog_action_receive_network::result() const
 {
Index: wesnoth/src/tools/exploder_utils.cpp
diff -u wesnoth/src/tools/exploder_utils.cpp:1.4 
wesnoth/src/tools/exploder_utils.cpp:1.5
--- wesnoth/src/tools/exploder_utils.cpp:1.4    Sun Feb 20 21:45:22 2005
+++ wesnoth/src/tools/exploder_utils.cpp        Thu Mar 10 13:46:22 2005
@@ -1,4 +1,4 @@
-/* $Id: exploder_utils.cpp,v 1.4 2005/02/20 21:45:22 silene Exp $ */
+/* $Id: exploder_utils.cpp,v 1.5 2005/03/10 13:46:22 silene Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -206,7 +206,7 @@
                        PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
        //puts the actual image data in the row_pointers array
-       png_byte *row_pointers[surf->h];
+       png_byte **row_pointers = new png_byte *[surf->h];
        surface_lock lock(surf);
        
        //converts the data to the RGBA format. We cannot pass SDL data
@@ -237,5 +237,6 @@
        //cleans everything
        png_write_end(png_ptr, info_ptr);
        png_destroy_write_struct(&png_ptr, &info_ptr);
+       delete row_pointers;
 }
 
Index: wesnoth/src/zipios++/xcoll.hpp
diff -u wesnoth/src/zipios++/xcoll.hpp:1.1 wesnoth/src/zipios++/xcoll.hpp:1.2
--- wesnoth/src/zipios++/xcoll.hpp:1.1  Wed Jan  5 23:25:33 2005
+++ wesnoth/src/zipios++/xcoll.hpp      Thu Mar 10 13:46:22 2005
@@ -10,9 +10,9 @@
        public:
                // explicit XCColl
                bool hasSubdir(const std::string) const ;
-               void xzipios::XCColl::childrenOf(std::string path, 
-                                                std::vector<std::string>* 
files,
-                                                std::vector<std::string>* 
dirs) const;
+               void childrenOf(std::string path, 
+                               std::vector<std::string>* files,
+                               std::vector<std::string>* dirs) const;
        };
 }