[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp po/de.po po/en_GB.po po/pspp.pot src/data/...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp po/de.po po/en_GB.po po/pspp.pot src/data/... |
|
Date: |
Wed, 19 Sep 2007 06:21:20 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/09/19 06:21:20
Modified files:
po : de.po en_GB.po pspp.pot
src/data : procedure.c procedure.h
src/language/expressions: evaluate.c
src/ui/gui : psppire.c
src/ui/terminal: main.c
Log message:
Remove callbacks from struct dataset. Closes patch #6075
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/pspp/po/en_GB.po?cvsroot=pspp&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.151&r2=1.152
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.c?cvsroot=pspp&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.h?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/evaluate.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/main.c?cvsroot=pspp&r1=1.36&r2=1.37
Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- po/de.po 15 Sep 2007 02:48:02 -0000 1.66
+++ po/de.po 19 Sep 2007 06:21:19 -0000 1.67
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-09-15 09:11+0800\n"
+"POT-Creation-Date: 2007-09-19 14:15+0800\n"
"PO-Revision-Date: 2006-07-28 19:32+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -4799,16 +4799,11 @@
msgid "_Discrete missing values"
msgstr "_Diskret Lösewerten"
-#: src/ui/gui/find-dialog.c:658
-#, c-format
-msgid "Bad regular expression: %s"
-msgstr ""
-
-#: src/ui/gui/helper.c:135
+#: src/ui/gui/helper.c:140
msgid "Sorry. The help system hasn't yet been implemented."
msgstr "Es gibt noch nicht kein Helpsysteme. Schade!"
-#: src/ui/gui/helper.c:158
+#: src/ui/gui/helper.c:163
#, c-format
msgid "Cannot open reference manual: %s"
msgstr ""
@@ -4903,11 +4898,11 @@
msgid "Paste"
msgstr "Datum"
-#: src/ui/gui/psppire-data-store.c:810
+#: src/ui/gui/psppire-data-store.c:816
msgid "var"
msgstr ""
-#: src/ui/gui/psppire-data-store.c:931 src/ui/gui/psppire-var-store.c:710
+#: src/ui/gui/psppire-data-store.c:937 src/ui/gui/psppire-var-store.c:710
#, c-format
msgid "%ld"
msgstr ""
Index: po/en_GB.po
===================================================================
RCS file: /sources/pspp/pspp/po/en_GB.po,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- po/en_GB.po 15 Sep 2007 02:48:02 -0000 1.82
+++ po/en_GB.po 19 Sep 2007 06:21:19 -0000 1.83
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-09-15 09:11+0800\n"
+"POT-Creation-Date: 2007-09-19 14:15+0800\n"
"PO-Revision-Date: 2007-09-15 08:29+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"MIME-Version: 1.0\n"
@@ -4761,16 +4761,11 @@
msgid "_Discrete missing values"
msgstr ""
-#: src/ui/gui/find-dialog.c:658
-#, c-format
-msgid "Bad regular expression: %s"
-msgstr ""
-
-#: src/ui/gui/helper.c:135
+#: src/ui/gui/helper.c:140
msgid "Sorry. The help system hasn't yet been implemented."
msgstr ""
-#: src/ui/gui/helper.c:158
+#: src/ui/gui/helper.c:163
#, c-format
msgid "Cannot open reference manual: %s"
msgstr ""
@@ -4862,11 +4857,11 @@
msgid "Paste"
msgstr ""
-#: src/ui/gui/psppire-data-store.c:810
+#: src/ui/gui/psppire-data-store.c:816
msgid "var"
msgstr ""
-#: src/ui/gui/psppire-data-store.c:931 src/ui/gui/psppire-var-store.c:710
+#: src/ui/gui/psppire-data-store.c:937 src/ui/gui/psppire-var-store.c:710
#, c-format
msgid "%ld"
msgstr ""
Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- po/pspp.pot 15 Sep 2007 02:48:02 -0000 1.151
+++ po/pspp.pot 19 Sep 2007 06:21:19 -0000 1.152
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-09-15 09:11+0800\n"
+"POT-Creation-Date: 2007-09-19 14:15+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -4764,16 +4764,11 @@
msgid "_Discrete missing values"
msgstr ""
-#: src/ui/gui/find-dialog.c:658
-#, c-format
-msgid "Bad regular expression: %s"
-msgstr ""
-
-#: src/ui/gui/helper.c:135
+#: src/ui/gui/helper.c:140
msgid "Sorry. The help system hasn't yet been implemented."
msgstr ""
-#: src/ui/gui/helper.c:158
+#: src/ui/gui/helper.c:163
#, c-format
msgid "Cannot open reference manual: %s"
msgstr ""
@@ -4865,11 +4860,11 @@
msgid "Paste"
msgstr ""
-#: src/ui/gui/psppire-data-store.c:810
+#: src/ui/gui/psppire-data-store.c:816
msgid "var"
msgstr ""
-#: src/ui/gui/psppire-data-store.c:931 src/ui/gui/psppire-var-store.c:710
+#: src/ui/gui/psppire-data-store.c:937 src/ui/gui/psppire-var-store.c:710
#, c-format
msgid "%ld"
msgstr ""
Index: src/data/procedure.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/procedure.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- src/data/procedure.c 19 Sep 2007 04:29:00 -0000 1.36
+++ src/data/procedure.c 19 Sep 2007 06:21:19 -0000 1.37
@@ -56,13 +56,6 @@
struct trns_chain *temporary_trns_chain;
struct dictionary *dict;
- /* Callback which occurs when a procedure provides a new source for
- the dataset */
- replace_source_callback *replace_source ;
-
- /* Callback which occurs whenever the DICT is replaced by a new one */
- replace_dictionary_callback *replace_dict;
-
/* Callback which occurs whenever the transformation chain(s) have
been modified */
transformation_change_callback_func *xform_callback;
@@ -341,7 +334,6 @@
ds->discard_output = false;
}
ds->sink = NULL;
- if ( ds->replace_source) ds->replace_source (ds->source);
caseinit_clear (ds->caseinit);
caseinit_mark_as_preinited (ds->caseinit, ds->dict);
@@ -498,7 +490,6 @@
dict_destroy (ds->dict);
ds->dict = ds->permanent_dict;
ds->permanent_dict = NULL;
- if (ds->replace_dict) ds->replace_dict (ds->dict);
trns_chain_destroy (ds->temporary_trns_chain);
ds->temporary_trns_chain = NULL;
@@ -532,13 +523,11 @@
/* Initializes procedure handling. */
struct dataset *
-create_dataset (transformation_change_callback_func *cb, void *aux)
+create_dataset (void)
{
struct dataset *ds = xzalloc (sizeof(*ds));
ds->dict = dict_create ();
ds->caseinit = caseinit_create ();
- ds->xform_callback = cb;
- ds->xform_callback_aux = aux;
proc_cancel_all_transformations (ds);
return ds;
}
@@ -589,7 +578,6 @@
casereader_destroy (ds->source);
ds->source = NULL;
- if ( ds->replace_source) ds->replace_source (NULL);
proc_cancel_all_transformations (ds);
}
@@ -608,7 +596,6 @@
dict_destroy (ds->dict);
ds->dict = dict;
- if ( ds->replace_dict) ds->replace_dict (dict);
proc_set_active_file_data (ds, source);
}
@@ -620,7 +607,6 @@
{
casereader_destroy (ds->source);
ds->source = reader;
- if (ds->replace_source) ds->replace_source (reader);
caseinit_clear (ds->caseinit);
caseinit_mark_as_preinited (ds->caseinit, ds->dict);
@@ -643,7 +629,6 @@
{
struct casereader *reader = ds->source;
ds->source = NULL;
- if (ds->replace_source) ds->replace_source (reader);
return reader;
}
Index: src/data/procedure.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/procedure.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/data/procedure.h 19 Sep 2007 04:29:00 -0000 1.18
+++ src/data/procedure.h 19 Sep 2007 06:21:19 -0000 1.19
@@ -53,7 +53,8 @@
typedef void transformation_change_callback_func (bool non_empty, void *aux);
-struct dataset * create_dataset (transformation_change_callback_func *, void
*);
+struct dataset * create_dataset (void);
+
void destroy_dataset (struct dataset *);
void dataset_add_transform_change_callback (struct dataset *,
Index: src/language/expressions/evaluate.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/expressions/evaluate.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/language/expressions/evaluate.c 7 Jul 2007 06:14:14 -0000 1.22
+++ src/language/expressions/evaluate.c 19 Sep 2007 06:21:20 -0000 1.23
@@ -156,7 +156,7 @@
if ( ds == NULL )
{
- ds = create_dataset (NULL, NULL);
+ ds = create_dataset ();
d = dataset_dict (ds);
}
Index: src/ui/gui/psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- src/ui/gui/psppire.c 25 Aug 2007 10:04:03 -0000 1.49
+++ src/ui/gui/psppire.c 19 Sep 2007 06:21:20 -0000 1.50
@@ -92,7 +92,7 @@
fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
);
- the_dataset = create_dataset (NULL, NULL);
+ the_dataset = create_dataset ();
message_dialog_init (the_source_stream);
Index: src/ui/terminal/main.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/main.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- src/ui/terminal/main.c 26 Aug 2007 18:35:45 -0000 1.36
+++ src/ui/terminal/main.c 19 Sep 2007 06:21:20 -0000 1.37
@@ -107,7 +107,7 @@
settings_init ();
random_init ();
- the_dataset = create_dataset (NULL, NULL);
+ the_dataset = create_dataset ();
if (parse_command_line (argc, argv, the_source_stream))
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp po/de.po po/en_GB.po po/pspp.pot src/data/...,
John Darrington <=