gnome-games r8063 - in trunk: gnometris libgames-support

[thomashpa svn gnome org]

Author: thomashpa
Date: Fri Oct 17 16:30:35 2008
New Revision: 8063
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8063&view=rev

Log:
Fix constant string cast insanity

Modified:
   trunk/gnometris/highscores.cpp
   trunk/gnometris/renderer.cpp
   trunk/gnometris/renderer.h
   trunk/libgames-support/games-scores.h

Modified: trunk/gnometris/highscores.cpp
==============================================================================
--- trunk/gnometris/highscores.cpp	(original)
+++ trunk/gnometris/highscores.cpp	Fri Oct 17 16:30:35 2008
@@ -25,7 +25,7 @@
 #include "highscores.h"
 
 static const GamesScoresDescription scoredesc = {NULL, NULL,
-                                                 (gchar*)"gnometris",
+                                                 "gnometris",
                                                  GAMES_SCORES_STYLE_PLAIN_DESCENDING};
 
 

Modified: trunk/gnometris/renderer.cpp
==============================================================================
--- trunk/gnometris/renderer.cpp	(original)
+++ trunk/gnometris/renderer.cpp	Fri Oct 17 16:30:35 2008
@@ -24,10 +24,10 @@
 
 #include "renderer.h"
 
-const ThemeTableEntry ThemeTable[] = {{N_("Plain"), (gchar*) "plain"},
-                                      {N_("Joined"), (gchar*) "joined"},
-                                      {N_("Tango Flat"), (gchar*) "tangoflat"},
-                                      {N_("Tango Shaded"), (gchar*) "tangoshaded"},
+const ThemeTableEntry ThemeTable[] = {{N_("Plain"), "plain"},
+                                      {N_("Joined"), "joined"},
+                                      {N_("Tango Flat"), "tangoflat"},
+                                      {N_("Tango Shaded"), "tangoshaded"},
                                       {NULL, NULL}};
 
 

Modified: trunk/gnometris/renderer.h
==============================================================================
--- trunk/gnometris/renderer.h	(original)
+++ trunk/gnometris/renderer.h	Fri Oct 17 16:30:35 2008
@@ -30,8 +30,8 @@
 #include "blockops.h"
 
 struct ThemeTableEntry {
-  gchar *name;
-  gchar *id;
+  const gchar *name;
+  const gchar *id;
 };
 
 extern const ThemeTableEntry ThemeTable[];

Modified: trunk/libgames-support/games-scores.h
==============================================================================
--- trunk/libgames-support/games-scores.h	(original)
+++ trunk/libgames-support/games-scores.h	Fri Oct 17 16:30:35 2008
@@ -45,8 +45,8 @@
 typedef struct {
   const GamesScoresCategory *categories;	/* Array of categories, terminate
 						 * with GAMES_SCORES_LAST_CATEGORY. */
-  gchar *deflt;			/* The key of the default category. */
-  gchar *basename;		/* The base of the filename. The old appname. */
+  const gchar *deflt;			/* The key of the default category. */
+  const gchar *basename;		/* The base of the filename. The old appname. */
   GamesScoreStyle style;
 } GamesScoresDescription;