aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Needed to compile with glib 2.67 and later.
pull/918/head
John Ralls 5 years ago
parent 62df5866ef
commit 7a7c26f87e
36 changed files with 90 additions and 56 deletions
Show Stats Download Patch File Download Diff File

5
gnucash/import-export/test/test-import-pending-matches.cpp
Unescape View File

@ -1,9 +1,10 @@
#include <glib.h>
#include <gtk/gtk.h> /* for references in import-backend.h */
extern "C" {
#include <config.h>
#include <unittest-support.h>
#include <glib.h>
#include <gtk/gtk.h> /* for references in import-backend.h */
#include "import-backend.h"
#include "import-pending-matches.h"
#include "Split.h"

2
libgnucash/app-utils/test/test-autoclear.cpp
Unescape View File

@ -22,7 +22,7 @@
* Boston, MA 02110-1301, USA gnu@gnu.org *
********************************************************************/
#include "config.h"
#include <glib.h>
// GoogleTest is written in C++, however, the function we test in C.
extern "C" {
#include "../gnc-ui-balances.h"

5
libgnucash/app-utils/test/test-print-parse-amount.cpp
Unescape View File

@ -21,9 +21,7 @@
extern "C"
{
#include <config.h>
#include <glib.h>
#include <stdlib.h>
#include <glib/gprintf.h>
#include "gnc-ui-util.h"
#include "gnc-numeric.h"
@ -32,6 +30,9 @@ extern "C"
#include <unittest-support.h>
}
#include <glib.h>
#include <glib/gprintf.h>
static void
test_num_print_info (gnc_numeric n, GNCPrintAmountInfo print_info, int line)
{

2
libgnucash/backend/dbi/test/test-backend-dbi.cpp
Unescape View File

@ -19,11 +19,11 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <glib.h>
#include "qof.h"
#include "cashobjects.h"
}

3
libgnucash/backend/sql/test/test-sqlbe.cpp
Unescape View File

@ -20,10 +20,11 @@
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <glib.h>
#include "qof.h"
}
extern void test_suite_gnc_backend_sql ();

3
libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp
Unescape View File

@ -20,11 +20,12 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
********************************************************************/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <string.h>
#include <glib.h>
#include <unittest-support.h>
}
/* Add specific headers for this class */

7
libgnucash/backend/xml/test/test-dom-converters1.cpp
Unescape View File

@ -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"

7
libgnucash/backend/xml/test/test-dom-parser1.cpp
Unescape View File

@ -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"

7
libgnucash/backend/xml/test/test-file-stuff.cpp
Unescape View File

@ -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"

4
libgnucash/backend/xml/test/test-file-stuff.h
Unescape View File

@ -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>
}

6
libgnucash/backend/xml/test/test-load-example-account.cpp
Unescape View File

@ -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"

7
libgnucash/backend/xml/test/test-load-xml2.cpp
Unescape View File

@ -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>

8
libgnucash/backend/xml/test/test-save-in-lang.cpp
Unescape View File

@ -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"

8
libgnucash/backend/xml/test/test-xml-account.cpp
Unescape View File

@ -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"

8
libgnucash/backend/xml/test/test-xml-commodity.cpp
Unescape View File

@ -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"

5
libgnucash/backend/xml/test/test-xml-pricedb.cpp
Unescape View File

@ -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>

5
libgnucash/backend/xml/test/test-xml-transaction.cpp
Unescape View File

@ -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>

3
libgnucash/core-utils/test/gtest-path-utilities.cpp
Unescape View File

@ -1,7 +1,8 @@
#include <glib.h>
extern "C"
{
#include <config.h>
#include <glib.h>
#include <gncla-dir.h>
#include <gnc-path.h>
#include <binreloc.h>

2
libgnucash/engine/guid.h
Unescape View File

@ -25,13 +25,13 @@
#ifndef GUID_H
#define GUID_H
#include <glib-object.h>
#ifdef __cplusplus
extern "C"
{
#endif
#include <stddef.h>
#include <glib-object.h>
/** @addtogroup Entity
@{ */

1
libgnucash/engine/qofbook.h
Unescape View File

@ -41,6 +41,7 @@
#define QOF_BOOK_H
#ifdef __cplusplus
#include <glib.h> //To preempt it being included extern "C" in a later header.
extern "C"
{
#endif

3
libgnucash/engine/test/test-account-object.cpp
Unescape View File

@ -24,11 +24,12 @@
* @brief Minimal test of reading/writing account parameters
* @author David Hampton <hampton@employees.org>
*/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <unistd.h>
#include <glib.h>
#include "qof.h"
#include "Account.h"
#include "cashobjects.h"

4
libgnucash/engine/test/test-commodities.cpp
Unescape View File

@ -22,11 +22,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <glib.h>
#include "gnc-commodity.h"
#include "qof.h"
#include "test-engine-stuff.h"

3
libgnucash/engine/test/test-gnc-guid-old.cpp
Unescape View File

@ -21,12 +21,13 @@
* Boston, MA 02110-1301, USA gnu@gnu.org *
********************************************************************/
#include <glib.h>
#include "../guid.hpp"
extern "C"
{
#include <config.h>
#include <string.h>
#include <glib.h>
#include <unittest-support.h>
void test_suite_gnc_guid (void);
}

3
libgnucash/engine/test/test-group-vs-book.cpp
Unescape View File

@ -20,10 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <glib.h>
#include "qof.h"
#include "cashobjects.h"
#include "Account.h"

3
libgnucash/engine/test/test-guid.cpp
Unescape View File

@ -26,11 +26,12 @@
*
*/
#include <guid.hpp>
#include <glib.h>
extern "C"
{
#include <config.h>
#include <ctype.h>
#include <glib.h>
#include "cashobjects.h"
#include "test-stuff.h"
#include "test-engine-stuff.h"

3
libgnucash/engine/test/test-lots.cpp
Unescape View File

@ -24,11 +24,12 @@
* @brief Minimal test to see if automatic lot scrubbing works.
* @author Linas Vepstas <linas@linas.org>
*/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <ctype.h>
#include <glib.h>
#include "qof.h"
#include "Account.h"
#include "Scrub3.h"

2
libgnucash/engine/test/test-numeric.cpp
Unescape View File

@ -21,12 +21,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <ctype.h>
#include <glib.h>
#include "cashobjects.h"
#include "test-stuff.h"
#include "test-engine-stuff.h"

3
libgnucash/engine/test/test-qofinstance.cpp
Unescape View File

@ -20,11 +20,12 @@
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#include <glib.h>
#include <guid.hpp>
extern "C"
{
#include <config.h>
#include <glib.h>
#include <unittest-support.h>
#include "../qof.h"
}

3
libgnucash/engine/test/test-qofsession-old.cpp
Unescape View File

@ -21,10 +21,11 @@
\********************************************************************/
#include "../guid.hpp"
#include <glib.h>
extern "C"
{
#include <config.h>
#include <glib.h>
#include <unittest-support.h>
}

3
libgnucash/engine/test/test-query.cpp
Unescape View File

@ -20,10 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <glib.h>
#include "qof.h"
#include "cashobjects.h"
#include "Transaction.h"

3
libgnucash/engine/test/test-split-vs-account.cpp
Unescape View File

@ -21,10 +21,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <glib.h>
#include "qof.h"
#include "cashobjects.h"
#include "AccountP.h"

3
libgnucash/engine/test/test-transaction-reversal.cpp
Unescape View File

@ -20,10 +20,11 @@
* 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 "cashobjects.h"
#include "Transaction.h"

3
libgnucash/engine/test/test-transaction-voiding.cpp
Unescape View File

@ -20,10 +20,11 @@
* 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 "cashobjects.h"
#include "Account.h"

3
libgnucash/engine/test/utest-Account.cpp
Unescape View File

@ -19,11 +19,12 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
********************************************************************/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <string.h>
#include <glib.h>
#include <unittest-support.h>
#include <gnc-event.h>
#include <gnc-date.h>

3
libgnucash/engine/test/utest-Split.cpp
Unescape View File

@ -21,11 +21,12 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
********************************************************************/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <string.h>
#include <glib.h>
#include <unittest-support.h>
/* Add specific headers for this class */
#include <Split.h>

3
libgnucash/engine/test/utest-Transaction.cpp
Unescape View File

@ -21,11 +21,12 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
********************************************************************/
#include <glib.h>
extern "C"
{
#include <config.h>
#include <string.h>
#include <glib.h>
#include <unittest-support.h>
/* Add specific headers for this class */
#include "../Transaction.h"

Write Preview
Loading…
Cancel
Save