From 32b010ba3a0cfcd82f6d274a64b709777a848421 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 14 Feb 2013 20:36:31 +0100
Subject: [PATCH] Rename sheets to n_sheets

---
 src/data/gnumeric-reader.c             | 18 +++++++++---------
 src/data/ods-reader.c                  |  2 +-
 src/data/spreadsheet-reader.h          |  2 +-
 src/ui/gui/psppire-spreadsheet-model.c |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 69dd23689f..fa00804293 100644
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -138,7 +138,7 @@ const char *
 gnumeric_get_sheet_name (struct spreadsheet *s, int n)
 {
   struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
-  assert (n < s->sheets);
+  assert (n < s->n_sheets);
 
   return gr->sheets[n].name;
 }
@@ -153,7 +153,7 @@ gnumeric_get_sheet_range (struct spreadsheet *s, int n)
   int ret;
   struct gnumeric_reader *gr = (struct gnumeric_reader *) s;
   
-  assert (n < s->sheets);
+  assert (n < s->n_sheets);
 
   while ( 
 	 (gr->sheets[n].stop_col == -1)
@@ -189,7 +189,7 @@ gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
 
   caseproto_unref (r->proto);
 
-  for (i = 0; i < r->spreadsheet.sheets; ++i)
+  for (i = 0; i < r->spreadsheet.n_sheets; ++i)
     {
       xmlFree (r->sheets[i].name);
     }
@@ -217,7 +217,7 @@ process_node (struct gnumeric_reader *r)
 	  XML_READER_TYPE_ELEMENT  == r->node_type)
 	{
 	  r->state = STATE_SHEET_COUNT;
-	  r->spreadsheet.sheets = 0;
+	  r->spreadsheet.n_sheets = 0;
 	}
       break;
 
@@ -226,9 +226,9 @@ process_node (struct gnumeric_reader *r)
 	  XML_READER_TYPE_ELEMENT  == r->node_type)
 	{
 	  struct sheet_detail *sd ;
-	  r->spreadsheet.sheets++;
-	  r->sheets = xrealloc (r->sheets, r->spreadsheet.sheets * sizeof *r->sheets);
-	  sd = &r->sheets[r->spreadsheet.sheets - 1];
+	  r->spreadsheet.n_sheets++;
+	  r->sheets = xrealloc (r->sheets, r->spreadsheet.n_sheets * sizeof *r->sheets);
+	  sd = &r->sheets[r->spreadsheet.n_sheets - 1];
 	  sd->start_col = sd->stop_col = sd->start_row = sd->stop_row = -1;
 	}
       else if (0 == xmlStrcasecmp (name, _xml("gnm:SheetNameIndex")) &&
@@ -238,7 +238,7 @@ process_node (struct gnumeric_reader *r)
 	}
       else if (XML_READER_TYPE_TEXT == r->node_type)
 	{
-	  r->sheets [r->spreadsheet.sheets - 1].name = xmlTextReaderValue (r->xtr);
+	  r->sheets [r->spreadsheet.n_sheets - 1].name = xmlTextReaderValue (r->xtr);
 	}
       break;
 
@@ -462,7 +462,7 @@ gnumeric_reopen (struct gnumeric_reader *r, const char *filename)
   if (r == NULL)
     {
       r = xzalloc (sizeof *r);
-      r->spreadsheet.sheets = -1;
+      r->spreadsheet.n_sheets = -1;
       r->spreadsheet.file_name = filename;
     }
 
diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index d12223013c..d6ed43e8f6 100644
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -404,7 +404,7 @@ struct spreadsheet *ods_probe (const char *filename)
   r = xzalloc (sizeof *r);
   r->xtr = xtr;
   r->spreadsheet.type = SPREADSHEET_ODS;
-  r->spreadsheet.sheets = sheet_count;
+  r->spreadsheet.n_sheets = sheet_count;
 
   ds_destroy (&errs);
 
diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index 9f84fa1abe..765f3ca953 100644
--- a/src/data/spreadsheet-reader.h
+++ b/src/data/spreadsheet-reader.h
@@ -66,7 +66,7 @@ struct spreadsheet
   enum spreadsheet_type type;
 
   /* The total number of sheets in the "workbook" */
-  int sheets;
+  int n_sheets;
 
   /* The dictionary */
   struct dictionary *dict;
diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c
index 240356f294..f64f35ad09 100644
--- a/src/ui/gui/psppire-spreadsheet-model.c
+++ b/src/ui/gui/psppire-spreadsheet-model.c
@@ -217,7 +217,7 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
   if (iter == NULL)
     return FALSE;
 
-  if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->sheets - 1)
+  if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1)
     {
       iter->user_data = NULL;
       iter->stamp = 0;
@@ -276,7 +276,7 @@ tree_model_nth_child (GtkTreeModel * model, GtkTreeIter * iter,
   if (parent)
     return FALSE;
 
-  if (n >= spreadsheetModel->spreadsheet->sheets)
+  if (n >= spreadsheetModel->spreadsheet->n_sheets)
     return FALSE;
 
   iter->stamp = spreadsheetModel->stamp;
@@ -292,7 +292,7 @@ tree_model_n_children (GtkTreeModel * model, GtkTreeIter * iter)
     PSPPIRE_SPREADSHEET_MODEL (model);
 
   if (iter == NULL)
-    return spreadsheetModel->spreadsheet->sheets;
+    return spreadsheetModel->spreadsheet->n_sheets;
 
   return 0;
 }
-- 
2.30.2