mail[Wesnoth-commits] r28870 - in /trunk/src/gui/widgets: canvas.cpp helper.cpp helper.hpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on August 23, 2008 - 13:34:
Author: mordante
Date: Sat Aug 23 13:34:15 2008
New Revision: 28870

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28870&view=rev
Log:
Make the return value of decode_font_style() unsigned since it's a flag
field.

Modified:
    trunk/src/gui/widgets/canvas.cpp
    trunk/src/gui/widgets/helper.cpp
    trunk/src/gui/widgets/helper.hpp

Modified: trunk/src/gui/widgets/canvas.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/canvas.cpp?rev=28870&r1=28869&r2=28870&view=diff
==============================================================================
--- trunk/src/gui/widgets/canvas.cpp (original)
+++ trunk/src/gui/widgets/canvas.cpp Sat Aug 23 13:34:15 2008
@@ -717,7 +717,7 @@
        unsigned font_size_;
 
        /** The style of the text. */
-       int font_style_;
+       unsigned font_style_;
 
        /** The colour of the text. */
        Uint32 colour_;

Modified: trunk/src/gui/widgets/helper.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/helper.cpp?rev=28870&r1=28869&r2=28870&view=diff
==============================================================================
--- trunk/src/gui/widgets/helper.cpp (original)
+++ trunk/src/gui/widgets/helper.cpp Sat Aug 23 13:34:15 2008
@@ -86,7 +86,7 @@
        return stream;
 }
 
-int decode_font_style(const std::string& style)
+unsigned decode_font_style(const std::string& style)
 {
        if(style == "bold") {
                return TTF_STYLE_BOLD;

Modified: trunk/src/gui/widgets/helper.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/helper.hpp?rev=28870&r1=28869&r2=28870&view=diff
==============================================================================
--- trunk/src/gui/widgets/helper.hpp (original)
+++ trunk/src/gui/widgets/helper.hpp Sat Aug 23 13:34:15 2008
@@ -97,7 +97,7 @@
  *
  * @returns                       The font style.
  */
-int decode_font_style(const std::string& style);
+unsigned decode_font_style(const std::string& style);
 
 /**
  * Copies a portion of a surface.




Related Messages


Powered by MHonArc, Updated Sat Aug 23 13:42:06 2008