projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into sheet
[pspp]
/
src
/
ui
/
gui
/
psppire-dict.c
diff --git
a/src/ui/gui/psppire-dict.c
b/src/ui/gui/psppire-dict.c
index 5368538fe30ccc8816f816127ca093a79f066d27..924ff7c5564e70530ae0323bd679cc69c760700d 100644
(file)
--- a/
src/ui/gui/psppire-dict.c
+++ b/
src/ui/gui/psppire-dict.c
@@
-34,7
+34,7
@@
#include "ui/gui/psppire-marshal.h"
#include "ui/gui/psppire-var-ptr.h"
#include "ui/gui/psppire-marshal.h"
#include "ui/gui/psppire-var-ptr.h"
-#include
"ui/gui/efficient-sheet/src/jmd-datum.h"
+#include
<ssw-datum.h>
#include <gobject/genums.h>
#include <gobject/genums.h>
@@
-81,13
+81,13
@@
gni (GListModel *list)
static GType
git (GListModel *list)
{
static GType
git (GListModel *list)
{
- return
JMD
_TYPE_DATUM;
+ return
SSW
_TYPE_DATUM;
}
static gpointer
gi (GListModel *list, guint id)
{
}
static gpointer
gi (GListModel *list, guint id)
{
-
JmdDatum *gd = JMD_DATUM (g_object_new (JMD
_TYPE_DATUM, NULL));
+
SswDatum *gd = SSW_DATUM (g_object_new (SSW
_TYPE_DATUM, NULL));
PsppireDict *dict = PSPPIRE_DICT (list);
PsppireDict *dict = PSPPIRE_DICT (list);
@@
-108,7
+108,7
@@
gi (GListModel *list, guint id)
static void
static void
-
jmd
_init_iface (GListModelInterface *iface)
+
ssw
_init_iface (GListModelInterface *iface)
{
iface->get_n_items = gni;
iface->get_item = gi;
{
iface->get_n_items = gni;
iface->get_item = gi;
@@
-152,7
+152,7
@@
psppire_dict_get_type (void)
};
static const GInterfaceInfo list_model_info = {
};
static const GInterfaceInfo list_model_info = {
- (GInterfaceInitFunc)
jmd
_init_iface,
+ (GInterfaceInitFunc)
ssw
_init_iface,
NULL,
NULL
};
NULL,
NULL
};
@@
-390,7
+390,7
@@
psppire_dict_generate_name (const PsppireDict *dict, char *name, size_t size)
- The string may not contain whitespace.
- The first character may not be '$'
- The first character may not be a digit
- The string may not contain whitespace.
- The first character may not be '$'
- The first character may not be a digit
- - The final charact
o
r may not be '.' or '_'
+ - The final charact
e
r may not be '.' or '_'
*/
len = snprintf (name, size, _("Var%04d"), d);
if (len + 1 >= size)
*/
len = snprintf (name, size, _("Var%04d"), d);
if (len + 1 >= size)