{
PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model);
- return psppire_dict_get_var_cnt (store->dict);
+ return psppire_dict_get_n_vars (store->dict);
}
{
PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
- while (col >= psppire_dict_get_var_cnt (store->dict))
+ while (col >= psppire_dict_get_n_vars (store->dict))
{
const struct variable *var =
psppire_dict_insert_variable (store->dict,
- psppire_dict_get_var_cnt (store->dict),
+ psppire_dict_get_n_vars (store->dict),
NULL);
g_return_val_if_fail (var, FALSE);
}
unlabeled_value (PsppireDataStore *store, const struct variable *variable, const union value *val)
{
if (var_is_numeric (variable) &&
- var_is_value_missing (variable, val, MV_SYSTEM))
+ var_is_value_missing (variable, val) == MV_SYSTEM)
return g_strdup ("");
const struct fmt_spec *fmt = var_get_print_format (variable);
size_t
psppire_data_store_get_value_count (const PsppireDataStore *store)
{
- return psppire_dict_get_value_cnt (store->dict);
+ return psppire_dict_get_n_values (store->dict);
}
const struct caseproto *
struct casereader *
psppire_data_store_get_reader (PsppireDataStore *ds)
{
- int i;
struct casereader *reader ;
if (ds->dict)
- for (i = 0 ; i < n_dict_signals; ++i)
+ for (int i = 0 ; i < n_dict_signals; ++i)
{
g_signal_handler_block (ds->dict,
ds->dict_handler_id[i]);