Change io-gncxml-v2.c to C++.

po/POTFILES.in

@@ -87,7 +87,7 @@ src/backend/xml/gnc-vendor-xml-v2.c
 src/backend/xml/gnc-xml-helper.c
 src/backend/xml/io-example-account.c
 src/backend/xml/io-gncxml-gen.c
-src/backend/xml/io-gncxml-v1.c
+src/backend/xml/io-gncxml-v1.cpp
 src/backend/xml/io-gncxml-v2.c
 src/backend/xml/io-utils.c
 src/backend/xml/sixtp.c

src/backend/xml/Makefile.am

@@ -42,7 +42,7 @@ libgnc_backend_xml_utils_la_SOURCES = \
   gnc-xml-helper.c \
   io-example-account.c \
   io-gncxml-gen.c \
-  io-gncxml-v1.c \
+  io-gncxml-v1.cpp \
   io-gncxml-v2.c \
   io-utils.c \
   sixtp-dom-generators.cpp \

src/backend/xml/io-gncxml-v1.cpp

@@ -24,7 +24,8 @@
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
  *                                                                  *
  *******************************************************************/
-
+extern "C"
+{
 #include "config.h"
 
 #include <stdlib.h>
@@ -49,6 +50,7 @@
 #include "sixtp-stack.h"
 #include "sixtp-parsers.h"
 #include "sixtp-utils.h"
+}
 
 /* from Transaction-xml-parser-v1.c */
 static sixtp* gnc_transaction_parser_new(void);
@@ -787,13 +789,13 @@ kvp_frame_slot_end_handler(gpointer data_for_children,
         {
             if (is_child_result_from_node_named(cr, "frame"))
             {
-                KvpFrame *frame = cr->data;
+                KvpFrame *frame = static_cast<KvpFrame*>(cr->data);
                 value = kvp_value_new_frame (frame);
                 delete_value = TRUE;
             }
             else
             {
-                value = cr->data;
+                value = static_cast<KvpValue*>(cr->data);
                 delete_value = FALSE;
             }
 
@@ -1401,7 +1403,7 @@ acc_restore_type_end_handler(gpointer data_for_children,
 {
     Account *acc = (Account *) parent_data;
     gchar *txt = NULL;
-    int type;
+    GNCAccountType type;
     gboolean ok;
 
     g_return_val_if_fail(acc, FALSE);

src/backend/xml/io-gncxml.h

@@ -32,6 +32,10 @@
 
 #ifndef IO_GNCXML_H
 #define IO_GNCXML_H
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
 #include <glib.h>
 #include "qof.h"
@@ -47,4 +51,7 @@ gboolean qof_session_load_from_xml_file(QofBook *, const char * filename);
  */
 gboolean gnc_is_xml_data_file(const gchar *name);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* IO_GNCXML_H */