[Freeciv-Dev] Re: (PR#11278) [C++] common/nation.h has struct member "class"

["Frédéric Brière" <fbriere@xxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=11278 >

On Fri, Dec 03, 2004 at 08:27:23PM -0800, Jason Short wrote:
> dialogs.c: In function `create_races_dialog':
> dialogs.c:1655: error: structure has no member named `class'

Sh*t, I forgot about the clients.  Here's the second half of the patch.

Could you take a look at server/ruleset.c:2461?  I don't know what that
does, so I can't say if it needs changing or not.


-- 
             Frédéric Brière    <*>    fbriere@xxxxxxxxxxx

 =>  <fbriere@xxxxxxxxxx> IS NO MORE:  <http://www.abacomsucks.com>  <=

Index: client/gui-ftwl/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-ftwl/dialogs.c,v
retrieving revision 1.5
diff -u -r1.5 dialogs.c
--- client/gui-ftwl/dialogs.c   29 Sep 2004 02:24:19 -0000      1.5
+++ client/gui-ftwl/dialogs.c   4 Dec 2004 06:09:15 -0000
@@ -228,7 +228,7 @@
 
     string = ct_string_create(STYLE_ITALIC, 14,
                              ct_extend_std_color(COLOR_STD_BLACK),
-                             COLOR_EXT_GRAY, Q_(nation->class));
+                             COLOR_EXT_GRAY, Q_(nation->category));
     label = sw_label_create_text(root_window, string);
     sw_list_set_item(nations_list, 2, i, label);    
   }
Index: client/gui-gtk-2.0/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/dialogs.c,v
retrieving revision 1.83
diff -u -r1.83 dialogs.c
--- client/gui-gtk-2.0/dialogs.c        23 Nov 2004 17:23:40 -0000      1.83
+++ client/gui-gtk-2.0/dialogs.c        4 Dec 2004 06:09:15 -0000
@@ -1652,7 +1652,7 @@
     g_value_unset(&value);
 
     g_value_init(&value, G_TYPE_STRING);
-    g_value_set_static_string(&value, Q_(nation->class));
+    g_value_set_static_string(&value, Q_(nation->category));
     gtk_list_store_set_value(store, &it, 4, &value);
     g_value_unset(&value);
   }
Index: client/gui-gtk/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/dialogs.c,v
retrieving revision 1.150
diff -u -r1.150 dialogs.c
--- client/gui-gtk/dialogs.c    17 Nov 2004 18:04:40 -0000      1.150
+++ client/gui-gtk/dialogs.c    4 Dec 2004 06:09:16 -0000
@@ -1823,7 +1823,7 @@
 
     /* Find the nation's class. */
     for (class_id = 1; class_id < num_classes; class_id++) {
-      if (strcmp(nation->class, class_names[class_id]) == 0) {
+      if (strcmp(nation->category, class_names[class_id]) == 0) {
        found = TRUE;
        break;
       }
@@ -1832,7 +1832,7 @@
     /* Append a new class. */
     if (!found && num_classes < MAX_NUM_ITEMS) {
       class_id = num_classes++;
-      class_names[class_id] = nation->class;
+      class_names[class_id] = nation->category;
     }
 
     /* Add the nation to the class list. */
@@ -2213,7 +2213,7 @@
   gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(races_by_name[class_id])->entry),
                     get_nation_by_idx(selected_nation)->name);
   gtk_label_set_text(GTK_LABEL(class[class_id]),
-                    get_nation_by_idx(selected_nation)->class);
+                    get_nation_by_idx(selected_nation)->category);
   gtk_label_set_text(GTK_LABEL(legend[class_id]),
                     get_nation_by_idx(selected_nation)->legend);
 
Index: client/gui-sdl/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/dialogs.c,v
retrieving revision 1.53
diff -u -r1.53 dialogs.c
--- client/gui-sdl/dialogs.c    20 Nov 2004 21:27:17 -0000      1.53
+++ client/gui-sdl/dialogs.c    4 Dec 2004 06:09:16 -0000
@@ -4144,8 +4144,8 @@
     pText_Name = create_text_surf_smaller_that_w(pStr, pTmp_Surf->w - 4);
     SDL_SetAlpha(pText_Name, 0x0, 0x0);
     
-    if (pNation->class && *(pNation->class) != '\0') {
-      copy_chars_to_string16(pStr, pNation->class);
+    if (pNation->category && *(pNation->category) != '\0') {
+      copy_chars_to_string16(pStr, pNation->category);
       change_ptsize16(pStr, 10);
       pText_Class = create_text_surf_smaller_that_w(pStr, pTmp_Surf->w - 4);
       SDL_SetAlpha(pText_Class, 0x0, 0x0);
Index: client/gui-win32/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/dialogs.c,v
retrieving revision 1.57
diff -u -r1.57 dialogs.c
--- client/gui-win32/dialogs.c  17 Nov 2004 18:04:40 -0000      1.57
+++ client/gui-win32/dialogs.c  4 Dec 2004 06:09:16 -0000
@@ -279,7 +279,7 @@
 static void update_nation_info()
 {
   SetWindowText(races_class, 
-               get_nation_by_idx(selected_nation)->class);
+               get_nation_by_idx(selected_nation)->category);
   SetWindowText(races_legend,
                get_nation_by_idx(selected_nation)->legend);
 }