[gnumeric] Compilation: namespace.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Compilation: namespace.
- Date: Wed, 8 Jan 2014 15:55:18 +0000 (UTC)
commit 984ae91d05534f3d18986e805923f6ba495a62df
Author: Morten Welinder <terra gnome org>
Date: Wed Jan 8 10:55:01 2014 -0500
Compilation: namespace.
ChangeLog | 5 +++++
src/main-application.c | 2 +-
src/wbc-gtk-actions.c | 14 +++++++-------
src/workbook.c | 6 +++---
src/workbook.h | 2 +-
5 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 84b60b2..63e886a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-08 Morten Welinder <terra gnome org>
+
+ * src/gui-file.h: Namespace improvements. Also make gui_file_read
+ return the WorkbookView instead of a boolean.
+
2014-01-01 Morten Welinder <terra gnome org>
* src/sf-dpq.c (dlnorm): Go crazy with accuracy.
diff --git a/src/main-application.c b/src/main-application.c
index c2d0e6e..0352069 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -330,7 +330,7 @@ main (int argc, char const **argv)
if (wbv != NULL) {
WBCGtk *wbcg;
- workbook_update_history (wb_view_get_workbook (wbv), FILE_SAVE_AS_SAVE);
+ workbook_update_history (wb_view_get_workbook (wbv),
GNM_FILE_SAVE_AS_STYLE_SAVE);
wbcg = wbc_gtk_new (wbv, NULL, NULL, geometry);
geometry = NULL;
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 6e161b5..f414cd9 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -101,11 +101,11 @@ static GNM_ACTION_DEF (cb_file_new)
wbcg_copy_toolbar_visibility (new_wbcg, wbcg);
}
-static GNM_ACTION_DEF (cb_file_open) { gui_file_open (wbcg, FILE_OPEN_OPEN, NULL); }
+static GNM_ACTION_DEF (cb_file_open) { gui_file_open (wbcg, GNM_FILE_OPEN_STYLE_OPEN, NULL); }
static GNM_ACTION_DEF (cb_file_save) { gui_file_save (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg))); }
static GNM_ACTION_DEF (cb_file_save_as) { gui_file_save_as
(wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)),
- FILE_SAVE_AS_SAVE, NULL); }
+ GNM_FILE_SAVE_AS_STYLE_SAVE, NULL); }
#ifndef HAVE_MKDTEMP
#include "gnm-random.h"
@@ -980,9 +980,9 @@ static GNM_ACTION_DEF (cb_tools_random_generator_correlated) { dialog_random_cor
static GNM_ACTION_DEF (cb_data_sort) { dialog_cell_sort (wbcg); }
static GNM_ACTION_DEF (cb_data_shuffle) { dialog_shuffle (wbcg); }
static GNM_ACTION_DEF (cb_data_import_text) { gui_file_open
- (wbcg, FILE_OPEN_IMPORT, "Gnumeric_stf:stf_assistant"); }
+ (wbcg, GNM_FILE_OPEN_STYLE_IMPORT, "Gnumeric_stf:stf_assistant"); }
static GNM_ACTION_DEF (cb_data_import_other) { gui_file_open
- (wbcg, FILE_OPEN_IMPORT, NULL); }
+ (wbcg, GNM_FILE_OPEN_STYLE_IMPORT, NULL); }
static GNM_ACTION_DEF (cb_auto_filter) { cmd_autofilter_add_remove (WORKBOOK_CONTROL (wbcg)); }
static GNM_ACTION_DEF (cb_show_all) { filter_show_all (WORKBOOK_CONTROL (wbcg)); }
@@ -997,13 +997,13 @@ static GNM_ACTION_DEF (cb_data_slicer_refresh) { cmd_slicer_refresh (WORKBOOK_CO
static GNM_ACTION_DEF (cb_data_slicer_edit) { dialog_data_slicer (wbcg, FALSE); }
static GNM_ACTION_DEF (cb_data_export) { gui_file_save_as
(wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)),
- FILE_SAVE_AS_EXPORT, NULL); }
+ GNM_FILE_SAVE_AS_STYLE_EXPORT, NULL); }
static GNM_ACTION_DEF (cb_data_export_text) { gui_file_save_as
(wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)),
- FILE_SAVE_AS_EXPORT, "Gnumeric_stf:stf_assistant"); }
+ GNM_FILE_SAVE_AS_STYLE_EXPORT, "Gnumeric_stf:stf_assistant"); }
static GNM_ACTION_DEF (cb_data_export_csv) { gui_file_save_as
(wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)),
- FILE_SAVE_AS_EXPORT, "Gnumeric_stf:stf_csv"); }
+ GNM_FILE_SAVE_AS_STYLE_EXPORT, "Gnumeric_stf:stf_csv"); }
static GNM_ACTION_DEF (cb_data_export_repeat) { gui_file_export_repeat (wbcg); }
static void
diff --git a/src/workbook.c b/src/workbook.c
index 4d11863..3b804c3 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -84,12 +84,12 @@ cb_exporter_finalize (Workbook *wb, GOFileSaver *saver)
}
void
-workbook_update_history (Workbook *wb, file_save_as_t type)
+workbook_update_history (Workbook *wb, GnmFileSaveAsStyle type)
{
g_return_if_fail (IS_WORKBOOK (wb));
switch (type) {
- case FILE_SAVE_AS_SAVE:
+ case GNM_FILE_SAVE_AS_STYLE_SAVE:
if (wb->doc.uri && wb->file_format_level >= GO_FILE_FL_MANUAL_REMEMBER) {
const char *mimetype = wb->file_saver
? go_file_saver_get_mime_type (wb->file_saver)
@@ -97,7 +97,7 @@ workbook_update_history (Workbook *wb, file_save_as_t type)
gnm_app_history_add (wb->doc.uri, mimetype);
}
break;
- case FILE_SAVE_AS_EXPORT:
+ case GNM_FILE_SAVE_AS_STYLE_EXPORT:
default:
if (wb->last_export_uri &&
wb->file_export_format_level >= GO_FILE_FL_MANUAL_REMEMBER) {
diff --git a/src/workbook.h b/src/workbook.h
index 433bc1f..6cb4f23 100644
--- a/src/workbook.h
+++ b/src/workbook.h
@@ -48,7 +48,7 @@ void workbook_optimize_style (Workbook *wb);
/* IO Routines */
gboolean workbook_set_saveinfo (Workbook *wb, GOFileFormatLevel lev,
GOFileSaver *saver);
-void workbook_update_history (Workbook *wb, file_save_as_t type);
+void workbook_update_history (Workbook *wb, GnmFileSaveAsStyle type);
GOFileSaver *workbook_get_file_saver (Workbook *wb);
GOFileSaver *workbook_get_file_exporter (Workbook *wb);
gchar const *workbook_get_last_export_uri (Workbook *wb);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]