[Wesnoth-cvs-commits] wesnoth/src font.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/03/04 12:34:38

Modified files:
        src            : font.cpp 

Log message:
        * added text_chunk::operator!=

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.112&tr2=1.113&r1=text&r2=text

Patches:
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.112 wesnoth/src/font.cpp:1.113
--- wesnoth/src/font.cpp:1.112  Fri Mar  4 11:59:54 2005
+++ wesnoth/src/font.cpp        Fri Mar  4 12:34:37 2005
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.112 2005/03/04 11:59:54 j_daniel Exp $ */
+/* $Id: font.cpp,v 1.113 2005/03/04 12:34:37 j_daniel Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -69,9 +69,10 @@
        text_chunk(subset_id subset, std::string const & text) : 
subset(subset), text(text) {}
        text_chunk(subset_id subset, ucs2_string const & ucs2_text) : 
subset(subset), ucs2_text(ucs2_text) {}
        text_chunk(subset_id subset, std::string const & text, ucs2_string 
const & ucs2_text) : subset(subset), text(text), ucs2_text(ucs2_text) {}
-       bool operator==(text_chunk const & t) const {
-               return subset == t.subset && ucs2_text == t.ucs2_text;
-       }
+       
+       bool operator==(text_chunk const & t) const { return subset == t.subset 
&& ucs2_text == t.ucs2_text; }
+       bool operator!=(text_chunk const & t) const { return !operator==(t); }
+       
        subset_id subset;
        //FIXME if we don't need the utf8 here remove it
        std::string text;