Move glib and gtk includes out of extern C for tests.

Needed to compile with glib 2.67 and later.

libgnucash/backend/xml/test/test-dom-converters1.cpp

@@ -21,21 +21,22 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  *  02110-1301, USA.
  */
+#include <glib.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
-
 #include "test-engine-stuff.h"
 #include "cashobjects.h"
 #include "gnc-engine.h"
 #include "gnc-commodity.h"
 }
 
+#include <cstdlib>
+
 #include "test-file-stuff.h"
 #include "gnc-xml-helper.h"
 #include "sixtp.h"

libgnucash/backend/xml/test/test-dom-parser1.cpp

@@ -17,18 +17,19 @@
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
  *                                                                  *
 \********************************************************************/
+#include <glib.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
-
 #include "test-stuff.h"
 }
 
+#include <cstdlib>
+
 #include "gnc-xml-helper.h"
 #include "sixtp.h"
 #include "sixtp-parsers.h"

libgnucash/backend/xml/test/test-file-stuff.cpp

@@ -21,6 +21,8 @@
  *  02110-1301, USA.
  */
 #include <kvp-frame.hpp>
+#include <glib.h>
+#include <glib/gstdio.h>
 
 extern "C"
 {
@@ -31,15 +33,14 @@ extern "C"
 #include <sys/stat.h>
 #include <dirent.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
-#include <glib.h>
-#include <glib/gstdio.h>
 
 #include "gnc-engine.h"
 #include "test-stuff.h"
 }
 
+#include <cstdlib>
+
 #include "test-file-stuff.h"
 #include "sixtp-dom-parsers.h"
 #include "sixtp-parsers.h"

libgnucash/backend/xml/test/test-file-stuff.h

@@ -24,10 +24,10 @@
 
 #ifndef TEST_FILE_STUFF_H
 #define TEST_FILE_STUFF_H
-extern "C"
-{
 #include <glib.h>
 
+extern "C"
+{
 #include <gnc-commodity.h>
 #include <gnc-engine.h>
 }

libgnucash/backend/xml/test/test-load-example-account.cpp

@@ -20,12 +20,12 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  *  02110-1301, USA.
  */
+#include <glib.h>
+
 extern "C"
 {
 #include <config.h>
-#include <glib.h>
 #include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -36,6 +36,8 @@ extern "C"
 #include "test-engine-stuff.h"
 }
 
+#include <cstdlib>
+
 #include "test-file-stuff.h"
 #include "io-gncxml-v2.h"
 

libgnucash/backend/xml/test/test-load-xml2.cpp

@@ -25,6 +25,10 @@
 /* @file test-load-xml2.c
  * @brief test the loading of a version-2 gnucash XML file
  */
+#include <glib.h>
+#include <glib-object.h>
+#include <glib/gstdio.h>
+
 extern "C"
 {
 #include <config.h>
@@ -36,9 +40,6 @@ extern "C"
 #include <unistd.h>
 #include <dirent.h>
 #include <string.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <glib/gstdio.h>
 
 #include <cashobjects.h>
 #include <TransLog.h>

libgnucash/backend/xml/test/test-save-in-lang.cpp

@@ -17,17 +17,17 @@
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
  *                                                                  *
 \********************************************************************/
+#include <glib.h>
+#include <glib/gstdio.h>
+
 extern "C"
 {
 #include <config.h>
-#include <glib.h>
-#include <glib/gstdio.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "test-engine-stuff.h"
@@ -36,6 +36,8 @@ extern "C"
 #include "TransLog.h"
 }
 
+#include <cstdlib>
+
 #include "test-file-stuff.h"
 #include "io-gncxml-v2.h"
 #include "test-stuff.h"

libgnucash/backend/xml/test/test-xml-account.cpp

@@ -21,13 +21,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  *  02110-1301, USA.
  */
+#include <glib.h>
+#include <glib/gstdio.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <gnc-engine.h>
 #include <cashobjects.h>
@@ -39,6 +39,8 @@ extern "C"
 #include "Scrub.h"
 }
 
+#include <cstdlib>
+
 #include "../gnc-xml-helper.h"
 #include "../gnc-xml.h"
 #include "../sixtp-parsers.h"

libgnucash/backend/xml/test/test-xml-commodity.cpp

@@ -17,13 +17,13 @@
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
  *                                                                  *
 \********************************************************************/
+#include <glib.h>
+#include <glib/gstdio.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include "qof.h"
@@ -32,6 +32,8 @@ extern "C"
 #include "Account.h"
 }
 
+#include <cstdlib>
+
 #include "gnc-xml-helper.h"
 #include "gnc-xml.h"
 #include "sixtp-parsers.h"

libgnucash/backend/xml/test/test-xml-pricedb.cpp

@@ -21,12 +21,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  *  02110-1301, USA.
  */
+#include <glib.h>
+#include <glib/gstdio.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <glib.h>
-#include <glib/gstdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 

libgnucash/backend/xml/test/test-xml-transaction.cpp

@@ -21,12 +21,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  *  02110-1301, USA.
  */
+#include <glib.h>
+#include <glib/gstdio.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <glib.h>
-#include <glib/gstdio.h>
 #include <stdlib.h>
 #include <unistd.h>