IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renaming functions to get rid of temporary name

Browse Source 
_var_ was used to make sure I caught all references, but isn't intended
as a permanent name.
This commit is contained in:
lmat 2017-11-09 16:33:58 -05:00
parent 5636afc4a2
commit d9eebd332b
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libgnucash/engine/Scrub.c
View File

@ -50,7 +50,7 @@
#include "Transaction.h"
#include "TransactionP.h"
#include "gnc-commodity.h"
#include <qofinstance-p.h>
#include "qofinstance-p.h"
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "gnc.engine.scrub"
@ -1342,7 +1342,7 @@ xaccAccountScrubKvp (Account *account)
{
str2 = g_strstrip(g_value_dup_string(&v));
if (strlen(str2) == 0)
qof_instance_slot_var_delete (QOF_INSTANCE (account), 1, "notes");
qof_instance_slot_delete (QOF_INSTANCE (account), "notes");
g_free(str2);
}
@ -1350,9 +1350,9 @@ xaccAccountScrubKvp (Account *account)
if ((G_VALUE_HOLDS_STRING (&v) &&
strcmp(g_value_get_string (&v), "false") == 0) ||
(G_VALUE_HOLDS_BOOLEAN (&v) && ! g_value_get_boolean (&v)))
qof_instance_slot_var_delete (QOF_INSTANCE (account), 1, "placeholder");
qof_instance_slot_delete (QOF_INSTANCE (account), "placeholder");
qof_instance_slot_var_delete_if_empty (QOF_INSTANCE (account), 1, "hbci");
qof_instance_slot_delete_if_empty (QOF_INSTANCE (account), "hbci");
}
/* ================================================================ */

4
libgnucash/engine/qofinstance-p.h
View File

@ -153,8 +153,8 @@ gboolean qof_instance_kvp_has_guid (const QofInstance *inst, const char *path,
void qof_instance_kvp_merge_guids (const QofInstance *target,
const QofInstance *donor, const char* path);
gboolean qof_instance_has_slot (const QofInstance *inst, const char *path);
void qof_instance_slot_var_delete (const QofInstance *, unsigned count, ...);
void qof_instance_slot_var_delete_if_empty (const QofInstance *, unsigned count, ...);
void qof_instance_slot_delete (const QofInstance *, const char * path);
void qof_instance_slot_delete_if_empty (const QofInstance *, const char * path);
void qof_instance_foreach_slot (const QofInstance *inst, const char *path,
void(*proc)(const char*, const GValue*, void*),
void* data);

22
libgnucash/engine/qofinstance.cpp
View File

@ -1295,15 +1295,9 @@ void qof_instance_slot_path_delete (QofInstance const * inst, std::vector<std::s
}
void
qof_instance_slot_var_delete (QofInstance const *inst, unsigned count, ...)
qof_instance_slot_delete (QofInstance const *inst, char const * path)
{
std::vector<std::string> path;
va_list args;
va_start (args, count);
for (unsigned i{0}; i < count; ++i)
path.push_back (va_arg (args, char const *));
va_end (args);
delete inst->kvp_data->set (path, nullptr);
delete inst->kvp_data->set ({path}, nullptr);
}
void qof_instance_slot_path_delete_if_empty (QofInstance const * inst, std::vector<std::string> const & path)
@ -1318,20 +1312,14 @@ void qof_instance_slot_path_delete_if_empty (QofInstance const * inst, std::vect
}
void
qof_instance_slot_var_delete_if_empty (QofInstance const *inst, unsigned count, ...)
qof_instance_slot_delete_if_empty (QofInstance const *inst, char const * path)
{
std::vector<std::string> path;
va_list args;
va_start (args, count);
for (unsigned i{0}; i < count; ++i)
path.push_back (va_arg (args, char const *));
va_end (args);
auto slot = inst->kvp_data->get_slot (path);
auto slot = inst->kvp_data->get_slot ({path});
if (slot)
{
auto frame = slot->get <KvpFrame*> ();
if (frame && frame->empty ())
delete inst->kvp_data->set (path, nullptr);
delete inst->kvp_data->set ({path}, nullptr);
}
}