From 805549ba247f79308f5e18e40f8999359dcc6e2a Mon Sep 17 00:00:00 2001 From: lmat Date: Sun, 10 Dec 2017 05:42:08 -0800 Subject: [PATCH] Rename qofinstance function This function was supposed to be renamed a while back. I had named it this way for debugging purposes. --- libgnucash/engine/Scrub.c | 12 ++--- libgnucash/engine/Split.c | 54 +++++++++++----------- libgnucash/engine/Transaction.c | 76 +++++++++++++++---------------- libgnucash/engine/gnc-budget.c | 10 ++-- libgnucash/engine/gnc-commodity.c | 12 ++--- libgnucash/engine/gnc-lot.c | 20 ++++---- libgnucash/engine/gncCustomer.c | 12 ++--- libgnucash/engine/gncEmployee.c | 12 ++--- libgnucash/engine/gncInvoice.c | 8 ++-- libgnucash/engine/gncJob.c | 10 ++-- libgnucash/engine/gncVendor.c | 12 ++--- libgnucash/engine/qofinstance-p.h | 4 +- libgnucash/engine/qofinstance.cpp | 4 +- 13 files changed, 123 insertions(+), 123 deletions(-) diff --git a/libgnucash/engine/Scrub.c b/libgnucash/engine/Scrub.c index b4b744bc72..f168a248ee 100644 --- a/libgnucash/engine/Scrub.c +++ b/libgnucash/engine/Scrub.c @@ -1228,10 +1228,10 @@ xaccAccountDeleteOldData (Account *account) { if (!account) return; xaccAccountBeginEdit (account); - qof_instance_set_var_kvp (QOF_INSTANCE (account), NULL, 1, "old-currency"); - qof_instance_set_var_kvp (QOF_INSTANCE (account), NULL, 1, "old-security"); - qof_instance_set_var_kvp (QOF_INSTANCE (account), NULL, 1, "old-currency-scu"); - qof_instance_set_var_kvp (QOF_INSTANCE (account), NULL, 1, "old-security-scu"); + qof_instance_set_kvp (QOF_INSTANCE (account), NULL, 1, "old-currency"); + qof_instance_set_kvp (QOF_INSTANCE (account), NULL, 1, "old-security"); + qof_instance_set_kvp (QOF_INSTANCE (account), NULL, 1, "old-currency-scu"); + qof_instance_set_kvp (QOF_INSTANCE (account), NULL, 1, "old-security-scu"); qof_instance_set_dirty (QOF_INSTANCE (account)); xaccAccountCommitEdit (account); } @@ -1337,7 +1337,7 @@ xaccAccountScrubKvp (Account *account) if (!account) return; - qof_instance_get_var_kvp (QOF_INSTANCE (account), &v, 1, "notes"); + qof_instance_get_kvp (QOF_INSTANCE (account), &v, 1, "notes"); if (G_VALUE_HOLDS_STRING (&v)) { str2 = g_strstrip(g_value_dup_string(&v)); @@ -1346,7 +1346,7 @@ xaccAccountScrubKvp (Account *account) g_free(str2); } - qof_instance_get_var_kvp (QOF_INSTANCE (account), &v, 1, "placeholder"); + qof_instance_get_kvp (QOF_INSTANCE (account), &v, 1, "placeholder"); if ((G_VALUE_HOLDS_STRING (&v) && strcmp(g_value_get_string (&v), "false") == 0) || (G_VALUE_HOLDS_BOOLEAN (&v) && ! g_value_get_boolean (&v))) diff --git a/libgnucash/engine/Split.c b/libgnucash/engine/Split.c index 772849f804..452b36ad30 100644 --- a/libgnucash/engine/Split.c +++ b/libgnucash/engine/Split.c @@ -184,31 +184,31 @@ gnc_split_get_property(GObject *object, g_value_take_object(value, split->lot); break; case PROP_SX_CREDIT_FORMULA: - qof_instance_get_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_CREDIT_FORMULA); + qof_instance_get_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_CREDIT_FORMULA); break; case PROP_SX_CREDIT_NUMERIC: - qof_instance_get_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_CREDIT_NUMERIC); + qof_instance_get_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_CREDIT_NUMERIC); break; case PROP_SX_DEBIT_FORMULA: - qof_instance_get_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_DEBIT_FORMULA); + qof_instance_get_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_DEBIT_FORMULA); break; case PROP_SX_DEBIT_NUMERIC: - qof_instance_get_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_DEBIT_NUMERIC); + qof_instance_get_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_DEBIT_NUMERIC); break; case PROP_SX_ACCOUNT: - qof_instance_get_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_ACCOUNT); + qof_instance_get_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_ACCOUNT); break; case PROP_SX_SHARES: - qof_instance_get_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_SHARES); + qof_instance_get_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_SHARES); break; case PROP_ONLINE_ACCOUNT: - qof_instance_get_var_kvp (QOF_INSTANCE (split), value, 1, "online_id"); + qof_instance_get_kvp (QOF_INSTANCE (split), value, 1, "online_id"); break; case PROP_GAINS_SPLIT: - qof_instance_get_var_kvp (QOF_INSTANCE (split), value, 1, "gains-split"); + qof_instance_get_kvp (QOF_INSTANCE (split), value, 1, "gains-split"); break; case PROP_GAINS_SOURCE: - qof_instance_get_var_kvp (QOF_INSTANCE (split), value, 1, "gains-source"); + qof_instance_get_kvp (QOF_INSTANCE (split), value, 1, "gains-source"); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -261,31 +261,31 @@ gnc_split_set_property(GObject *object, xaccSplitSetLot(split, g_value_get_object(value)); break; case PROP_SX_CREDIT_FORMULA: - qof_instance_set_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_CREDIT_FORMULA); + qof_instance_set_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_CREDIT_FORMULA); break; case PROP_SX_CREDIT_NUMERIC: - qof_instance_set_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_CREDIT_NUMERIC); + qof_instance_set_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_CREDIT_NUMERIC); break; case PROP_SX_DEBIT_FORMULA: - qof_instance_set_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_DEBIT_FORMULA); + qof_instance_set_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_DEBIT_FORMULA); break; case PROP_SX_DEBIT_NUMERIC: - qof_instance_set_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_DEBIT_NUMERIC); + qof_instance_set_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_DEBIT_NUMERIC); break; case PROP_SX_ACCOUNT: - qof_instance_set_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_ACCOUNT); + qof_instance_set_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_ACCOUNT); break; case PROP_SX_SHARES: - qof_instance_set_var_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_SHARES); + qof_instance_set_kvp (QOF_INSTANCE (split), value, 2, GNC_SX_ID, GNC_SX_SHARES); break; case PROP_ONLINE_ACCOUNT: - qof_instance_set_var_kvp (QOF_INSTANCE (split), value, 1, "online_id"); + qof_instance_set_kvp (QOF_INSTANCE (split), value, 1, "online_id"); break; case PROP_GAINS_SPLIT: - qof_instance_set_var_kvp (QOF_INSTANCE (split), value, 1, "gains-split"); + qof_instance_set_kvp (QOF_INSTANCE (split), value, 1, "gains-split"); break; case PROP_GAINS_SOURCE: - qof_instance_set_var_kvp (QOF_INSTANCE (split), value, 1, "gains-source"); + qof_instance_set_kvp (QOF_INSTANCE (split), value, 1, "gains-source"); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -1079,7 +1079,7 @@ xaccSplitDetermineGainStatus (Split *split) return; } - qof_instance_get_var_kvp (QOF_INSTANCE (split), &v, 1, "gains-source"); + qof_instance_get_kvp (QOF_INSTANCE (split), &v, 1, "gains-source"); if (G_VALUE_HOLDS_BOXED (&v)) guid = (GncGUID*)g_value_get_boxed (&v); if (!guid) @@ -1972,7 +1972,7 @@ xaccSplitGetType(const Split *s) const char *split_type = NULL; if (!s) return NULL; - qof_instance_get_var_kvp (QOF_INSTANCE (s), &v, 1, "split-type"); + qof_instance_get_kvp (QOF_INSTANCE (s), &v, 1, "split-type"); if (G_VALUE_HOLDS_STRING (&v)) split_type = g_value_get_string (&v); return split_type ? split_type : "normal"; @@ -1989,7 +1989,7 @@ xaccSplitMakeStockSplit(Split *s) s->value = gnc_numeric_zero(); g_value_init (&v, G_TYPE_STRING); g_value_set_string (&v, "stock-split"); - qof_instance_set_var_kvp (QOF_INSTANCE (s), &v, 1, "split-type"); + qof_instance_set_kvp (QOF_INSTANCE (s), &v, 1, "split-type"); SET_GAINS_VDIRTY(s); mark_split(s); qof_instance_set_dirty(QOF_INSTANCE(s)); @@ -2126,7 +2126,7 @@ xaccSplitVoidFormerAmount(const Split *split) GValue v = G_VALUE_INIT; gnc_numeric *num = NULL; g_return_val_if_fail(split, gnc_numeric_zero()); - qof_instance_get_var_kvp (QOF_INSTANCE (split), &v, 1, void_former_amt_str); + qof_instance_get_kvp (QOF_INSTANCE (split), &v, 1, void_former_amt_str); if (G_VALUE_HOLDS_BOXED (&v)) num = (gnc_numeric*)g_value_get_boxed (&v); return num ? *num : gnc_numeric_zero(); @@ -2138,7 +2138,7 @@ xaccSplitVoidFormerValue(const Split *split) GValue v = G_VALUE_INIT; gnc_numeric *num = NULL; g_return_val_if_fail(split, gnc_numeric_zero()); - qof_instance_get_var_kvp (QOF_INSTANCE (split), &v, 1, void_former_val_str); + qof_instance_get_kvp (QOF_INSTANCE (split), &v, 1, void_former_val_str); if (G_VALUE_HOLDS_BOXED (&v)) num = (gnc_numeric*)g_value_get_boxed (&v); return num ? *num : gnc_numeric_zero(); @@ -2153,10 +2153,10 @@ xaccSplitVoid(Split *split) g_value_init (&v, GNC_TYPE_NUMERIC); num = xaccSplitGetAmount(split); g_value_set_boxed (&v, &num); - qof_instance_set_var_kvp (QOF_INSTANCE (split), &v, 1, void_former_amt_str); + qof_instance_set_kvp (QOF_INSTANCE (split), &v, 1, void_former_amt_str); num = xaccSplitGetValue(split); g_value_set_boxed (&v, &num); - qof_instance_set_var_kvp (QOF_INSTANCE (split), &v, 1, void_former_val_str); + qof_instance_set_kvp (QOF_INSTANCE (split), &v, 1, void_former_val_str); /* Marking dirty handled by SetAmount etc. */ xaccSplitSetAmount (split, zero); @@ -2170,8 +2170,8 @@ xaccSplitUnvoid(Split *split) xaccSplitSetAmount (split, xaccSplitVoidFormerAmount(split)); xaccSplitSetValue (split, xaccSplitVoidFormerValue(split)); xaccSplitSetReconcile(split, NREC); - qof_instance_set_var_kvp (QOF_INSTANCE (split), NULL, 1, void_former_amt_str); - qof_instance_set_var_kvp (QOF_INSTANCE (split), NULL, 1, void_former_val_str); + qof_instance_set_kvp (QOF_INSTANCE (split), NULL, 1, void_former_amt_str); + qof_instance_set_kvp (QOF_INSTANCE (split), NULL, 1, void_former_val_str); qof_instance_set_dirty (QOF_INSTANCE (split)); } diff --git a/libgnucash/engine/Transaction.c b/libgnucash/engine/Transaction.c index cfa651ae16..5fc7c7eeb1 100644 --- a/libgnucash/engine/Transaction.c +++ b/libgnucash/engine/Transaction.c @@ -338,13 +338,13 @@ gnc_transaction_get_property(GObject* object, g_value_set_boxed(value, &tx->date_entered); break; case PROP_INVOICE: - qof_instance_get_var_kvp (QOF_INSTANCE (tx), value, 2, GNC_INVOICE_ID, GNC_INVOICE_GUID); + qof_instance_get_kvp (QOF_INSTANCE (tx), value, 2, GNC_INVOICE_ID, GNC_INVOICE_GUID); break; case PROP_SX_TXN: - qof_instance_get_var_kvp (QOF_INSTANCE (tx), value, 1, GNC_SX_FROM); + qof_instance_get_kvp (QOF_INSTANCE (tx), value, 1, GNC_SX_FROM); break; case PROP_ONLINE_ACCOUNT: - qof_instance_get_var_kvp (QOF_INSTANCE (tx), value, 1, "online_id"); + qof_instance_get_kvp (QOF_INSTANCE (tx), value, 1, "online_id"); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -384,13 +384,13 @@ gnc_transaction_set_property(GObject* object, xaccTransSetDateEnteredTS(tx, g_value_get_boxed(value)); break; case PROP_INVOICE: - qof_instance_set_var_kvp (QOF_INSTANCE (tx), value, 2, GNC_INVOICE_ID, GNC_INVOICE_GUID); + qof_instance_set_kvp (QOF_INSTANCE (tx), value, 2, GNC_INVOICE_ID, GNC_INVOICE_GUID); break; case PROP_SX_TXN: - qof_instance_set_var_kvp (QOF_INSTANCE (tx), value, 1, GNC_SX_FROM); + qof_instance_set_kvp (QOF_INSTANCE (tx), value, 1, GNC_SX_FROM); break; case PROP_ONLINE_ACCOUNT: - qof_instance_set_var_kvp (QOF_INSTANCE (tx), value, 1, "online_id"); + qof_instance_set_kvp (QOF_INSTANCE (tx), value, 1, "online_id"); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -1987,7 +1987,7 @@ xaccTransSetDatePostedGDate (Transaction *trans, GDate date) * clearly be distinguished from the Timespec. */ g_value_init (&v, G_TYPE_DATE); g_value_set_boxed (&v, &date); - qof_instance_set_var_kvp (QOF_INSTANCE(trans), &v, 1, TRANS_DATE_POSTED); + qof_instance_set_kvp (QOF_INSTANCE(trans), &v, 1, TRANS_DATE_POSTED); /* mark dirty and commit handled by SetDateInternal */ xaccTransSetDateInternal(trans, &trans->date_posted, gdate_to_timespec(date)); @@ -2063,7 +2063,7 @@ xaccTransSetDateDueTS (Transaction *trans, const Timespec *ts) g_value_init (&v, GNC_TYPE_TIMESPEC); g_value_set_boxed (&v, ts); xaccTransBeginEdit(trans); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_DATE_DUE_KVP); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_DATE_DUE_KVP); qof_instance_set_dirty(QOF_INSTANCE(trans)); xaccTransCommitEdit(trans); } @@ -2077,7 +2077,7 @@ xaccTransSetTxnType (Transaction *trans, char type) g_value_init (&v, G_TYPE_STRING); g_value_set_string (&v, s); xaccTransBeginEdit(trans); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_TXN_TYPE_KVP); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_TXN_TYPE_KVP); qof_instance_set_dirty(QOF_INSTANCE(trans)); xaccTransCommitEdit(trans); } @@ -2087,7 +2087,7 @@ void xaccTransClearReadOnly (Transaction *trans) if (trans) { xaccTransBeginEdit(trans); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), NULL, 1, TRANS_READ_ONLY_REASON); + qof_instance_set_kvp (QOF_INSTANCE (trans), NULL, 1, TRANS_READ_ONLY_REASON); qof_instance_set_dirty(QOF_INSTANCE(trans)); xaccTransCommitEdit(trans); } @@ -2102,7 +2102,7 @@ xaccTransSetReadOnly (Transaction *trans, const char *reason) g_value_init (&v, G_TYPE_STRING); g_value_set_string (&v, reason); xaccTransBeginEdit(trans); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_READ_ONLY_REASON); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_READ_ONLY_REASON); qof_instance_set_dirty(QOF_INSTANCE(trans)); xaccTransCommitEdit(trans); } @@ -2160,7 +2160,7 @@ xaccTransSetAssociation (Transaction *trans, const char *assoc) g_value_init (&v, G_TYPE_STRING); g_value_set_string (&v, assoc); xaccTransBeginEdit(trans); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, assoc_uri_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, assoc_uri_str); qof_instance_set_dirty(QOF_INSTANCE(trans)); xaccTransCommitEdit(trans); } @@ -2182,7 +2182,7 @@ xaccTransSetNotes (Transaction *trans, const char *notes) g_value_set_string (&v, notes); xaccTransBeginEdit(trans); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); qof_instance_set_dirty(QOF_INSTANCE(trans)); xaccTransCommitEdit(trans); } @@ -2198,10 +2198,10 @@ xaccTransSetIsClosingTxn (Transaction *trans, gboolean is_closing) GValue v = G_VALUE_INIT; g_value_init (&v, G_TYPE_INT64); g_value_set_int64 (&v, 1); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, trans_is_closing_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, trans_is_closing_str); } else - qof_instance_set_var_kvp (QOF_INSTANCE (trans), NULL, 1, trans_is_closing_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), NULL, 1, trans_is_closing_str); qof_instance_set_dirty(QOF_INSTANCE(trans)); xaccTransCommitEdit(trans); } @@ -2336,7 +2336,7 @@ xaccTransGetAssociation (const Transaction *trans) { GValue v = G_VALUE_INIT; if (!trans) return NULL; - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, assoc_uri_str); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, assoc_uri_str); if (G_VALUE_HOLDS_STRING (&v)) return g_value_get_string (&v); return NULL; @@ -2347,7 +2347,7 @@ xaccTransGetNotes (const Transaction *trans) { GValue v = G_VALUE_INIT; if (!trans) return NULL; - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); if (G_VALUE_HOLDS_STRING (&v)) return g_value_get_string (&v); return NULL; @@ -2358,7 +2358,7 @@ xaccTransGetIsClosingTxn (const Transaction *trans) { GValue v = G_VALUE_INIT; if (!trans) return FALSE; - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, trans_is_closing_str); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, trans_is_closing_str); if (G_VALUE_HOLDS_INT64 (&v)) return g_value_get_int64 (&v); return FALSE; @@ -2413,7 +2413,7 @@ xaccTransGetDatePostedGDate (const Transaction *trans) * from there because it doesn't suffer from time zone * shifts. */ GValue v = G_VALUE_INIT; - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_DATE_POSTED); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_DATE_POSTED); if (G_VALUE_HOLDS_BOXED (&v)) result = *(GDate*)g_value_get_boxed (&v); if (! g_date_valid (&result)) @@ -2448,7 +2448,7 @@ xaccTransGetDateDueTS (const Transaction *trans, Timespec *ts) GValue v = G_VALUE_INIT; if (!trans || !ts) return; - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_DATE_DUE_KVP); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_DATE_DUE_KVP); if (G_VALUE_HOLDS_BOXED (&v)) *ts = *(Timespec*)g_value_get_boxed (&v); if (ts->tv_sec == 0) @@ -2470,7 +2470,7 @@ xaccTransGetTxnType (const Transaction *trans) GValue v = G_VALUE_INIT; if (!trans) return TXN_TYPE_NONE; - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_TXN_TYPE_KVP); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, TRANS_TXN_TYPE_KVP); if (G_VALUE_HOLDS_STRING (&v)) s = g_value_get_string (&v); if (s && strlen (s) == 1) @@ -2488,7 +2488,7 @@ xaccTransGetReadOnly (const Transaction *trans) GValue v = G_VALUE_INIT; const char *s = NULL; if (trans == NULL) return NULL; - qof_instance_get_var_kvp (QOF_INSTANCE(trans), &v, 1, TRANS_READ_ONLY_REASON); + qof_instance_get_kvp (QOF_INSTANCE(trans), &v, 1, TRANS_READ_ONLY_REASON); if (G_VALUE_HOLDS_STRING (&v)) s = g_value_get_string (&v); if (s && strlen (s)) @@ -2686,20 +2686,20 @@ xaccTransVoid(Transaction *trans, const char *reason) return; } xaccTransBeginEdit(trans); - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); if (G_VALUE_HOLDS_STRING (&v)) - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, void_former_notes_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, void_former_notes_str); else g_value_init (&v, G_TYPE_STRING); g_value_set_string (&v, _("Voided transaction")); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); g_value_set_string (&v, reason); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, void_reason_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, void_reason_str); gnc_timespec_to_iso8601_buff (timespec_now (), iso8601_str); g_value_set_string (&v, iso8601_str); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, void_time_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, void_time_str); FOR_EACH_SPLIT(trans, xaccSplitVoid(s)); @@ -2715,7 +2715,7 @@ xaccTransGetVoidStatus(const Transaction *trans) GValue v = G_VALUE_INIT; g_return_val_if_fail(trans, FALSE); - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, void_reason_str); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, void_reason_str); if (G_VALUE_HOLDS_STRING (&v)) s = g_value_get_string (&v); return s && strlen(s); @@ -2727,7 +2727,7 @@ xaccTransGetVoidReason(const Transaction *trans) GValue v = G_VALUE_INIT; g_return_val_if_fail(trans, FALSE); - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, void_reason_str); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, void_reason_str); if (G_VALUE_HOLDS_STRING (&v)) return g_value_get_string (&v); return NULL; @@ -2741,7 +2741,7 @@ xaccTransGetVoidTime(const Transaction *tr) Timespec void_time = {0, 0}; g_return_val_if_fail(tr, void_time); - qof_instance_get_var_kvp (QOF_INSTANCE (tr), &v, 1, void_time_str); + qof_instance_get_kvp (QOF_INSTANCE (tr), &v, 1, void_time_str); if (G_VALUE_HOLDS_STRING (&v)) s = g_value_get_string (&v); if (s) @@ -2756,18 +2756,18 @@ xaccTransUnvoid (Transaction *trans) const char *s = NULL; g_return_if_fail(trans); - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, void_reason_str); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, void_reason_str); if (G_VALUE_HOLDS_STRING (&v)) s = g_value_get_string (&v); if (s == NULL) return; /* Transaction isn't voided. Bail. */ xaccTransBeginEdit(trans); - qof_instance_get_var_kvp (QOF_INSTANCE (trans), &v, 1, void_former_notes_str); + qof_instance_get_kvp (QOF_INSTANCE (trans), &v, 1, void_former_notes_str); if (G_VALUE_HOLDS_STRING (&v)) - qof_instance_set_var_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), NULL, 1, void_former_notes_str); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), NULL, 1, void_reason_str); - qof_instance_set_var_kvp (QOF_INSTANCE (trans), NULL, 1, void_time_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), &v, 1, trans_notes_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), NULL, 1, void_former_notes_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), NULL, 1, void_reason_str); + qof_instance_set_kvp (QOF_INSTANCE (trans), NULL, 1, void_time_str); FOR_EACH_SPLIT(trans, xaccSplitUnvoid(s)); @@ -2797,7 +2797,7 @@ xaccTransReverse (Transaction *orig) /* Now update the original with a pointer to the new one */ g_value_init (&v, GNC_TYPE_GUID); g_value_set_boxed (&v, xaccTransGetGUID(trans)); - qof_instance_set_var_kvp (QOF_INSTANCE (orig), &v, 1, TRANS_REVERSED_BY); + qof_instance_set_kvp (QOF_INSTANCE (orig), &v, 1, TRANS_REVERSED_BY); /* Make sure the reverse transaction is not read-only */ xaccTransClearReadOnly(trans); @@ -2812,7 +2812,7 @@ xaccTransGetReversedBy(const Transaction *trans) { GValue v = G_VALUE_INIT; g_return_val_if_fail(trans, NULL); - qof_instance_get_var_kvp (QOF_INSTANCE(trans), &v, 1, TRANS_REVERSED_BY); + qof_instance_get_kvp (QOF_INSTANCE(trans), &v, 1, TRANS_REVERSED_BY); if (G_VALUE_HOLDS_BOXED (&v)) return xaccTransLookup((GncGUID*)g_value_get_boxed (&v), qof_instance_get_book(trans)); diff --git a/libgnucash/engine/gnc-budget.c b/libgnucash/engine/gnc-budget.c index 4da6cf1ba2..a4a2a21a15 100644 --- a/libgnucash/engine/gnc-budget.c +++ b/libgnucash/engine/gnc-budget.c @@ -497,7 +497,7 @@ gnc_budget_unset_account_period_value(GncBudget *budget, const Account *account, make_period_path (account, period_num, path_part_one, path_part_two); gnc_budget_begin_edit(budget); - qof_instance_set_var_kvp (QOF_INSTANCE (budget), NULL, 2, path_part_one, path_part_two); + qof_instance_set_kvp (QOF_INSTANCE (budget), NULL, 2, path_part_one, path_part_two); qof_instance_set_dirty(&budget->inst); gnc_budget_commit_edit(budget); @@ -529,13 +529,13 @@ gnc_budget_set_account_period_value(GncBudget *budget, const Account *account, gnc_budget_begin_edit(budget); if (gnc_numeric_check(val)) - qof_instance_set_var_kvp (QOF_INSTANCE (budget), NULL, 2, path_part_one, path_part_two); + qof_instance_set_kvp (QOF_INSTANCE (budget), NULL, 2, path_part_one, path_part_two); else { GValue v = G_VALUE_INIT; g_value_init (&v, GNC_TYPE_NUMERIC); g_value_set_boxed (&v, &val); - qof_instance_set_var_kvp (QOF_INSTANCE (budget), &v, 2, path_part_one, path_part_two); + qof_instance_set_kvp (QOF_INSTANCE (budget), &v, 2, path_part_one, path_part_two); } qof_instance_set_dirty(&budget->inst); gnc_budget_commit_edit(budget); @@ -561,7 +561,7 @@ gnc_budget_is_account_period_value_set(const GncBudget *budget, g_return_val_if_fail(account, FALSE); make_period_path (account, period_num, path_part_one, path_part_two); - qof_instance_get_var_kvp (QOF_INSTANCE (budget), &v, 2, path_part_one, path_part_two); + qof_instance_get_kvp (QOF_INSTANCE (budget), &v, 2, path_part_one, path_part_two); if (G_VALUE_HOLDS_BOXED (&v)) ptr = g_value_get_boxed (&v); return (ptr != NULL); @@ -581,7 +581,7 @@ gnc_budget_get_account_period_value(const GncBudget *budget, g_return_val_if_fail(account, gnc_numeric_zero()); make_period_path (account, period_num, path_part_one, path_part_two); - qof_instance_get_var_kvp (QOF_INSTANCE (budget), &v, 2, path_part_one, path_part_two); + qof_instance_get_kvp (QOF_INSTANCE (budget), &v, 2, path_part_one, path_part_two); if (G_VALUE_HOLDS_BOXED (&v)) numeric = (gnc_numeric*)g_value_get_boxed (&v); diff --git a/libgnucash/engine/gnc-commodity.c b/libgnucash/engine/gnc-commodity.c index 85570fbcce..c9c28ed123 100644 --- a/libgnucash/engine/gnc-commodity.c +++ b/libgnucash/engine/gnc-commodity.c @@ -1083,7 +1083,7 @@ gnc_commodity_get_auto_quote_control_flag(const gnc_commodity *cm) GValue v = G_VALUE_INIT; if (!cm) return FALSE; - qof_instance_get_var_kvp (QOF_INSTANCE (cm), &v, 1, "auto_quote_control"); + qof_instance_get_kvp (QOF_INSTANCE (cm), &v, 1, "auto_quote_control"); if (G_VALUE_HOLDS_STRING (&v) && strcmp(g_value_get_string (&v), "false") == 0) return FALSE; @@ -1145,7 +1145,7 @@ gnc_commodity_get_user_symbol(const gnc_commodity *cm) { GValue v = G_VALUE_INIT; if (!cm) return NULL; - qof_instance_get_var_kvp (QOF_INSTANCE(cm), &v, 1, "user_symbol"); + qof_instance_get_kvp (QOF_INSTANCE(cm), &v, 1, "user_symbol"); if (G_VALUE_HOLDS_STRING (&v)) return g_value_get_string (&v); return NULL; @@ -1316,12 +1316,12 @@ gnc_commodity_set_auto_quote_control_flag(gnc_commodity *cm, } gnc_commodity_begin_edit(cm); if (flag) - qof_instance_set_var_kvp (QOF_INSTANCE (cm), NULL, 1, "auto_quote_control"); + qof_instance_set_kvp (QOF_INSTANCE (cm), NULL, 1, "auto_quote_control"); else { g_value_init (&v, G_TYPE_STRING); g_value_set_string (&v, "false"); - qof_instance_set_var_kvp (QOF_INSTANCE (cm), &v, 1, "auto_quote_control"); + qof_instance_set_kvp (QOF_INSTANCE (cm), &v, 1, "auto_quote_control"); } mark_commodity_dirty(cm); gnc_commodity_commit_edit(cm); @@ -1456,10 +1456,10 @@ gnc_commodity_set_user_symbol(gnc_commodity * cm, const char * user_symbol) { g_value_init (&v, G_TYPE_STRING); g_value_set_string (&v, user_symbol); - qof_instance_set_var_kvp (QOF_INSTANCE(cm), &v, 1, "user_symbol"); + qof_instance_set_kvp (QOF_INSTANCE(cm), &v, 1, "user_symbol"); } else - qof_instance_set_var_kvp (QOF_INSTANCE(cm), NULL, 1, "user_symbol"); + qof_instance_set_kvp (QOF_INSTANCE(cm), NULL, 1, "user_symbol"); mark_commodity_dirty(cm); gnc_commodity_commit_edit(cm); diff --git a/libgnucash/engine/gnc-lot.c b/libgnucash/engine/gnc-lot.c index 896a39d6d6..7df4483dbb 100644 --- a/libgnucash/engine/gnc-lot.c +++ b/libgnucash/engine/gnc-lot.c @@ -148,13 +148,13 @@ gnc_lot_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* g_value_set_int(value, priv->marker); break; case PROP_INVOICE: - qof_instance_get_var_kvp (QOF_INSTANCE (lot), value, 2, GNC_INVOICE_ID, GNC_INVOICE_GUID); + qof_instance_get_kvp (QOF_INSTANCE (lot), value, 2, GNC_INVOICE_ID, GNC_INVOICE_GUID); break; case PROP_OWNER_TYPE: - qof_instance_get_var_kvp (QOF_INSTANCE (lot), value, 2, GNC_OWNER_ID, GNC_OWNER_TYPE); + qof_instance_get_kvp (QOF_INSTANCE (lot), value, 2, GNC_OWNER_ID, GNC_OWNER_TYPE); break; case PROP_OWNER_GUID: - qof_instance_get_var_kvp (QOF_INSTANCE (lot), value, 2, GNC_OWNER_ID, GNC_OWNER_GUID); + qof_instance_get_kvp (QOF_INSTANCE (lot), value, 2, GNC_OWNER_ID, GNC_OWNER_GUID); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -188,13 +188,13 @@ gnc_lot_set_property (GObject* object, priv->marker = g_value_get_int(value); break; case PROP_INVOICE: - qof_instance_set_var_kvp (QOF_INSTANCE (lot), value, 2, GNC_INVOICE_ID, GNC_INVOICE_GUID); + qof_instance_set_kvp (QOF_INSTANCE (lot), value, 2, GNC_INVOICE_ID, GNC_INVOICE_GUID); break; case PROP_OWNER_TYPE: - qof_instance_set_var_kvp (QOF_INSTANCE (lot), value, 2, GNC_OWNER_ID, GNC_OWNER_TYPE); + qof_instance_set_kvp (QOF_INSTANCE (lot), value, 2, GNC_OWNER_ID, GNC_OWNER_TYPE); break; case PROP_OWNER_GUID: - qof_instance_set_var_kvp (QOF_INSTANCE (lot), value, 2, GNC_OWNER_ID, GNC_OWNER_GUID); + qof_instance_set_kvp (QOF_INSTANCE (lot), value, 2, GNC_OWNER_ID, GNC_OWNER_GUID); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -427,7 +427,7 @@ gnc_lot_get_title (const GNCLot *lot) { GValue v = G_VALUE_INIT; if (!lot) return NULL; - qof_instance_get_var_kvp (QOF_INSTANCE (lot), &v, 1, "title"); + qof_instance_get_kvp (QOF_INSTANCE (lot), &v, 1, "title"); if (G_VALUE_HOLDS_STRING (&v)) return g_value_get_string (&v); return NULL; @@ -438,7 +438,7 @@ gnc_lot_get_notes (const GNCLot *lot) { GValue v = G_VALUE_INIT; if (!lot) return NULL; - qof_instance_get_var_kvp (QOF_INSTANCE (lot), &v, 1, "notes"); + qof_instance_get_kvp (QOF_INSTANCE (lot), &v, 1, "notes"); if (G_VALUE_HOLDS_STRING (&v)) return g_value_get_string (&v); return NULL; @@ -452,7 +452,7 @@ gnc_lot_set_title (GNCLot *lot, const char *str) qof_begin_edit(QOF_INSTANCE(lot)); g_value_init (&v, G_TYPE_STRING); g_value_set_string (&v, str); - qof_instance_set_var_kvp (QOF_INSTANCE (lot), &v, 1, "title"); + qof_instance_set_kvp (QOF_INSTANCE (lot), &v, 1, "title"); qof_instance_set_dirty(QOF_INSTANCE(lot)); gnc_lot_commit_edit(lot); } @@ -465,7 +465,7 @@ gnc_lot_set_notes (GNCLot *lot, const char *str) qof_begin_edit(QOF_INSTANCE(lot)); g_value_init (&v, G_TYPE_STRING); g_value_set_string (&v, str); - qof_instance_set_var_kvp (QOF_INSTANCE (lot), &v, 1, "notes"); + qof_instance_set_kvp (QOF_INSTANCE (lot), &v, 1, "notes"); qof_instance_set_dirty(QOF_INSTANCE(lot)); gnc_lot_commit_edit(lot); } diff --git a/libgnucash/engine/gncCustomer.c b/libgnucash/engine/gncCustomer.c index b318e7195f..48b470f382 100644 --- a/libgnucash/engine/gncCustomer.c +++ b/libgnucash/engine/gncCustomer.c @@ -140,13 +140,13 @@ gnc_customer_get_property (GObject *object, g_value_set_string(value, cust->name); break; case PROP_PDF_DIRNAME: - qof_instance_get_var_kvp (QOF_INSTANCE (cust), value, 1, OWNER_EXPORT_PDF_DIRNAME); + qof_instance_get_kvp (QOF_INSTANCE (cust), value, 1, OWNER_EXPORT_PDF_DIRNAME); break; case PROP_LAST_POSTED: - qof_instance_get_var_kvp (QOF_INSTANCE (cust), value, 1, LAST_POSTED_TO_ACCT); + qof_instance_get_kvp (QOF_INSTANCE (cust), value, 1, LAST_POSTED_TO_ACCT); break; case PROP_PAYMENT_LAST_ACCT: - qof_instance_get_var_kvp (QOF_INSTANCE (cust), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); + qof_instance_get_kvp (QOF_INSTANCE (cust), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -174,13 +174,13 @@ gnc_customer_set_property (GObject *object, gncCustomerSetName(cust, g_value_get_string(value)); break; case PROP_PDF_DIRNAME: - qof_instance_set_var_kvp (QOF_INSTANCE (cust), value, 1, OWNER_EXPORT_PDF_DIRNAME); + qof_instance_set_kvp (QOF_INSTANCE (cust), value, 1, OWNER_EXPORT_PDF_DIRNAME); break; case PROP_LAST_POSTED: - qof_instance_set_var_kvp (QOF_INSTANCE (cust), value, 1, LAST_POSTED_TO_ACCT); + qof_instance_set_kvp (QOF_INSTANCE (cust), value, 1, LAST_POSTED_TO_ACCT); break; case PROP_PAYMENT_LAST_ACCT: - qof_instance_set_var_kvp (QOF_INSTANCE (cust), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); + qof_instance_set_kvp (QOF_INSTANCE (cust), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); diff --git a/libgnucash/engine/gncEmployee.c b/libgnucash/engine/gncEmployee.c index f41c388a72..d992b0ac8b 100644 --- a/libgnucash/engine/gncEmployee.c +++ b/libgnucash/engine/gncEmployee.c @@ -163,13 +163,13 @@ gnc_employee_get_property (GObject *object, g_value_take_object(value, emp->ccard_acc); break; case PROP_PDF_DIRNAME: - qof_instance_get_var_kvp (QOF_INSTANCE (emp), value, 1, OWNER_EXPORT_PDF_DIRNAME); + qof_instance_get_kvp (QOF_INSTANCE (emp), value, 1, OWNER_EXPORT_PDF_DIRNAME); break; case PROP_LAST_POSTED: - qof_instance_get_var_kvp (QOF_INSTANCE (emp), value, 1, LAST_POSTED_TO_ACCT); + qof_instance_get_kvp (QOF_INSTANCE (emp), value, 1, LAST_POSTED_TO_ACCT); break; case PROP_PAYMENT_LAST_ACCT: - qof_instance_get_var_kvp (QOF_INSTANCE (emp), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); + qof_instance_get_kvp (QOF_INSTANCE (emp), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -220,13 +220,13 @@ gnc_employee_set_property (GObject *object, gncEmployeeSetCCard(emp, g_value_get_object(value)); break; case PROP_PDF_DIRNAME: - qof_instance_set_var_kvp (QOF_INSTANCE (emp), value, 1, OWNER_EXPORT_PDF_DIRNAME); + qof_instance_set_kvp (QOF_INSTANCE (emp), value, 1, OWNER_EXPORT_PDF_DIRNAME); break; case PROP_LAST_POSTED: - qof_instance_set_var_kvp (QOF_INSTANCE (emp), value, 1, LAST_POSTED_TO_ACCT); + qof_instance_set_kvp (QOF_INSTANCE (emp), value, 1, LAST_POSTED_TO_ACCT); break; case PROP_PAYMENT_LAST_ACCT: - qof_instance_set_var_kvp (QOF_INSTANCE (emp), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); + qof_instance_set_kvp (QOF_INSTANCE (emp), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); diff --git a/libgnucash/engine/gncInvoice.c b/libgnucash/engine/gncInvoice.c index 074270dea0..ac8eaacceb 100644 --- a/libgnucash/engine/gncInvoice.c +++ b/libgnucash/engine/gncInvoice.c @@ -354,9 +354,9 @@ GncInvoice *gncInvoiceCopy (const GncInvoice *from) invoice->billing_id = CACHE_INSERT (from->billing_id); invoice->active = from->active; - qof_instance_get_var_kvp (QOF_INSTANCE (from), &v, 1, GNC_INVOICE_IS_CN); + qof_instance_get_kvp (QOF_INSTANCE (from), &v, 1, GNC_INVOICE_IS_CN); if (G_VALUE_HOLDS_INT64 (&v)) - qof_instance_set_var_kvp (QOF_INSTANCE (invoice), &v, 1, GNC_INVOICE_IS_CN); + qof_instance_set_kvp (QOF_INSTANCE (invoice), &v, 1, GNC_INVOICE_IS_CN); invoice->terms = from->terms; gncBillTermIncRef (invoice->terms); @@ -551,7 +551,7 @@ void gncInvoiceSetIsCreditNote (GncInvoice *invoice, gboolean credit_note) gncInvoiceBeginEdit (invoice); g_value_init (&v, G_TYPE_INT64); g_value_set_int64(&v, credit_note ? 1 : 0); - qof_instance_set_var_kvp (QOF_INSTANCE (invoice), &v, 1, GNC_INVOICE_IS_CN); + qof_instance_set_kvp (QOF_INSTANCE (invoice), &v, 1, GNC_INVOICE_IS_CN); mark_invoice (invoice); gncInvoiceCommitEdit (invoice); @@ -1040,7 +1040,7 @@ gboolean gncInvoiceGetIsCreditNote (const GncInvoice *invoice) { GValue v = G_VALUE_INIT; if (!invoice) return FALSE; - qof_instance_get_var_kvp (QOF_INSTANCE(invoice), &v, 1, GNC_INVOICE_IS_CN); + qof_instance_get_kvp (QOF_INSTANCE(invoice), &v, 1, GNC_INVOICE_IS_CN); if (G_VALUE_HOLDS_INT64(&v) && g_value_get_int64(&v)) return TRUE; else diff --git a/libgnucash/engine/gncJob.c b/libgnucash/engine/gncJob.c index 5d76c29bd9..2ee97b796e 100644 --- a/libgnucash/engine/gncJob.c +++ b/libgnucash/engine/gncJob.c @@ -120,7 +120,7 @@ gnc_job_get_property (GObject *object, g_value_set_string(value, job->name); break; case PROP_PDF_DIRNAME: - qof_instance_get_var_kvp (QOF_INSTANCE (job), value, 1, OWNER_EXPORT_PDF_DIRNAME); + qof_instance_get_kvp (QOF_INSTANCE (job), value, 1, OWNER_EXPORT_PDF_DIRNAME); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -148,7 +148,7 @@ gnc_job_set_property (GObject *object, gncJobSetName(job, g_value_get_string(value)); break; case PROP_PDF_DIRNAME: - qof_instance_set_var_kvp (QOF_INSTANCE (job), value, 1, OWNER_EXPORT_PDF_DIRNAME); + qof_instance_set_kvp (QOF_INSTANCE (job), value, 1, OWNER_EXPORT_PDF_DIRNAME); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -316,11 +316,11 @@ void gncJobSetRate (GncJob *job, gnc_numeric rate) GValue v = G_VALUE_INIT; g_value_init (&v, GNC_TYPE_NUMERIC); g_value_set_boxed (&v, &rate); - qof_instance_set_var_kvp (QOF_INSTANCE (job), &v, 1, GNC_JOB_RATE); + qof_instance_set_kvp (QOF_INSTANCE (job), &v, 1, GNC_JOB_RATE); } else { - qof_instance_set_var_kvp (QOF_INSTANCE (job), NULL, 1, GNC_JOB_RATE); + qof_instance_set_kvp (QOF_INSTANCE (job), NULL, 1, GNC_JOB_RATE); } mark_job (job); gncJobCommitEdit (job); @@ -454,7 +454,7 @@ gnc_numeric gncJobGetRate (const GncJob *job) GValue v = G_VALUE_INIT; gnc_numeric *rate = NULL; if (!job) return gnc_numeric_zero (); - qof_instance_get_var_kvp (QOF_INSTANCE (job), &v, 1, GNC_JOB_RATE); + qof_instance_get_kvp (QOF_INSTANCE (job), &v, 1, GNC_JOB_RATE); if (G_VALUE_HOLDS_BOXED (&v)) rate = (gnc_numeric*)g_value_get_boxed (&v); if (rate) diff --git a/libgnucash/engine/gncVendor.c b/libgnucash/engine/gncVendor.c index 1df3fab482..b5f418cc60 100644 --- a/libgnucash/engine/gncVendor.c +++ b/libgnucash/engine/gncVendor.c @@ -179,13 +179,13 @@ gnc_vendor_get_property (GObject *object, g_value_set_string(value, qofVendorGetTaxIncluded(vendor)); break; case PROP_PDF_DIRNAME: - qof_instance_get_var_kvp (QOF_INSTANCE (vendor), value, 1, OWNER_EXPORT_PDF_DIRNAME); + qof_instance_get_kvp (QOF_INSTANCE (vendor), value, 1, OWNER_EXPORT_PDF_DIRNAME); break; case PROP_LAST_POSTED: - qof_instance_get_var_kvp (QOF_INSTANCE (vendor), value, 1, LAST_POSTED_TO_ACCT); + qof_instance_get_kvp (QOF_INSTANCE (vendor), value, 1, LAST_POSTED_TO_ACCT); break; case PROP_PAYMENT_LAST_ACCT: - qof_instance_get_var_kvp (QOF_INSTANCE (vendor), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); + qof_instance_get_kvp (QOF_INSTANCE (vendor), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -243,13 +243,13 @@ gnc_vendor_set_property (GObject *object, qofVendorSetTaxIncluded(vendor, g_value_get_string(value)); break; case PROP_PDF_DIRNAME: - qof_instance_set_var_kvp (QOF_INSTANCE (vendor), value, 1, OWNER_EXPORT_PDF_DIRNAME); + qof_instance_set_kvp (QOF_INSTANCE (vendor), value, 1, OWNER_EXPORT_PDF_DIRNAME); break; case PROP_LAST_POSTED: - qof_instance_set_var_kvp (QOF_INSTANCE (vendor), value, 1, LAST_POSTED_TO_ACCT); + qof_instance_set_kvp (QOF_INSTANCE (vendor), value, 1, LAST_POSTED_TO_ACCT); break; case PROP_PAYMENT_LAST_ACCT: - qof_instance_set_var_kvp (QOF_INSTANCE (vendor), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); + qof_instance_set_kvp (QOF_INSTANCE (vendor), value, 2, GNC_PAYMENT, GNC_LAST_ACCOUNT); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); diff --git a/libgnucash/engine/qofinstance-p.h b/libgnucash/engine/qofinstance-p.h index c0d79f94ee..102af1ed70 100644 --- a/libgnucash/engine/qofinstance-p.h +++ b/libgnucash/engine/qofinstance-p.h @@ -124,7 +124,7 @@ gboolean qof_instance_has_kvp (QofInstance *inst); * @param value: A GValue containing an item of a type which KvpValue knows * how to store. */ -void qof_instance_set_var_kvp (QofInstance *, GValue const * value, unsigned count, ...); +void qof_instance_set_kvp (QofInstance *, GValue const * value, unsigned count, ...); /** Retrieves the contents of a KVP slot into a provided GValue. * @param inst: The QofInstance @@ -132,7 +132,7 @@ void qof_instance_set_var_kvp (QofInstance *, GValue const * value, unsigned cou * @param value: A GValue into which to store the value of the slot. It will be * set to the correct type. */ -void qof_instance_get_var_kvp (QofInstance *, GValue * value, unsigned count, ...); +void qof_instance_get_kvp (QofInstance *, GValue * value, unsigned count, ...); /** @} Close out the DOxygen ingroup */ /* Functions to isolate the KVP mechanism inside QOF for cases where diff --git a/libgnucash/engine/qofinstance.cpp b/libgnucash/engine/qofinstance.cpp index 57cc6bd1e1..e82980c34a 100644 --- a/libgnucash/engine/qofinstance.cpp +++ b/libgnucash/engine/qofinstance.cpp @@ -1066,7 +1066,7 @@ void qof_instance_set_path_kvp (QofInstance * inst, GValue const * value, std::v } void -qof_instance_set_var_kvp (QofInstance * inst, GValue const * value, unsigned count, ...) +qof_instance_set_kvp (QofInstance * inst, GValue const * value, unsigned count, ...) { std::vector path; va_list args; @@ -1091,7 +1091,7 @@ void qof_instance_get_path_kvp (QofInstance * inst, GValue * value, std::vector< } void -qof_instance_get_var_kvp (QofInstance * inst, GValue * value, unsigned count, ...) +qof_instance_get_kvp (QofInstance * inst, GValue * value, unsigned count, ...) { std::vector path; va_list args;