r21368 - gnucash/trunk/src/business/business-gnome - Need to rename enum symbols to not conflict with those from gnc-split-reg.h.

[Christian Stimming]

Author: cstim
Date: 2011-09-30 14:48:07 -0400 (Fri, 30 Sep 2011)
New Revision: 21368
Trac: http://svn.gnucash.org/trac/changeset/21368

Modified:
   gnucash/trunk/src/business/business-gnome/dialog-invoice.c
   gnucash/trunk/src/business/business-gnome/dialog-invoice.h
   gnucash/trunk/src/business/business-gnome/gnc-plugin-page-invoice.c
Log:
Need to rename enum symbols to not conflict with those from gnc-split-reg.h.

Modified: gnucash/trunk/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-invoice.c	2011-09-30 18:47:56 UTC (rev 21367)
+++ gnucash/trunk/src/business/business-gnome/dialog-invoice.c	2011-09-30 18:48:07 UTC (rev 21368)
@@ -969,26 +969,26 @@
 
     switch (sort_code)
     {
-    case BY_STANDARD:
+    case INVSORT_BY_STANDARD:
         p1 = standard;
         break;
-    case BY_DATE:
+    case INVSORT_BY_DATE:
         p1 = g_slist_prepend (p1, ENTRY_DATE);
         p2 = standard;
         break;
-    case BY_DATE_ENTERED:
+    case INVSORT_BY_DATE_ENTERED:
         p1 = g_slist_prepend (p1, ENTRY_DATE_ENTERED);
         p2 = standard;
         break;
-    case BY_DESC:
+    case INVSORT_BY_DESC:
         p1 = g_slist_prepend (p1, ENTRY_DESC);
         p2 = standard;
         break;
-    case BY_QTY:
+    case INVSORT_BY_QTY:
         p1 = g_slist_prepend (p1, ENTRY_QTY);
         p2 = standard;
         break;
-    case BY_PRICE:
+    case INVSORT_BY_PRICE:
         p1 = g_slist_prepend (p1, ((iw->owner.type == GNC_OWNER_CUSTOMER) ?
                                    ENTRY_IPRICE : ENTRY_BPRICE));
         p2 = standard;

Modified: gnucash/trunk/src/business/business-gnome/dialog-invoice.h
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-invoice.h	2011-09-30 18:47:56 UTC (rev 21367)
+++ gnucash/trunk/src/business/business-gnome/dialog-invoice.h	2011-09-30 18:48:07 UTC (rev 21368)
@@ -37,12 +37,12 @@
 
 typedef enum
 {
-    BY_STANDARD = 0,
-    BY_DATE,
-    BY_DATE_ENTERED,
-    BY_DESC,
-    BY_QTY,
-    BY_PRICE
+    INVSORT_BY_STANDARD = 0,
+    INVSORT_BY_DATE,
+    INVSORT_BY_DATE_ENTERED,
+    INVSORT_BY_DESC,
+    INVSORT_BY_QTY,
+    INVSORT_BY_PRICE
 } invoice_sort_type_t;
 
 

Modified: gnucash/trunk/src/business/business-gnome/gnc-plugin-page-invoice.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/gnc-plugin-page-invoice.c	2011-09-30 18:47:56 UTC (rev 21367)
+++ gnucash/trunk/src/business/business-gnome/gnc-plugin-page-invoice.c	2011-09-30 18:48:07 UTC (rev 21368)
@@ -208,12 +208,12 @@
 
 static GtkRadioActionEntry radio_entries [] =
 {
-    { "SortStandardAction", NULL, N_("_Standard"), NULL, N_("Keep normal invoice order"), BY_STANDARD },
-    { "SortDateAction", NULL, N_("_Date"), NULL, N_("Sort by date"), BY_DATE },
-    { "SortDateEntryAction", NULL, N_("Date of _Entry"), NULL, N_("Sort by the date of entry"), BY_DATE_ENTERED },
-    { "SortQuantityAction", NULL, N_("_Quantity"), NULL, N_("Sort by quantity"), BY_QTY },
-    { "SortPriceAction", NULL, N_("_Price"), NULL, N_("Sort by price"), BY_PRICE },
-    { "SortDescriptionAction", NULL, N_("Descri_ption"), NULL, N_("Sort by description"), BY_DESC },
+    { "SortStandardAction", NULL, N_("_Standard"), NULL, N_("Keep normal invoice order"), INVSORT_BY_STANDARD },
+    { "SortDateAction", NULL, N_("_Date"), NULL, N_("Sort by date"), INVSORT_BY_DATE },
+    { "SortDateEntryAction", NULL, N_("Date of _Entry"), NULL, N_("Sort by the date of entry"), INVSORT_BY_DATE_ENTERED },
+    { "SortQuantityAction", NULL, N_("_Quantity"), NULL, N_("Sort by quantity"), INVSORT_BY_QTY },
+    { "SortPriceAction", NULL, N_("_Price"), NULL, N_("Sort by price"), INVSORT_BY_PRICE },
+    { "SortDescriptionAction", NULL, N_("Descri_ption"), NULL, N_("Sort by description"), INVSORT_BY_DESC },
 };
 static guint n_radio_entries = G_N_ELEMENTS (radio_entries);