[Eliot-dev] eliot dic/encoding.cpp game/game_io.cpp game/ra...

[eliot-dev]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>      08/01/11 10:09:27

Modified files:
        dic            : encoding.cpp 
        game           : game_io.cpp rack.cpp rack.h 

Log message:
         - dic/encoding.cpp: simplification (this also removes a warning)
         - game/rack.*: added a missing const
         - game/game_io.cpp: fixed a compilation warning

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/dic/encoding.cpp?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/game/game_io.cpp?cvsroot=eliot&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/eliot/game/rack.cpp?cvsroot=eliot&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/eliot/game/rack.h?cvsroot=eliot&r1=1.10&r2=1.11

Patches:
Index: dic/encoding.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/dic/encoding.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- dic/encoding.cpp    8 Jan 2008 13:52:34 -0000       1.2
+++ dic/encoding.cpp    11 Jan 2008 10:09:26 -0000      1.3
@@ -181,17 +181,7 @@
 
 string convertToMb(wchar_t iWChar)
 {
-#ifdef WIN32
     return convertToMb(wstring(1, iWChar));
-#else
-    char res[MB_CUR_MAX + 1];
-    int len = wctomb(res, iWChar);
-    if (len == -1)
-        return "";
-    res[len] = '\0';
-
-    return res;
-#endif
 }
 
 

Index: game/game_io.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/game_io.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- game/game_io.cpp    8 Jan 2008 13:52:38 -0000       1.6
+++ game/game_io.cpp    11 Jan 2008 10:09:27 -0000      1.7
@@ -327,7 +327,7 @@
         int pts;
         unsigned int player;
         char bonus = 0;
-        int res = sscanf(buff, "   %2d | %8s | %s | %3s | %3d | %1d | %c",
+        int res = sscanf(buff, "   %2d | %8s | %s | %3s | %3d | %1u | %c",
                          &num, rack, tmpWord, ref, &pts, &player, &bonus);
 
         debug("   -- line %s",buff);

Index: game/rack.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/game/rack.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- game/rack.cpp       8 Jan 2008 13:52:39 -0000       1.8
+++ game/rack.cpp       11 Jan 2008 10:09:27 -0000      1.9
@@ -68,7 +68,7 @@
 }
 
 
-wstring Rack::toString()
+wstring Rack::toString() const
 {
     wstring rs;
     for (unsigned int i = 1; i < m_tiles.size(); i++)

Index: game/rack.h
===================================================================
RCS file: /cvsroot/eliot/eliot/game/rack.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- game/rack.h 8 Jan 2008 13:52:39 -0000       1.10
+++ game/rack.h 11 Jan 2008 10:09:27 -0000      1.11
@@ -55,7 +55,7 @@
     void clear();
     void getTiles(vector<Tile> &oTiles) const;
 
-    wstring toString();
+    wstring toString() const;
 
 private:
     /// Vector indexed by tile codes, containing the number of tiles