From 7a7c26f87e171cc7e180cfed6b79e5e2f25ef0db Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 15 Feb 2021 12:37:09 -0800 Subject: [PATCH] Move glib and gtk includes out of extern C for tests. Needed to compile with glib 2.67 and later. --- .../import-export/test/test-import-pending-matches.cpp | 5 +++-- libgnucash/app-utils/test/test-autoclear.cpp | 2 +- libgnucash/app-utils/test/test-print-parse-amount.cpp | 5 +++-- libgnucash/backend/dbi/test/test-backend-dbi.cpp | 2 +- libgnucash/backend/sql/test/test-sqlbe.cpp | 3 ++- libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp | 3 ++- libgnucash/backend/xml/test/test-dom-converters1.cpp | 7 ++++--- libgnucash/backend/xml/test/test-dom-parser1.cpp | 7 ++++--- libgnucash/backend/xml/test/test-file-stuff.cpp | 7 ++++--- libgnucash/backend/xml/test/test-file-stuff.h | 4 ++-- libgnucash/backend/xml/test/test-load-example-account.cpp | 6 ++++-- libgnucash/backend/xml/test/test-load-xml2.cpp | 7 ++++--- libgnucash/backend/xml/test/test-save-in-lang.cpp | 8 +++++--- libgnucash/backend/xml/test/test-xml-account.cpp | 8 +++++--- libgnucash/backend/xml/test/test-xml-commodity.cpp | 8 +++++--- libgnucash/backend/xml/test/test-xml-pricedb.cpp | 5 +++-- libgnucash/backend/xml/test/test-xml-transaction.cpp | 5 +++-- libgnucash/core-utils/test/gtest-path-utilities.cpp | 3 ++- libgnucash/engine/guid.h | 2 +- libgnucash/engine/qofbook.h | 1 + libgnucash/engine/test/test-account-object.cpp | 3 ++- libgnucash/engine/test/test-commodities.cpp | 4 ++-- libgnucash/engine/test/test-gnc-guid-old.cpp | 3 ++- libgnucash/engine/test/test-group-vs-book.cpp | 3 ++- libgnucash/engine/test/test-guid.cpp | 3 ++- libgnucash/engine/test/test-lots.cpp | 3 ++- libgnucash/engine/test/test-numeric.cpp | 2 +- libgnucash/engine/test/test-qofinstance.cpp | 3 ++- libgnucash/engine/test/test-qofsession-old.cpp | 3 ++- libgnucash/engine/test/test-query.cpp | 3 ++- libgnucash/engine/test/test-split-vs-account.cpp | 3 ++- libgnucash/engine/test/test-transaction-reversal.cpp | 3 ++- libgnucash/engine/test/test-transaction-voiding.cpp | 3 ++- libgnucash/engine/test/utest-Account.cpp | 3 ++- libgnucash/engine/test/utest-Split.cpp | 3 ++- libgnucash/engine/test/utest-Transaction.cpp | 3 ++- 36 files changed, 90 insertions(+), 56 deletions(-) diff --git a/gnucash/import-export/test/test-import-pending-matches.cpp b/gnucash/import-export/test/test-import-pending-matches.cpp index e5dccc441f..3d3d61dfcd 100644 --- a/gnucash/import-export/test/test-import-pending-matches.cpp +++ b/gnucash/import-export/test/test-import-pending-matches.cpp @@ -1,9 +1,10 @@ +#include +#include /* for references in import-backend.h */ + extern "C" { #include #include -#include -#include /* for references in import-backend.h */ #include "import-backend.h" #include "import-pending-matches.h" #include "Split.h" diff --git a/libgnucash/app-utils/test/test-autoclear.cpp b/libgnucash/app-utils/test/test-autoclear.cpp index 92b6d7404f..1dad9e488a 100644 --- a/libgnucash/app-utils/test/test-autoclear.cpp +++ b/libgnucash/app-utils/test/test-autoclear.cpp @@ -22,7 +22,7 @@ * Boston, MA 02110-1301, USA gnu@gnu.org * ********************************************************************/ #include "config.h" - +#include // GoogleTest is written in C++, however, the function we test in C. extern "C" { #include "../gnc-ui-balances.h" diff --git a/libgnucash/app-utils/test/test-print-parse-amount.cpp b/libgnucash/app-utils/test/test-print-parse-amount.cpp index 62d3785302..ac6b4c27b5 100644 --- a/libgnucash/app-utils/test/test-print-parse-amount.cpp +++ b/libgnucash/app-utils/test/test-print-parse-amount.cpp @@ -21,9 +21,7 @@ extern "C" { #include -#include #include -#include #include "gnc-ui-util.h" #include "gnc-numeric.h" @@ -32,6 +30,9 @@ extern "C" #include } +#include +#include + static void test_num_print_info (gnc_numeric n, GNCPrintAmountInfo print_info, int line) { diff --git a/libgnucash/backend/dbi/test/test-backend-dbi.cpp b/libgnucash/backend/dbi/test/test-backend-dbi.cpp index 4ba484448a..acb21e40c0 100644 --- a/libgnucash/backend/dbi/test/test-backend-dbi.cpp +++ b/libgnucash/backend/dbi/test/test-backend-dbi.cpp @@ -19,11 +19,11 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * \********************************************************************/ +#include extern "C" { #include -#include #include "qof.h" #include "cashobjects.h" } diff --git a/libgnucash/backend/sql/test/test-sqlbe.cpp b/libgnucash/backend/sql/test/test-sqlbe.cpp index 644711df41..0a6191c3f3 100644 --- a/libgnucash/backend/sql/test/test-sqlbe.cpp +++ b/libgnucash/backend/sql/test/test-sqlbe.cpp @@ -20,10 +20,11 @@ * Boston, MA 02110-1301, USA gnu@gnu.org * \********************************************************************/ +#include + extern "C" { #include -#include #include "qof.h" } extern void test_suite_gnc_backend_sql (); diff --git a/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp b/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp index b89cde9a7e..b7669f4180 100644 --- a/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp +++ b/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp @@ -20,11 +20,12 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * ********************************************************************/ +#include + extern "C" { #include #include -#include #include } /* Add specific headers for this class */ diff --git a/libgnucash/backend/xml/test/test-dom-converters1.cpp b/libgnucash/backend/xml/test/test-dom-converters1.cpp index fe63368419..02c31dfe66 100644 --- a/libgnucash/backend/xml/test/test-dom-converters1.cpp +++ b/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 + extern "C" { #include -#include #include -#include - #include "test-engine-stuff.h" #include "cashobjects.h" #include "gnc-engine.h" #include "gnc-commodity.h" } +#include + #include "test-file-stuff.h" #include "gnc-xml-helper.h" #include "sixtp.h" diff --git a/libgnucash/backend/xml/test/test-dom-parser1.cpp b/libgnucash/backend/xml/test/test-dom-parser1.cpp index 59933a4c5f..28de9542cb 100644 --- a/libgnucash/backend/xml/test/test-dom-parser1.cpp +++ b/libgnucash/backend/xml/test/test-dom-parser1.cpp @@ -17,18 +17,19 @@ * Boston, MA 02110-1301, USA gnu@gnu.org * * * \********************************************************************/ +#include + extern "C" { #include -#include #include -#include - #include "test-stuff.h" } +#include + #include "gnc-xml-helper.h" #include "sixtp.h" #include "sixtp-parsers.h" diff --git a/libgnucash/backend/xml/test/test-file-stuff.cpp b/libgnucash/backend/xml/test/test-file-stuff.cpp index 1ba6e974e5..0264c81224 100644 --- a/libgnucash/backend/xml/test/test-file-stuff.cpp +++ b/libgnucash/backend/xml/test/test-file-stuff.cpp @@ -21,6 +21,8 @@ * 02110-1301, USA. */ #include +#include +#include extern "C" { @@ -31,15 +33,14 @@ extern "C" #include #include #include -#include #include -#include -#include #include "gnc-engine.h" #include "test-stuff.h" } +#include + #include "test-file-stuff.h" #include "sixtp-dom-parsers.h" #include "sixtp-parsers.h" diff --git a/libgnucash/backend/xml/test/test-file-stuff.h b/libgnucash/backend/xml/test/test-file-stuff.h index fd9e00ea3d..158d8cddf3 100644 --- a/libgnucash/backend/xml/test/test-file-stuff.h +++ b/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 +extern "C" +{ #include #include } diff --git a/libgnucash/backend/xml/test/test-load-example-account.cpp b/libgnucash/backend/xml/test/test-load-example-account.cpp index af0c437771..3596a7cad4 100644 --- a/libgnucash/backend/xml/test/test-load-example-account.cpp +++ b/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 + extern "C" { #include -#include #include -#include #include #include #include @@ -36,6 +36,8 @@ extern "C" #include "test-engine-stuff.h" } +#include + #include "test-file-stuff.h" #include "io-gncxml-v2.h" diff --git a/libgnucash/backend/xml/test/test-load-xml2.cpp b/libgnucash/backend/xml/test/test-load-xml2.cpp index f1e3cfdffc..9454700789 100644 --- a/libgnucash/backend/xml/test/test-load-xml2.cpp +++ b/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 +#include +#include + extern "C" { #include @@ -36,9 +40,6 @@ extern "C" #include #include #include -#include -#include -#include #include #include diff --git a/libgnucash/backend/xml/test/test-save-in-lang.cpp b/libgnucash/backend/xml/test/test-save-in-lang.cpp index 8501a7c883..78cc644b6b 100644 --- a/libgnucash/backend/xml/test/test-save-in-lang.cpp +++ b/libgnucash/backend/xml/test/test-save-in-lang.cpp @@ -17,17 +17,17 @@ * Boston, MA 02110-1301, USA gnu@gnu.org * * * \********************************************************************/ +#include +#include + extern "C" { #include -#include -#include #include #include #include #include #include -#include #include #include "test-engine-stuff.h" @@ -36,6 +36,8 @@ extern "C" #include "TransLog.h" } +#include + #include "test-file-stuff.h" #include "io-gncxml-v2.h" #include "test-stuff.h" diff --git a/libgnucash/backend/xml/test/test-xml-account.cpp b/libgnucash/backend/xml/test/test-xml-account.cpp index d336ec2372..ee90e5901b 100644 --- a/libgnucash/backend/xml/test/test-xml-account.cpp +++ b/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 +#include + extern "C" { #include -#include -#include -#include #include #include #include @@ -39,6 +39,8 @@ extern "C" #include "Scrub.h" } +#include + #include "../gnc-xml-helper.h" #include "../gnc-xml.h" #include "../sixtp-parsers.h" diff --git a/libgnucash/backend/xml/test/test-xml-commodity.cpp b/libgnucash/backend/xml/test/test-xml-commodity.cpp index 6ff7e76565..5deeeed9d3 100644 --- a/libgnucash/backend/xml/test/test-xml-commodity.cpp +++ b/libgnucash/backend/xml/test/test-xml-commodity.cpp @@ -17,13 +17,13 @@ * Boston, MA 02110-1301, USA gnu@gnu.org * * * \********************************************************************/ +#include +#include + extern "C" { #include -#include -#include -#include #include #include "qof.h" @@ -32,6 +32,8 @@ extern "C" #include "Account.h" } +#include + #include "gnc-xml-helper.h" #include "gnc-xml.h" #include "sixtp-parsers.h" diff --git a/libgnucash/backend/xml/test/test-xml-pricedb.cpp b/libgnucash/backend/xml/test/test-xml-pricedb.cpp index 4660084f7b..7bf5afe92e 100644 --- a/libgnucash/backend/xml/test/test-xml-pricedb.cpp +++ b/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 +#include + extern "C" { #include -#include -#include #include #include diff --git a/libgnucash/backend/xml/test/test-xml-transaction.cpp b/libgnucash/backend/xml/test/test-xml-transaction.cpp index 2389206828..54a22262ad 100644 --- a/libgnucash/backend/xml/test/test-xml-transaction.cpp +++ b/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 +#include + extern "C" { #include -#include -#include #include #include diff --git a/libgnucash/core-utils/test/gtest-path-utilities.cpp b/libgnucash/core-utils/test/gtest-path-utilities.cpp index 94e83566ff..d7210007bd 100644 --- a/libgnucash/core-utils/test/gtest-path-utilities.cpp +++ b/libgnucash/core-utils/test/gtest-path-utilities.cpp @@ -1,7 +1,8 @@ +#include + extern "C" { #include -#include #include #include #include diff --git a/libgnucash/engine/guid.h b/libgnucash/engine/guid.h index 918b75a789..f43f194d16 100644 --- a/libgnucash/engine/guid.h +++ b/libgnucash/engine/guid.h @@ -25,13 +25,13 @@ #ifndef GUID_H #define GUID_H +#include #ifdef __cplusplus extern "C" { #endif #include -#include /** @addtogroup Entity @{ */ diff --git a/libgnucash/engine/qofbook.h b/libgnucash/engine/qofbook.h index bc315c80f8..4a7877c0af 100644 --- a/libgnucash/engine/qofbook.h +++ b/libgnucash/engine/qofbook.h @@ -41,6 +41,7 @@ #define QOF_BOOK_H #ifdef __cplusplus +#include //To preempt it being included extern "C" in a later header. extern "C" { #endif diff --git a/libgnucash/engine/test/test-account-object.cpp b/libgnucash/engine/test/test-account-object.cpp index 32f612e65f..f1d21a5706 100644 --- a/libgnucash/engine/test/test-account-object.cpp +++ b/libgnucash/engine/test/test-account-object.cpp @@ -24,11 +24,12 @@ * @brief Minimal test of reading/writing account parameters * @author David Hampton */ +#include + extern "C" { #include #include -#include #include "qof.h" #include "Account.h" #include "cashobjects.h" diff --git a/libgnucash/engine/test/test-commodities.cpp b/libgnucash/engine/test/test-commodities.cpp index 5aae8ec60f..efd9421586 100644 --- a/libgnucash/engine/test/test-commodities.cpp +++ b/libgnucash/engine/test/test-commodities.cpp @@ -22,11 +22,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ +#include + extern "C" { #include -#include - #include "gnc-commodity.h" #include "qof.h" #include "test-engine-stuff.h" diff --git a/libgnucash/engine/test/test-gnc-guid-old.cpp b/libgnucash/engine/test/test-gnc-guid-old.cpp index 1ce3456d7e..a64adb3361 100644 --- a/libgnucash/engine/test/test-gnc-guid-old.cpp +++ b/libgnucash/engine/test/test-gnc-guid-old.cpp @@ -21,12 +21,13 @@ * Boston, MA 02110-1301, USA gnu@gnu.org * ********************************************************************/ +#include #include "../guid.hpp" + extern "C" { #include #include -#include #include void test_suite_gnc_guid (void); } diff --git a/libgnucash/engine/test/test-group-vs-book.cpp b/libgnucash/engine/test/test-group-vs-book.cpp index 31cf1aadee..010913ebba 100644 --- a/libgnucash/engine/test/test-group-vs-book.cpp +++ b/libgnucash/engine/test/test-group-vs-book.cpp @@ -20,10 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ +#include + extern "C" { #include -#include #include "qof.h" #include "cashobjects.h" #include "Account.h" diff --git a/libgnucash/engine/test/test-guid.cpp b/libgnucash/engine/test/test-guid.cpp index 6c76075249..ad42ec49c7 100644 --- a/libgnucash/engine/test/test-guid.cpp +++ b/libgnucash/engine/test/test-guid.cpp @@ -26,11 +26,12 @@ * */ #include +#include + extern "C" { #include #include -#include #include "cashobjects.h" #include "test-stuff.h" #include "test-engine-stuff.h" diff --git a/libgnucash/engine/test/test-lots.cpp b/libgnucash/engine/test/test-lots.cpp index c1033d3d04..58d2f8ab11 100644 --- a/libgnucash/engine/test/test-lots.cpp +++ b/libgnucash/engine/test/test-lots.cpp @@ -24,11 +24,12 @@ * @brief Minimal test to see if automatic lot scrubbing works. * @author Linas Vepstas */ +#include + extern "C" { #include #include -#include #include "qof.h" #include "Account.h" #include "Scrub3.h" diff --git a/libgnucash/engine/test/test-numeric.cpp b/libgnucash/engine/test/test-numeric.cpp index 1963d80fe8..c2cd7e534d 100644 --- a/libgnucash/engine/test/test-numeric.cpp +++ b/libgnucash/engine/test/test-numeric.cpp @@ -21,12 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ +#include extern "C" { #include #include -#include #include "cashobjects.h" #include "test-stuff.h" #include "test-engine-stuff.h" diff --git a/libgnucash/engine/test/test-qofinstance.cpp b/libgnucash/engine/test/test-qofinstance.cpp index 1f979a1615..9299e42239 100644 --- a/libgnucash/engine/test/test-qofinstance.cpp +++ b/libgnucash/engine/test/test-qofinstance.cpp @@ -20,11 +20,12 @@ * Boston, MA 02110-1301, USA gnu@gnu.org * \********************************************************************/ +#include #include + extern "C" { #include -#include #include #include "../qof.h" } diff --git a/libgnucash/engine/test/test-qofsession-old.cpp b/libgnucash/engine/test/test-qofsession-old.cpp index 2282c0df50..4c73365eab 100644 --- a/libgnucash/engine/test/test-qofsession-old.cpp +++ b/libgnucash/engine/test/test-qofsession-old.cpp @@ -21,10 +21,11 @@ \********************************************************************/ #include "../guid.hpp" +#include + extern "C" { #include -#include #include } diff --git a/libgnucash/engine/test/test-query.cpp b/libgnucash/engine/test/test-query.cpp index f21c7922ac..94ab2c0d83 100644 --- a/libgnucash/engine/test/test-query.cpp +++ b/libgnucash/engine/test/test-query.cpp @@ -20,10 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ +#include + extern "C" { #include -#include #include "qof.h" #include "cashobjects.h" #include "Transaction.h" diff --git a/libgnucash/engine/test/test-split-vs-account.cpp b/libgnucash/engine/test/test-split-vs-account.cpp index ee1e320a11..81c42d635a 100644 --- a/libgnucash/engine/test/test-split-vs-account.cpp +++ b/libgnucash/engine/test/test-split-vs-account.cpp @@ -21,10 +21,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ +#include + extern "C" { #include -#include #include "qof.h" #include "cashobjects.h" #include "AccountP.h" diff --git a/libgnucash/engine/test/test-transaction-reversal.cpp b/libgnucash/engine/test/test-transaction-reversal.cpp index c8e918e4f6..e5183cc5af 100644 --- a/libgnucash/engine/test/test-transaction-reversal.cpp +++ b/libgnucash/engine/test/test-transaction-reversal.cpp @@ -20,10 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ +#include + extern "C" { #include -#include #include #include "cashobjects.h" #include "Transaction.h" diff --git a/libgnucash/engine/test/test-transaction-voiding.cpp b/libgnucash/engine/test/test-transaction-voiding.cpp index f6037d1783..e4aa60c63e 100644 --- a/libgnucash/engine/test/test-transaction-voiding.cpp +++ b/libgnucash/engine/test/test-transaction-voiding.cpp @@ -20,10 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ +#include + extern "C" { #include -#include #include #include "cashobjects.h" #include "Account.h" diff --git a/libgnucash/engine/test/utest-Account.cpp b/libgnucash/engine/test/utest-Account.cpp index eab36c3253..be3057f3bd 100644 --- a/libgnucash/engine/test/utest-Account.cpp +++ b/libgnucash/engine/test/utest-Account.cpp @@ -19,11 +19,12 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * ********************************************************************/ +#include + extern "C" { #include #include -#include #include #include #include diff --git a/libgnucash/engine/test/utest-Split.cpp b/libgnucash/engine/test/utest-Split.cpp index 18286e283c..660210b16e 100644 --- a/libgnucash/engine/test/utest-Split.cpp +++ b/libgnucash/engine/test/utest-Split.cpp @@ -21,11 +21,12 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * ********************************************************************/ +#include + extern "C" { #include #include -#include #include /* Add specific headers for this class */ #include diff --git a/libgnucash/engine/test/utest-Transaction.cpp b/libgnucash/engine/test/utest-Transaction.cpp index 69cf8ed621..26aa66d3d1 100644 --- a/libgnucash/engine/test/utest-Transaction.cpp +++ b/libgnucash/engine/test/utest-Transaction.cpp @@ -21,11 +21,12 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * ********************************************************************/ +#include + extern "C" { #include #include -#include #include /* Add specific headers for this class */ #include "../Transaction.h"