gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Oct 25 14:51:57 EDT 2016
Updated via https://github.com/Gnucash/gnucash/commit/1e5f2459 (commit)
via https://github.com/Gnucash/gnucash/commit/85770afb (commit)
via https://github.com/Gnucash/gnucash/commit/0a5a0ab7 (commit)
via https://github.com/Gnucash/gnucash/commit/e1e85cee (commit)
from https://github.com/Gnucash/gnucash/commit/3877c03e (commit)
commit 1e5f245900f20bf6f2ecbdf58e40d4163f8cbfce
Merge: 3877c03 85770af
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Oct 25 11:49:48 2016 -0700
Merge convert GUID from inheriting boost::guid to composition.
commit 85770afb8ebf0dcdf253eaf0f85455c30ba7c25b
Author: lmat <dartme18 at gmail.com>
Date: Mon Oct 24 14:20:55 2016 -0400
Replaced inheritance from boost uuid with composition
Rather than extending boost::uuids::uuid, we add a boost::uuids::uuid
member to handle the implementation of equality checking, uuid
generation, etc.
diff --git a/src/libqof/qof/guid.cpp b/src/libqof/qof/guid.cpp
index ed102b7..b3a33b8 100644
--- a/src/libqof/qof/guid.cpp
+++ b/src/libqof/qof/guid.cpp
@@ -111,6 +111,9 @@ void
guid_free (GncGUID *guid)
{
if (!guid) return;
+ if (guid == s_null_gncguid)
+ /* Don't delete that! */
+ return;
delete guid;
}
@@ -118,7 +121,9 @@ GncGUID *
guid_copy (const GncGUID *guid)
{
if (!guid) return nullptr;
- return new GncGUID {*guid};
+ auto ret = guid_malloc ();
+ memcpy (ret, guid, sizeof (GncGUID));
+ return ret;
}
/*It looks like we are expected to provide the same pointer every time from this function*/
@@ -146,7 +151,8 @@ guid_replace (GncGUID *guid)
GncGUID *
guid_new (void)
{
- return new GncGUID {guid_new_return ()};
+ auto ret = guid_new_return ();
+ return guid_copy (&ret);
}
GncGUID
@@ -276,7 +282,7 @@ gnc_guid_to_string (const GValue *src, GValue *dest)
g_return_if_fail (G_VALUE_HOLDS_STRING (dest) &&
GNC_VALUE_HOLDS_GUID (src));
- str = guid_to_string(gnc_value_get_guid (src));
+ str = guid_to_string (gnc_value_get_guid (src));
g_value_set_string (dest, str);
}
@@ -315,7 +321,7 @@ GUID::create_random () noexcept
}
GUID::GUID (boost::uuids::uuid const & other) noexcept
- : boost::uuids::uuid (other)
+ : implementation (other)
{
}
@@ -328,7 +334,7 @@ GUID::null_guid () noexcept
std::string
GUID::to_string () const noexcept
{
- auto const & val = boost::uuids::to_string (*this);
+ auto const & val = boost::uuids::to_string (implementation);
std::string ret;
std::for_each (val.begin (), val.end (), [&ret] (char a) {
if (a != '-') ret.push_back (a);
@@ -355,8 +361,8 @@ guid_syntax_exception::guid_syntax_exception () noexcept
{
}
-GUID::GUID(GncGUID const & other) noexcept
- : boost::uuids::uuid {other.reserved[0] , other.reserved[1]
+GUID::GUID (GncGUID const & other) noexcept
+ : implementation {other.reserved[0] , other.reserved[1]
, other.reserved[2], other.reserved[3]
, other.reserved[4], other.reserved[5]
, other.reserved[6], other.reserved[7]
@@ -369,7 +375,44 @@ GUID::GUID(GncGUID const & other) noexcept
}
-GUID::operator GncGUID() const noexcept
+auto
+GUID::end () const noexcept -> decltype (implementation.end ())
+{
+ return implementation.end ();
+}
+
+auto
+GUID::begin () const noexcept -> decltype (implementation.begin ())
+{
+ return implementation.begin ();
+}
+
+bool
+GUID::operator < (GUID const & other) noexcept
+{
+ return implementation < other.implementation;
+}
+
+bool operator == (GUID const & lhs, GncGUID const & rhs) noexcept
+{
+ auto ret = std::mismatch (lhs.begin (), lhs.end (), rhs.reserved);
+ return ret.first == lhs.end ();
+
+}
+
+bool
+operator != (GUID const & one, GUID const & two) noexcept
+{
+ return one.implementation != two.implementation;
+}
+
+GUID & GUID::operator = (GUID && other) noexcept
+{
+ boost::uuids::swap (other.implementation, implementation);
+ return *this;
+}
+
+GUID::operator GncGUID () const noexcept
{
GncGUID ret;
guid_assign (ret, *this);
diff --git a/src/libqof/qof/guid.hpp b/src/libqof/qof/guid.hpp
index 2b52c47..65d8f88 100644
--- a/src/libqof/qof/guid.hpp
+++ b/src/libqof/qof/guid.hpp
@@ -34,19 +34,31 @@ struct guid_syntax_exception : public std::invalid_argument
guid_syntax_exception () noexcept;
};
-struct GUID : public boost::uuids::uuid
+struct GUID
{
+ private:
+ boost::uuids::uuid implementation;
+
+ public:
GUID (boost::uuids::uuid const &) noexcept;
GUID (GncGUID const &) noexcept;
+ GUID (GUID const &) noexcept = default;
GUID () noexcept = default;
- operator GncGUID() const noexcept;
+ GUID & operator = (GUID &&) noexcept;
+
+ operator GncGUID () const noexcept;
static GUID create_random () noexcept;
static GUID const & null_guid () noexcept;
static GUID from_string (std::string const &) throw (guid_syntax_exception);
std::string to_string () const noexcept;
+ auto begin () const noexcept -> decltype (implementation.begin ());
+ auto end () const noexcept -> decltype (implementation.end ());
+ bool operator < (GUID const &) noexcept;
+ friend bool operator != (GUID const &, GUID const &) noexcept;
};
-bool operator==(GUID const &, GncGUID const &) noexcept;
+bool operator != (GUID const &, GUID const &) noexcept;
+bool operator == (GUID const &, GncGUID const &) noexcept;
}
commit 0a5a0ab7abcce141a533a780d41c683e23cc085d
Author: lmat <dartme18 at gmail.com>
Date: Thu Oct 20 16:47:32 2016 -0400
Separate C guid from C++ guid
diff --git a/src/libqof/qof/guid.cpp b/src/libqof/qof/guid.cpp
index ab00254..ed102b7 100644
--- a/src/libqof/qof/guid.cpp
+++ b/src/libqof/qof/guid.cpp
@@ -83,17 +83,24 @@ gnc_value_get_guid (const GValue *value)
return val;
}
-static GncGUID s_null_guid {{{0}}};
+GncGUID * guid_convert_create (gnc::GUID const &);
-/*It looks like we are expected to provide the same pointer every time from this function*/
-const GncGUID *
-guid_null (void)
-{
- return &s_null_guid;
-}
+static gnc::GUID s_null_guid {boost::uuids::uuid { {0}}};
+static GncGUID * s_null_gncguid {guid_convert_create (s_null_guid)};
/* Memory management routines ***************************************/
+/**
+ * Allocates and returns a new GncGUID containing the same value as the
+ * gnc::GUID passed in.
+ */
+GncGUID *
+guid_convert_create (gnc::GUID const & guid)
+{
+ GncGUID temp = guid;
+ return guid_copy (&temp);
+}
+
GncGUID *
guid_malloc (void)
{
@@ -104,9 +111,6 @@ void
guid_free (GncGUID *guid)
{
if (!guid) return;
- if (guid == &s_null_guid)
- /*!!Don't delete that!!*/
- return;
delete guid;
}
@@ -117,32 +121,47 @@ guid_copy (const GncGUID *guid)
return new GncGUID {*guid};
}
+/*It looks like we are expected to provide the same pointer every time from this function*/
+const GncGUID *
+guid_null (void)
+{
+ return s_null_gncguid;
+}
+
+void
+guid_assign (GncGUID & target, gnc::GUID const & source)
+{
+ memcpy (&target, &source, sizeof (GncGUID));
+}
+
/*Takes an allocated guid pointer and constructs it in place*/
void
guid_replace (GncGUID *guid)
{
if (!guid) return;
- auto other = GncGUID::create_random();
- guid->swap (other);
+ gnc::GUID temp_random {gnc::GUID::create_random ()};
+ guid_assign (*guid, temp_random);
}
GncGUID *
guid_new (void)
{
- return new GncGUID {GncGUID::create_random ()};
+ return new GncGUID {guid_new_return ()};
}
GncGUID
guid_new_return (void)
{
- return GncGUID::create_random ();
+ return gnc::GUID::create_random ();
}
gchar *
guid_to_string (const GncGUID * guid)
{
if (!guid) return nullptr;
- return g_strdup (guid->to_string ().c_str ());
+ gnc::GUID temp {*guid};
+ auto temp_str = temp.to_string ();
+ return g_strdup (temp_str.c_str ());
}
gchar *
@@ -150,10 +169,11 @@ guid_to_string_buff (const GncGUID * guid, gchar *str)
{
if (!str || !guid) return NULL;
- auto val = guid->to_string ();
+ gnc::GUID temp {*guid};
+ auto val = temp.to_string ();
/*We need to be sure to copy the terminating null character.*/
- std::copy (val.c_str (), val.c_str() + val.size () + 1, str);
- return str + val.size();
+ std::copy (val.c_str (), val.c_str () + val.size () + 1, str);
+ return str + val.size ();
}
gboolean
@@ -163,8 +183,7 @@ string_to_guid (const char * str, GncGUID * guid)
try
{
- auto other = GncGUID::from_string (str);
- guid->swap (other);
+ guid_assign (*guid, gnc::GUID::from_string (str));
}
catch (...)
{
@@ -178,15 +197,21 @@ guid_equal (const GncGUID *guid_1, const GncGUID *guid_2)
{
if (!guid_1 || !guid_2)
return !guid_1 && !guid_2;
- return *guid_1 == *guid_2;
+ gnc::GUID temp1 {*guid_1};
+ gnc::GUID temp2 {*guid_2};
+ return temp1 == temp2;
}
gint
guid_compare (const GncGUID *guid_1, const GncGUID *guid_2)
{
- if (*guid_1 < *guid_2)
+ if (!guid_1 || !guid_2)
+ return !guid_1 && !guid_2;
+ gnc::GUID temp1 {*guid_1};
+ gnc::GUID temp2 {*guid_2};
+ if (temp1 < temp2)
return -1;
- if (*guid_1 == *guid_2)
+ if (temp1 == temp2)
return 0;
return 1;
}
@@ -200,10 +225,11 @@ guid_hash_to_guint (gconstpointer ptr)
return 0;
}
GncGUID const & guid = * reinterpret_cast <GncGUID const *> (ptr);
+ gnc::GUID const & temp {guid};
guint hash {0};
unsigned retspot {0};
- std::for_each (guid.begin (), guid.end (), [&hash] (unsigned char a) {
+ std::for_each (temp.begin (), temp.end (), [&hash] (unsigned char a) {
hash <<=4;
hash |= a;
});
@@ -278,26 +304,29 @@ gnc_guid_get_type (void)
return type;
}
-GncGUID
-GncGUID::create_random () noexcept
+namespace gnc
+{
+
+GUID
+GUID::create_random () noexcept
{
static boost::uuids::random_generator gen;
return {gen ()};
}
-GncGUID::GncGUID (boost::uuids::uuid const & other) noexcept
+GUID::GUID (boost::uuids::uuid const & other) noexcept
: boost::uuids::uuid (other)
{
}
-GncGUID const &
-GncGUID::null_guid () noexcept
+GUID const &
+GUID::null_guid () noexcept
{
return s_null_guid;
}
std::string
-GncGUID::to_string () const noexcept
+GUID::to_string () const noexcept
{
auto const & val = boost::uuids::to_string (*this);
std::string ret;
@@ -307,8 +336,8 @@ GncGUID::to_string () const noexcept
return ret;
}
-GncGUID
-GncGUID::from_string (std::string const & str) throw (guid_syntax_exception)
+GUID
+GUID::from_string (std::string const & str) throw (guid_syntax_exception)
{
try
{
@@ -325,3 +354,26 @@ guid_syntax_exception::guid_syntax_exception () noexcept
: invalid_argument {"Invalid syntax for guid."}
{
}
+
+GUID::GUID(GncGUID const & other) noexcept
+ : boost::uuids::uuid {other.reserved[0] , other.reserved[1]
+ , other.reserved[2], other.reserved[3]
+ , other.reserved[4], other.reserved[5]
+ , other.reserved[6], other.reserved[7]
+ , other.reserved[8], other.reserved[9]
+ , other.reserved[10], other.reserved[11]
+ , other.reserved[12], other.reserved[13]
+ , other.reserved[14], other.reserved[15]
+ }
+{
+
+}
+
+GUID::operator GncGUID() const noexcept
+{
+ GncGUID ret;
+ guid_assign (ret, *this);
+ return ret;
+}
+
+} // namespace gnc
diff --git a/src/libqof/qof/guid.h b/src/libqof/qof/guid.h
index 7000e68..918b75a 100644
--- a/src/libqof/qof/guid.h
+++ b/src/libqof/qof/guid.h
@@ -66,13 +66,15 @@ extern "C"
* found in guid.hpp
*/
#ifdef __cplusplus
-struct GncGUID;
-#else
+namespace gnc {
+struct GUID;
+}
+#endif
+
/** The type used to store guids in C */
typedef struct _gncGuid {
unsigned char reserved[GUID_DATA_SIZE];
} GncGUID;
-#endif
GType gnc_guid_get_type (void);
const GncGUID* gnc_value_get_guid (const GValue *value);
diff --git a/src/libqof/qof/guid.hpp b/src/libqof/qof/guid.hpp
index f33c58b..2b52c47 100644
--- a/src/libqof/qof/guid.hpp
+++ b/src/libqof/qof/guid.hpp
@@ -24,20 +24,30 @@
#include <boost/uuid/uuid.hpp>
#include <stdexcept>
+extern "C" {
+#include "guid.h"
+}
+namespace gnc {
struct guid_syntax_exception : public std::invalid_argument
{
guid_syntax_exception () noexcept;
};
-struct GncGUID : public boost::uuids::uuid
+struct GUID : public boost::uuids::uuid
{
- GncGUID (boost::uuids::uuid const &) noexcept;
- GncGUID () noexcept = default;
- static GncGUID create_random () noexcept;
- static GncGUID const & null_guid () noexcept;
- static GncGUID from_string (std::string const &) throw (guid_syntax_exception);
+ GUID (boost::uuids::uuid const &) noexcept;
+ GUID (GncGUID const &) noexcept;
+ GUID () noexcept = default;
+ operator GncGUID() const noexcept;
+ static GUID create_random () noexcept;
+ static GUID const & null_guid () noexcept;
+ static GUID from_string (std::string const &) throw (guid_syntax_exception);
std::string to_string () const noexcept;
};
+bool operator==(GUID const &, GncGUID const &) noexcept;
+
+
+}
#endif
diff --git a/src/libqof/qof/test/test-gnc-guid.cpp b/src/libqof/qof/test/test-gnc-guid.cpp
index a8e0505..b188c7c 100644
--- a/src/libqof/qof/test/test-gnc-guid.cpp
+++ b/src/libqof/qof/test/test-gnc-guid.cpp
@@ -33,24 +33,24 @@
TEST (GncGUID, creation)
{
- auto guid = GncGUID::create_random ();
- EXPECT_NE (guid, GncGUID::null_guid ());
+ auto guid = gnc::GUID::create_random ();
+ EXPECT_NE (guid, gnc::GUID::null_guid ());
// There should be a default constructor.
GncGUID other;
}
TEST (GncGUID, copy)
{
- auto guid = GncGUID::create_random ();
+ auto guid = gnc::GUID::create_random ();
auto cpy = guid;
EXPECT_EQ (guid, cpy);
- GncGUID cpy2 {cpy};
+ gnc::GUID cpy2 {cpy};
EXPECT_EQ (guid, cpy2);
}
TEST (GncGUID, move)
{
- auto guid = GncGUID::create_random ();
+ auto guid = gnc::GUID::create_random ();
auto cpy = guid;
auto mv = std::move(guid);
EXPECT_EQ (cpy, mv);
@@ -59,24 +59,24 @@ TEST (GncGUID, move)
TEST (GncGUID, to_string)
{
std::string fixture (32, '0');
- auto str = GncGUID::null_guid ().to_string ();
+ auto str = gnc::GUID::null_guid ().to_string ();
EXPECT_EQ (str, fixture);
}
TEST (GncGUID, from_string)
{
std::string fixture (32, '0');
- auto guid = GncGUID::from_string (fixture);
- EXPECT_EQ (guid, GncGUID::null_guid ());
+ auto guid = gnc::GUID::from_string (fixture);
+ EXPECT_EQ (guid, gnc::GUID::null_guid ());
- guid = GncGUID::create_random ();
+ guid = gnc::GUID::create_random ();
std::string bogus {"Have a great big roast beef sandwich, if you please!"};
bool fail = false;
try
{
- auto guid = GncGUID::from_string (bogus);
+ auto guid = gnc::GUID::from_string (bogus);
}
- catch (guid_syntax_exception const &)
+ catch (gnc::guid_syntax_exception const &)
{
fail = true;
}
@@ -88,9 +88,9 @@ TEST (GncGUID, from_string)
TEST (GncGUID, round_trip)
{
- auto guid1 = GncGUID::create_random ();
+ auto guid1 = gnc::GUID::create_random ();
auto str = guid1.to_string ();
- auto guid2 = GncGUID::from_string (str);
+ auto guid2 = gnc::GUID::from_string (str);
EXPECT_EQ (guid1, guid2);
}
commit e1e85cee164fb545e796f9edfddd58486f638f67
Author: lmat <dartme18 at gmail.com>
Date: Sun Jun 12 15:47:49 2016 -0400
Added forward declaration for struct GncGUID
I also removed the guid.hpp include where I could.
diff --git a/src/app-utils/test/test-option-util.cpp b/src/app-utils/test/test-option-util.cpp
index db25596..7bc7b9b 100644
--- a/src/app-utils/test/test-option-util.cpp
+++ b/src/app-utils/test/test-option-util.cpp
@@ -21,7 +21,6 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu at gnu.org *
********************************************************************/
-#include <guid.hpp>
#include <kvp_frame.hpp>
#include <gmp.h>
extern "C"
diff --git a/src/app-utils/test/test-print-parse-amount.cpp b/src/app-utils/test/test-print-parse-amount.cpp
index 5941897..728cbcf 100644
--- a/src/app-utils/test/test-print-parse-amount.cpp
+++ b/src/app-utils/test/test-print-parse-amount.cpp
@@ -18,7 +18,6 @@
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/app-utils/test/test-scm-query-string.cpp b/src/app-utils/test/test-scm-query-string.cpp
index 460d1ba..33f963e 100644
--- a/src/app-utils/test/test-scm-query-string.cpp
+++ b/src/app-utils/test/test-scm-query-string.cpp
@@ -18,7 +18,6 @@
* *
\********************************************************************/
-#include <guid.hpp>
#include <libguile.h>
extern "C"
diff --git a/src/app-utils/test/test-sx.cpp b/src/app-utils/test/test-sx.cpp
index f3028fa..027731b 100644
--- a/src/app-utils/test/test-sx.cpp
+++ b/src/app-utils/test/test-sx.cpp
@@ -18,7 +18,6 @@
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/dbi/gnc-backend-dbi.cpp b/src/backend/dbi/gnc-backend-dbi.cpp
index 5f97225..3e90e96 100644
--- a/src/backend/dbi/gnc-backend-dbi.cpp
+++ b/src/backend/dbi/gnc-backend-dbi.cpp
@@ -25,7 +25,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL db using libdbi
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/dbi/test/test-backend-dbi-basic.cpp b/src/backend/dbi/test/test-backend-dbi-basic.cpp
index 02fc7bc..b0112d7 100644
--- a/src/backend/dbi/test/test-backend-dbi-basic.cpp
+++ b/src/backend/dbi/test/test-backend-dbi-basic.cpp
@@ -24,7 +24,6 @@
* *
\********************************************************************/
-#include <guid.hpp>
#include <kvp_frame.hpp>
extern "C"
diff --git a/src/backend/dbi/test/test-backend-dbi.cpp b/src/backend/dbi/test/test-backend-dbi.cpp
index 209c88d..6bf6785 100644
--- a/src/backend/dbi/test/test-backend-dbi.cpp
+++ b/src/backend/dbi/test/test-backend-dbi.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/dbi/test/test-dbi-business-stuff.cpp b/src/backend/dbi/test/test-dbi-business-stuff.cpp
index ae5d440..6461f41 100644
--- a/src/backend/dbi/test/test-dbi-business-stuff.cpp
+++ b/src/backend/dbi/test/test-dbi-business-stuff.cpp
@@ -22,7 +22,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/dbi/test/test-dbi-stuff.cpp b/src/backend/dbi/test/test-dbi-stuff.cpp
index 56cd329..58526af 100644
--- a/src/backend/dbi/test/test-dbi-stuff.cpp
+++ b/src/backend/dbi/test/test-dbi-stuff.cpp
@@ -22,7 +22,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include <config.h>
diff --git a/src/backend/sql/escape.cpp b/src/backend/sql/escape.cpp
index 704e414..5c4103c 100644
--- a/src/backend/sql/escape.cpp
+++ b/src/backend/sql/escape.cpp
@@ -27,7 +27,6 @@
* FUNCTION:
* Escapes the ' and \ characters in a string
*/
-#include <guid.hpp>
#include "config.h"
#include <glib.h>
diff --git a/src/backend/sql/gnc-address-sql.cpp b/src/backend/sql/gnc-address-sql.cpp
index b4d3038..43d5006 100644
--- a/src/backend/sql/gnc-address-sql.cpp
+++ b/src/backend/sql/gnc-address-sql.cpp
@@ -27,7 +27,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/gnc-book-sql.cpp b/src/backend/sql/gnc-book-sql.cpp
index ddf4a5f..9c47987 100644
--- a/src/backend/sql/gnc-book-sql.cpp
+++ b/src/backend/sql/gnc-book-sql.cpp
@@ -25,7 +25,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL db
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/gnc-customer-sql.cpp b/src/backend/sql/gnc-customer-sql.cpp
index ba67acf..05ff4bf 100644
--- a/src/backend/sql/gnc-customer-sql.cpp
+++ b/src/backend/sql/gnc-customer-sql.cpp
@@ -27,7 +27,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/gnc-employee-sql.cpp b/src/backend/sql/gnc-employee-sql.cpp
index ee0b2ef..ce28239 100644
--- a/src/backend/sql/gnc-employee-sql.cpp
+++ b/src/backend/sql/gnc-employee-sql.cpp
@@ -27,7 +27,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/gnc-entry-sql.cpp b/src/backend/sql/gnc-entry-sql.cpp
index 11dd17c..88a43d8 100644
--- a/src/backend/sql/gnc-entry-sql.cpp
+++ b/src/backend/sql/gnc-entry-sql.cpp
@@ -27,7 +27,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/gnc-job-sql.cpp b/src/backend/sql/gnc-job-sql.cpp
index baa16c3..1a42eb5 100644
--- a/src/backend/sql/gnc-job-sql.cpp
+++ b/src/backend/sql/gnc-job-sql.cpp
@@ -27,7 +27,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/gnc-price-sql.cpp b/src/backend/sql/gnc-price-sql.cpp
index 5e2370b..c061120 100644
--- a/src/backend/sql/gnc-price-sql.cpp
+++ b/src/backend/sql/gnc-price-sql.cpp
@@ -25,7 +25,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL db
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/gnc-recurrence-sql.cpp b/src/backend/sql/gnc-recurrence-sql.cpp
index 7f18877..17e60be 100644
--- a/src/backend/sql/gnc-recurrence-sql.cpp
+++ b/src/backend/sql/gnc-recurrence-sql.cpp
@@ -25,7 +25,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL db
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/gnc-schedxaction-sql.cpp b/src/backend/sql/gnc-schedxaction-sql.cpp
index 5b3869f..9cce493 100644
--- a/src/backend/sql/gnc-schedxaction-sql.cpp
+++ b/src/backend/sql/gnc-schedxaction-sql.cpp
@@ -25,7 +25,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL db
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/gnc-vendor-sql.cpp b/src/backend/sql/gnc-vendor-sql.cpp
index d6ccbb3..70935ed 100644
--- a/src/backend/sql/gnc-vendor-sql.cpp
+++ b/src/backend/sql/gnc-vendor-sql.cpp
@@ -27,7 +27,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/test/test-column-types.cpp b/src/backend/sql/test/test-column-types.cpp
index 0084ce9..0189001 100644
--- a/src/backend/sql/test/test-column-types.cpp
+++ b/src/backend/sql/test/test-column-types.cpp
@@ -23,7 +23,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/test/test-sqlbe.cpp b/src/backend/sql/test/test-sqlbe.cpp
index cc3a056..0b3d12e 100644
--- a/src/backend/sql/test/test-sqlbe.cpp
+++ b/src/backend/sql/test/test-sqlbe.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/sql/test/utest-gnc-backend-sql.cpp b/src/backend/sql/test/utest-gnc-backend-sql.cpp
index 236ddb5..9e474b5 100644
--- a/src/backend/sql/test/utest-gnc-backend-sql.cpp
+++ b/src/backend/sql/test/utest-gnc-backend-sql.cpp
@@ -20,7 +20,6 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu at gnu.org *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-account-xml-v2.cpp b/src/backend/xml/gnc-account-xml-v2.cpp
index 92cd1db..72e70ba 100644
--- a/src/backend/xml/gnc-account-xml-v2.cpp
+++ b/src/backend/xml/gnc-account-xml-v2.cpp
@@ -22,7 +22,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-address-xml-v2.cpp b/src/backend/xml/gnc-address-xml-v2.cpp
index ef3dc81..90dcf69 100644
--- a/src/backend/xml/gnc-address-xml-v2.cpp
+++ b/src/backend/xml/gnc-address-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-backend-xml.cpp b/src/backend/xml/gnc-backend-xml.cpp
index 21980ca..e9ebb81 100644
--- a/src/backend/xml/gnc-backend-xml.cpp
+++ b/src/backend/xml/gnc-backend-xml.cpp
@@ -27,7 +27,6 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an ordinary Unix filesystem file.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-bill-term-xml-v2.cpp b/src/backend/xml/gnc-bill-term-xml-v2.cpp
index 65db438..5bee3cd 100644
--- a/src/backend/xml/gnc-bill-term-xml-v2.cpp
+++ b/src/backend/xml/gnc-bill-term-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-book-xml-v2.cpp b/src/backend/xml/gnc-book-xml-v2.cpp
index 43bced8..868dc35 100644
--- a/src/backend/xml/gnc-book-xml-v2.cpp
+++ b/src/backend/xml/gnc-book-xml-v2.cpp
@@ -22,7 +22,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-budget-xml-v2.cpp b/src/backend/xml/gnc-budget-xml-v2.cpp
index a5efa92..93b9163 100644
--- a/src/backend/xml/gnc-budget-xml-v2.cpp
+++ b/src/backend/xml/gnc-budget-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-commodity-xml-v2.cpp b/src/backend/xml/gnc-commodity-xml-v2.cpp
index 8fd980c..69d7f18 100644
--- a/src/backend/xml/gnc-commodity-xml-v2.cpp
+++ b/src/backend/xml/gnc-commodity-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-customer-xml-v2.cpp b/src/backend/xml/gnc-customer-xml-v2.cpp
index 18f0720..74cc13e 100644
--- a/src/backend/xml/gnc-customer-xml-v2.cpp
+++ b/src/backend/xml/gnc-customer-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-employee-xml-v2.cpp b/src/backend/xml/gnc-employee-xml-v2.cpp
index 96ec1f5..d8f8be2 100644
--- a/src/backend/xml/gnc-employee-xml-v2.cpp
+++ b/src/backend/xml/gnc-employee-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-entry-xml-v2.cpp b/src/backend/xml/gnc-entry-xml-v2.cpp
index 982b402..4466201 100644
--- a/src/backend/xml/gnc-entry-xml-v2.cpp
+++ b/src/backend/xml/gnc-entry-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-freqspec-xml-v2.cpp b/src/backend/xml/gnc-freqspec-xml-v2.cpp
index ac33572..3b11029 100644
--- a/src/backend/xml/gnc-freqspec-xml-v2.cpp
+++ b/src/backend/xml/gnc-freqspec-xml-v2.cpp
@@ -22,7 +22,6 @@
* *
*******************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-invoice-xml-v2.cpp b/src/backend/xml/gnc-invoice-xml-v2.cpp
index 2ef9065..4cf3fbd 100644
--- a/src/backend/xml/gnc-invoice-xml-v2.cpp
+++ b/src/backend/xml/gnc-invoice-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-job-xml-v2.cpp b/src/backend/xml/gnc-job-xml-v2.cpp
index be33e23..9239376 100644
--- a/src/backend/xml/gnc-job-xml-v2.cpp
+++ b/src/backend/xml/gnc-job-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-lot-xml-v2.cpp b/src/backend/xml/gnc-lot-xml-v2.cpp
index 03d1e9e..696a466 100644
--- a/src/backend/xml/gnc-lot-xml-v2.cpp
+++ b/src/backend/xml/gnc-lot-xml-v2.cpp
@@ -22,7 +22,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-order-xml-v2.cpp b/src/backend/xml/gnc-order-xml-v2.cpp
index 7afb347..12512c7 100644
--- a/src/backend/xml/gnc-order-xml-v2.cpp
+++ b/src/backend/xml/gnc-order-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-owner-xml-v2.cpp b/src/backend/xml/gnc-owner-xml-v2.cpp
index 78d7157..b17923a 100644
--- a/src/backend/xml/gnc-owner-xml-v2.cpp
+++ b/src/backend/xml/gnc-owner-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-pricedb-xml-v2.cpp b/src/backend/xml/gnc-pricedb-xml-v2.cpp
index 232754c..1c5240c 100644
--- a/src/backend/xml/gnc-pricedb-xml-v2.cpp
+++ b/src/backend/xml/gnc-pricedb-xml-v2.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
*******************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-recurrence-xml-v2.cpp b/src/backend/xml/gnc-recurrence-xml-v2.cpp
index a973555..b3e817a 100644
--- a/src/backend/xml/gnc-recurrence-xml-v2.cpp
+++ b/src/backend/xml/gnc-recurrence-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-schedxaction-xml-v2.cpp b/src/backend/xml/gnc-schedxaction-xml-v2.cpp
index c399e05..f719cde 100644
--- a/src/backend/xml/gnc-schedxaction-xml-v2.cpp
+++ b/src/backend/xml/gnc-schedxaction-xml-v2.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
*******************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-tax-table-xml-v2.cpp b/src/backend/xml/gnc-tax-table-xml-v2.cpp
index 27f2e7d..183fe3a 100644
--- a/src/backend/xml/gnc-tax-table-xml-v2.cpp
+++ b/src/backend/xml/gnc-tax-table-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-transaction-xml-v2.cpp b/src/backend/xml/gnc-transaction-xml-v2.cpp
index 2f08e74..4992fac 100644
--- a/src/backend/xml/gnc-transaction-xml-v2.cpp
+++ b/src/backend/xml/gnc-transaction-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
*******************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/gnc-vendor-xml-v2.cpp b/src/backend/xml/gnc-vendor-xml-v2.cpp
index 447e078..f897502 100644
--- a/src/backend/xml/gnc-vendor-xml-v2.cpp
+++ b/src/backend/xml/gnc-vendor-xml-v2.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/io-example-account.cpp b/src/backend/xml/io-example-account.cpp
index 95b61a3..c024d6a 100644
--- a/src/backend/xml/io-example-account.cpp
+++ b/src/backend/xml/io-example-account.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/io-gncxml-gen.cpp b/src/backend/xml/io-gncxml-gen.cpp
index 440c36f..6accc4a 100644
--- a/src/backend/xml/io-gncxml-gen.cpp
+++ b/src/backend/xml/io-gncxml-gen.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/io-gncxml-v2.cpp b/src/backend/xml/io-gncxml-v2.cpp
index 920fe8d..994b24a 100644
--- a/src/backend/xml/io-gncxml-v2.cpp
+++ b/src/backend/xml/io-gncxml-v2.cpp
@@ -18,7 +18,6 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/io-utils.cpp b/src/backend/xml/io-utils.cpp
index 1b1293a..72c3563 100644
--- a/src/backend/xml/io-utils.cpp
+++ b/src/backend/xml/io-utils.cpp
@@ -21,7 +21,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/sixtp-dom-generators.cpp b/src/backend/xml/sixtp-dom-generators.cpp
index c2b298d..1db5895 100644
--- a/src/backend/xml/sixtp-dom-generators.cpp
+++ b/src/backend/xml/sixtp-dom-generators.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#define __EXTENSIONS__
diff --git a/src/backend/xml/sixtp-dom-parsers.cpp b/src/backend/xml/sixtp-dom-parsers.cpp
index 1848b14..7f1b93c 100644
--- a/src/backend/xml/sixtp-dom-parsers.cpp
+++ b/src/backend/xml/sixtp-dom-parsers.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/sixtp-stack.cpp b/src/backend/xml/sixtp-stack.cpp
index 5f86008..4aea535 100644
--- a/src/backend/xml/sixtp-stack.cpp
+++ b/src/backend/xml/sixtp-stack.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/sixtp-to-dom-parser.cpp b/src/backend/xml/sixtp-to-dom-parser.cpp
index 5c2331f..5404952 100644
--- a/src/backend/xml/sixtp-to-dom-parser.cpp
+++ b/src/backend/xml/sixtp-to-dom-parser.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/sixtp.cpp b/src/backend/xml/sixtp.cpp
index 5d7115a..0767f8e 100644
--- a/src/backend/xml/sixtp.cpp
+++ b/src/backend/xml/sixtp.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-date-converting.cpp b/src/backend/xml/test/test-date-converting.cpp
index 4c94171..7a514b7 100644
--- a/src/backend/xml/test/test-date-converting.cpp
+++ b/src/backend/xml/test/test-date-converting.cpp
@@ -17,7 +17,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-dom-converters1.cpp b/src/backend/xml/test/test-dom-converters1.cpp
index 4725408..c577f9a 100644
--- a/src/backend/xml/test/test-dom-converters1.cpp
+++ b/src/backend/xml/test/test-dom-converters1.cpp
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-file-stuff.cpp b/src/backend/xml/test/test-file-stuff.cpp
index 59556c0..a6bbf80 100644
--- a/src/backend/xml/test/test-file-stuff.cpp
+++ b/src/backend/xml/test/test-file-stuff.cpp
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
#include <kvp_frame.hpp>
extern "C"
diff --git a/src/backend/xml/test/test-kvp-frames.cpp b/src/backend/xml/test/test-kvp-frames.cpp
index fac1f15..2a483d1 100644
--- a/src/backend/xml/test/test-kvp-frames.cpp
+++ b/src/backend/xml/test/test-kvp-frames.cpp
@@ -1,4 +1,3 @@
-#include <guid.hpp>
#include <kvp_frame.hpp>
extern "C"
diff --git a/src/backend/xml/test/test-load-backend.cpp b/src/backend/xml/test/test-load-backend.cpp
index 475e0f3..b891743 100644
--- a/src/backend/xml/test/test-load-backend.cpp
+++ b/src/backend/xml/test/test-load-backend.cpp
@@ -24,7 +24,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-load-example-account.cpp b/src/backend/xml/test/test-load-example-account.cpp
index 356ba0f..c098e81 100644
--- a/src/backend/xml/test/test-load-example-account.cpp
+++ b/src/backend/xml/test/test-load-example-account.cpp
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-load-xml2.cpp b/src/backend/xml/test/test-load-xml2.cpp
index 0ddabf6..3df9861 100644
--- a/src/backend/xml/test/test-load-xml2.cpp
+++ b/src/backend/xml/test/test-load-xml2.cpp
@@ -25,7 +25,6 @@
/* @file test-load-xml2.c
* @brief test the loading of a version-2 gnucash XML file
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-save-in-lang.cpp b/src/backend/xml/test/test-save-in-lang.cpp
index 71bdb61..04214d0 100644
--- a/src/backend/xml/test/test-save-in-lang.cpp
+++ b/src/backend/xml/test/test-save-in-lang.cpp
@@ -17,7 +17,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-string-converters.cpp b/src/backend/xml/test/test-string-converters.cpp
index 2f0362f..8cbf726 100644
--- a/src/backend/xml/test/test-string-converters.cpp
+++ b/src/backend/xml/test/test-string-converters.cpp
@@ -17,7 +17,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-xml-account.cpp b/src/backend/xml/test/test-xml-account.cpp
index b31763e..352e259 100644
--- a/src/backend/xml/test/test-xml-account.cpp
+++ b/src/backend/xml/test/test-xml-account.cpp
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-xml-commodity.cpp b/src/backend/xml/test/test-xml-commodity.cpp
index 206465f..afb9d0e 100644
--- a/src/backend/xml/test/test-xml-commodity.cpp
+++ b/src/backend/xml/test/test-xml-commodity.cpp
@@ -17,7 +17,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-xml-pricedb.cpp b/src/backend/xml/test/test-xml-pricedb.cpp
index 4ce7145..efbf249 100644
--- a/src/backend/xml/test/test-xml-pricedb.cpp
+++ b/src/backend/xml/test/test-xml-pricedb.cpp
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-xml-transaction.cpp b/src/backend/xml/test/test-xml-transaction.cpp
index 24b1241..9247fda 100644
--- a/src/backend/xml/test/test-xml-transaction.cpp
+++ b/src/backend/xml/test/test-xml-transaction.cpp
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/backend/xml/test/test-xml2-is-file.cpp b/src/backend/xml/test/test-xml2-is-file.cpp
index f2a15fe..956d269 100644
--- a/src/backend/xml/test/test-xml2-is-file.cpp
+++ b/src/backend/xml/test/test-xml2-is-file.cpp
@@ -17,7 +17,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/gtest-import-map.cpp b/src/engine/test/gtest-import-map.cpp
index e990067..53a00e9 100644
--- a/src/engine/test/gtest-import-map.cpp
+++ b/src/engine/test/gtest-import-map.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include <config.h>
diff --git a/src/engine/test/test-account-object.cpp b/src/engine/test/test-account-object.cpp
index 7c21491..ccc4289 100644
--- a/src/engine/test/test-account-object.cpp
+++ b/src/engine/test/test-account-object.cpp
@@ -24,7 +24,6 @@
* @brief Minimal test of reading/writing account parameters
* @author David Hampton <hampton at employees.org>
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-commodities.cpp b/src/engine/test/test-commodities.cpp
index ea577c0..eaff923 100644
--- a/src/engine/test/test-commodities.cpp
+++ b/src/engine/test/test-commodities.cpp
@@ -22,7 +22,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-date.cpp b/src/engine/test/test-date.cpp
index 07285ee..6efc39b 100644
--- a/src/engine/test/test-date.cpp
+++ b/src/engine/test/test-date.cpp
@@ -21,7 +21,6 @@
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-group-vs-book.cpp b/src/engine/test/test-group-vs-book.cpp
index 769c4ba..8ef2a8e 100644
--- a/src/engine/test/test-group-vs-book.cpp
+++ b/src/engine/test/test-group-vs-book.cpp
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-lots.cpp b/src/engine/test/test-lots.cpp
index 31ee122..556df24 100644
--- a/src/engine/test/test-lots.cpp
+++ b/src/engine/test/test-lots.cpp
@@ -24,7 +24,6 @@
* @brief Minimal test to see if automatic lot scrubbing works.
* @author Linas Vepstas <linas at linas.org>
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-numeric.cpp b/src/engine/test/test-numeric.cpp
index adf06a9..7bbb9c4 100644
--- a/src/engine/test/test-numeric.cpp
+++ b/src/engine/test/test-numeric.cpp
@@ -22,7 +22,6 @@
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-query.cpp b/src/engine/test/test-query.cpp
index 9226f7d..844d7ea 100644
--- a/src/engine/test/test-query.cpp
+++ b/src/engine/test/test-query.cpp
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-scm-query.cpp b/src/engine/test/test-scm-query.cpp
index c3e3b53..98d394b 100644
--- a/src/engine/test/test-scm-query.cpp
+++ b/src/engine/test/test-scm-query.cpp
@@ -20,7 +20,6 @@
#include <libguile.h>
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-split-vs-account.cpp b/src/engine/test/test-split-vs-account.cpp
index af22cc6..77e92e7 100644
--- a/src/engine/test/test-split-vs-account.cpp
+++ b/src/engine/test/test-split-vs-account.cpp
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-transaction-reversal.cpp b/src/engine/test/test-transaction-reversal.cpp
index 36ebdd6..3214167 100644
--- a/src/engine/test/test-transaction-reversal.cpp
+++ b/src/engine/test/test-transaction-reversal.cpp
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/test-transaction-voiding.cpp b/src/engine/test/test-transaction-voiding.cpp
index 56f58a5..9c556d5 100644
--- a/src/engine/test/test-transaction-voiding.cpp
+++ b/src/engine/test/test-transaction-voiding.cpp
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/utest-Account.cpp b/src/engine/test/utest-Account.cpp
index 1ce5365..cc7e19e 100644
--- a/src/engine/test/utest-Account.cpp
+++ b/src/engine/test/utest-Account.cpp
@@ -19,7 +19,6 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu at gnu.org *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/utest-Split.cpp b/src/engine/test/utest-Split.cpp
index 4989705..71fe4b5 100644
--- a/src/engine/test/utest-Split.cpp
+++ b/src/engine/test/utest-Split.cpp
@@ -21,7 +21,6 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu at gnu.org *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/engine/test/utest-Transaction.cpp b/src/engine/test/utest-Transaction.cpp
index 0331eb5..dcdac4d 100644
--- a/src/engine/test/utest-Transaction.cpp
+++ b/src/engine/test/utest-Transaction.cpp
@@ -21,7 +21,6 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu at gnu.org *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include <config.h>
diff --git a/src/libqof/qof/gnc-aqbanking-templates.cpp b/src/libqof/qof/gnc-aqbanking-templates.cpp
index 8f542aa..54f9b6f 100644
--- a/src/libqof/qof/gnc-aqbanking-templates.cpp
+++ b/src/libqof/qof/gnc-aqbanking-templates.cpp
@@ -25,7 +25,6 @@
/** Class for managing AQBanking Transaction Templates.
*/
-#include "guid.hpp"
#include <string>
extern "C"
diff --git a/src/libqof/qof/gnc-date.cpp b/src/libqof/qof/gnc-date.cpp
index 3867a61..922e3cc 100644
--- a/src/libqof/qof/gnc-date.cpp
+++ b/src/libqof/qof/gnc-date.cpp
@@ -24,7 +24,6 @@
* *
\********************************************************************/
-#include <guid.hpp>
#define __EXTENSIONS__
extern "C"
{
diff --git a/src/libqof/qof/gnc-timezone.cpp b/src/libqof/qof/gnc-timezone.cpp
index d6b8c89..f2e8538 100644
--- a/src/libqof/qof/gnc-timezone.cpp
+++ b/src/libqof/qof/gnc-timezone.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
-#include <guid.hpp>
#include "gnc-timezone.hpp"
#include <string>
diff --git a/src/libqof/qof/guid.h b/src/libqof/qof/guid.h
index e3f0cf0..7000e68 100644
--- a/src/libqof/qof/guid.h
+++ b/src/libqof/qof/guid.h
@@ -65,7 +65,9 @@ extern "C"
* the object can be persisted), and a different one when compiling for C++
* found in guid.hpp
*/
-#ifndef __cplusplus
+#ifdef __cplusplus
+struct GncGUID;
+#else
/** The type used to store guids in C */
typedef struct _gncGuid {
unsigned char reserved[GUID_DATA_SIZE];
diff --git a/src/libqof/qof/kvp-value.cpp b/src/libqof/qof/kvp-value.cpp
index 12d16b1..a671284 100644
--- a/src/libqof/qof/kvp-value.cpp
+++ b/src/libqof/qof/kvp-value.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
#include "kvp-value.hpp"
#include "kvp_frame.hpp"
diff --git a/src/libqof/qof/kvp_frame.cpp b/src/libqof/qof/kvp_frame.cpp
index 790ae26..5a5b6be 100644
--- a/src/libqof/qof/kvp_frame.cpp
+++ b/src/libqof/qof/kvp_frame.cpp
@@ -22,7 +22,6 @@
* *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/libqof/qof/qof-string-cache.cpp b/src/libqof/qof/qof-string-cache.cpp
index 118b205..70084ce 100644
--- a/src/libqof/qof/qof-string-cache.cpp
+++ b/src/libqof/qof/qof-string-cache.cpp
@@ -26,7 +26,6 @@
* Author: Phil Longstaff (phil.longstaff at yahoo.ca) *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/libqof/qof/qofbackend.cpp b/src/libqof/qof/qofbackend.cpp
index f8c286e..4076df5 100644
--- a/src/libqof/qof/qofbackend.cpp
+++ b/src/libqof/qof/qofbackend.cpp
@@ -22,7 +22,6 @@
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
diff --git a/src/libqof/qof/qofbook.cpp b/src/libqof/qof/qofbook.cpp
index e5f3ad9..e7701f6 100644
--- a/src/libqof/qof/qofbook.cpp
+++ b/src/libqof/qof/qofbook.cpp
@@ -33,7 +33,6 @@
* Copyright (c) 2007 David Hampton <hampton at employees.org>
*/
-#include <guid.hpp>
extern "C"
{
diff --git a/src/libqof/qof/qofchoice.cpp b/src/libqof/qof/qofchoice.cpp
index c680acf..204adca 100644
--- a/src/libqof/qof/qofchoice.cpp
+++ b/src/libqof/qof/qofchoice.cpp
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <guid.hpp>
extern "C"
{
diff --git a/src/libqof/qof/qofclass.cpp b/src/libqof/qof/qofclass.cpp
index 25f0708..f453aa4 100644
--- a/src/libqof/qof/qofclass.cpp
+++ b/src/libqof/qof/qofclass.cpp
@@ -20,7 +20,6 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
diff --git a/src/libqof/qof/qofevent.cpp b/src/libqof/qof/qofevent.cpp
index 9fbae7d..5e75b3e 100644
--- a/src/libqof/qof/qofevent.cpp
+++ b/src/libqof/qof/qofevent.cpp
@@ -22,7 +22,6 @@
* *
********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/libqof/qof/qofid.cpp b/src/libqof/qof/qofid.cpp
index 53a2ee1..88caba2 100644
--- a/src/libqof/qof/qofid.cpp
+++ b/src/libqof/qof/qofid.cpp
@@ -22,7 +22,6 @@
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/libqof/qof/qoflog.cpp b/src/libqof/qof/qoflog.cpp
index 37c4916..40bfddd 100644
--- a/src/libqof/qof/qoflog.cpp
+++ b/src/libqof/qof/qoflog.cpp
@@ -25,7 +25,6 @@
* 02110-1301, USA
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/libqof/qof/qofobject.cpp b/src/libqof/qof/qofobject.cpp
index 1675c9f..e706214 100644
--- a/src/libqof/qof/qofobject.cpp
+++ b/src/libqof/qof/qofobject.cpp
@@ -23,7 +23,6 @@
* Copyright (C) 2001 Derek Atkins
* Author: Derek Atkins <warlord at MIT.EDU>
*/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/libqof/qof/qofquery.cpp b/src/libqof/qof/qofquery.cpp
index bd9dbad..1129971 100644
--- a/src/libqof/qof/qofquery.cpp
+++ b/src/libqof/qof/qofquery.cpp
@@ -21,7 +21,6 @@
* *
\********************************************************************/
-#include <guid.hpp>
extern "C"
{
#include "config.h"
diff --git a/src/libqof/qof/qofsession.cpp b/src/libqof/qof/qofsession.cpp
index 2d77edb..d6f7d6e 100644
--- a/src/libqof/qof/qofsession.cpp
+++ b/src/libqof/qof/qofsession.cpp
@@ -32,7 +32,6 @@
@author Copyright (c) 2016 Aaron Laws
*/
-#include "guid.hpp"
extern "C"
{
diff --git a/src/libqof/qof/qofutil.cpp b/src/libqof/qof/qofutil.cpp
index 9119e63..2881fd7 100644
--- a/src/libqof/qof/qofutil.cpp
+++ b/src/libqof/qof/qofutil.cpp
@@ -25,7 +25,6 @@
* Author: Linas Vepstas (linas at linas.org) *
\********************************************************************/
-#include <guid.hpp>
#include "config.h"
#include <ctype.h>
Summary of changes:
src/app-utils/test/test-option-util.cpp | 1 -
src/app-utils/test/test-print-parse-amount.cpp | 1 -
src/app-utils/test/test-scm-query-string.cpp | 1 -
src/app-utils/test/test-sx.cpp | 1 -
src/backend/dbi/gnc-backend-dbi.cpp | 1 -
src/backend/dbi/test/test-backend-dbi-basic.cpp | 1 -
src/backend/dbi/test/test-backend-dbi.cpp | 1 -
src/backend/dbi/test/test-dbi-business-stuff.cpp | 1 -
src/backend/dbi/test/test-dbi-stuff.cpp | 1 -
src/backend/sql/escape.cpp | 1 -
src/backend/sql/gnc-address-sql.cpp | 1 -
src/backend/sql/gnc-book-sql.cpp | 1 -
src/backend/sql/gnc-customer-sql.cpp | 1 -
src/backend/sql/gnc-employee-sql.cpp | 1 -
src/backend/sql/gnc-entry-sql.cpp | 1 -
src/backend/sql/gnc-job-sql.cpp | 1 -
src/backend/sql/gnc-price-sql.cpp | 1 -
src/backend/sql/gnc-recurrence-sql.cpp | 1 -
src/backend/sql/gnc-schedxaction-sql.cpp | 1 -
src/backend/sql/gnc-vendor-sql.cpp | 1 -
src/backend/sql/test/test-column-types.cpp | 1 -
src/backend/sql/test/test-sqlbe.cpp | 1 -
src/backend/sql/test/utest-gnc-backend-sql.cpp | 1 -
src/backend/xml/gnc-account-xml-v2.cpp | 1 -
src/backend/xml/gnc-address-xml-v2.cpp | 1 -
src/backend/xml/gnc-backend-xml.cpp | 1 -
src/backend/xml/gnc-bill-term-xml-v2.cpp | 1 -
src/backend/xml/gnc-book-xml-v2.cpp | 1 -
src/backend/xml/gnc-budget-xml-v2.cpp | 1 -
src/backend/xml/gnc-commodity-xml-v2.cpp | 1 -
src/backend/xml/gnc-customer-xml-v2.cpp | 1 -
src/backend/xml/gnc-employee-xml-v2.cpp | 1 -
src/backend/xml/gnc-entry-xml-v2.cpp | 1 -
src/backend/xml/gnc-freqspec-xml-v2.cpp | 1 -
src/backend/xml/gnc-invoice-xml-v2.cpp | 1 -
src/backend/xml/gnc-job-xml-v2.cpp | 1 -
src/backend/xml/gnc-lot-xml-v2.cpp | 1 -
src/backend/xml/gnc-order-xml-v2.cpp | 1 -
src/backend/xml/gnc-owner-xml-v2.cpp | 1 -
src/backend/xml/gnc-pricedb-xml-v2.cpp | 1 -
src/backend/xml/gnc-recurrence-xml-v2.cpp | 1 -
src/backend/xml/gnc-schedxaction-xml-v2.cpp | 1 -
src/backend/xml/gnc-tax-table-xml-v2.cpp | 1 -
src/backend/xml/gnc-transaction-xml-v2.cpp | 1 -
src/backend/xml/gnc-vendor-xml-v2.cpp | 1 -
src/backend/xml/io-example-account.cpp | 1 -
src/backend/xml/io-gncxml-gen.cpp | 1 -
src/backend/xml/io-gncxml-v2.cpp | 1 -
src/backend/xml/io-utils.cpp | 1 -
src/backend/xml/sixtp-dom-generators.cpp | 1 -
src/backend/xml/sixtp-dom-parsers.cpp | 1 -
src/backend/xml/sixtp-stack.cpp | 1 -
src/backend/xml/sixtp-to-dom-parser.cpp | 1 -
src/backend/xml/sixtp.cpp | 1 -
src/backend/xml/test/test-date-converting.cpp | 1 -
src/backend/xml/test/test-dom-converters1.cpp | 1 -
src/backend/xml/test/test-file-stuff.cpp | 1 -
src/backend/xml/test/test-kvp-frames.cpp | 1 -
src/backend/xml/test/test-load-backend.cpp | 1 -
src/backend/xml/test/test-load-example-account.cpp | 1 -
src/backend/xml/test/test-load-xml2.cpp | 1 -
src/backend/xml/test/test-save-in-lang.cpp | 1 -
src/backend/xml/test/test-string-converters.cpp | 1 -
src/backend/xml/test/test-xml-account.cpp | 1 -
src/backend/xml/test/test-xml-commodity.cpp | 1 -
src/backend/xml/test/test-xml-pricedb.cpp | 1 -
src/backend/xml/test/test-xml-transaction.cpp | 1 -
src/backend/xml/test/test-xml2-is-file.cpp | 1 -
src/engine/test/gtest-import-map.cpp | 1 -
src/engine/test/test-account-object.cpp | 1 -
src/engine/test/test-commodities.cpp | 1 -
src/engine/test/test-date.cpp | 1 -
src/engine/test/test-group-vs-book.cpp | 1 -
src/engine/test/test-lots.cpp | 1 -
src/engine/test/test-numeric.cpp | 1 -
src/engine/test/test-query.cpp | 1 -
src/engine/test/test-scm-query.cpp | 1 -
src/engine/test/test-split-vs-account.cpp | 1 -
src/engine/test/test-transaction-reversal.cpp | 1 -
src/engine/test/test-transaction-voiding.cpp | 1 -
src/engine/test/utest-Account.cpp | 1 -
src/engine/test/utest-Split.cpp | 1 -
src/engine/test/utest-Transaction.cpp | 1 -
src/libqof/qof/gnc-aqbanking-templates.cpp | 1 -
src/libqof/qof/gnc-date.cpp | 1 -
src/libqof/qof/gnc-timezone.cpp | 1 -
src/libqof/qof/guid.cpp | 165 ++++++++++++++++-----
src/libqof/qof/guid.h | 8 +-
src/libqof/qof/guid.hpp | 34 ++++-
src/libqof/qof/kvp-value.cpp | 1 -
src/libqof/qof/kvp_frame.cpp | 1 -
src/libqof/qof/qof-string-cache.cpp | 1 -
src/libqof/qof/qofbackend.cpp | 1 -
src/libqof/qof/qofbook.cpp | 1 -
src/libqof/qof/qofchoice.cpp | 1 -
src/libqof/qof/qofclass.cpp | 1 -
src/libqof/qof/qofevent.cpp | 1 -
src/libqof/qof/qofid.cpp | 1 -
src/libqof/qof/qoflog.cpp | 1 -
src/libqof/qof/qofobject.cpp | 1 -
src/libqof/qof/qofquery.cpp | 1 -
src/libqof/qof/qofsession.cpp | 1 -
src/libqof/qof/qofutil.cpp | 1 -
src/libqof/qof/test/test-gnc-guid.cpp | 26 ++--
104 files changed, 177 insertions(+), 156 deletions(-)
More information about the gnucash-changes
mailing list