[goffice] init: use g_type_ensure



commit 68ccb16f2c19a7d7dad0c64f7d360c931075bf03
Author: Morten Welinder <terra gnome org>
Date:   Fri Aug 3 08:36:56 2018 -0400

    init: use g_type_ensure

 ChangeLog         |  5 +++++
 goffice/goffice.c | 53 +++++++++++++++++++++++++++--------------------------
 2 files changed, 32 insertions(+), 26 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1c2aad41..6d853a96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-03  Morten Welinder  <terra gnome org>
+
+       * goffice/goffice.c (libgoffice_init): Use g_type_ensure to avoid
+       giving the compiler any good ideas about removing calls.
+
 2018-07-13  Jean Brefort  <jean brefort normalesup org>
 
        * plugins/plot_distrib/gog-boxplot.c (gog_box_plot_view_render): do
diff --git a/goffice/goffice.c b/goffice/goffice.c
index a30cee8f..08798e7e 100644
--- a/goffice/goffice.c
+++ b/goffice/goffice.c
@@ -213,34 +213,35 @@ libgoffice_init (void)
        _goc_plugin_services_init ();
        install_icons ();
 #endif
-       (void) GO_TYPE_PLUGIN_LOADER_MODULE;
-       (void) GOG_TYPE_GRAPH;
-       (void) GOG_TYPE_CHART;
-       (void) GOG_TYPE_PLOT;
-       (void) GOG_TYPE_SERIES;
-       (void) GOG_TYPE_SERIES_ELEMENT;
-       (void) GOG_TYPE_LEGEND;
-       (void) GOG_TYPE_AXIS;
-       (void) GOG_TYPE_AXIS_LINE;
-       (void) GOG_TYPE_COLOR_SCALE;
-       (void) GOG_TYPE_LABEL;
-       (void) GOG_TYPE_GRID;
-       (void) GOG_TYPE_GRID_LINE;
+       g_type_ensure (GO_TYPE_PLUGIN_LOADER_MODULE);
+       g_type_ensure (GOG_TYPE_GRAPH);
+       g_type_ensure (GOG_TYPE_CHART);
+       g_type_ensure (GOG_TYPE_PLOT);
+       g_type_ensure (GOG_TYPE_SERIES);
+       g_type_ensure (GOG_TYPE_SERIES_ELEMENT);
+       g_type_ensure (GOG_TYPE_LEGEND);
+       g_type_ensure (GOG_TYPE_AXIS);
+       g_type_ensure (GOG_TYPE_AXIS_LINE);
+       g_type_ensure (GOG_TYPE_COLOR_SCALE);
+       g_type_ensure (GOG_TYPE_LABEL);
+       g_type_ensure (GOG_TYPE_GRID);
+       g_type_ensure (GOG_TYPE_GRID_LINE);
 #ifdef GOFFICE_WITH_LASEM
-       (void) GOG_TYPE_EQUATION;
+       g_type_ensure (GOG_TYPE_EQUATION);
 #endif
-       (void) GOG_TYPE_ERROR_BAR;
-       (void) GOG_TYPE_REG_EQN;
-       (void) GOG_TYPE_SERIES_LABELS;
-       (void) GOG_TYPE_DATA_LABEL;
-       (void) GOG_TYPE_SERIES_LINES;
-       (void) GO_TYPE_DATA_SCALAR_VAL;
-       (void) GO_TYPE_DATA_SCALAR_STR;
-       (void) GOG_3D_BOX_TYPE;
-       (void) GO_TYPE_EMF;
-       (void) GO_TYPE_PIXBUF;
-       (void) GO_TYPE_SPECTRE;
-       (void) GO_TYPE_SVG;
+       g_type_ensure (GOG_TYPE_ERROR_BAR);
+       g_type_ensure (GOG_TYPE_REG_EQN);
+       g_type_ensure (GOG_TYPE_SERIES_LABELS);
+       g_type_ensure (GOG_TYPE_DATA_LABEL);
+       g_type_ensure (GOG_TYPE_SERIES_LINES);
+       g_type_ensure (GO_TYPE_DATA_SCALAR_VAL);
+       g_type_ensure (GO_TYPE_DATA_SCALAR_STR);
+       g_type_ensure (GOG_3D_BOX_TYPE);
+       g_type_ensure (GO_TYPE_EMF);
+       g_type_ensure (GO_TYPE_PIXBUF);
+       g_type_ensure (GO_TYPE_SPECTRE);
+       g_type_ensure (GO_TYPE_SVG);
+
        _gog_themes_init ();
        _go_number_format_init ();
        _go_currency_date_format_init ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]