goffice r2366 - in trunk: . goffice goffice/app goffice/component goffice/data goffice/drawing goffice/graph goffice/gtk goffice/math goffice/ms-compat goffice/utils plugins/plot_barcol plugins/plot_distrib plugins/plot_pie plugins/plot_radar plugins/plot_surface plugins/plot_xy plugins/reg_linear plugins/reg_logfit plugins/smoothing tests
- From: emmanuel svn gnome org
- To: svn-commits-list gnome org
- Subject: goffice r2366 - in trunk: . goffice goffice/app goffice/component goffice/data goffice/drawing goffice/graph goffice/gtk goffice/math goffice/ms-compat goffice/utils plugins/plot_barcol plugins/plot_distrib plugins/plot_pie plugins/plot_radar plugins/plot_surface plugins/plot_xy plugins/reg_linear plugins/reg_logfit plugins/smoothing tests
- Date: Tue, 7 Apr 2009 09:29:28 +0000 (UTC)
Author: emmanuel
Date: Tue Apr 7 09:29:28 2009
New Revision: 2366
URL: http://svn.gnome.org/viewvc/goffice?rev=2366&view=rev
Log:
2009-04-06 Emmanuel Pacaud <emmanuel pacaud lapp in2p3 fr>
Naming consistency fix.
/\bGo([A-Z])/GO$1/
/\bIS_GO_/GO_IS_/
/\bIS_GOG_/GOG_IS_/
/\bIS_GOD_/GOD_IS_/
/\bGO_([A-Z,_]*)_TYPE\b/GO_TYPE_$1/
/\bGOG_([A-Z,_]*)_TYPE\b/GOG_TYPE_$1/
/\bGOD_([A-Z,_]*)_TYPE\b/GOD_TYPE_$1/
Modified:
trunk/ChangeLog
trunk/goffice/app/file.c
trunk/goffice/app/file.h
trunk/goffice/app/go-app.h
trunk/goffice/app/go-cmd-context-impl.h
trunk/goffice/app/go-cmd-context.c
trunk/goffice/app/go-cmd-context.h
trunk/goffice/app/go-doc-control-impl.h
trunk/goffice/app/go-doc-control.h
trunk/goffice/app/go-doc-impl.h
trunk/goffice/app/go-doc.c
trunk/goffice/app/go-doc.h
trunk/goffice/app/go-object.c
trunk/goffice/app/go-object.h
trunk/goffice/app/go-plugin-loader-module.c
trunk/goffice/app/go-plugin-loader-module.h
trunk/goffice/app/go-plugin-loader.c
trunk/goffice/app/go-plugin-loader.h
trunk/goffice/app/go-plugin-service-impl.h
trunk/goffice/app/go-plugin-service.c
trunk/goffice/app/go-plugin-service.h
trunk/goffice/app/go-plugin.c
trunk/goffice/app/go-plugin.h
trunk/goffice/app/go-service.h
trunk/goffice/app/io-context.c
trunk/goffice/component/go-component-factory.c
trunk/goffice/component/go-component.c
trunk/goffice/component/go-component.h
trunk/goffice/data/go-data-simple.c
trunk/goffice/data/go-data-simple.h
trunk/goffice/data/go-data.c
trunk/goffice/data/go-data.h
trunk/goffice/drawing/god-anchor.c
trunk/goffice/drawing/god-anchor.h
trunk/goffice/drawing/god-default-attributes.c
trunk/goffice/drawing/god-default-attributes.h
trunk/goffice/drawing/god-drawing-group.c
trunk/goffice/drawing/god-drawing-group.h
trunk/goffice/drawing/god-drawing-renderer-gdk.c
trunk/goffice/drawing/god-drawing-renderer-gdk.h
trunk/goffice/drawing/god-drawing-view.c
trunk/goffice/drawing/god-drawing-view.h
trunk/goffice/drawing/god-drawing.c
trunk/goffice/drawing/god-drawing.h
trunk/goffice/drawing/god-image-store.c
trunk/goffice/drawing/god-image-store.h
trunk/goffice/drawing/god-image.c
trunk/goffice/drawing/god-image.h
trunk/goffice/drawing/god-paragraph-attributes.c
trunk/goffice/drawing/god-paragraph-attributes.h
trunk/goffice/drawing/god-property-table.c
trunk/goffice/drawing/god-property-table.h
trunk/goffice/drawing/god-shape.c
trunk/goffice/drawing/god-shape.h
trunk/goffice/drawing/god-text-model.c
trunk/goffice/drawing/god-text-model.h
trunk/goffice/goffice.c
trunk/goffice/graph/gog-3d-box.c
trunk/goffice/graph/gog-3d-box.h
trunk/goffice/graph/gog-axis-line-impl.h
trunk/goffice/graph/gog-axis-line.c
trunk/goffice/graph/gog-axis-line.h
trunk/goffice/graph/gog-axis.c
trunk/goffice/graph/gog-axis.h
trunk/goffice/graph/gog-chart-impl.h
trunk/goffice/graph/gog-chart-map-3d.c
trunk/goffice/graph/gog-chart-map.c
trunk/goffice/graph/gog-chart.c
trunk/goffice/graph/gog-chart.h
trunk/goffice/graph/gog-child-button.c
trunk/goffice/graph/gog-control-foocanvas.c
trunk/goffice/graph/gog-control-foocanvas.h
trunk/goffice/graph/gog-data-allocator.c
trunk/goffice/graph/gog-data-allocator.h
trunk/goffice/graph/gog-data-set.c
trunk/goffice/graph/gog-data-set.h
trunk/goffice/graph/gog-equation.c
trunk/goffice/graph/gog-equation.h
trunk/goffice/graph/gog-error-bar.c
trunk/goffice/graph/gog-error-bar.h
trunk/goffice/graph/gog-graph-impl.h
trunk/goffice/graph/gog-graph.c
trunk/goffice/graph/gog-graph.h
trunk/goffice/graph/gog-grid-line.c
trunk/goffice/graph/gog-grid-line.h
trunk/goffice/graph/gog-grid.c
trunk/goffice/graph/gog-grid.h
trunk/goffice/graph/gog-guru.c
trunk/goffice/graph/gog-label.c
trunk/goffice/graph/gog-label.h
trunk/goffice/graph/gog-legend.c
trunk/goffice/graph/gog-legend.h
trunk/goffice/graph/gog-object-xml.c
trunk/goffice/graph/gog-object.c
trunk/goffice/graph/gog-object.h
trunk/goffice/graph/gog-outlined-object.c
trunk/goffice/graph/gog-outlined-object.h
trunk/goffice/graph/gog-plot-engine.c
trunk/goffice/graph/gog-plot-impl.h
trunk/goffice/graph/gog-plot.c
trunk/goffice/graph/gog-plot.h
trunk/goffice/graph/gog-reg-curve.c
trunk/goffice/graph/gog-reg-curve.h
trunk/goffice/graph/gog-renderer.c
trunk/goffice/graph/gog-renderer.h
trunk/goffice/graph/gog-series-impl.h
trunk/goffice/graph/gog-series-lines.c
trunk/goffice/graph/gog-series-lines.h
trunk/goffice/graph/gog-series.c
trunk/goffice/graph/gog-series.h
trunk/goffice/graph/gog-smoothed-curve.c
trunk/goffice/graph/gog-smoothed-curve.h
trunk/goffice/graph/gog-style.c
trunk/goffice/graph/gog-style.h
trunk/goffice/graph/gog-styled-object.c
trunk/goffice/graph/gog-styled-object.h
trunk/goffice/graph/gog-theme.c
trunk/goffice/graph/gog-theme.h
trunk/goffice/graph/gog-trend-line.c
trunk/goffice/graph/gog-trend-line.h
trunk/goffice/graph/gog-view.c
trunk/goffice/graph/gog-view.h
trunk/goffice/gtk/go-3d-rotation-sel.c
trunk/goffice/gtk/go-3d-rotation-sel.h
trunk/goffice/gtk/go-action-combo-color.c
trunk/goffice/gtk/go-action-combo-color.h
trunk/goffice/gtk/go-action-combo-pixmaps.c
trunk/goffice/gtk/go-action-combo-pixmaps.h
trunk/goffice/gtk/go-action-combo-stack.c
trunk/goffice/gtk/go-action-combo-stack.h
trunk/goffice/gtk/go-action-combo-text.c
trunk/goffice/gtk/go-action-combo-text.h
trunk/goffice/gtk/go-charmap-sel.c
trunk/goffice/gtk/go-charmap-sel.h
trunk/goffice/gtk/go-color-group.c
trunk/goffice/gtk/go-color-group.h
trunk/goffice/gtk/go-color-palette.c
trunk/goffice/gtk/go-color-palette.h
trunk/goffice/gtk/go-combo-box.c
trunk/goffice/gtk/go-combo-box.h
trunk/goffice/gtk/go-combo-color.c
trunk/goffice/gtk/go-combo-color.h
trunk/goffice/gtk/go-combo-pixmaps.c
trunk/goffice/gtk/go-combo-pixmaps.h
trunk/goffice/gtk/go-combo-text.c
trunk/goffice/gtk/go-combo-text.h
trunk/goffice/gtk/go-font-sel.c
trunk/goffice/gtk/go-font-sel.h
trunk/goffice/gtk/go-format-sel.c
trunk/goffice/gtk/go-format-sel.h
trunk/goffice/gtk/go-graph-widget.c
trunk/goffice/gtk/go-graph-widget.h
trunk/goffice/gtk/go-locale-sel.c
trunk/goffice/gtk/go-locale-sel.h
trunk/goffice/gtk/go-rotation-sel.c
trunk/goffice/gtk/go-rotation-sel.h
trunk/goffice/math/go-distribution.c
trunk/goffice/math/go-distribution.h
trunk/goffice/ms-compat/god-drawing-ms-client-handler.h
trunk/goffice/ms-compat/god-drawing-ms.c
trunk/goffice/ms-compat/god-image-ms.c
trunk/goffice/ms-compat/god-image-ms.h
trunk/goffice/utils/go-geometry.h
trunk/goffice/utils/go-image.c
trunk/goffice/utils/go-image.h
trunk/goffice/utils/go-marker.c
trunk/goffice/utils/go-marker.h
trunk/goffice/utils/go-path.c
trunk/goffice/utils/go-path.h
trunk/goffice/utils/go-persist.c
trunk/goffice/utils/go-persist.h
trunk/goffice/utils/go-undo.c
trunk/goffice/utils/go-undo.h
trunk/goffice/utils/regutf8.c
trunk/goffice/utils/regutf8.h
trunk/plugins/plot_barcol/gog-1.5d.c
trunk/plugins/plot_barcol/gog-1.5d.h
trunk/plugins/plot_barcol/gog-barcol.c
trunk/plugins/plot_barcol/gog-barcol.h
trunk/plugins/plot_barcol/gog-dropbar.c
trunk/plugins/plot_barcol/gog-dropbar.h
trunk/plugins/plot_barcol/gog-line.c
trunk/plugins/plot_barcol/gog-line.h
trunk/plugins/plot_barcol/gog-minmax.c
trunk/plugins/plot_barcol/gog-minmax.h
trunk/plugins/plot_distrib/go-distribution-prefs.c
trunk/plugins/plot_distrib/gog-boxplot.c
trunk/plugins/plot_distrib/gog-boxplot.h
trunk/plugins/plot_distrib/gog-histogram.c
trunk/plugins/plot_distrib/gog-histogram.h
trunk/plugins/plot_distrib/gog-probability-plot.c
trunk/plugins/plot_distrib/gog-probability-plot.h
trunk/plugins/plot_pie/gog-pie.c
trunk/plugins/plot_pie/gog-pie.h
trunk/plugins/plot_radar/gog-radar.c
trunk/plugins/plot_radar/gog-radar.h
trunk/plugins/plot_surface/gog-contour.c
trunk/plugins/plot_surface/gog-contour.h
trunk/plugins/plot_surface/gog-surface.c
trunk/plugins/plot_surface/gog-surface.h
trunk/plugins/plot_surface/gog-xyz-surface.c
trunk/plugins/plot_surface/gog-xyz-surface.h
trunk/plugins/plot_surface/gog-xyz.c
trunk/plugins/plot_surface/gog-xyz.h
trunk/plugins/plot_surface/xl-surface.c
trunk/plugins/plot_xy/gog-xy.c
trunk/plugins/plot_xy/gog-xy.h
trunk/plugins/reg_linear/gog-exp-reg.c
trunk/plugins/reg_linear/gog-exp-reg.h
trunk/plugins/reg_linear/gog-lin-reg.c
trunk/plugins/reg_linear/gog-lin-reg.h
trunk/plugins/reg_linear/gog-log-reg.c
trunk/plugins/reg_linear/gog-log-reg.h
trunk/plugins/reg_linear/gog-polynom-reg.c
trunk/plugins/reg_linear/gog-polynom-reg.h
trunk/plugins/reg_linear/gog-power-reg.c
trunk/plugins/reg_linear/gog-power-reg.h
trunk/plugins/reg_logfit/gog-logfit.c
trunk/plugins/reg_logfit/gog-logfit.h
trunk/plugins/smoothing/gog-exp-smooth.c
trunk/plugins/smoothing/gog-exp-smooth.h
trunk/plugins/smoothing/gog-moving-avg.c
trunk/plugins/smoothing/gog-moving-avg.h
trunk/tests/go-demo.c
trunk/tests/pie-demo.c
Modified: trunk/goffice/app/file.c
==============================================================================
--- trunk/goffice/app/file.c (original)
+++ trunk/goffice/app/file.c Tue Apr 7 09:29:28 2009
@@ -40,7 +40,7 @@
{
GOFileOpener *fo;
- g_return_if_fail (IS_GO_FILE_OPENER (obj));
+ g_return_if_fail (GO_IS_FILE_OPENER (obj));
fo = GO_FILE_OPENER (obj);
g_free (fo->id);
@@ -128,7 +128,7 @@
GOFileOpenerProbeFunc probe_func,
GOFileOpenerOpenFunc open_func)
{
- g_return_if_fail (IS_GO_FILE_OPENER (fo));
+ g_return_if_fail (GO_IS_FILE_OPENER (fo));
fo->id = g_strdup (id);
fo->description = g_strdup (description);
@@ -207,7 +207,7 @@
gchar const *
go_file_opener_get_id (GOFileOpener const *fo)
{
- g_return_val_if_fail (IS_GO_FILE_OPENER (fo), NULL);
+ g_return_val_if_fail (GO_IS_FILE_OPENER (fo), NULL);
return fo->id;
}
@@ -215,7 +215,7 @@
gchar const *
go_file_opener_get_description (GOFileOpener const *fo)
{
- g_return_val_if_fail (IS_GO_FILE_OPENER (fo), NULL);
+ g_return_val_if_fail (GO_IS_FILE_OPENER (fo), NULL);
return fo->description;
}
@@ -223,7 +223,7 @@
gboolean
go_file_opener_is_encoding_dependent (GOFileOpener const *fo)
{
- g_return_val_if_fail (IS_GO_FILE_OPENER (fo), FALSE);
+ g_return_val_if_fail (GO_IS_FILE_OPENER (fo), FALSE);
return fo->encoding_dependent;
}
@@ -231,7 +231,7 @@
gboolean
go_file_opener_can_probe (GOFileOpener const *fo, FileProbeLevel pl)
{
- g_return_val_if_fail (IS_GO_FILE_OPENER (fo), FALSE);
+ g_return_val_if_fail (GO_IS_FILE_OPENER (fo), FALSE);
return GO_FILE_OPENER_METHOD (fo, can_probe) (fo, pl);
}
@@ -239,13 +239,13 @@
GSList const *
go_file_opener_get_suffixes (GOFileOpener const *fo)
{
- g_return_val_if_fail (IS_GO_FILE_OPENER (fo), NULL);
+ g_return_val_if_fail (GO_IS_FILE_OPENER (fo), NULL);
return fo->suffixes;
}
GSList const *
go_file_opener_get_mimes (GOFileOpener const *fo)
{
- g_return_val_if_fail (IS_GO_FILE_OPENER (fo), NULL);
+ g_return_val_if_fail (GO_IS_FILE_OPENER (fo), NULL);
return fo->mimes;
}
@@ -263,7 +263,7 @@
gboolean
go_file_opener_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
{
- g_return_val_if_fail (IS_GO_FILE_OPENER (fo), FALSE);
+ g_return_val_if_fail (GO_IS_FILE_OPENER (fo), FALSE);
g_return_val_if_fail (GSF_IS_INPUT (input), FALSE);
#if 0
@@ -293,7 +293,7 @@
IOContext *io_context,
gpointer FIXME_workbook_view, GsfInput *input)
{
- g_return_if_fail (IS_GO_FILE_OPENER (fo));
+ g_return_if_fail (GO_IS_FILE_OPENER (fo));
g_return_if_fail (GSF_IS_INPUT (input));
GO_FILE_OPENER_METHOD (fo, open) (fo, opt_enc, io_context,
@@ -322,7 +322,7 @@
{
GOFileSaver *fs;
- g_return_if_fail (IS_GO_FILE_SAVER (obj));
+ g_return_if_fail (GO_IS_FILE_SAVER (obj));
fs = GO_FILE_SAVER (obj);
g_free (fs->id);
@@ -510,7 +510,7 @@
g_param_spec_enum ("format-level",
_("Format Level"),
_(""),
- GO_FILE_SAVER_LEVEL_TYPE,
+ GO_TYPE_FILE_SAVER_LEVEL,
FILE_FL_NEW,
GSF_PARAM_STATIC |
G_PARAM_READWRITE));
@@ -521,7 +521,7 @@
g_param_spec_enum ("scope",
_("Scope"),
_("How much of a document is saved"),
- GO_FILE_SAVER_SCOPE_TYPE,
+ GO_TYPE_FILE_SAVER_SCOPE,
FILE_SAVE_WORKBOOK,
GSF_PARAM_STATIC |
G_PARAM_READWRITE));
@@ -537,7 +537,7 @@
NULL, NULL,
go__BOOLEAN__OBJECT_STRING_POINTER,
G_TYPE_BOOLEAN,
- 3, GO_DOC_TYPE, G_TYPE_STRING, G_TYPE_POINTER);
+ 3, GO_TYPE_DOC, G_TYPE_STRING, G_TYPE_POINTER);
}
GSF_CLASS (GOFileSaver, go_file_saver,
@@ -581,7 +581,7 @@
void
go_file_saver_set_save_scope (GOFileSaver *fs, FileSaveScope scope)
{
- g_return_if_fail (IS_GO_FILE_SAVER (fs));
+ g_return_if_fail (GO_IS_FILE_SAVER (fs));
g_return_if_fail (scope < FILE_SAVE_LAST);
fs->save_scope = scope;
@@ -590,7 +590,7 @@
FileSaveScope
go_file_saver_get_save_scope (GOFileSaver const *fs)
{
- g_return_val_if_fail (IS_GO_FILE_SAVER (fs), FILE_SAVE_WORKBOOK);
+ g_return_val_if_fail (GO_IS_FILE_SAVER (fs), FILE_SAVE_WORKBOOK);
return fs->save_scope;
}
@@ -598,7 +598,7 @@
gchar const *
go_file_saver_get_id (GOFileSaver const *fs)
{
- g_return_val_if_fail (IS_GO_FILE_SAVER (fs), NULL);
+ g_return_val_if_fail (GO_IS_FILE_SAVER (fs), NULL);
return fs->id;
}
@@ -606,7 +606,7 @@
gchar const *
go_file_saver_get_mime_type (GOFileSaver const *fs)
{
- g_return_val_if_fail (IS_GO_FILE_SAVER (fs), NULL);
+ g_return_val_if_fail (GO_IS_FILE_SAVER (fs), NULL);
return fs->mime_type;
}
@@ -614,7 +614,7 @@
gchar const *
go_file_saver_get_extension (GOFileSaver const *fs)
{
- g_return_val_if_fail (IS_GO_FILE_SAVER (fs), NULL);
+ g_return_val_if_fail (GO_IS_FILE_SAVER (fs), NULL);
return fs->extension;
}
@@ -622,7 +622,7 @@
gchar const *
go_file_saver_get_description (GOFileSaver const *fs)
{
- g_return_val_if_fail (IS_GO_FILE_SAVER (fs), NULL);
+ g_return_val_if_fail (GO_IS_FILE_SAVER (fs), NULL);
return fs->description;
}
@@ -630,7 +630,7 @@
FileFormatLevel
go_file_saver_get_format_level (GOFileSaver const *fs)
{
- g_return_val_if_fail (IS_GO_FILE_SAVER (fs), FILE_FL_NEW);
+ g_return_val_if_fail (GO_IS_FILE_SAVER (fs), FILE_FL_NEW);
return fs->format_level;
}
@@ -666,7 +666,7 @@
gconstpointer FIXME_workbook_view,
GsfOutput *output)
{
- g_return_if_fail (IS_GO_FILE_SAVER (fs));
+ g_return_if_fail (GO_IS_FILE_SAVER (fs));
g_return_if_fail (GSF_IS_OUTPUT (output));
if (GSF_IS_OUTPUT_STDIO (output)) {
@@ -719,7 +719,7 @@
void
go_file_saver_set_overwrite_files (GOFileSaver *fs, gboolean overwrite)
{
- g_return_if_fail (IS_GO_FILE_SAVER (fs));
+ g_return_if_fail (GO_IS_FILE_SAVER (fs));
fs->overwrite_files = overwrite;
}
@@ -804,7 +804,7 @@
gint pos;
gchar const *id;
- g_return_if_fail (IS_GO_FILE_OPENER (fo));
+ g_return_if_fail (GO_IS_FILE_OPENER (fo));
g_return_if_fail (priority >=0 && priority <= 100);
pos = go_list_index_custom (file_opener_priority_list,
@@ -839,7 +839,7 @@
GList *l;
gchar const *id;
- g_return_if_fail (IS_GO_FILE_OPENER (fo));
+ g_return_if_fail (GO_IS_FILE_OPENER (fo));
pos = g_list_index (file_opener_list, fo);
g_return_if_fail (pos != -1);
@@ -882,7 +882,7 @@
{
gchar const *id;
- g_return_if_fail (IS_GO_FILE_SAVER (fs));
+ g_return_if_fail (GO_IS_FILE_SAVER (fs));
file_saver_list = g_list_prepend (file_saver_list, fs);
g_object_ref (G_OBJECT (fs));
@@ -912,7 +912,7 @@
{
DefaultFileSaver *dfs;
- g_return_if_fail (IS_GO_FILE_SAVER (fs));
+ g_return_if_fail (GO_IS_FILE_SAVER (fs));
g_return_if_fail (priority >=0 && priority <= 100);
go_file_saver_register (fs);
@@ -939,7 +939,7 @@
GList *l;
gchar const *id;
- g_return_if_fail (IS_GO_FILE_SAVER (fs));
+ g_return_if_fail (GO_IS_FILE_SAVER (fs));
l = g_list_find (file_saver_list, fs);
g_return_if_fail (l != NULL);
Modified: trunk/goffice/app/file.h
==============================================================================
--- trunk/goffice/app/file.h (original)
+++ trunk/goffice/app/file.h Tue Apr 7 09:29:28 2009
@@ -22,7 +22,7 @@
FILE_FL_LAST
} FileFormatLevel;
GType go_file_saver_level_get_type (void);
-#define GO_FILE_SAVER_LEVEL_TYPE (go_file_saver_level_get_type ())
+#define GO_TYPE_FILE_SAVER_LEVEL (go_file_saver_level_get_type ())
/*
* FileSaveScope specifies what information file saver can save in a file.
@@ -36,7 +36,7 @@
FILE_SAVE_LAST
} FileSaveScope;
GType go_file_saver_scope_get_type (void);
-#define GO_FILE_SAVER_SCOPE_TYPE (go_file_saver_scope_get_type ())
+#define GO_TYPE_FILE_SAVER_SCOPE (go_file_saver_scope_get_type ())
/*
* GOFileOpener
@@ -46,7 +46,7 @@
#define TYPE_GO_FILE_OPENER (go_file_opener_get_type ())
#define GO_FILE_OPENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GO_FILE_OPENER, GOFileOpener))
-#define IS_GO_FILE_OPENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_FILE_OPENER))
+#define GO_IS_FILE_OPENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_FILE_OPENER))
typedef gboolean (*GOFileOpenerProbeFunc) (GOFileOpener const *fo,
GsfInput *input,
@@ -101,7 +101,7 @@
#define TYPE_GO_FILE_SAVER (go_file_saver_get_type ())
#define GO_FILE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GO_FILE_SAVER, GOFileSaver))
-#define IS_GO_FILE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_FILE_SAVER))
+#define GO_IS_FILE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_FILE_SAVER))
typedef void (*GOFileSaverSaveFunc) (GOFileSaver const *fs,
IOContext *io_context,
Modified: trunk/goffice/app/go-app.h
==============================================================================
--- trunk/goffice/app/go-app.h (original)
+++ trunk/goffice/app/go-app.h Tue Apr 7 09:29:28 2009
@@ -26,9 +26,9 @@
G_BEGIN_DECLS
-#define GO_APP_TYPE (go_app_get_type ())
-#define GO_APP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_APP_TYPE, GOApp))
-#define IS_GO_APP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_APP_TYPE))
+#define GO_TYPE_APP (go_app_get_type ())
+#define GO_APP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_APP, GOApp))
+#define GO_IS_APP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_APP))
GType go_app_get_type (void);
Modified: trunk/goffice/app/go-cmd-context-impl.h
==============================================================================
--- trunk/goffice/app/go-cmd-context-impl.h (original)
+++ trunk/goffice/app/go-cmd-context-impl.h Tue Apr 7 09:29:28 2009
@@ -21,8 +21,8 @@
void (*progress_message_set) (GOCmdContext *gcc, gchar const *msg);
} GOCmdContextClass;
-#define GO_CMD_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GO_CMD_CONTEXT_TYPE, GOCmdContextClass))
-#define IS_GO_CMD_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GO_CMD_CONTEXT_TYPE))
+#define GO_CMD_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GO_TYPE_CMD_CONTEXT, GOCmdContextClass))
+#define GO_IS_CMD_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GO_TYPE_CMD_CONTEXT))
/* protected, these do not really belong here, they are associated with io-context */
void go_cmd_context_progress_set (GOCmdContext *gcc, float f);
Modified: trunk/goffice/app/go-cmd-context.c
==============================================================================
--- trunk/goffice/app/go-cmd-context.c (original)
+++ trunk/goffice/app/go-cmd-context.c Tue Apr 7 09:29:28 2009
@@ -12,7 +12,7 @@
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
-#define GCC_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_CMD_CONTEXT_TYPE, GOCmdContextClass))
+#define GCC_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_TYPE_CMD_CONTEXT, GOCmdContextClass))
static GError *
format_message (GQuark id, char const *message)
@@ -24,14 +24,14 @@
void
go_cmd_context_error (GOCmdContext *context, GError *err)
{
- g_return_if_fail (IS_GO_CMD_CONTEXT (context));
+ g_return_if_fail (GO_IS_CMD_CONTEXT (context));
GCC_CLASS (context)->error.error (context, err);
}
void
go_cmd_context_error_info (GOCmdContext *context, ErrorInfo *stack)
{
- g_return_if_fail (IS_GO_CMD_CONTEXT (context));
+ g_return_if_fail (GO_IS_CMD_CONTEXT (context));
GCC_CLASS (context)->error.error_info (context, stack);
}
@@ -103,7 +103,7 @@
void
go_cmd_context_progress_set (GOCmdContext *context, gfloat f)
{
- g_return_if_fail (IS_GO_CMD_CONTEXT (context));
+ g_return_if_fail (GO_IS_CMD_CONTEXT (context));
GCC_CLASS (context)->progress_set (context, f);
}
@@ -111,7 +111,7 @@
void
go_cmd_context_progress_message_set (GOCmdContext *context, gchar const *msg)
{
- g_return_if_fail (IS_GO_CMD_CONTEXT (context));
+ g_return_if_fail (GO_IS_CMD_CONTEXT (context));
if (msg == NULL)
msg = " ";
@@ -121,7 +121,7 @@
char *
go_cmd_context_get_password (GOCmdContext *cc, char const *filename)
{
- g_return_val_if_fail (IS_GO_CMD_CONTEXT (cc), NULL);
+ g_return_val_if_fail (GO_IS_CMD_CONTEXT (cc), NULL);
return GCC_CLASS (cc)->get_password (cc, filename);
}
@@ -129,7 +129,7 @@
void
go_cmd_context_set_sensitive (GOCmdContext *cc, gboolean sensitive)
{
- g_return_if_fail (IS_GO_CMD_CONTEXT (cc));
+ g_return_if_fail (GO_IS_CMD_CONTEXT (cc));
GCC_CLASS (cc)->set_sensitive (cc, sensitive);
}
Modified: trunk/goffice/app/go-cmd-context.h
==============================================================================
--- trunk/goffice/app/go-cmd-context.h (original)
+++ trunk/goffice/app/go-cmd-context.h Tue Apr 7 09:29:28 2009
@@ -26,9 +26,9 @@
G_BEGIN_DECLS
-#define GO_CMD_CONTEXT_TYPE (go_cmd_context_get_type ())
-#define GO_CMD_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_CMD_CONTEXT_TYPE, GOCmdContext))
-#define IS_GO_CMD_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_CMD_CONTEXT_TYPE))
+#define GO_TYPE_CMD_CONTEXT (go_cmd_context_get_type ())
+#define GO_CMD_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_CMD_CONTEXT, GOCmdContext))
+#define GO_IS_CMD_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_CMD_CONTEXT))
GType go_cmd_context_get_type (void);
Modified: trunk/goffice/app/go-doc-control-impl.h
==============================================================================
--- trunk/goffice/app/go-doc-control-impl.h (original)
+++ trunk/goffice/app/go-doc-control-impl.h Tue Apr 7 09:29:28 2009
@@ -35,9 +35,9 @@
GObjectClass base;
} GODocControlClass;
-#define GO_DOC_CONTROL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_DOC_CONTROL_TYPE, GODocControlClass))
-#define IS_GO_DOC_CONTROL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_DOC_CONTROL_TYPE))
-#define GO_DOC_CONTROL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_DOC_CONTROL_TYPE, GODocControlClass))
+#define GO_DOC_CONTROL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_DOC_CONTROL, GODocControlClass))
+#define GO_IS_DOC_CONTROL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_DOC_CONTROL))
+#define GO_DOC_CONTROL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_TYPE_DOC_CONTROL, GODocControlClass))
G_END_DECLS
Modified: trunk/goffice/app/go-doc-control.h
==============================================================================
--- trunk/goffice/app/go-doc-control.h (original)
+++ trunk/goffice/app/go-doc-control.h Tue Apr 7 09:29:28 2009
@@ -26,9 +26,9 @@
G_BEGIN_DECLS
-#define GO_DOC_CONTROL_TYPE (go_doc_control_get_type ())
-#define GO_DOC_CONTROL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DOC_CONTROL_TYPE, GODocControl))
-#define IS_GO_DOC_CONTROL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DOC_CONTROL_TYPE))
+#define GO_TYPE_DOC_CONTROL (go_doc_control_get_type ())
+#define GO_DOC_CONTROL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DOC_CONTROL, GODocControl))
+#define GO_IS_DOC_CONTROL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DOC_CONTROL))
typedef enum {
GO_DOC_CONTROL_STATE_NORMAL = 0,
Modified: trunk/goffice/app/go-doc-impl.h
==============================================================================
--- trunk/goffice/app/go-doc-impl.h (original)
+++ trunk/goffice/app/go-doc-impl.h Tue Apr 7 09:29:28 2009
@@ -46,9 +46,9 @@
} meta_data;
} GODocClass;
-#define GO_DOC_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_DOC_TYPE, GODocClass))
-#define IS_GO_DOC_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_DOC_TYPE))
-#define GO_DOC_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_DOC_TYPE, GODocClass))
+#define GO_DOC_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_DOC, GODocClass))
+#define GO_IS_DOC_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_DOC))
+#define GO_DOC_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_TYPE_DOC, GODocClass))
G_END_DECLS
Modified: trunk/goffice/app/go-doc.c
==============================================================================
--- trunk/goffice/app/go-doc.c (original)
+++ trunk/goffice/app/go-doc.c Tue Apr 7 09:29:28 2009
@@ -131,13 +131,13 @@
FALSE, GSF_PARAM_STATIC | G_PARAM_READWRITE));
signals [METADATA_UPDATE] = g_signal_new ("metadata-update",
- GO_DOC_TYPE, G_SIGNAL_RUN_LAST,
+ GO_TYPE_DOC, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GODocClass, meta_data.update),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, G_TYPE_NONE);
signals [METADATA_CHANGED] = g_signal_new ("metadata-changed",
- GO_DOC_TYPE, G_SIGNAL_RUN_LAST,
+ GO_TYPE_DOC, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GODocClass, meta_data.changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
@@ -179,7 +179,7 @@
char const *
go_doc_get_uri (GODoc const *doc)
{
- g_return_val_if_fail (IS_GO_DOC (doc), NULL);
+ g_return_val_if_fail (GO_IS_DOC (doc), NULL);
return doc->uri;
}
@@ -194,7 +194,7 @@
void
go_doc_set_dirty (GODoc *doc, gboolean is_dirty)
{
- g_return_if_fail (IS_GO_DOC (doc));
+ g_return_if_fail (GO_IS_DOC (doc));
is_dirty = !!is_dirty;
if (is_dirty == doc->modified)
@@ -216,7 +216,7 @@
gboolean
go_doc_is_dirty (GODoc const *doc)
{
- g_return_val_if_fail (IS_GO_DOC (doc), FALSE);
+ g_return_val_if_fail (GO_IS_DOC (doc), FALSE);
return doc->modified;
}
@@ -233,7 +233,7 @@
gboolean
go_doc_is_pristine (GODoc const *doc)
{
- g_return_val_if_fail (IS_GO_DOC (doc), FALSE);
+ g_return_val_if_fail (GO_IS_DOC (doc), FALSE);
#if 0
if (doc->names ||
@@ -247,7 +247,7 @@
GsfDocMetaData *
go_doc_get_meta_data (GODoc const *doc)
{
- g_return_val_if_fail (IS_GO_DOC (doc), NULL);
+ g_return_val_if_fail (GO_IS_DOC (doc), NULL);
return doc->meta_data;
}
@@ -261,7 +261,7 @@
void
go_doc_set_meta_data (GODoc *doc, GsfDocMetaData *data)
{
- g_return_if_fail (IS_GO_DOC (doc));
+ g_return_if_fail (GO_IS_DOC (doc));
g_object_ref (data);
g_object_unref (doc->meta_data);
@@ -281,7 +281,7 @@
void
go_doc_update_meta_data (GODoc *doc)
{
- g_return_if_fail (IS_GO_DOC (doc));
+ g_return_if_fail (GO_IS_DOC (doc));
/* update linked properties and automatic content */
g_signal_emit (G_OBJECT (doc), signals [METADATA_UPDATE], 0);
@@ -490,7 +490,7 @@
{
GOImage *image = g_hash_table_lookup (doc->imagebuf, id);
if (!image) {
- image = g_object_new (GO_IMAGE_TYPE, NULL);
+ image = g_object_new (GO_TYPE_IMAGE, NULL);
go_image_set_name (image, id);
g_hash_table_insert (doc->imagebuf, (gpointer) go_image_get_name (image), image);
}
Modified: trunk/goffice/app/go-doc.h
==============================================================================
--- trunk/goffice/app/go-doc.h (original)
+++ trunk/goffice/app/go-doc.h Tue Apr 7 09:29:28 2009
@@ -28,9 +28,9 @@
G_BEGIN_DECLS
-#define GO_DOC_TYPE (go_doc_get_type ())
-#define GO_DOC(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DOC_TYPE, GODoc))
-#define IS_GO_DOC(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DOC_TYPE))
+#define GO_TYPE_DOC (go_doc_get_type ())
+#define GO_DOC(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DOC, GODoc))
+#define GO_IS_DOC(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DOC))
GType go_doc_get_type (void);
Modified: trunk/goffice/app/go-object.c
==============================================================================
--- trunk/goffice/app/go-object.c (original)
+++ trunk/goffice/app/go-object.c Tue Apr 7 09:29:28 2009
@@ -63,19 +63,19 @@
GSF_CLASS (GOServiceObject, go_service_object,
go_service_object_class_init, NULL,
- GO_SERVICE_TYPE)
+ GO_TYPE_SERVICE)
char const *
go_service_object_primary_type (GOServiceObject const *service)
{
- g_return_val_if_fail (IS_GO_SERVICE_OBJECT (service), NULL);
+ g_return_val_if_fail (GO_IS_SERVICE_OBJECT (service), NULL);
return service->primary_type;
}
GSList const *
go_service_object_interfaces (GOServiceObject const *service)
{
- g_return_val_if_fail (IS_GO_SERVICE_OBJECT (service), NULL);
+ g_return_val_if_fail (GO_IS_SERVICE_OBJECT (service), NULL);
return service->interfaces;
}
Modified: trunk/goffice/app/go-object.h
==============================================================================
--- trunk/goffice/app/go-object.h (original)
+++ trunk/goffice/app/go-object.h Tue Apr 7 09:29:28 2009
@@ -31,9 +31,9 @@
/*****************************************************************************/
-#define GO_SERVICE_OBJECT_TYPE (go_service_object_get_type ())
-#define GO_SERVICE_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_SERVICE_OBJECT_TYPE, GOServiceObject))
-#define IS_GO_SERVICE_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_SERVICE_OBJECT_TYPE))
+#define GO_TYPE_SERVICE_OBJECT (go_service_object_get_type ())
+#define GO_SERVICE_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_SERVICE_OBJECT, GOServiceObject))
+#define GO_IS_SERVICE_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_SERVICE_OBJECT))
typedef struct _GOServiceObject GOServiceObject;
GType go_service_object_get_type (void);
Modified: trunk/goffice/app/go-plugin-loader-module.c
==============================================================================
--- trunk/goffice/app/go-plugin-loader-module.c (original)
+++ trunk/goffice/app/go-plugin-loader-module.c Tue Apr 7 09:29:28 2009
@@ -161,7 +161,7 @@
static void
go_plugin_loader_module_init (GOPluginLoaderModule *loader_module)
{
- g_return_if_fail (IS_GO_PLUGIN_LOADER_MODULE (loader_module));
+ g_return_if_fail (GO_IS_PLUGIN_LOADER_MODULE (loader_module));
loader_module->module_file_name = NULL;
loader_module->handle = NULL;
@@ -197,7 +197,7 @@
GSF_CLASS_FULL (GOPluginLoaderModule, go_plugin_loader_module,
NULL, NULL, go_plugin_loader_module_class_init, NULL,
go_plugin_loader_module_init, G_TYPE_OBJECT, 0,
- GSF_INTERFACE (go_plugin_loader_init, GO_PLUGIN_LOADER_TYPE))
+ GSF_INTERFACE (go_plugin_loader_init, GO_TYPE_PLUGIN_LOADER))
/*
* Service - file_opener
@@ -217,7 +217,7 @@
{
ServiceLoaderDataFileOpener *loader_data;
- g_return_val_if_fail (IS_GO_PLUGIN_SERVICE_FILE_OPENER (service), FALSE);
+ g_return_val_if_fail (GO_IS_PLUGIN_SERVICE_FILE_OPENER (service), FALSE);
g_return_val_if_fail (input != NULL, FALSE);
loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
@@ -232,7 +232,7 @@
{
ServiceLoaderDataFileOpener *loader_data;
- g_return_if_fail (IS_GO_PLUGIN_SERVICE_FILE_OPENER (service));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE_FILE_OPENER (service));
g_return_if_fail (input != NULL);
loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
@@ -267,7 +267,7 @@
gchar *func_name_file_probe, *func_name_file_open;
gpointer module_func_file_probe = NULL, module_func_file_open = NULL;
- g_return_if_fail (IS_GO_PLUGIN_SERVICE_FILE_OPENER (service));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE_FILE_OPENER (service));
GO_INIT_RET_ERROR_INFO (ret_error);
func_name_file_probe = make_function_name (service, "_file_probe");
@@ -316,7 +316,7 @@
{
ServiceLoaderDataFileSaver *loader_data;
- g_return_if_fail (IS_GO_PLUGIN_SERVICE_FILE_SAVER (service));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE_FILE_SAVER (service));
g_return_if_fail (GSF_IS_OUTPUT (output));
loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
@@ -333,7 +333,7 @@
gchar *func_name_file_save;
gpointer module_func_file_save = NULL;
- g_return_if_fail (IS_GO_PLUGIN_SERVICE_FILE_SAVER (service));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE_FILE_SAVER (service));
GO_INIT_RET_ERROR_INFO (ret_error);
func_name_file_save = make_function_name (service, "_file_save");
@@ -376,7 +376,7 @@
ErrorInfo *error = NULL;
GType loader_type;
- g_return_val_if_fail (IS_GO_PLUGIN_SERVICE_PLUGIN_LOADER (service), 0);
+ g_return_val_if_fail (GO_IS_PLUGIN_SERVICE_PLUGIN_LOADER (service), 0);
GO_INIT_RET_ERROR_INFO (ret_error);
loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
@@ -398,7 +398,7 @@
gchar *func_name_get_loader_type;
gpointer module_func_get_loader_type = NULL;
- g_return_if_fail (IS_GO_PLUGIN_SERVICE_PLUGIN_LOADER (service));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE_PLUGIN_LOADER (service));
GO_INIT_RET_ERROR_INFO (ret_error);
func_name_get_loader_type =
Modified: trunk/goffice/app/go-plugin-loader-module.h
==============================================================================
--- trunk/goffice/app/go-plugin-loader-module.h (original)
+++ trunk/goffice/app/go-plugin-loader-module.h Tue Apr 7 09:29:28 2009
@@ -7,11 +7,11 @@
G_BEGIN_DECLS
-#define GO_PLUGIN_LOADER_MODULE_TYPE (go_plugin_loader_module_get_type ())
-#define GO_PLUGIN_LOADER_MODULE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_LOADER_MODULE_TYPE, GOPluginLoaderModule))
-#define IS_GO_PLUGIN_LOADER_MODULE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_LOADER_MODULE_TYPE))
-#define GO_PLUGIN_LOADER_MODULE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_PLUGIN_LOADER_MODULE_TYPE, GOPluginLoaderModuleClass))
-#define IS_GO_PLUGIN_LOADER_MODULE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_PLUGIN_LOADER_MODULE_TYPE))
+#define GO_TYPE_PLUGIN_LOADER_MODULE (go_plugin_loader_module_get_type ())
+#define GO_PLUGIN_LOADER_MODULE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_LOADER_MODULE, GOPluginLoaderModule))
+#define GO_IS_PLUGIN_LOADER_MODULE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_LOADER_MODULE))
+#define GO_PLUGIN_LOADER_MODULE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_PLUGIN_LOADER_MODULE, GOPluginLoaderModuleClass))
+#define GO_IS_PLUGIN_LOADER_MODULE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_PLUGIN_LOADER_MODULE))
typedef struct {
GObject base;
Modified: trunk/goffice/app/go-plugin-loader.c
==============================================================================
--- trunk/goffice/app/go-plugin-loader.c (original)
+++ trunk/goffice/app/go-plugin-loader.c Tue Apr 7 09:29:28 2009
@@ -15,7 +15,7 @@
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
-#define PL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_PLUGIN_LOADER_TYPE, GOPluginLoaderClass))
+#define PL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_TYPE_PLUGIN_LOADER, GOPluginLoaderClass))
gboolean
go_plugin_loader_is_base_loaded (GOPluginLoader *loader)
@@ -38,7 +38,7 @@
go_plugin_loader_set_attributes (GOPluginLoader *loader, GHashTable *attrs,
ErrorInfo **err)
{
- g_return_if_fail (IS_GO_PLUGIN_LOADER (loader));
+ g_return_if_fail (GO_IS_PLUGIN_LOADER (loader));
GO_INIT_RET_ERROR_INFO (err);
if (PL_GET_CLASS (loader)->set_attributes)
@@ -52,7 +52,7 @@
{
GOPluginLoaderClass *go_plugin_loader_class;
- g_return_if_fail (IS_GO_PLUGIN_LOADER (loader));
+ g_return_if_fail (GO_IS_PLUGIN_LOADER (loader));
g_return_if_fail (!go_plugin_loader_is_base_loaded (loader));
go_plugin_loader_class = PL_GET_CLASS (loader);
@@ -69,7 +69,7 @@
{
GOPluginLoaderClass *go_plugin_loader_class;
- g_return_if_fail (IS_GO_PLUGIN_LOADER (loader));
+ g_return_if_fail (GO_IS_PLUGIN_LOADER (loader));
go_plugin_loader_class = PL_GET_CLASS (loader);
if (go_plugin_loader_class->unload_base != NULL) {
@@ -85,8 +85,8 @@
GOPluginLoaderClass *klass;
void (*load_service_method) (GOPluginLoader *, GOPluginService *, ErrorInfo **) = NULL;
- g_return_if_fail (IS_GO_PLUGIN_LOADER (l));
- g_return_if_fail (IS_GO_PLUGIN_SERVICE (s));
+ g_return_if_fail (GO_IS_PLUGIN_LOADER (l));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE (s));
g_return_if_fail (go_plugin_loader_is_base_loaded (l));
GO_INIT_RET_ERROR_INFO (err);
@@ -95,13 +95,13 @@
if (klass->service_load && (klass->service_load) (l, s, err))
return;
- if (IS_GO_PLUGIN_SERVICE_FILE_OPENER (s)) {
+ if (GO_IS_PLUGIN_SERVICE_FILE_OPENER (s)) {
load_service_method = klass->load_service_file_opener;
- } else if (IS_GO_PLUGIN_SERVICE_FILE_SAVER (s)) {
+ } else if (GO_IS_PLUGIN_SERVICE_FILE_SAVER (s)) {
load_service_method = klass->load_service_file_saver;
- } else if (IS_GO_PLUGIN_SERVICE_PLUGIN_LOADER (s)) {
+ } else if (GO_IS_PLUGIN_SERVICE_PLUGIN_LOADER (s)) {
load_service_method = klass->load_service_plugin_loader;
- } else if (IS_GO_PLUGIN_SERVICE_SIMPLE (s)) {
+ } else if (GO_IS_PLUGIN_SERVICE_SIMPLE (s)) {
load_service_method = NULL;
} else {
*err = error_info_new_printf (_("Service '%s' not supported by l."),
@@ -124,8 +124,8 @@
void (*unload_service_method) (GOPluginLoader *, GOPluginService *, ErrorInfo **) = NULL;
ErrorInfo *error = NULL;
- g_return_if_fail (IS_GO_PLUGIN_LOADER (l));
- g_return_if_fail (IS_GO_PLUGIN_SERVICE (s));
+ g_return_if_fail (GO_IS_PLUGIN_LOADER (l));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE (s));
GO_INIT_RET_ERROR_INFO (err);
@@ -133,13 +133,13 @@
if (klass->service_unload && (klass->service_unload) (l, s, err))
return;
- if (IS_GO_PLUGIN_SERVICE_FILE_OPENER (s)) {
+ if (GO_IS_PLUGIN_SERVICE_FILE_OPENER (s)) {
unload_service_method = klass->unload_service_file_opener;
- } else if (IS_GO_PLUGIN_SERVICE_FILE_SAVER (s)) {
+ } else if (GO_IS_PLUGIN_SERVICE_FILE_SAVER (s)) {
unload_service_method = klass->unload_service_file_saver;
- } else if (IS_GO_PLUGIN_SERVICE_PLUGIN_LOADER (s)) {
+ } else if (GO_IS_PLUGIN_SERVICE_PLUGIN_LOADER (s)) {
unload_service_method = klass->unload_service_plugin_loader;
- } else if (IS_GO_PLUGIN_SERVICE_SIMPLE (s)) {
+ } else if (GO_IS_PLUGIN_SERVICE_SIMPLE (s)) {
unload_service_method = NULL;
} else
*err = error_info_new_printf (_("Service '%s' not supported by l."),
Modified: trunk/goffice/app/go-plugin-loader.h
==============================================================================
--- trunk/goffice/app/go-plugin-loader.h (original)
+++ trunk/goffice/app/go-plugin-loader.h Tue Apr 7 09:29:28 2009
@@ -9,11 +9,11 @@
G_BEGIN_DECLS
-#define GO_PLUGIN_LOADER_TYPE (go_plugin_loader_get_type ())
-#define GO_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_LOADER_TYPE, GOPluginLoader))
-#define IS_GO_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_LOADER_TYPE))
-#define GO_PLUGIN_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_PLUGIN_LOADER_TYPE, GOPluginLoaderClass))
-#define IS_GO_PLUGIN_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_PLUGIN_LOADER_TYPE))
+#define GO_TYPE_PLUGIN_LOADER (go_plugin_loader_get_type ())
+#define GO_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_LOADER, GOPluginLoader))
+#define GO_IS_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_LOADER))
+#define GO_PLUGIN_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_PLUGIN_LOADER, GOPluginLoaderClass))
+#define GO_IS_PLUGIN_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_PLUGIN_LOADER))
typedef struct {
GTypeInterface base;
Modified: trunk/goffice/app/go-plugin-service-impl.h
==============================================================================
--- trunk/goffice/app/go-plugin-service-impl.h (original)
+++ trunk/goffice/app/go-plugin-service-impl.h Tue Apr 7 09:29:28 2009
@@ -53,7 +53,7 @@
char *(*get_description) (GOPluginService *service);
} GOPluginServiceClass;
-#define GPS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_PLUGIN_SERVICE_TYPE, GOPluginServiceClass))
+#define GPS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_PLUGIN_SERVICE, GOPluginServiceClass))
#define GPS_GET_CLASS(o) GPS_CLASS (G_OBJECT_GET_CLASS (o))
typedef struct{
@@ -65,7 +65,7 @@
GOPluginService plugin_service;
};
-#define GPS_GOBJECT_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_PLUGIN_SERVICE_TYPE, PluginServiceGObjectLoaderClass))
+#define GPS_GOBJECT_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GO_TYPE_PLUGIN_SERVICE, PluginServiceGObjectLoaderClass))
#define GPS_GOBJECT_LOADER_GET_CLASS(o) GPS_GOBJECT_LOADER_CLASS (G_OBJECT_GET_CLASS (o))
typedef struct{
Modified: trunk/goffice/app/go-plugin-service.c
==============================================================================
--- trunk/goffice/app/go-plugin-service.c (original)
+++ trunk/goffice/app/go-plugin-service.c Tue Apr 7 09:29:28 2009
@@ -180,7 +180,7 @@
GSF_CLASS (PluginServiceGeneral, plugin_service_general,
plugin_service_general_class_init, plugin_service_general_init,
- GO_PLUGIN_SERVICE_TYPE)
+ GO_TYPE_PLUGIN_SERVICE)
/****************************************************************************/
@@ -248,7 +248,7 @@
service_file_opener->opener = NULL;
}
- parent_class = g_type_class_peek (GO_PLUGIN_SERVICE_TYPE);
+ parent_class = g_type_class_peek (GO_TYPE_PLUGIN_SERVICE);
parent_class->finalize (obj);
}
@@ -365,7 +365,7 @@
GSF_CLASS (PluginServiceFileOpener, plugin_service_file_opener,
plugin_service_file_opener_class_init, plugin_service_file_opener_init,
- GO_PLUGIN_SERVICE_TYPE)
+ GO_TYPE_PLUGIN_SERVICE)
/** GOPluginFileOpener class **/
@@ -373,7 +373,7 @@
#define TYPE_GO_PLUGIN_FILE_OPENER (go_plugin_file_opener_get_type ())
#define GO_PLUGIN_FILE_OPENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GO_PLUGIN_FILE_OPENER, GOPluginFileOpener))
#define GO_PLUGIN_FILE_OPENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GO_PLUGIN_FILE_OPENER, GOPluginFileOpenerClass))
-#define IS_GO_PLUGIN_FILE_OPENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_PLUGIN_FILE_OPENER))
+#define GO_IS_PLUGIN_FILE_OPENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_PLUGIN_FILE_OPENER))
GType go_plugin_file_opener_get_type (void);
@@ -576,7 +576,7 @@
if (service_file_saver->saver != NULL)
g_object_unref (service_file_saver->saver);
- parent_class = g_type_class_peek (GO_PLUGIN_SERVICE_TYPE);
+ parent_class = g_type_class_peek (GO_TYPE_PLUGIN_SERVICE);
parent_class->finalize (obj);
}
@@ -623,14 +623,14 @@
psfs->description = description;
(void)xml_node_get_enum (tree, "format_level",
- GO_FILE_SAVER_LEVEL_TYPE, &level);
+ GO_TYPE_FILE_SAVER_LEVEL, &level);
psfs->format_level = (FileFormatLevel)level;
if (!xml_node_get_int (tree, "default_saver_priority", &(psfs->default_saver_priority)))
psfs->default_saver_priority = -1;
(void)xml_node_get_enum (tree, "save_scope",
- GO_FILE_SAVER_SCOPE_TYPE, &scope);
+ GO_TYPE_FILE_SAVER_SCOPE, &scope);
psfs->save_scope = (FileSaveScope)scope;
if (!xml_node_get_bool (tree, "overwrite_files", &(psfs->overwrite_files)))
@@ -696,7 +696,7 @@
GSF_CLASS (PluginServiceFileSaver, plugin_service_file_saver,
plugin_service_file_saver_class_init, plugin_service_file_saver_init,
- GO_PLUGIN_SERVICE_TYPE)
+ GO_TYPE_PLUGIN_SERVICE)
/** GOPluginFileSaver class **/
@@ -704,7 +704,7 @@
#define TYPE_GO_PLUGIN_FILE_SAVER (go_plugin_file_saver_get_type ())
#define GO_PLUGIN_FILE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GO_PLUGIN_FILE_SAVER, GOPluginFileSaver))
#define GO_PLUGIN_FILE_SAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GO_PLUGIN_FILE_SAVER, GOPluginFileSaverClass))
-#define IS_GO_PLUGIN_FILE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_PLUGIN_FILE_SAVER))
+#define GO_IS_PLUGIN_FILE_SAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GO_PLUGIN_FILE_SAVER))
GType go_plugin_file_saver_get_type (void);
@@ -878,7 +878,7 @@
GSF_CLASS (PluginServicePluginLoader, plugin_service_plugin_loader,
plugin_service_plugin_loader_class_init, plugin_service_plugin_loader_init,
- GO_PLUGIN_SERVICE_TYPE)
+ GO_TYPE_PLUGIN_SERVICE)
/**************************************************************************
* PluginServiceGObjectLoader
@@ -912,7 +912,7 @@
GSF_CLASS (PluginServiceGObjectLoader, plugin_service_gobject_loader,
plugin_service_gobject_loader_class_init, NULL,
- GO_PLUGIN_SERVICE_SIMPLE_TYPE)
+ GO_TYPE_PLUGIN_SERVICE_SIMPLE)
/**************************************************************************
* PluginServiceSimple
@@ -942,14 +942,14 @@
GSF_CLASS (PluginServiceSimple, plugin_service_simple,
plugin_service_simple_class_init,
NULL,
- GO_PLUGIN_SERVICE_TYPE)
+ GO_TYPE_PLUGIN_SERVICE)
/* ---------------------------------------------------------------------- */
void
plugin_service_load (GOPluginService *service, ErrorInfo **ret_error)
{
- g_return_if_fail (IS_GO_PLUGIN_SERVICE (service));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE (service));
GO_INIT_RET_ERROR_INFO (ret_error);
@@ -965,7 +965,7 @@
{
ErrorInfo *error = NULL;
- g_return_if_fail (IS_GO_PLUGIN_SERVICE (service));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE (service));
GO_INIT_RET_ERROR_INFO (ret_error);
if (!service->is_loaded) {
@@ -987,7 +987,7 @@
ErrorInfo *service_error = NULL;
GOPluginServiceCreate ctor;
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), NULL);
g_return_val_if_fail (tree != NULL, NULL);
g_return_val_if_fail (strcmp (tree->name, "service") == 0, NULL);
@@ -1028,7 +1028,7 @@
char const *
plugin_service_get_id (const GOPluginService *service)
{
- g_return_val_if_fail (IS_GO_PLUGIN_SERVICE (service), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN_SERVICE (service), NULL);
return service->id;
}
@@ -1036,7 +1036,7 @@
char const *
plugin_service_get_description (GOPluginService *service)
{
- g_return_val_if_fail (IS_GO_PLUGIN_SERVICE (service), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN_SERVICE (service), NULL);
if (service->saved_description == NULL) {
service->saved_description = GPS_GET_CLASS (service)->get_description (service);
@@ -1048,7 +1048,7 @@
GOPlugin *
plugin_service_get_plugin (GOPluginService *service)
{
- g_return_val_if_fail (IS_GO_PLUGIN_SERVICE (service), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN_SERVICE (service), NULL);
return service->plugin;
}
@@ -1056,7 +1056,7 @@
gpointer
plugin_service_get_cbs (GOPluginService *service)
{
- g_return_val_if_fail (IS_GO_PLUGIN_SERVICE (service), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN_SERVICE (service), NULL);
g_return_val_if_fail (service->cbs_ptr != NULL, NULL);
return service->cbs_ptr;
@@ -1065,7 +1065,7 @@
void
plugin_service_activate (GOPluginService *service, ErrorInfo **ret_error)
{
- g_return_if_fail (IS_GO_PLUGIN_SERVICE (service));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE (service));
GO_INIT_RET_ERROR_INFO (ret_error);
if (service->is_active) {
@@ -1090,7 +1090,7 @@
void
plugin_service_deactivate (GOPluginService *service, ErrorInfo **ret_error)
{
- g_return_if_fail (IS_GO_PLUGIN_SERVICE (service));
+ g_return_if_fail (GO_IS_PLUGIN_SERVICE (service));
GO_INIT_RET_ERROR_INFO (ret_error);
if (!service->is_active) {
Modified: trunk/goffice/app/go-plugin-service.h
==============================================================================
--- trunk/goffice/app/go-plugin-service.h (original)
+++ trunk/goffice/app/go-plugin-service.h Tue Apr 7 09:29:28 2009
@@ -10,15 +10,15 @@
G_BEGIN_DECLS
-#define GO_PLUGIN_SERVICE_TYPE (plugin_service_get_type ())
-#define GO_PLUGIN_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_SERVICE_TYPE, GOPluginService))
-#define IS_GO_PLUGIN_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_SERVICE_TYPE))
+#define GO_TYPE_PLUGIN_SERVICE (plugin_service_get_type ())
+#define GO_PLUGIN_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE, GOPluginService))
+#define GO_IS_PLUGIN_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE))
GType plugin_service_get_type (void);
-#define GO_PLUGIN_SERVICE_GENERAL_TYPE (plugin_service_general_get_type ())
-#define GO_PLUGIN_SERVICE_GENERAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_SERVICE_GENERAL_TYPE, PluginServiceGeneral))
-#define IS_GO_PLUGIN_SERVICE_GENERAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_SERVICE_GENERAL_TYPE))
+#define GO_TYPE_PLUGIN_SERVICE_GENERAL (plugin_service_general_get_type ())
+#define GO_PLUGIN_SERVICE_GENERAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_GENERAL, PluginServiceGeneral))
+#define GO_IS_PLUGIN_SERVICE_GENERAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_GENERAL))
GType plugin_service_general_get_type (void);
typedef struct _PluginServiceGeneral PluginServiceGeneral;
@@ -27,9 +27,9 @@
void (*plugin_func_cleanup) (GOPluginService *service, ErrorInfo **ret_error);
} PluginServiceGeneralCallbacks;
-#define GO_PLUGIN_SERVICE_FILE_OPENER_TYPE (plugin_service_file_opener_get_type ())
-#define GO_PLUGIN_SERVICE_FILE_OPENER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_SERVICE_FILE_OPENER_TYPE, PluginServiceFileOpener))
-#define IS_GO_PLUGIN_SERVICE_FILE_OPENER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_SERVICE_FILE_OPENER_TYPE))
+#define GO_TYPE_PLUGIN_SERVICE_FILE_OPENER (plugin_service_file_opener_get_type ())
+#define GO_PLUGIN_SERVICE_FILE_OPENER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_FILE_OPENER, PluginServiceFileOpener))
+#define GO_IS_PLUGIN_SERVICE_FILE_OPENER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_FILE_OPENER))
GType plugin_service_file_opener_get_type (void);
typedef struct _PluginServiceFileOpener PluginServiceFileOpener;
@@ -45,9 +45,9 @@
} PluginServiceFileOpenerCallbacks;
-#define GO_PLUGIN_SERVICE_FILE_SAVER_TYPE (plugin_service_file_saver_get_type ())
-#define GO_PLUGIN_SERVICE_FILE_SAVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_SERVICE_FILE_SAVER_TYPE, PluginServiceFileSaver))
-#define IS_GO_PLUGIN_SERVICE_FILE_SAVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_SERVICE_FILE_SAVER_TYPE))
+#define GO_TYPE_PLUGIN_SERVICE_FILE_SAVER (plugin_service_file_saver_get_type ())
+#define GO_PLUGIN_SERVICE_FILE_SAVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_FILE_SAVER, PluginServiceFileSaver))
+#define GO_IS_PLUGIN_SERVICE_FILE_SAVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_FILE_SAVER))
GType plugin_service_file_saver_get_type (void);
typedef struct _PluginServiceFileSaver PluginServiceFileSaver;
@@ -58,9 +58,9 @@
GsfOutput *output);
} PluginServiceFileSaverCallbacks;
-#define GO_PLUGIN_SERVICE_PLUGIN_LOADER_TYPE (plugin_service_plugin_loader_get_type ())
-#define GO_PLUGIN_SERVICE_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_SERVICE_PLUGIN_LOADER_TYPE, PluginServicePluginLoader))
-#define IS_GO_PLUGIN_SERVICE_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_SERVICE_PLUGIN_LOADER_TYPE))
+#define GO_TYPE_PLUGIN_SERVICE_PLUGIN_LOADER (plugin_service_plugin_loader_get_type ())
+#define GO_PLUGIN_SERVICE_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_PLUGIN_LOADER, PluginServicePluginLoader))
+#define GO_IS_PLUGIN_SERVICE_PLUGIN_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_PLUGIN_LOADER))
GType plugin_service_plugin_loader_get_type (void);
typedef struct _PluginServicePluginLoader PluginServicePluginLoader;
@@ -74,17 +74,17 @@
/****************************************************************************/
-#define GO_PLUGIN_SERVICE_GOBJECT_LOADER_TYPE (plugin_service_gobject_loader_get_type ())
-#define GO_PLUGIN_SERVICE_GOBJECT_LOADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_SERVICE_GOBJECT_LOADER_TYPE, PluginServiceGObjectLoader))
-#define IS_GO_PLUGIN_SERVICE_GOBJECT_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_SERVICE_GOBJECT_LOADER_TYPE))
+#define GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER (plugin_service_gobject_loader_get_type ())
+#define GO_PLUGIN_SERVICE_GOBJECT_LOADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER, PluginServiceGObjectLoader))
+#define GO_IS_PLUGIN_SERVICE_GOBJECT_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER))
GType plugin_service_gobject_loader_get_type (void);
typedef struct _PluginServiceGObjectLoader PluginServiceGObjectLoader;
/****************************************************************************/
-#define GO_PLUGIN_SERVICE_SIMPLE_TYPE (plugin_service_simple_get_type ())
-#define GO_PLUGIN_SERVICE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_SERVICE_SIMPLE_TYPE, PluginServiceSimple))
-#define IS_GO_PLUGIN_SERVICE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_SERVICE_SIMPLE_TYPE))
+#define GO_TYPE_PLUGIN_SERVICE_SIMPLE (plugin_service_simple_get_type ())
+#define GO_PLUGIN_SERVICE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN_SERVICE_SIMPLE, PluginServiceSimple))
+#define GO_IS_PLUGIN_SERVICE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN_SERVICE_SIMPLE))
GType plugin_service_simple_get_type (void);
typedef struct _PluginServiceSimple PluginServiceSimple;
Modified: trunk/goffice/app/go-plugin.c
==============================================================================
--- trunk/goffice/app/go-plugin.c (original)
+++ trunk/goffice/app/go-plugin.c Tue Apr 7 09:29:28 2009
@@ -210,7 +210,7 @@
ErrorInfo *error;
GO_INIT_RET_ERROR_INFO (ret_error);
- plugin = g_object_new (GO_PLUGIN_TYPE, NULL);
+ plugin = g_object_new (GO_TYPE_PLUGIN, NULL);
go_plugin_read (plugin, dir_name, &error);
if (error == NULL) {
plugin->has_full_info = TRUE;
@@ -226,7 +226,7 @@
static GOPlugin *
go_plugin_new_with_id_and_dir_name_only (gchar const *id, gchar const *dir_name)
{
- GOPlugin *plugin = g_object_new (GO_PLUGIN_TYPE, NULL);
+ GOPlugin *plugin = g_object_new (GO_TYPE_PLUGIN, NULL);
plugin->id = g_strdup (id);
plugin->dir_name = g_strdup (dir_name);
plugin->has_full_info = FALSE;
@@ -372,7 +372,7 @@
gchar const *
go_plugin_get_textdomain (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), NULL);
if (plugin->saved_textdomain == NULL) {
plugin->saved_textdomain = g_strconcat ("gnumeric__", plugin->id, NULL);
@@ -390,7 +390,7 @@
gboolean
go_plugin_is_active (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), FALSE);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), FALSE);
if (!plugin->has_full_info) {
return FALSE;
@@ -424,7 +424,7 @@
GTypeModule *
go_plugin_get_type_module (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), NULL);
g_return_val_if_fail (plugin->is_active, NULL);
if (NULL == plugin->type_module) {
@@ -444,7 +444,7 @@
gchar const *
go_plugin_get_dir_name (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), NULL);
return plugin->dir_name;
}
@@ -460,7 +460,7 @@
gchar const *
go_plugin_get_id (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), NULL);
return plugin->id;
}
@@ -476,7 +476,7 @@
gchar const *
go_plugin_get_name (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), NULL);
if (!go_plugin_read_full_info_if_needed (plugin)) {
return _("Unknown name");
@@ -494,7 +494,7 @@
gchar const *
go_plugin_get_description (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), NULL);
if (!go_plugin_read_full_info_if_needed (plugin)) {
return NULL;
@@ -511,7 +511,7 @@
gboolean
go_plugin_is_loaded (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), FALSE);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), FALSE);
return plugin->has_full_info &&
plugin->loader != NULL &&
go_plugin_loader_is_base_loaded (plugin->loader);
@@ -730,7 +730,7 @@
GHashTable *loader_attrs;
gboolean require_explicit_enabling = FALSE;
- g_return_if_fail (IS_GO_PLUGIN (plugin));
+ g_return_if_fail (GO_IS_PLUGIN (plugin));
g_return_if_fail (dir_name != NULL);
GO_INIT_RET_ERROR_INFO (ret_error);
@@ -875,7 +875,7 @@
GType loader_type;
ErrorInfo *error = NULL;
- g_return_if_fail (IS_GO_PLUGIN (plugin));
+ g_return_if_fail (GO_IS_PLUGIN (plugin));
GO_INIT_RET_ERROR_INFO (ret_error);
if (!go_plugin_read_full_info_if_needed_error_info (plugin, ret_error)) {
@@ -922,7 +922,7 @@
gint i;
static GSList *activate_stack = NULL;
- g_return_if_fail (IS_GO_PLUGIN (plugin));
+ g_return_if_fail (GO_IS_PLUGIN (plugin));
GO_INIT_RET_ERROR_INFO (ret_error);
if (g_slist_find (activate_stack, plugin) != NULL) {
@@ -1012,7 +1012,7 @@
GSList *l;
gint i;
- g_return_if_fail (IS_GO_PLUGIN (plugin));
+ g_return_if_fail (GO_IS_PLUGIN (plugin));
GO_INIT_RET_ERROR_INFO (ret_error);
if (!plugin->has_full_info || !plugin->is_active) {
@@ -1065,7 +1065,7 @@
gboolean
go_plugin_can_deactivate (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), FALSE);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), FALSE);
if (!plugin->is_active) {
return FALSE;
@@ -1165,7 +1165,7 @@
void
go_plugin_load_service (GOPlugin *plugin, GOPluginService *service, ErrorInfo **ret_error)
{
- g_return_if_fail (IS_GO_PLUGIN (plugin));
+ g_return_if_fail (GO_IS_PLUGIN (plugin));
g_return_if_fail (service != NULL);
GO_INIT_RET_ERROR_INFO (ret_error);
@@ -1188,7 +1188,7 @@
void
go_plugin_unload_service (GOPlugin *plugin, GOPluginService *service, ErrorInfo **ret_error)
{
- g_return_if_fail (IS_GO_PLUGIN (plugin));
+ g_return_if_fail (GO_IS_PLUGIN (plugin));
g_return_if_fail (plugin->loader != NULL);
g_return_if_fail (service != NULL);
@@ -1206,7 +1206,7 @@
void
go_plugin_use_ref (GOPlugin *plugin)
{
- g_return_if_fail (IS_GO_PLUGIN (plugin));
+ g_return_if_fail (GO_IS_PLUGIN (plugin));
g_return_if_fail (plugin->is_active);
plugin->use_refcount++;
@@ -1222,7 +1222,7 @@
void
go_plugin_use_unref (GOPlugin *plugin)
{
- g_return_if_fail (IS_GO_PLUGIN (plugin));
+ g_return_if_fail (GO_IS_PLUGIN (plugin));
g_return_if_fail (plugin->is_active);
g_return_if_fail (plugin->use_refcount > 0);
@@ -1263,7 +1263,7 @@
GSList *
go_plugin_get_services (GOPlugin *plugin)
{
- g_return_val_if_fail (IS_GO_PLUGIN (plugin), NULL);
+ g_return_val_if_fail (GO_IS_PLUGIN (plugin), NULL);
return plugin->services;
}
@@ -1539,7 +1539,7 @@
void
go_plugin_db_mark_plugin_for_deactivation (GOPlugin *plugin, gboolean mark)
{
- g_return_if_fail (IS_GO_PLUGIN (plugin));
+ g_return_if_fail (GO_IS_PLUGIN (plugin));
if (mark) {
if (plugins_marked_for_deactivation_hash == NULL) {
Modified: trunk/goffice/app/go-plugin.h
==============================================================================
--- trunk/goffice/app/go-plugin.h (original)
+++ trunk/goffice/app/go-plugin.h Tue Apr 7 09:29:28 2009
@@ -13,9 +13,9 @@
* Define PLUGIN_ALWAYS_LOAD to disable loading on demand feature
*/
-#define GO_PLUGIN_TYPE (go_plugin_get_type ())
-#define GO_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PLUGIN_TYPE, GOPlugin))
-#define IS_GO_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PLUGIN_TYPE))
+#define GO_TYPE_PLUGIN (go_plugin_get_type ())
+#define GO_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PLUGIN, GOPlugin))
+#define GO_IS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PLUGIN))
GType go_plugin_get_type (void);
Modified: trunk/goffice/app/go-service.h
==============================================================================
--- trunk/goffice/app/go-service.h (original)
+++ trunk/goffice/app/go-service.h Tue Apr 7 09:29:28 2009
@@ -26,16 +26,16 @@
G_BEGIN_DECLS
-#define GO_SERVICE_TYPE (go_service_get_type ())
-#define GO_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_SERVICE_TYPE, GOService))
-#define IS_GO_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_SERVICE_TYPE))
+#define GO_TYPE_SERVICE (go_service_get_type ())
+#define GO_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_SERVICE, GOService))
+#define GO_IS_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_SERVICE))
GType go_service_get_type (void);
GOPlugin *go_service_get_plugin (GOService const *service);
-#define GO_SERVICE_SIMPLE_TYPE (go_service_simple_get_type ())
-#define GO_SERVICE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_SERVICE_SIMPLE_TYPE, GOServiceSimple))
-#define IS_GO_SERVICE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_SERVICE_SIMPLE_TYPE))
+#define GO_TYPE_SERVICE_SIMPLE (go_service_simple_get_type ())
+#define GO_SERVICE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_SERVICE_SIMPLE, GOServiceSimple))
+#define GO_IS_SERVICE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_SERVICE_SIMPLE))
typedef struct _GOServiceSimple GOServiceSimple;
GType go_service_simple_get_type (void);
Modified: trunk/goffice/app/io-context.c
==============================================================================
--- trunk/goffice/app/io-context.c (original)
+++ trunk/goffice/app/io-context.c Tue Apr 7 09:29:28 2009
@@ -160,14 +160,14 @@
GSF_CLASS_FULL (IOContext, io_context,
NULL, NULL, io_context_class_init, NULL,
io_context_init, G_TYPE_OBJECT, 0,
- GSF_INTERFACE (io_context_gnm_cmd_context_init, GO_CMD_CONTEXT_TYPE))
+ GSF_INTERFACE (io_context_gnm_cmd_context_init, GO_TYPE_CMD_CONTEXT))
IOContext *
gnumeric_io_context_new (GOCmdContext *cc)
{
IOContext *ioc;
- g_return_val_if_fail (IS_GO_CMD_CONTEXT (cc), NULL);
+ g_return_val_if_fail (GO_IS_CMD_CONTEXT (cc), NULL);
ioc = g_object_new (TYPE_IO_CONTEXT, NULL);
/* The cc is optional for subclasses, but mandatory in this class. */
Modified: trunk/goffice/component/go-component-factory.c
==============================================================================
--- trunk/goffice/component/go-component-factory.c (original)
+++ trunk/goffice/component/go-component-factory.c Tue Apr 7 09:29:28 2009
@@ -37,9 +37,9 @@
/***************************************************************************/
/* Support component engines in plugins */
-#define GO_COMPONENT_ENGINE_SERVICE_TYPE (go_component_engine_service_get_type ())
-#define GO_COMPONENT_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_COMPONENT_ENGINE_SERVICE_TYPE, GOComponentEngineService))
-#define IS_GO_COMPONENT_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_COMPONENT_ENGINE_SERVICE_TYPE))
+#define GO_TYPE_COMPONENT_ENGINE_SERVICE (go_component_engine_service_get_type ())
+#define GO_COMPONENT_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_COMPONENT_ENGINE_SERVICE, GOComponentEngineService))
+#define GO_IS_COMPONENT_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_COMPONENT_ENGINE_SERVICE))
static GType go_component_engine_service_get_type (void);
@@ -73,12 +73,12 @@
GSF_CLASS (GOComponentEngineService, go_component_engine_service,
go_component_engine_service_class_init, NULL,
- GO_PLUGIN_SERVICE_GOBJECT_LOADER_TYPE)
+ GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER)
/***************************************************************************/
/* Use a plugin service to define where to find plot types */
-#define GO_COMPONENT_TYPE_SERVICE_TYPE (go_component_type_service_get_type ())
-#define GO_COMPONENT_TYPE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_COMPONENT_TYPE_SERVICE_TYPE, GOComponentTypeService))
-#define IS_GO_COMPONENT_TYPE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_COMPONENT_TYPE_SERVICE_TYPE))
+#define GO_TYPE_COMPONENT_TYPE_SERVICE (go_component_type_service_get_type ())
+#define GO_COMPONENT_TYPE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_COMPONENT_TYPE_SERVICE, GOComponentTypeService))
+#define GO_IS_COMPONENT_TYPE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_COMPONENT_TYPE_SERVICE))
GType go_component_type_service_get_type (void);
typedef struct
@@ -203,7 +203,7 @@
GSF_CLASS (GOComponentTypeService, go_component_type_service,
go_component_type_service_class_init,
- go_component_type_service_init, GO_PLUGIN_SERVICE_SIMPLE_TYPE)
+ go_component_type_service_init, GO_TYPE_PLUGIN_SERVICE_SIMPLE)
/***************************************************************************/
void goc_plugin_services_init (void)
{
Modified: trunk/goffice/component/go-component.c
==============================================================================
--- trunk/goffice/component/go-component.c (original)
+++ trunk/goffice/component/go-component.c Tue Apr 7 09:29:28 2009
@@ -25,7 +25,7 @@
#include <gsf/gsf-impl-utils.h>
-#define GO_COMPONENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_COMPONENT_TYPE, GOComponentClass))
+#define GO_COMPONENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_TYPE_COMPONENT, GOComponentClass))
enum {
COMPONENT_PROP_0,
@@ -173,7 +173,7 @@
{
GOComponentClass *klass;
- g_return_if_fail (IS_GO_COMPONENT (component));
+ g_return_if_fail (GO_IS_COMPONENT (component));
klass = GO_COMPONENT_GET_CLASS(component);
component->default_width = width;
@@ -194,7 +194,7 @@
gboolean
go_component_needs_window (GOComponent *component)
{
- g_return_val_if_fail (IS_GO_COMPONENT (component), FALSE);
+ g_return_val_if_fail (GO_IS_COMPONENT (component), FALSE);
return component->needs_window;
}
@@ -203,7 +203,7 @@
{
GOComponentClass *klass;
- g_return_if_fail (IS_GO_COMPONENT (component));
+ g_return_if_fail (GO_IS_COMPONENT (component));
klass = GO_COMPONENT_GET_CLASS(component);
component->window = window;
@@ -216,7 +216,7 @@
{
GOComponentClass *klass;
- g_return_if_fail (IS_GO_COMPONENT (component));
+ g_return_if_fail (GO_IS_COMPONENT (component));
component->data = data;
component->length = length;
@@ -232,7 +232,7 @@
{
GOComponentClass *klass;
- g_return_val_if_fail (IS_GO_COMPONENT (component), FALSE);
+ g_return_val_if_fail (GO_IS_COMPONENT (component), FALSE);
klass = GO_COMPONENT_GET_CLASS(component);
if (klass->get_data)
@@ -245,7 +245,7 @@
{
GOComponentClass *klass;
- g_return_if_fail (IS_GO_COMPONENT (component));
+ g_return_if_fail (GO_IS_COMPONENT (component));
if (!component->resizable)
return;
@@ -262,7 +262,7 @@
{
GOComponentClass *klass;
- g_return_if_fail (IS_GO_COMPONENT (component));
+ g_return_if_fail (GO_IS_COMPONENT (component));
klass = GO_COMPONENT_GET_CLASS(component);
if (klass->render)
@@ -272,14 +272,14 @@
gboolean
go_component_is_resizable (GOComponent *component)
{
- g_return_val_if_fail (IS_GO_COMPONENT (component), FALSE);
+ g_return_val_if_fail (GO_IS_COMPONENT (component), FALSE);
return component->resizable;
}
gboolean
go_component_is_editable (GOComponent *component)
{
- g_return_val_if_fail (IS_GO_COMPONENT (component), FALSE);
+ g_return_val_if_fail (GO_IS_COMPONENT (component), FALSE);
return component->editable;
}
@@ -287,7 +287,7 @@
{
GOComponentClass *klass;
- g_return_val_if_fail (IS_GO_COMPONENT (component), NULL);
+ g_return_val_if_fail (GO_IS_COMPONENT (component), NULL);
klass = GO_COMPONENT_GET_CLASS(component);
if (component->editable && klass->edit)
@@ -298,7 +298,7 @@
void
go_component_emit_changed (GOComponent *component)
{
- g_return_if_fail (IS_GO_COMPONENT (component));
+ g_return_if_fail (GO_IS_COMPONENT (component));
g_signal_emit (G_OBJECT (component),
go_component_signals [CHANGED], 0);
Modified: trunk/goffice/component/go-component.h
==============================================================================
--- trunk/goffice/component/go-component.h (original)
+++ trunk/goffice/component/go-component.h Tue Apr 7 09:29:28 2009
@@ -65,9 +65,9 @@
typedef struct _GOComponentClass GOComponentClass;
-#define GO_COMPONENT_TYPE (go_component_get_type ())
-#define GO_COMPONENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_COMPONENT_TYPE, GOComponent))
-#define IS_GO_COMPONENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_COMPONENT_TYPE))
+#define GO_TYPE_COMPONENT (go_component_get_type ())
+#define GO_COMPONENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_COMPONENT, GOComponent))
+#define GO_IS_COMPONENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_COMPONENT))
#define GOC_PARAM_PERSISTENT (1 << (G_PARAM_USER_SHIFT+0))
Modified: trunk/goffice/data/go-data-simple.c
==============================================================================
--- trunk/goffice/data/go-data-simple.c (original)
+++ trunk/goffice/data/go-data-simple.c Tue Apr 7 09:29:28 2009
@@ -130,12 +130,12 @@
GSF_CLASS (GODataScalarVal, go_data_scalar_val,
go_data_scalar_val_class_init, NULL,
- GO_DATA_SCALAR_TYPE)
+ GO_TYPE_DATA_SCALAR)
GOData *
go_data_scalar_val_new (double val)
{
- GODataScalarVal *res = g_object_new (GO_DATA_SCALAR_VAL_TYPE, NULL);
+ GODataScalarVal *res = g_object_new (GO_TYPE_DATA_SCALAR_VAL, NULL);
res->val = val;
return GO_DATA (res);
}
@@ -241,12 +241,12 @@
GSF_CLASS (GODataScalarStr, go_data_scalar_str,
go_data_scalar_str_class_init, go_data_scalar_str_init,
- GO_DATA_SCALAR_TYPE)
+ GO_TYPE_DATA_SCALAR)
GOData *
go_data_scalar_str_new (char const *str, gboolean needs_free)
{
- GODataScalarStr *res = g_object_new (GO_DATA_SCALAR_STR_TYPE, NULL);
+ GODataScalarStr *res = g_object_new (GO_TYPE_DATA_SCALAR_STR, NULL);
res->str = str;
res->needs_free = needs_free;
return GO_DATA (res);
@@ -445,12 +445,12 @@
GSF_CLASS (GODataVectorVal, go_data_vector_val,
go_data_vector_val_class_init, NULL,
- GO_DATA_VECTOR_TYPE)
+ GO_TYPE_DATA_VECTOR)
GOData *
go_data_vector_val_new (double *val, unsigned n, GDestroyNotify notify)
{
- GODataVectorVal *res = g_object_new (GO_DATA_VECTOR_VAL_TYPE, NULL);
+ GODataVectorVal *res = g_object_new (GO_TYPE_DATA_VECTOR_VAL, NULL);
res->val = val;
res->n = n;
res->notify = notify;
@@ -717,12 +717,12 @@
GSF_CLASS (GODataVectorStr, go_data_vector_str,
go_data_vector_str_class_init, go_data_vector_str_init,
- GO_DATA_VECTOR_TYPE)
+ GO_TYPE_DATA_VECTOR)
GOData *
go_data_vector_str_new (char const * const *str, unsigned n, GDestroyNotify notify)
{
- GODataVectorStr *res = g_object_new (GO_DATA_VECTOR_STR_TYPE, NULL);
+ GODataVectorStr *res = g_object_new (GO_TYPE_DATA_VECTOR_STR, NULL);
res->str = str;
res->n = n;
res->notify = notify;
@@ -996,12 +996,12 @@
GSF_CLASS (GODataMatrixVal, go_data_matrix_val,
go_data_matrix_val_class_init, NULL,
- GO_DATA_MATRIX_TYPE)
+ GO_TYPE_DATA_MATRIX)
GOData *
go_data_matrix_val_new (double *val, unsigned rows, unsigned columns, GDestroyNotify notify)
{
- GODataMatrixVal *res = g_object_new (GO_DATA_MATRIX_VAL_TYPE, NULL);
+ GODataMatrixVal *res = g_object_new (GO_TYPE_DATA_MATRIX_VAL, NULL);
res->val = val;
res->size.rows = rows;
res->size.columns = columns;
Modified: trunk/goffice/data/go-data-simple.h
==============================================================================
--- trunk/goffice/data/go-data-simple.h (original)
+++ trunk/goffice/data/go-data-simple.h Tue Apr 7 09:29:28 2009
@@ -26,17 +26,17 @@
G_BEGIN_DECLS
-#define GO_DATA_SCALAR_VAL_TYPE (go_data_scalar_val_get_type ())
-#define GO_DATA_SCALAR_VAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DATA_SCALAR_VAL_TYPE, GODataScalarVal))
-#define IS_GO_DATA_SCALAR_VAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_SCALAR_VAL_TYPE))
+#define GO_TYPE_DATA_SCALAR_VAL (go_data_scalar_val_get_type ())
+#define GO_DATA_SCALAR_VAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DATA_SCALAR_VAL, GODataScalarVal))
+#define GO_IS_DATA_SCALAR_VAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DATA_SCALAR_VAL))
typedef struct _GODataScalarVal GODataScalarVal;
GType go_data_scalar_val_get_type (void);
GOData *go_data_scalar_val_new (double val);
-#define GO_DATA_SCALAR_STR_TYPE (go_data_scalar_str_get_type ())
-#define GO_DATA_SCALAR_STR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DATA_SCALAR_STR_TYPE, GODataScalarStr))
-#define IS_GO_DATA_SCALAR_STR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_SCALAR_STR_TYPE))
+#define GO_TYPE_DATA_SCALAR_STR (go_data_scalar_str_get_type ())
+#define GO_DATA_SCALAR_STR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DATA_SCALAR_STR, GODataScalarStr))
+#define GO_IS_DATA_SCALAR_STR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DATA_SCALAR_STR))
typedef struct _GODataScalarStr GODataScalarStr;
GType go_data_scalar_str_get_type (void);
@@ -44,17 +44,17 @@
void go_data_scalar_str_set_str (GODataScalarStr *str,
char const *text, gboolean needs_free);
-#define GO_DATA_VECTOR_VAL_TYPE (go_data_vector_val_get_type ())
-#define GO_DATA_VECTOR_VAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DATA_VECTOR_VAL_TYPE, GODataVectorVal))
-#define IS_GO_DATA_VECTOR_VAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_VECTOR_VAL_TYPE))
+#define GO_TYPE_DATA_VECTOR_VAL (go_data_vector_val_get_type ())
+#define GO_DATA_VECTOR_VAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DATA_VECTOR_VAL, GODataVectorVal))
+#define GO_IS_DATA_VECTOR_VAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DATA_VECTOR_VAL))
typedef struct _GODataVectorVal GODataVectorVal;
GType go_data_vector_val_get_type (void);
GOData *go_data_vector_val_new (double *val, unsigned n, GDestroyNotify notify);
-#define GO_DATA_VECTOR_STR_TYPE (go_data_vector_str_get_type ())
-#define GO_DATA_VECTOR_STR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DATA_VECTOR_STR_TYPE, GODataVectorStr))
-#define IS_GO_DATA_VECTOR_STR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_VECTOR_STR_TYPE))
+#define GO_TYPE_DATA_VECTOR_STR (go_data_vector_str_get_type ())
+#define GO_DATA_VECTOR_STR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DATA_VECTOR_STR, GODataVectorStr))
+#define GO_IS_DATA_VECTOR_STR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DATA_VECTOR_STR))
typedef struct _GODataVectorStr GODataVectorStr;
GType go_data_vector_str_get_type (void);
@@ -66,9 +66,9 @@
void go_data_vector_str_set_translation_domain (GODataVectorStr *vector,
char const *domain);
-#define GO_DATA_MATRIX_VAL_TYPE (go_data_matrix_val_get_type ())
-#define GO_DATA_MATRIX_VAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DATA_MATRIX_VAL_TYPE, GODataMatrixVal))
-#define IS_GO_DATA_MATRIX_VAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_MATRIX_VAL_TYPE))
+#define GO_TYPE_DATA_MATRIX_VAL (go_data_matrix_val_get_type ())
+#define GO_DATA_MATRIX_VAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DATA_MATRIX_VAL, GODataMatrixVal))
+#define GO_IS_DATA_MATRIX_VAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DATA_MATRIX_VAL))
typedef struct _GODataMatrixVal GODataMatrixVal;
GType go_data_matrix_val_get_type (void);
Modified: trunk/goffice/data/go-data.c
==============================================================================
--- trunk/goffice/data/go-data.c (original)
+++ trunk/goffice/data/go-data.c Tue Apr 7 09:29:28 2009
@@ -29,9 +29,9 @@
#include <glib/gi18n-lib.h>
#include <string.h>
-#define GO_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_DATA_TYPE, GODataClass))
-#define IS_GO_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_DATA_TYPE))
-#define GO_DATA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_DATA_TYPE, GODataClass))
+#define GO_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_DATA, GODataClass))
+#define GO_IS_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_DATA))
+#define GO_DATA_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_TYPE_DATA, GODataClass))
enum {
CHANGED,
@@ -209,13 +209,13 @@
/*************************************************************************/
-#define GO_DATA_SCALAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_DATA_SCALAR_TYPE, GODataScalarClass))
-#define IS_GO_DATA_SCALAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_DATA_SCALAR_TYPE))
-#define GO_DATA_SCALAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_DATA_SCALAR_TYPE, GODataScalarClass))
+#define GO_DATA_SCALAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_DATA_SCALAR, GODataScalarClass))
+#define GO_IS_DATA_SCALAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_DATA_SCALAR))
+#define GO_DATA_SCALAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_TYPE_DATA_SCALAR, GODataScalarClass))
GSF_CLASS_ABSTRACT (GODataScalar, go_data_scalar,
NULL, NULL,
- GO_DATA_TYPE)
+ GO_TYPE_DATA)
double
go_data_scalar_get_value (GODataScalar *scalar)
@@ -235,9 +235,9 @@
/*************************************************************************/
-#define GO_DATA_VECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_DATA_VECTOR_TYPE, GODataVectorClass))
-#define IS_GO_DATA_VECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_DATA_VECTOR_TYPE))
-#define GO_DATA_VECTOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_DATA_VECTOR_TYPE, GODataVectorClass))
+#define GO_DATA_VECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_DATA_VECTOR, GODataVectorClass))
+#define GO_IS_DATA_VECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_DATA_VECTOR))
+#define GO_DATA_VECTOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_TYPE_DATA_VECTOR, GODataVectorClass))
static void
go_data_vector_emit_changed (GOData *data)
@@ -252,7 +252,7 @@
GSF_CLASS_ABSTRACT (GODataVector, go_data_vector,
go_data_vector_class_init, NULL,
- GO_DATA_TYPE)
+ GO_TYPE_DATA)
int
go_data_vector_get_len (GODataVector *vec)
@@ -361,9 +361,9 @@
/*************************************************************************/
-#define GO_DATA_MATRIX_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_DATA_MATRIX_TYPE, GODataMatrixClass))
-#define IS_GO_DATA_MATRIX_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_DATA_MATRIX_TYPE))
-#define GO_DATA_MATRIX_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_DATA_MATRIX_TYPE, GODataMatrixClass))
+#define GO_DATA_MATRIX_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_DATA_MATRIX, GODataMatrixClass))
+#define GO_IS_DATA_MATRIX_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_DATA_MATRIX))
+#define GO_DATA_MATRIX_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_TYPE_DATA_MATRIX, GODataMatrixClass))
static void
go_data_matrix_emit_changed (GOData *data)
@@ -379,7 +379,7 @@
GSF_CLASS_ABSTRACT (GODataMatrix, go_data_matrix,
go_data_matrix_class_init, NULL,
- GO_DATA_TYPE)
+ GO_TYPE_DATA)
GODataMatrixSize
go_data_matrix_get_size (GODataMatrix *mat)
Modified: trunk/goffice/data/go-data.h
==============================================================================
--- trunk/goffice/data/go-data.h (original)
+++ trunk/goffice/data/go-data.h Tue Apr 7 09:29:28 2009
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define GO_DATA_TYPE (go_data_get_type ())
-#define GO_DATA(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DATA_TYPE, GOData))
-#define IS_GO_DATA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_TYPE))
+#define GO_TYPE_DATA (go_data_get_type ())
+#define GO_DATA(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DATA, GOData))
+#define GO_IS_DATA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DATA))
GType go_data_get_type (void);
GOData *go_data_dup (GOData const *src);
@@ -41,9 +41,9 @@
/*************************************************************************/
-#define GO_DATA_SCALAR_TYPE (go_data_scalar_get_type ())
-#define GO_DATA_SCALAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DATA_SCALAR_TYPE, GODataScalar))
-#define IS_GO_DATA_SCALAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_SCALAR_TYPE))
+#define GO_TYPE_DATA_SCALAR (go_data_scalar_get_type ())
+#define GO_DATA_SCALAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DATA_SCALAR, GODataScalar))
+#define GO_IS_DATA_SCALAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DATA_SCALAR))
GType go_data_scalar_get_type (void);
@@ -52,9 +52,9 @@
/*************************************************************************/
-#define GO_DATA_VECTOR_TYPE (go_data_vector_get_type ())
-#define GO_DATA_VECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DATA_VECTOR_TYPE, GODataVector))
-#define IS_GO_DATA_VECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_VECTOR_TYPE))
+#define GO_TYPE_DATA_VECTOR (go_data_vector_get_type ())
+#define GO_DATA_VECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DATA_VECTOR, GODataVector))
+#define GO_IS_DATA_VECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DATA_VECTOR))
GType go_data_vector_get_type (void);
@@ -69,9 +69,9 @@
/*************************************************************************/
-#define GO_DATA_MATRIX_TYPE (go_data_matrix_get_type ())
-#define GO_DATA_MATRIX(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_DATA_MATRIX_TYPE, GODataMatrix))
-#define IS_GO_DATA_MATRIX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_DATA_MATRIX_TYPE))
+#define GO_TYPE_DATA_MATRIX (go_data_matrix_get_type ())
+#define GO_DATA_MATRIX(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_DATA_MATRIX, GODataMatrix))
+#define GO_IS_DATA_MATRIX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_DATA_MATRIX))
GType go_data_matrix_get_type (void);
Modified: trunk/goffice/drawing/god-anchor.c
==============================================================================
--- trunk/goffice/drawing/god-anchor.c (original)
+++ trunk/goffice/drawing/god-anchor.c Tue Apr 7 09:29:28 2009
@@ -39,7 +39,7 @@
{
GodAnchor *anchor;
- anchor = g_object_new (GOD_ANCHOR_TYPE, NULL);
+ anchor = g_object_new (GOD_TYPE_ANCHOR, NULL);
return anchor;
}
Modified: trunk/goffice/drawing/god-anchor.h
==============================================================================
--- trunk/goffice/drawing/god-anchor.h (original)
+++ trunk/goffice/drawing/god-anchor.h Tue Apr 7 09:29:28 2009
@@ -19,12 +19,12 @@
G_BEGIN_DECLS
-#define GOD_ANCHOR_TYPE (god_anchor_get_type ())
-#define GOD_ANCHOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_ANCHOR_TYPE, GodAnchor))
-#define GOD_ANCHOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_ANCHOR_TYPE, GodAnchorClass))
-#define GOD_ANCHOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_ANCHOR_TYPE, GodAnchorClass))
-#define IS_GOD_ANCHOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_ANCHOR_TYPE))
-#define IS_GOD_ANCHOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_ANCHOR_TYPE))
+#define GOD_TYPE_ANCHOR (god_anchor_get_type ())
+#define GOD_ANCHOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_ANCHOR, GodAnchor))
+#define GOD_ANCHOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_ANCHOR, GodAnchorClass))
+#define GOD_ANCHOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_TYPE_ANCHOR, GodAnchorClass))
+#define GOD_IS_ANCHOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_ANCHOR))
+#define GOD_IS_ANCHOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_ANCHOR))
typedef struct GodAnchorPrivate_ GodAnchorPrivate;
Modified: trunk/goffice/drawing/god-default-attributes.c
==============================================================================
--- trunk/goffice/drawing/god-default-attributes.c (original)
+++ trunk/goffice/drawing/god-default-attributes.c Tue Apr 7 09:29:28 2009
@@ -43,7 +43,7 @@
{
GodDefaultAttributes *default_attributes;
- default_attributes = g_object_new (GOD_DEFAULT_ATTRIBUTES_TYPE, NULL);
+ default_attributes = g_object_new (GOD_TYPE_DEFAULT_ATTRIBUTES, NULL);
return default_attributes;
}
Modified: trunk/goffice/drawing/god-default-attributes.h
==============================================================================
--- trunk/goffice/drawing/god-default-attributes.h (original)
+++ trunk/goffice/drawing/god-default-attributes.h Tue Apr 7 09:29:28 2009
@@ -18,12 +18,12 @@
G_BEGIN_DECLS
-#define GOD_DEFAULT_ATTRIBUTES_TYPE (god_default_attributes_get_type ())
-#define GOD_DEFAULT_ATTRIBUTES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_DEFAULT_ATTRIBUTES_TYPE, GodDefaultAttributes))
-#define GOD_DEFAULT_ATTRIBUTES_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_DEFAULT_ATTRIBUTES_TYPE, GodDefaultAttributesClass))
-#define GOD_DEFAULT_ATTRIBUTES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_DEFAULT_ATTRIBUTES_TYPE, GodDefaultAttributesClass))
-#define IS_GOD_DEFAULT_ATTRIBUTES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_DEFAULT_ATTRIBUTES_TYPE))
-#define IS_GOD_DEFAULT_ATTRIBUTES_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_DEFAULT_ATTRIBUTES_TYPE))
+#define GOD_TYPE_DEFAULT_ATTRIBUTES (god_default_attributes_get_type ())
+#define GOD_DEFAULT_ATTRIBUTES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_DEFAULT_ATTRIBUTES, GodDefaultAttributes))
+#define GOD_DEFAULT_ATTRIBUTES_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_DEFAULT_ATTRIBUTES, GodDefaultAttributesClass))
+#define GOD_DEFAULT_ATTRIBUTES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_TYPE_DEFAULT_ATTRIBUTES, GodDefaultAttributesClass))
+#define GOD_IS_DEFAULT_ATTRIBUTES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_DEFAULT_ATTRIBUTES))
+#define GOD_IS_DEFAULT_ATTRIBUTES_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_DEFAULT_ATTRIBUTES))
typedef struct GodDefaultAttributesPrivate_ GodDefaultAttributesPrivate;
Modified: trunk/goffice/drawing/god-drawing-group.c
==============================================================================
--- trunk/goffice/drawing/god-drawing-group.c (original)
+++ trunk/goffice/drawing/god-drawing-group.c Tue Apr 7 09:29:28 2009
@@ -47,7 +47,7 @@
{
GodDrawingGroup *drawing_group;
- drawing_group = g_object_new (GOD_DRAWING_GROUP_TYPE, NULL);
+ drawing_group = g_object_new (GOD_TYPE_DRAWING_GROUP, NULL);
return drawing_group;
}
Modified: trunk/goffice/drawing/god-drawing-group.h
==============================================================================
--- trunk/goffice/drawing/god-drawing-group.h (original)
+++ trunk/goffice/drawing/god-drawing-group.h Tue Apr 7 09:29:28 2009
@@ -19,12 +19,12 @@
G_BEGIN_DECLS
-#define GOD_DRAWING_GROUP_TYPE (god_drawing_group_get_type ())
-#define GOD_DRAWING_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_DRAWING_GROUP_TYPE, GodDrawingGroup))
-#define GOD_DRAWING_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_DRAWING_GROUP_TYPE, GodDrawingGroupClass))
-#define GOD_DRAWING_GROUP_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_DRAWING_GROUP_TYPE, GodDrawingGroupClass))
-#define IS_GOD_DRAWING_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_DRAWING_GROUP_TYPE))
-#define IS_GOD_DRAWING_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_DRAWING_GROUP_TYPE))
+#define GOD_TYPE_DRAWING_GROUP (god_drawing_group_get_type ())
+#define GOD_DRAWING_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_DRAWING_GROUP, GodDrawingGroup))
+#define GOD_DRAWING_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_DRAWING_GROUP, GodDrawingGroupClass))
+#define GOD_DRAWING_GROUP_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_TYPE_DRAWING_GROUP, GodDrawingGroupClass))
+#define GOD_IS_DRAWING_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_DRAWING_GROUP))
+#define GOD_IS_DRAWING_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_DRAWING_GROUP))
typedef struct GodDrawingGroupPrivate_ GodDrawingGroupPrivate;
Modified: trunk/goffice/drawing/god-drawing-renderer-gdk.c
==============================================================================
--- trunk/goffice/drawing/god-drawing-renderer-gdk.c (original)
+++ trunk/goffice/drawing/god-drawing-renderer-gdk.c Tue Apr 7 09:29:28 2009
@@ -46,7 +46,7 @@
{
GodDrawingRendererGdk *renderer;
- renderer = g_object_new (GOD_DRAWING_RENDERER_GDK_TYPE, NULL);
+ renderer = g_object_new (GOD_TYPE_DRAWING_RENDERER_GDK, NULL);
return renderer;
}
Modified: trunk/goffice/drawing/god-drawing-renderer-gdk.h
==============================================================================
--- trunk/goffice/drawing/god-drawing-renderer-gdk.h (original)
+++ trunk/goffice/drawing/god-drawing-renderer-gdk.h Tue Apr 7 09:29:28 2009
@@ -21,11 +21,11 @@
G_BEGIN_DECLS
-#define GOD_DRAWING_RENDERER_GDK_TYPE (god_drawing_renderer_gdk_get_type ())
-#define GOD_DRAWING_RENDERER_GDK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_DRAWING_RENDERER_GDK_TYPE, GodDrawingRendererGdk))
-#define GOD_DRAWING_RENDERER_GDK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_DRAWING_RENDERER_GDK_TYPE, GodDrawingRendererGdkClass))
-#define IS_GOD_DRAWING_RENDERER_GDK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_DRAWING_RENDERER_GDK_TYPE))
-#define IS_GOD_DRAWING_RENDERER_GDK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_DRAWING_RENDERER_GDK_TYPE))
+#define GOD_TYPE_DRAWING_RENDERER_GDK (god_drawing_renderer_gdk_get_type ())
+#define GOD_DRAWING_RENDERER_GDK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_DRAWING_RENDERER_GDK, GodDrawingRendererGdk))
+#define GOD_DRAWING_RENDERER_GDK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_DRAWING_RENDERER_GDK, GodDrawingRendererGdkClass))
+#define GOD_IS_DRAWING_RENDERER_GDK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_DRAWING_RENDERER_GDK))
+#define GOD_IS_DRAWING_RENDERER_GDK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_DRAWING_RENDERER_GDK))
typedef struct GodDrawingRendererGdkPrivate_ GodDrawingRendererGdkPrivate;
Modified: trunk/goffice/drawing/god-drawing-view.c
==============================================================================
--- trunk/goffice/drawing/god-drawing-view.c (original)
+++ trunk/goffice/drawing/god-drawing-view.c Tue Apr 7 09:29:28 2009
@@ -39,7 +39,7 @@
{
GodDrawingView *view;
- view = g_object_new (GOD_DRAWING_VIEW_TYPE, NULL);
+ view = g_object_new (GOD_TYPE_DRAWING_VIEW, NULL);
return view;
}
Modified: trunk/goffice/drawing/god-drawing-view.h
==============================================================================
--- trunk/goffice/drawing/god-drawing-view.h (original)
+++ trunk/goffice/drawing/god-drawing-view.h Tue Apr 7 09:29:28 2009
@@ -22,11 +22,11 @@
G_BEGIN_DECLS
-#define GOD_DRAWING_VIEW_TYPE (god_drawing_view_get_type ())
-#define GOD_DRAWING_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_DRAWING_VIEW_TYPE, GodDrawingView))
-#define GOD_DRAWING_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_DRAWING_VIEW_TYPE, GodDrawingViewClass))
-#define IS_GOD_DRAWING_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_DRAWING_VIEW_TYPE))
-#define IS_GOD_DRAWING_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_DRAWING_VIEW_TYPE))
+#define GOD_TYPE_DRAWING_VIEW (god_drawing_view_get_type ())
+#define GOD_DRAWING_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_DRAWING_VIEW, GodDrawingView))
+#define GOD_DRAWING_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_DRAWING_VIEW, GodDrawingViewClass))
+#define GOD_IS_DRAWING_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_DRAWING_VIEW))
+#define GOD_IS_DRAWING_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_DRAWING_VIEW))
typedef struct GodDrawingViewPrivate_ GodDrawingViewPrivate;
Modified: trunk/goffice/drawing/god-drawing.c
==============================================================================
--- trunk/goffice/drawing/god-drawing.c (original)
+++ trunk/goffice/drawing/god-drawing.c Tue Apr 7 09:29:28 2009
@@ -40,7 +40,7 @@
{
GodDrawing *drawing;
- drawing = g_object_new (GOD_DRAWING_TYPE, NULL);
+ drawing = g_object_new (GOD_TYPE_DRAWING, NULL);
return drawing;
}
Modified: trunk/goffice/drawing/god-drawing.h
==============================================================================
--- trunk/goffice/drawing/god-drawing.h (original)
+++ trunk/goffice/drawing/god-drawing.h Tue Apr 7 09:29:28 2009
@@ -19,11 +19,11 @@
G_BEGIN_DECLS
-#define GOD_DRAWING_TYPE (god_drawing_get_type ())
-#define GOD_DRAWING(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_DRAWING_TYPE, GodDrawing))
-#define GOD_DRAWING_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_DRAWING_TYPE, GodDrawingClass))
-#define IS_GOD_DRAWING(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_DRAWING_TYPE))
-#define IS_GOD_DRAWING_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_DRAWING_TYPE))
+#define GOD_TYPE_DRAWING (god_drawing_get_type ())
+#define GOD_DRAWING(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_DRAWING, GodDrawing))
+#define GOD_DRAWING_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_DRAWING, GodDrawingClass))
+#define GOD_IS_DRAWING(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_DRAWING))
+#define GOD_IS_DRAWING_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_DRAWING))
typedef struct GodDrawingPrivate_ GodDrawingPrivate;
Modified: trunk/goffice/drawing/god-image-store.c
==============================================================================
--- trunk/goffice/drawing/god-image-store.c (original)
+++ trunk/goffice/drawing/god-image-store.c Tue Apr 7 09:29:28 2009
@@ -52,7 +52,7 @@
{
GodImageStore *shape;
- shape = g_object_new (GOD_IMAGE_STORE_TYPE, NULL);
+ shape = g_object_new (GOD_TYPE_IMAGE_STORE, NULL);
return shape;
}
Modified: trunk/goffice/drawing/god-image-store.h
==============================================================================
--- trunk/goffice/drawing/god-image-store.h (original)
+++ trunk/goffice/drawing/god-image-store.h Tue Apr 7 09:29:28 2009
@@ -18,11 +18,11 @@
G_BEGIN_DECLS
-#define GOD_IMAGE_STORE_TYPE (god_image_store_get_type ())
-#define GOD_IMAGE_STORE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_IMAGE_STORE_TYPE, GodImageStore))
-#define GOD_IMAGE_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_IMAGE_STORE_TYPE, GodImageStoreClass))
-#define IS_GOD_IMAGE_STORE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_IMAGE_STORE_TYPE))
-#define IS_GOD_IMAGE_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_IMAGE_STORE_TYPE))
+#define GOD_TYPE_IMAGE_STORE (god_image_store_get_type ())
+#define GOD_IMAGE_STORE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_IMAGE_STORE, GodImageStore))
+#define GOD_IMAGE_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_IMAGE_STORE, GodImageStoreClass))
+#define GOD_IS_IMAGE_STORE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_IMAGE_STORE))
+#define GOD_IS_IMAGE_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_IMAGE_STORE))
typedef struct GodImageStorePrivate_ GodImageStorePrivate;
Modified: trunk/goffice/drawing/god-image.c
==============================================================================
--- trunk/goffice/drawing/god-image.c (original)
+++ trunk/goffice/drawing/god-image.c Tue Apr 7 09:29:28 2009
@@ -66,7 +66,7 @@
{
GodImage *image;
- image = g_object_new (GOD_IMAGE_TYPE, NULL);
+ image = g_object_new (GOD_TYPE_IMAGE, NULL);
return image;
}
Modified: trunk/goffice/drawing/god-image.h
==============================================================================
--- trunk/goffice/drawing/god-image.h (original)
+++ trunk/goffice/drawing/god-image.h Tue Apr 7 09:29:28 2009
@@ -23,11 +23,11 @@
G_BEGIN_DECLS
-#define GOD_IMAGE_TYPE (god_image_get_type ())
-#define GOD_IMAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_IMAGE_TYPE, GodImage))
-#define GOD_IMAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_IMAGE_TYPE, GodImageClass))
-#define IS_GOD_IMAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_IMAGE_TYPE))
-#define IS_GOD_IMAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_IMAGE_TYPE))
+#define GOD_TYPE_IMAGE (god_image_get_type ())
+#define GOD_IMAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_IMAGE, GodImage))
+#define GOD_IMAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_IMAGE, GodImageClass))
+#define GOD_IS_IMAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_IMAGE))
+#define GOD_IS_IMAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_IMAGE))
typedef struct GodImagePrivate_ GodImagePrivate;
Modified: trunk/goffice/drawing/god-paragraph-attributes.c
==============================================================================
--- trunk/goffice/drawing/god-paragraph-attributes.c (original)
+++ trunk/goffice/drawing/god-paragraph-attributes.c Tue Apr 7 09:29:28 2009
@@ -63,7 +63,7 @@
{
GodParagraphAttributes *paragraph;
- paragraph = g_object_new (GOD_PARAGRAPH_ATTRIBUTES_TYPE, NULL);
+ paragraph = g_object_new (GOD_TYPE_PARAGRAPH_ATTRIBUTES, NULL);
return paragraph;
}
Modified: trunk/goffice/drawing/god-paragraph-attributes.h
==============================================================================
--- trunk/goffice/drawing/god-paragraph-attributes.h (original)
+++ trunk/goffice/drawing/god-paragraph-attributes.h Tue Apr 7 09:29:28 2009
@@ -17,12 +17,12 @@
G_BEGIN_DECLS
-#define GOD_PARAGRAPH_ATTRIBUTES_TYPE (god_paragraph_attributes_get_type ())
-#define GOD_PARAGRAPH_ATTRIBUTES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_PARAGRAPH_ATTRIBUTES_TYPE, GodParagraphAttributes))
-#define GOD_PARAGRAPH_ATTRIBUTES_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_PARAGRAPH_ATTRIBUTES_TYPE, GodParagraphAttributesClass))
-#define GOD_PARAGRAPH_ATTRIBUTES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_PARAGRAPH_ATTRIBUTES_TYPE, GodParagraphAttributesClass))
-#define IS_GOD_PARAGRAPH_ATTRIBUTES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_PARAGRAPH_ATTRIBUTES_TYPE))
-#define IS_GOD_PARAGRAPH_ATTRIBUTES_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_PARAGRAPH_ATTRIBUTES_TYPE))
+#define GOD_TYPE_PARAGRAPH_ATTRIBUTES (god_paragraph_attributes_get_type ())
+#define GOD_PARAGRAPH_ATTRIBUTES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_PARAGRAPH_ATTRIBUTES, GodParagraphAttributes))
+#define GOD_PARAGRAPH_ATTRIBUTES_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_PARAGRAPH_ATTRIBUTES, GodParagraphAttributesClass))
+#define GOD_PARAGRAPH_ATTRIBUTES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_TYPE_PARAGRAPH_ATTRIBUTES, GodParagraphAttributesClass))
+#define GOD_IS_PARAGRAPH_ATTRIBUTES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_PARAGRAPH_ATTRIBUTES))
+#define GOD_IS_PARAGRAPH_ATTRIBUTES_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_PARAGRAPH_ATTRIBUTES))
typedef struct GodParagraphAttributesPrivate_ GodParagraphAttributesPrivate;
Modified: trunk/goffice/drawing/god-property-table.c
==============================================================================
--- trunk/goffice/drawing/god-property-table.c (original)
+++ trunk/goffice/drawing/god-property-table.c Tue Apr 7 09:29:28 2009
@@ -280,7 +280,7 @@
{
GodPropertyTable *prop_table;
- prop_table = g_object_new (GOD_PROPERTY_TABLE_TYPE, NULL);
+ prop_table = g_object_new (GOD_TYPE_PROPERTY_TABLE, NULL);
return prop_table;
}
Modified: trunk/goffice/drawing/god-property-table.h
==============================================================================
--- trunk/goffice/drawing/god-property-table.h (original)
+++ trunk/goffice/drawing/god-property-table.h Tue Apr 7 09:29:28 2009
@@ -20,11 +20,11 @@
G_BEGIN_DECLS
-#define GOD_PROPERTY_TABLE_TYPE (god_property_table_get_type ())
-#define GOD_PROPERTY_TABLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_PROPERTY_TABLE_TYPE, GodPropertyTable))
-#define GOD_PROPERTY_TABLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_PROPERTY_TABLE_TYPE, GodClassPropertyTable))
-#define IS_GOD_PROPERTY_TABLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_PROPERTY_TABLE_TYPE))
-#define IS_GOD_PROPERTY_TABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_PROPERTY_TABLE_TYPE))
+#define GOD_TYPE_PROPERTY_TABLE (god_property_table_get_type ())
+#define GOD_PROPERTY_TABLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_PROPERTY_TABLE, GodPropertyTable))
+#define GOD_PROPERTY_TABLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_PROPERTY_TABLE, GodClassPropertyTable))
+#define GOD_IS_PROPERTY_TABLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_PROPERTY_TABLE))
+#define GOD_IS_PROPERTY_TABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_PROPERTY_TABLE))
typedef struct GodPropertyTablePrivate_ GodPropertyTablePrivate;
Modified: trunk/goffice/drawing/god-shape.c
==============================================================================
--- trunk/goffice/drawing/god-shape.c (original)
+++ trunk/goffice/drawing/god-shape.c Tue Apr 7 09:29:28 2009
@@ -72,7 +72,7 @@
{
GodShape *shape;
- shape = g_object_new (GOD_SHAPE_TYPE, NULL);
+ shape = g_object_new (GOD_TYPE_SHAPE, NULL);
return shape;
}
Modified: trunk/goffice/drawing/god-shape.h
==============================================================================
--- trunk/goffice/drawing/god-shape.h (original)
+++ trunk/goffice/drawing/god-shape.h Tue Apr 7 09:29:28 2009
@@ -20,11 +20,11 @@
G_BEGIN_DECLS
-#define GOD_SHAPE_TYPE (god_shape_get_type ())
-#define GOD_SHAPE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_SHAPE_TYPE, GodShape))
-#define GOD_SHAPE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_SHAPE_TYPE, GodShapeClass))
-#define IS_GOD_SHAPE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_SHAPE_TYPE))
-#define IS_GOD_SHAPE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_SHAPE_TYPE))
+#define GOD_TYPE_SHAPE (god_shape_get_type ())
+#define GOD_SHAPE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_SHAPE, GodShape))
+#define GOD_SHAPE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_SHAPE, GodShapeClass))
+#define GOD_IS_SHAPE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_SHAPE))
+#define GOD_IS_SHAPE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_SHAPE))
typedef struct GodShapePrivate_ GodShapePrivate;
Modified: trunk/goffice/drawing/god-text-model.c
==============================================================================
--- trunk/goffice/drawing/god-text-model.c (original)
+++ trunk/goffice/drawing/god-text-model.c Tue Apr 7 09:29:28 2009
@@ -43,7 +43,7 @@
{
GodTextModel *text;
- text = g_object_new (GOD_TEXT_MODEL_TYPE, NULL);
+ text = g_object_new (GOD_TYPE_TEXT_MODEL, NULL);
return text;
}
Modified: trunk/goffice/drawing/god-text-model.h
==============================================================================
--- trunk/goffice/drawing/god-text-model.h (original)
+++ trunk/goffice/drawing/god-text-model.h Tue Apr 7 09:29:28 2009
@@ -21,12 +21,12 @@
G_BEGIN_DECLS
-#define GOD_TEXT_MODEL_TYPE (god_text_model_get_type ())
-#define GOD_TEXT_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TEXT_MODEL_TYPE, GodTextModel))
-#define GOD_TEXT_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TEXT_MODEL_TYPE, GodTextModelClass))
-#define GOD_TEXT_MODEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_TEXT_MODEL_TYPE, GodTextModelClass))
-#define IS_GOD_TEXT_MODEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TEXT_MODEL_TYPE))
-#define IS_GOD_TEXT_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TEXT_MODEL_TYPE))
+#define GOD_TYPE_TEXT_MODEL (god_text_model_get_type ())
+#define GOD_TEXT_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_TEXT_MODEL, GodTextModel))
+#define GOD_TEXT_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_TEXT_MODEL, GodTextModelClass))
+#define GOD_TEXT_MODEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_TYPE_TEXT_MODEL, GodTextModelClass))
+#define GOD_IS_TEXT_MODEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_TEXT_MODEL))
+#define GOD_IS_TEXT_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_TEXT_MODEL))
typedef struct GodTextModelPrivate GodTextModelPrivate;
typedef struct GodTextModel GodTextModel;
Modified: trunk/goffice/goffice.c
==============================================================================
--- trunk/goffice/goffice.c (original)
+++ trunk/goffice/goffice.c Tue Apr 7 09:29:28 2009
@@ -132,25 +132,25 @@
#ifdef GOFFICE_WITH_GTK
goc_plugin_services_init ();
#endif
- (void) GOG_GRAPH_TYPE;
- (void) GOG_CHART_TYPE;
- (void) GOG_PLOT_TYPE;
- (void) GOG_SERIES_TYPE;
- (void) GOG_SERIES_ELEMENT_TYPE;
- (void) GOG_LEGEND_TYPE;
- (void) GOG_AXIS_TYPE;
- (void) GOG_AXIS_LINE_TYPE;
- (void) GOG_LABEL_TYPE;
- (void) GOG_GRID_TYPE;
- (void) GOG_GRID_LINE_TYPE;
+ (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_LABEL;
+ (void) GOG_TYPE_GRID;
+ (void) GOG_TYPE_GRID_LINE;
#ifdef GOFFICE_WITH_GMATHML
- (void) GOG_EQUATION_TYPE;
+ (void) GOG_TYPE_EQUATION;
#endif
- (void) GOG_ERROR_BAR_TYPE;
- (void) GOG_REG_EQN_TYPE;
- (void) GOG_SERIES_LINES_TYPE;
- (void) GO_DATA_SCALAR_VAL_TYPE;
- (void) GO_DATA_SCALAR_STR_TYPE;
+ (void) GOG_TYPE_ERROR_BAR;
+ (void) GOG_TYPE_REG_EQN;
+ (void) GOG_TYPE_SERIES_LINES;
+ (void) GO_TYPE_DATA_SCALAR_VAL;
+ (void) GO_TYPE_DATA_SCALAR_STR;
(void) GOG_3D_BOX_TYPE;
gog_themes_init ();
go_number_format_init ();
Modified: trunk/goffice/graph/gog-3d-box.c
==============================================================================
--- trunk/goffice/graph/gog-3d-box.c (original)
+++ trunk/goffice/graph/gog-3d-box.c Tue Apr 7 09:29:28 2009
@@ -324,4 +324,4 @@
GSF_CLASS (Gog3DBox, gog_3d_box,
gog_3d_box_class_init, gog_3d_box_init,
- GOG_OBJECT_TYPE)
+ GOG_TYPE_OBJECT)
Modified: trunk/goffice/graph/gog-3d-box.h
==============================================================================
--- trunk/goffice/graph/gog-3d-box.h (original)
+++ trunk/goffice/graph/gog-3d-box.h Tue Apr 7 09:29:28 2009
@@ -41,7 +41,7 @@
#define GOG_3D_BOX_TYPE (gog_3d_box_get_type ())
#define GOG_3D_BOX(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_3D_BOX_TYPE, Gog3DBox))
-#define IS_GOG_3D_BOX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_3D_BOX_TYPE))
+#define GOG_IS_3D_BOX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_3D_BOX_TYPE))
GType gog_3d_box_get_type (void);
Modified: trunk/goffice/graph/gog-axis-line-impl.h
==============================================================================
--- trunk/goffice/graph/gog-axis-line-impl.h (original)
+++ trunk/goffice/graph/gog-axis-line-impl.h Tue Apr 7 09:29:28 2009
@@ -66,9 +66,9 @@
typedef GogViewClass GogAxisBaseViewClass;
-#define GOG_AXIS_BASE_VIEW_TYPE (gog_axis_base_view_get_type ())
-#define GOG_AXIS_BASE_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_AXIS_BASE_VIEW_TYPE, GogAxisBaseView))
-#define IS_GOG_AXIS_BASE_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_AXIS_BASE_VIEW_TYPE))
+#define GOG_TYPE_AXIS_BASE_VIEW (gog_axis_base_view_get_type ())
+#define GOG_AXIS_BASE_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_AXIS_BASE_VIEW, GogAxisBaseView))
+#define GOG_IS_AXIS_BASE_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_AXIS_BASE_VIEW))
GType gog_axis_base_view_get_type (void);
void gog_axis_base_view_label_position_request (GogView *view,
Modified: trunk/goffice/graph/gog-axis-line.c
==============================================================================
--- trunk/goffice/graph/gog-axis-line.c (original)
+++ trunk/goffice/graph/gog-axis-line.c Tue Apr 7 09:29:28 2009
@@ -226,7 +226,7 @@
GogAxisBase *axis_base = GOG_AXIS_BASE (child);
if (was_set) {
- if (IS_GOG_AXIS (child))
+ if (GOG_IS_AXIS (child))
axis_base->axis = GOG_AXIS (child);
else
axis_base->axis = GOG_AXIS (child->parent);
@@ -322,7 +322,7 @@
g_return_if_fail (GOG_AXIS_BASE (axis_base) != NULL);
if (position == GOG_AXIS_AUTO) {
- if (IS_GOG_AXIS (axis_base))
+ if (GOG_IS_AXIS (axis_base))
axis = GOG_AXIS (axis_base);
else
axis = GOG_AXIS (gog_object_get_parent (GOG_OBJECT (axis_base)));
@@ -337,7 +337,7 @@
lines = gog_object_get_children (GOG_OBJECT (aptr->data), NULL);
lines = g_slist_prepend (lines, aptr->data);
for (lptr = lines; lptr != NULL; lptr = lptr->next) {
- if (lptr->data == axis_base || !IS_GOG_AXIS_BASE (lptr->data))
+ if (lptr->data == axis_base || !GOG_IS_AXIS_BASE (lptr->data))
continue;
position = gog_axis_base_get_position (GOG_AXIS_BASE (lptr->data));
if (position == GOG_AXIS_AT_HIGH )
@@ -365,7 +365,7 @@
{
GogAxisPosition axis_pos;
- g_return_val_if_fail (IS_GOG_AXIS_BASE (axis_base), GOG_AXIS_AT_LOW);
+ g_return_val_if_fail (GOG_IS_AXIS_BASE (axis_base), GOG_AXIS_AT_LOW);
axis_pos = axis_base->position;
if (axis_pos == GOG_AXIS_CROSS) {
@@ -456,7 +456,7 @@
lines = gog_object_get_children (GOG_OBJECT (aptr->data), NULL);
lines = g_slist_prepend (lines, aptr->data);
for (lptr = lines; lptr != NULL; lptr = lptr->next) {
- if (lptr->data == axis_base || !IS_GOG_AXIS_BASE (lptr->data))
+ if (lptr->data == axis_base || !GOG_IS_AXIS_BASE (lptr->data))
continue;
if (position == gog_axis_base_get_position (GOG_AXIS_BASE (lptr->data))) {
gog_axis_base_set_position (GOG_AXIS_BASE (lptr->data),
@@ -771,7 +771,7 @@
g_return_val_if_fail (GOG_AXIS_BASE (axis_base) != NULL, 0.);
data = axis_base->cross_location.data;
- if (data != NULL && IS_GO_DATA_SCALAR (data))
+ if (data != NULL && GO_IS_DATA_SCALAR (data))
return go_data_scalar_get_value (GO_DATA_SCALAR (data));
return 0.;
@@ -794,7 +794,7 @@
GSF_CLASS_ABSTRACT (GogAxisBase, gog_axis_base,
gog_axis_base_class_init, gog_axis_base_init,
- GOG_STYLED_OBJECT_TYPE);
+ GOG_TYPE_STYLED_OBJECT);
/************************************************************************/
static gboolean gog_axis_base_view_point (GogView *view, double x, double y);
@@ -2052,7 +2052,7 @@
return FALSE;
/* FIXME: not nice */
- if (IS_GOG_AXIS (view->model))
+ if (GOG_IS_AXIS (view->model))
plot_area = gog_chart_view_get_plot_area (view->parent);
else
plot_area = gog_chart_view_get_plot_area (view->parent->parent);
@@ -2140,7 +2140,7 @@
return;
/* FIXME: not nice */
- if (IS_GOG_AXIS (view->model))
+ if (GOG_IS_AXIS (view->model))
plot_area = gog_chart_view_get_plot_area (view->parent);
else
plot_area = gog_chart_view_get_plot_area (view->parent->parent);
@@ -2230,7 +2230,7 @@
GSF_CLASS (GogAxisBaseView, gog_axis_base_view,
gog_axis_base_view_class_init, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
/*****************************************************************************/
/*****************************************************************************/
@@ -2283,5 +2283,5 @@
GSF_CLASS_FULL (GogAxisLine, gog_axis_line,
NULL, NULL, gog_axis_line_class_init, NULL,
- NULL /*init*/, GOG_AXIS_BASE_TYPE, 0,
- GSF_INTERFACE (gog_axis_line_dataset_init, GOG_DATASET_TYPE))
+ NULL /*init*/, GOG_TYPE_AXIS_BASE, 0,
+ GSF_INTERFACE (gog_axis_line_dataset_init, GOG_TYPE_DATASET))
Modified: trunk/goffice/graph/gog-axis-line.h
==============================================================================
--- trunk/goffice/graph/gog-axis-line.h (original)
+++ trunk/goffice/graph/gog-axis-line.h Tue Apr 7 09:29:28 2009
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define GOG_AXIS_BASE_TYPE (gog_axis_base_get_type ())
-#define GOG_AXIS_BASE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_AXIS_BASE_TYPE, GogAxisBase))
-#define IS_GOG_AXIS_BASE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_AXIS_BASE_TYPE))
+#define GOG_TYPE_AXIS_BASE (gog_axis_base_get_type ())
+#define GOG_AXIS_BASE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_AXIS_BASE, GogAxisBase))
+#define GOG_IS_AXIS_BASE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_AXIS_BASE))
GType gog_axis_base_get_type (void);
@@ -51,9 +51,9 @@
GOG_AXIS_TICK_MINOR
} GogAxisTickTypes;
-#define GOG_AXIS_LINE_TYPE (gog_axis_line_get_type ())
-#define GOG_AXIS_LINE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_AXIS_LINE_TYPE, GogAxisLine))
-#define IS_GOG_AXIS_LINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_AXIS_LINE_TYPE))
+#define GOG_TYPE_AXIS_LINE (gog_axis_line_get_type ())
+#define GOG_AXIS_LINE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_AXIS_LINE, GogAxisLine))
+#define GOG_IS_AXIS_LINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_AXIS_LINE))
GType gog_axis_line_get_type (void);
Modified: trunk/goffice/graph/gog-axis.c
==============================================================================
--- trunk/goffice/graph/gog-axis.c (original)
+++ trunk/goffice/graph/gog-axis.c Tue Apr 7 09:29:28 2009
@@ -1197,7 +1197,7 @@
static void
gog_axis_map_set_by_num (GogAxis *axis, gint num)
{
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
if (num >= 0 && num < (gint)G_N_ELEMENTS (map_descs))
g_object_set (G_OBJECT (axis), "map-name", map_descs[num]->name, NULL);
@@ -1210,7 +1210,7 @@
{
unsigned i;
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
for (i = 0; i < G_N_ELEMENTS (map_descs); i++) {
const char *thisname = map_descs[i]->name;
@@ -1244,7 +1244,7 @@
{
unsigned i, map = 0;
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
if (name != NULL)
for (i = 0; i < G_N_ELEMENTS(map_descs); i++) {
@@ -1293,7 +1293,7 @@
{
GogAxisMap *map;
- g_return_val_if_fail (IS_GOG_AXIS (axis), NULL);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), NULL);
map = g_new0 (GogAxisMap, 1);
@@ -1501,7 +1501,7 @@
double tmp;
gboolean user_defined;
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
minimum = axis->min_val;
maximum = axis->max_val;
@@ -1527,7 +1527,7 @@
{
unsigned i;
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
if (axis->ticks != NULL) {
for (i = 0; i < axis->tick_nbr; i++)
@@ -1543,7 +1543,7 @@
static void
gog_axis_calc_ticks (GogAxis *axis)
{
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
if (axis->actual_map_desc->calc_ticks)
axis->actual_map_desc->calc_ticks (axis);
@@ -1654,7 +1654,7 @@
gboolean
gog_axis_set_format (GogAxis *axis, GOFormat *fmt)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), FALSE);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), FALSE);
if (go_format_eq (fmt, axis->assigned_format)) {
go_format_unref (fmt);
@@ -1679,7 +1679,7 @@
GOFormat *
gog_axis_get_format (GogAxis const *axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), NULL);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), NULL);
return axis->assigned_format;
}
@@ -1705,7 +1705,7 @@
GogAxisType
gog_axis_get_atype (GogAxis const *axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), GOG_AXIS_UNKNOWN);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), GOG_AXIS_UNKNOWN);
return axis->type;
}
@@ -1853,7 +1853,7 @@
if (user_defined)
*user_defined = FALSE;
- g_return_val_if_fail (IS_GOG_AXIS (axis), go_nan);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), go_nan);
g_return_val_if_fail (i >= GOG_AXIS_ELEM_MIN && i < GOG_AXIS_ELEM_MAX_ENTRY, go_nan);
if (i != GOG_AXIS_ELEM_CROSS_POINT)
@@ -1861,7 +1861,7 @@
else
dat = GOG_AXIS_BASE (axis)->cross_location.data;
- if (dat != NULL && IS_GO_DATA_SCALAR (dat)) {
+ if (dat != NULL && GO_IS_DATA_SCALAR (dat)) {
double tmp = go_data_scalar_get_value (GO_DATA_SCALAR (dat));
if (go_finite (tmp)) {
if (user_defined)
@@ -2103,7 +2103,7 @@
{
unsigned i, id = 0;
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
for (i = 0; i < G_N_ELEMENTS (polar_units); i++) {
gtk_combo_box_append_text (combo, _(polar_units[i].name));
@@ -2412,8 +2412,8 @@
GSF_CLASS_FULL (GogAxis, gog_axis,
NULL, NULL, gog_axis_class_init, NULL,
- gog_axis_init, GOG_AXIS_BASE_TYPE, 0,
- GSF_INTERFACE (gog_axis_dataset_init, GOG_DATASET_TYPE))
+ gog_axis_init, GOG_TYPE_AXIS_BASE, 0,
+ GSF_INTERFACE (gog_axis_dataset_init, GOG_TYPE_DATASET))
/**
@@ -2425,7 +2425,7 @@
gboolean
gog_axis_is_center_on_ticks (GogAxis const *axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), FALSE);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), FALSE);
return axis->center_on_ticks;
}
@@ -2439,7 +2439,7 @@
gboolean
gog_axis_is_discrete (GogAxis const *axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), FALSE);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), FALSE);
return axis->is_discrete;
}
@@ -2452,7 +2452,7 @@
gboolean
gog_axis_is_inverted (GogAxis const *axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), FALSE);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), FALSE);
return axis->inverted;
}
@@ -2467,7 +2467,7 @@
gboolean
gog_axis_get_bounds (GogAxis const *axis, double *minima, double *maxima)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), FALSE);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), FALSE);
g_return_val_if_fail (minima != NULL, FALSE);
g_return_val_if_fail (maxima != NULL, FALSE);
@@ -2489,7 +2489,7 @@
void
gog_axis_set_bounds (GogAxis *axis, double minimum, double maximum)
{
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
if (go_finite (minimum)) {
gog_dataset_set_dim (GOG_DATASET (axis), GOG_AXIS_ELEM_MIN,
@@ -2513,7 +2513,7 @@
void
gog_axis_set_extents (GogAxis *axis, double start, double stop)
{
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
if (axis->inverted)
gog_axis_set_bounds (axis, stop, start);
@@ -2534,7 +2534,7 @@
unsigned
gog_axis_get_ticks (GogAxis *axis, GogAxisTick **ticks)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), 0);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), 0);
g_return_val_if_fail (ticks != NULL, 0);
*ticks = axis->ticks;
@@ -2552,7 +2552,7 @@
GOData *
gog_axis_get_labels (GogAxis const *axis, GogPlot **plot_that_labeled_axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), NULL);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), NULL);
if (axis->is_discrete) {
if (plot_that_labeled_axis != NULL)
@@ -2574,7 +2574,7 @@
void
gog_axis_add_contributor (GogAxis *axis, GogObject *contrib)
{
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
g_return_if_fail (g_slist_find (axis->contributors, contrib) == NULL);
axis->contributors = g_slist_prepend (axis->contributors, contrib);
@@ -2594,7 +2594,7 @@
{
gboolean update = FALSE;
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
g_return_if_fail (g_slist_find (axis->contributors, contrib) != NULL);
if (axis->min_contrib == contrib) {
@@ -2617,7 +2617,7 @@
GSList *ptr, *list;
GogAxisSet filter;
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
filter = 1 << axis->type;
list = g_slist_copy (axis->contributors);
@@ -2629,7 +2629,7 @@
GSList const *
gog_axis_contributors (GogAxis *axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), NULL);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), NULL);
return axis->contributors;
}
@@ -2642,7 +2642,7 @@
void
gog_axis_bound_changed (GogAxis *axis, GogObject *contrib)
{
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
gog_object_request_update (GOG_OBJECT (axis));
}
@@ -2683,7 +2683,7 @@
void
gog_axis_set_polar_unit (GogAxis *axis, GogAxisPolarUnit unit)
{
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_AXIS (axis));
axis->polar_unit = CLAMP (unit, 0, GOG_AXIS_POLAR_UNIT_MAX - 1);
}
@@ -2699,7 +2699,7 @@
GogAxisPolarUnit
gog_axis_get_polar_unit (GogAxis *axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), 0);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), 0);
return axis->polar_unit;
}
@@ -2716,7 +2716,7 @@
double
gog_axis_get_polar_perimeter (GogAxis *axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), 0.0);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), 0.0);
return polar_units[axis->polar_unit].perimeter;
}
@@ -2730,7 +2730,7 @@
double
gog_axis_get_circular_rotation (GogAxis *axis)
{
- g_return_val_if_fail (IS_GOG_AXIS (axis), 0.0);
+ g_return_val_if_fail (GOG_IS_AXIS (axis), 0.0);
return axis->circular_rotation;
}
@@ -2740,9 +2740,9 @@
typedef GogAxisBaseView GogAxisView;
typedef GogAxisBaseViewClass GogAxisViewClass;
-#define GOG_AXIS_VIEW_TYPE (gog_axis_view_get_type ())
-#define GOG_AXIS_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_AXIS_VIEW_TYPE, GogAxisView))
-#define IS_GOG_AXIS_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_AXIS_VIEW_TYPE))
+#define GOG_TYPE_AXIS_VIEW (gog_axis_view_get_type ())
+#define GOG_AXIS_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_AXIS_VIEW, GogAxisView))
+#define GOG_IS_AXIS_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_AXIS_VIEW))
static GogViewClass *aview_parent_klass;
@@ -2822,7 +2822,7 @@
for (ptr = view->children; ptr != NULL ; ptr = ptr->next) {
child = ptr->data;
pos = child->model->position;
- if (IS_GOG_LABEL (child->model) && !(pos & GOG_POSITION_MANUAL)) {
+ if (GOG_IS_LABEL (child->model) && !(pos & GOG_POSITION_MANUAL)) {
if (gog_chart_is_3d (chart)) {
gog_axis_view_padding_request_3d (view, child,
bbox, &label_padding);
@@ -2936,14 +2936,14 @@
for (ptr = view->children; ptr != NULL ; ptr = ptr->next) {
child = ptr->data;
pos = child->model->position;
- if (IS_GOG_LABEL (child->model) && (pos & GOG_POSITION_MANUAL)) {
+ if (GOG_IS_LABEL (child->model) && (pos & GOG_POSITION_MANUAL)) {
gog_view_size_request (child, &available, &req);
child_bbox = gog_object_get_manual_allocation (gog_view_get_model (child),
bbox, &req);
gog_view_size_allocate (child, &child_bbox);
} else {
if (GOG_POSITION_IS_SPECIAL (pos)) {
- if (IS_GOG_LABEL (child->model)) {
+ if (GOG_IS_LABEL (child->model)) {
if (gog_chart_is_3d (chart)) {
gog_axis_view_size_allocate_3d (view,
child, plot_area);
@@ -3003,7 +3003,7 @@
* before in gog_chart_view since we don't want to render them
* over axis. */
for (ptr = view->children ; ptr != NULL ; ptr = ptr->next) {
- if (!IS_GOG_GRID_LINE (GOG_VIEW (ptr->data)->model))
+ if (!GOG_IS_GRID_LINE (GOG_VIEW (ptr->data)->model))
gog_view_render (ptr->data, bbox);
}
}
@@ -3021,4 +3021,4 @@
static GSF_CLASS (GogAxisView, gog_axis_view,
gog_axis_view_class_init, NULL,
- GOG_AXIS_BASE_VIEW_TYPE)
+ GOG_TYPE_AXIS_BASE_VIEW)
Modified: trunk/goffice/graph/gog-axis.h
==============================================================================
--- trunk/goffice/graph/gog-axis.h (original)
+++ trunk/goffice/graph/gog-axis.h Tue Apr 7 09:29:28 2009
@@ -68,9 +68,9 @@
/*****************************************************************************/
-#define GOG_AXIS_TYPE (gog_axis_get_type ())
-#define GOG_AXIS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_AXIS_TYPE, GogAxis))
-#define IS_GOG_AXIS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_AXIS_TYPE))
+#define GOG_TYPE_AXIS (gog_axis_get_type ())
+#define GOG_AXIS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_AXIS, GogAxis))
+#define GOG_IS_AXIS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_AXIS))
GType gog_axis_get_type (void);
Modified: trunk/goffice/graph/gog-chart-impl.h
==============================================================================
--- trunk/goffice/graph/gog-chart-impl.h (original)
+++ trunk/goffice/graph/gog-chart-impl.h Tue Apr 7 09:29:28 2009
@@ -48,8 +48,8 @@
};
typedef GogOutlinedObjectClass GogChartClass;
-#define GOG_CHART_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_CHART_TYPE, GogChartClass))
-#define IS_GOG_CHART_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_CHART_TYPE))
+#define GOG_CHART_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_CHART, GogChartClass))
+#define GOG_IS_CHART_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_CHART))
/* protected */
Modified: trunk/goffice/graph/gog-chart-map-3d.c
==============================================================================
--- trunk/goffice/graph/gog-chart-map-3d.c (original)
+++ trunk/goffice/graph/gog-chart-map-3d.c Tue Apr 7 09:29:28 2009
@@ -86,7 +86,7 @@
GogAxisSet axis_set;
Gog3DBox *box;
- g_return_val_if_fail (IS_GOG_CHART (chart), NULL);
+ g_return_val_if_fail (GOG_IS_CHART (chart), NULL);
map = g_new (GogChartMap3D, 1);
Modified: trunk/goffice/graph/gog-chart-map.c
==============================================================================
--- trunk/goffice/graph/gog-chart-map.c (original)
+++ trunk/goffice/graph/gog-chart-map.c Tue Apr 7 09:29:28 2009
@@ -792,7 +792,7 @@
GogChartMap *map;
GogAxisSet axis_set;
- g_return_val_if_fail (IS_GOG_CHART (chart), NULL);
+ g_return_val_if_fail (GOG_IS_CHART (chart), NULL);
axis_set = gog_chart_get_axis_set (chart);
g_return_val_if_fail (axis_set != GOG_AXIS_SET_UNKNOWN &&
axis_set != GOG_AXIS_SET_NONE, NULL);
Modified: trunk/goffice/graph/gog-chart.c
==============================================================================
--- trunk/goffice/graph/gog-chart.c (original)
+++ trunk/goffice/graph/gog-chart.c Tue Apr 7 09:29:28 2009
@@ -204,7 +204,7 @@
GogChart *chart = GOG_CHART (obj);
for (ptr = obj->children; ptr != NULL ; ptr = ptr->next)
- if (IS_GOG_PLOT (ptr->data))
+ if (GOG_IS_PLOT (ptr->data))
accum = g_slist_prepend (accum, ptr->data);
g_slist_free (chart->plots);
chart->plots = g_slist_reverse (accum);
@@ -224,7 +224,7 @@
int i = GOG_AXIS_VIRTUAL, j = 1 << GOG_AXIS_VIRTUAL;
for (; i < GOG_AXIS_TYPES; i++, j <<= 1)
if ((axis_set & j) != 0 && (chart->axis_set & j) == 0) {
- GogObject *axis = GOG_OBJECT (g_object_new (GOG_AXIS_TYPE, "type", i, NULL));
+ GogObject *axis = GOG_OBJECT (g_object_new (GOG_TYPE_AXIS, "type", i, NULL));
chart->axis_set |= j;
switch (i) {
case GOG_AXIS_PSEUDO_3D:
@@ -526,7 +526,7 @@
GSF_CLASS (GogChart, gog_chart,
gog_chart_class_init, gog_chart_init,
- GOG_OUTLINED_OBJECT_TYPE)
+ GOG_TYPE_OUTLINED_OBJECT)
/**
* gog_chart_get_position :
@@ -568,7 +568,7 @@
gog_chart_set_position (GogChart *chart,
unsigned int x, unsigned int y, unsigned int cols, unsigned int rows)
{
- g_return_if_fail (IS_GOG_CHART (chart));
+ g_return_if_fail (GOG_IS_CHART (chart));
if (chart->x == x && chart->y == y &&
chart->cols == cols && chart->rows == rows)
@@ -641,7 +641,7 @@
GSList *ptr;
unsigned tmp_full, tmp_visible;
- g_return_if_fail (IS_GOG_CHART (chart));
+ g_return_if_fail (GOG_IS_CHART (chart));
if (!chart->cardinality_valid) {
chart->cardinality_valid = TRUE;
@@ -663,7 +663,7 @@
void
gog_chart_request_cardinality_update (GogChart *chart)
{
- g_return_if_fail (IS_GOG_CHART (chart));
+ g_return_if_fail (GOG_IS_CHART (chart));
if (chart->cardinality_valid) {
chart->cardinality_valid = FALSE;
@@ -677,7 +677,7 @@
{
GSList *ptr;
- g_return_if_fail (IS_GOG_CHART (chart));
+ g_return_if_fail (GOG_IS_CHART (chart));
g_return_if_fail (chart->cardinality_valid);
for (ptr = chart->plots ; ptr != NULL ; ptr = ptr->next)
@@ -687,14 +687,14 @@
GSList *
gog_chart_get_plots (GogChart const *chart)
{
- g_return_val_if_fail (IS_GOG_CHART (chart), NULL);
+ g_return_val_if_fail (GOG_IS_CHART (chart), NULL);
return chart->plots;
}
GogAxisSet
gog_chart_get_axis_set (GogChart const *chart)
{
- g_return_val_if_fail (IS_GOG_CHART (chart), GOG_AXIS_SET_UNKNOWN);
+ g_return_val_if_fail (GOG_IS_CHART (chart), GOG_AXIS_SET_UNKNOWN);
return chart->axis_set;
}
@@ -703,7 +703,7 @@
{
GSList *ptr;
- g_return_val_if_fail (IS_GOG_CHART (chart), FALSE);
+ g_return_val_if_fail (GOG_IS_CHART (chart), FALSE);
for (ptr = chart->plots ; ptr != NULL ; ptr = ptr->next)
if (!gog_plot_axis_set_is_valid (ptr->data, type))
@@ -730,7 +730,7 @@
GSList *ptr;
GogAxisType type;
- g_return_val_if_fail (IS_GOG_CHART (chart), FALSE);
+ g_return_val_if_fail (GOG_IS_CHART (chart), FALSE);
if (chart->axis_set == axis_set)
return TRUE;
@@ -758,7 +758,7 @@
for (ptr = GOG_OBJECT (chart)->children ; ptr != NULL ; ) {
axis = ptr->data;
ptr = ptr->next; /* list may change under us */
- if (IS_GOG_AXIS (axis)) {
+ if (GOG_IS_AXIS (axis)) {
type = -1;
g_object_get (G_OBJECT (axis), "type", &type, NULL);
if (type < 0 || type >= GOG_AXIS_TYPES) {
@@ -791,11 +791,11 @@
GogAxis *axis;
int type;
- g_return_val_if_fail (IS_GOG_CHART (chart), NULL);
+ g_return_val_if_fail (GOG_IS_CHART (chart), NULL);
for (ptr = GOG_OBJECT (chart)->children ; ptr != NULL ; ptr = ptr->next) {
axis = ptr->data;
- if (IS_GOG_AXIS (axis)) {
+ if (GOG_IS_AXIS (axis)) {
type = -1;
g_object_get (G_OBJECT (axis), "type", &type, NULL);
if (type < 0 || type >= GOG_AXIS_TYPES) {
@@ -820,7 +820,7 @@
GogGrid *
gog_chart_get_grid (GogChart const *chart)
{
- g_return_val_if_fail (IS_GOG_CHART (chart), NULL);
+ g_return_val_if_fail (GOG_IS_CHART (chart), NULL);
return GOG_GRID (chart->grid);
}
@@ -1008,9 +1008,9 @@
} GogChartView;
typedef GogOutlinedViewClass GogChartViewClass;
-#define GOG_CHART_VIEW_TYPE (gog_chart_view_get_type ())
-#define GOG_CHART_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_CHART_VIEW_TYPE, GogChartView))
-#define IS_GOG_CHART_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_CHART_VIEW_TYPE))
+#define GOG_TYPE_CHART_VIEW (gog_chart_view_get_type ())
+#define GOG_CHART_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_CHART_VIEW, GogChartView))
+#define GOG_IS_CHART_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_CHART_VIEW))
static GogViewClass *cview_parent_klass;
@@ -1085,10 +1085,10 @@
for (ptr = start_ptr; ptr != NULL; ptr = ptr->next) {
child_view = ptr->data;
- if (IS_GOG_AXIS (child_view->model)) {
+ if (GOG_IS_AXIS (child_view->model)) {
for (child_ptr = child_view->children; child_ptr != NULL; child_ptr = child_ptr->next) {
axis_child_view = child_ptr->data;
- if (IS_GOG_GRID_LINE (axis_child_view->model)) {
+ if (GOG_IS_GRID_LINE (axis_child_view->model)) {
if (gog_grid_line_is_minor (GOG_GRID_LINE (axis_child_view->model)))
minor_grid_lines = g_slist_prepend (minor_grid_lines,
axis_child_view);
@@ -1129,7 +1129,7 @@
/* Render some plots before axes */
for (ptr = view->children ; ptr != NULL ; ptr = ptr->next) {
child_view = ptr->data;
- if (IS_GOG_PLOT (child_view->model) &&
+ if (GOG_IS_PLOT (child_view->model) &&
GOG_PLOT (child_view->model)->render_before_axes)
gog_view_render (ptr->data, bbox);
}
@@ -1148,34 +1148,34 @@
if (gog_chart_is_3d (chart)) {
for (ptr = view->children ; ptr != NULL ; ptr = ptr->next) {
child_view = ptr->data;
- if (!IS_GOG_AXIS (child_view->model) && !IS_GOG_PLOT (child_view->model))
+ if (!GOG_IS_AXIS (child_view->model) && !GOG_IS_PLOT (child_view->model))
gog_view_render (ptr->data, bbox);
}
/* now render plot and axes */
for (ptr = view->children ; ptr != NULL ; ptr = ptr->next) {
child_view = ptr->data;
- if (!IS_GOG_AXIS (child_view->model))
+ if (!GOG_IS_AXIS (child_view->model))
continue;
gog_view_render (ptr->data, bbox);
grid_line_render (ptr, bbox);
}
for (ptr = view->children ; ptr != NULL ; ptr = ptr->next) {
child_view = ptr->data;
- if (IS_GOG_AXIS (child_view->model))
+ if (GOG_IS_AXIS (child_view->model))
continue;
- if (IS_GOG_PLOT (child_view->model))
+ if (GOG_IS_PLOT (child_view->model))
gog_view_render (ptr->data, bbox);
}
} else {
/* KLUDGE: render grid lines before axis */
for (ptr = view->children ; ptr != NULL ; ptr = ptr->next) {
child_view = ptr->data;
- if (!grid_line_rendered && IS_GOG_AXIS (child_view->model)) {
+ if (!grid_line_rendered && GOG_IS_AXIS (child_view->model)) {
grid_line_render (ptr, bbox);
plot_render (view, bbox);
grid_line_rendered = TRUE;
}
- if (IS_GOG_PLOT (child_view->model)) {
+ if (GOG_IS_PLOT (child_view->model)) {
if (!GOG_PLOT (child_view->model)->render_before_axes)
gog_view_render (ptr->data, bbox);
} else
@@ -1200,12 +1200,12 @@
static GSF_CLASS (GogChartView, gog_chart_view,
gog_chart_view_class_init, gog_chart_view_init,
- GOG_OUTLINED_VIEW_TYPE)
+ GOG_TYPE_OUTLINED_VIEW)
GogViewAllocation const *
gog_chart_view_get_plot_area (GogView const *view)
{
- g_return_val_if_fail (IS_GOG_CHART_VIEW (view), NULL);
+ g_return_val_if_fail (GOG_IS_CHART_VIEW (view), NULL);
return &(GOG_CHART_VIEW (view)->plot_area);
}
Modified: trunk/goffice/graph/gog-chart.h
==============================================================================
--- trunk/goffice/graph/gog-chart.h (original)
+++ trunk/goffice/graph/gog-chart.h Tue Apr 7 09:29:28 2009
@@ -30,9 +30,9 @@
GogAxisSet gog_axis_set_from_str (char const *str);
-#define GOG_CHART_TYPE (gog_chart_get_type ())
-#define GOG_CHART(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_CHART_TYPE, GogChart))
-#define IS_GOG_CHART(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_CHART_TYPE))
+#define GOG_TYPE_CHART (gog_chart_get_type ())
+#define GOG_CHART(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_CHART, GogChart))
+#define GOG_IS_CHART(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_CHART))
GType gog_chart_get_type (void);
Modified: trunk/goffice/graph/gog-child-button.c
==============================================================================
--- trunk/goffice/graph/gog-child-button.c (original)
+++ trunk/goffice/graph/gog-child-button.c Tue Apr 7 09:29:28 2009
@@ -189,7 +189,7 @@
addition->parent = NULL;
}
- if (!IS_GOG_GRAPH (object))
+ if (!GOG_IS_GRAPH (object))
for (child_iter = object->children; child_iter != NULL; child_iter = child_iter->next)
build_addition_process_childs (child_iter->data, closure);
}
@@ -227,8 +227,8 @@
closure.child_button = child_button;
for (start_object = child_button->object;
- !IS_GOG_CHART (start_object) &&
- !IS_GOG_GRAPH (start_object) &&
+ !GOG_IS_CHART (start_object) &&
+ !GOG_IS_GRAPH (start_object) &&
start_object != NULL;
start_object = start_object->parent);
@@ -267,7 +267,7 @@
gog_child_button_set_object (GogChildButton *child_button, GogObject *gog_object)
{
g_return_if_fail (GOG_IS_CHILD_BUTTON (child_button));
- g_return_if_fail (IS_GOG_OBJECT (gog_object));
+ g_return_if_fail (GOG_IS_OBJECT (gog_object));
if (gog_object == child_button->object)
return;
Modified: trunk/goffice/graph/gog-control-foocanvas.c
==============================================================================
--- trunk/goffice/graph/gog-control-foocanvas.c (original)
+++ trunk/goffice/graph/gog-control-foocanvas.c Tue Apr 7 09:29:28 2009
@@ -39,9 +39,9 @@
static GObjectClass *parent_klass;
-#define GOG_CONTROL_FOOCANVAS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_CONTROL_FOOCANVAS_TYPE, GogControlFooCanvasClass))
-#define IS_GOG_CONTROL_FOOCANVAS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_CONTROL_FOOCANVAS_TYPE))
-#define GOG_CONTROL_FOOCANVAS_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS ((k), GOG_CONTROL_FOOCANVAS_TYPE, GogControlFooCanvasClass))
+#define GOG_CONTROL_FOOCANVAS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_CONTROL_FOOCANVAS, GogControlFooCanvasClass))
+#define GOG_IS_CONTROL_FOOCANVAS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_CONTROL_FOOCANVAS))
+#define GOG_CONTROL_FOOCANVAS_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS ((k), GOG_TYPE_CONTROL_FOOCANVAS, GogControlFooCanvasClass))
static void
gog_control_foocanvas_set_property (GObject *gobject, guint param_id,
@@ -248,13 +248,13 @@
g_param_spec_object ("model",
_("Model"),
_("The GogObject this object displays"),
- GOG_OBJECT_TYPE,
+ GOG_TYPE_OBJECT,
GSF_PARAM_STATIC | G_PARAM_WRITABLE));
g_object_class_install_property (gobject_klass, CTRL_FOO_PROP_RENDERER,
g_param_spec_object ("renderer",
_("Renderer"),
_("The GogRenderer being displayed"),
- GOG_RENDERER_TYPE,
+ GOG_TYPE_RENDERER,
GSF_PARAM_STATIC | G_PARAM_READWRITE));
}
Modified: trunk/goffice/graph/gog-control-foocanvas.h
==============================================================================
--- trunk/goffice/graph/gog-control-foocanvas.h (original)
+++ trunk/goffice/graph/gog-control-foocanvas.h Tue Apr 7 09:29:28 2009
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define GOG_CONTROL_FOOCANVAS_TYPE (gog_control_foocanvas_get_type ())
-#define GOG_CONTROL_FOOCANVAS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_CONTROL_FOOCANVAS_TYPE, GogControlFooCanvas))
-#define IS_GOG_CONTROL_FOOCANVAS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_CONTROL_FOOCANVAS_TYPE))
+#define GOG_TYPE_CONTROL_FOOCANVAS (gog_control_foocanvas_get_type ())
+#define GOG_CONTROL_FOOCANVAS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_CONTROL_FOOCANVAS, GogControlFooCanvas))
+#define GOG_IS_CONTROL_FOOCANVAS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_CONTROL_FOOCANVAS))
typedef struct _GogControlFooCanvas GogControlFooCanvas;
Modified: trunk/goffice/graph/gog-data-allocator.c
==============================================================================
--- trunk/goffice/graph/gog-data-allocator.c (original)
+++ trunk/goffice/graph/gog-data-allocator.c Tue Apr 7 09:29:28 2009
@@ -54,7 +54,7 @@
void
gog_data_allocator_allocate (GogDataAllocator *dalloc, GogPlot *plot)
{
- g_return_if_fail (IS_GOG_DATA_ALLOCATOR (dalloc));
+ g_return_if_fail (GOG_IS_DATA_ALLOCATOR (dalloc));
GOG_DATA_ALLOCATOR_GET_CLASS (dalloc)->allocate (dalloc, plot);
}
@@ -72,7 +72,7 @@
gog_data_allocator_editor (GogDataAllocator *dalloc, GogDataset *set,
int dim_i, GogDataType data_type)
{
- g_return_val_if_fail (IS_GOG_DATA_ALLOCATOR (dalloc), NULL);
+ g_return_val_if_fail (GOG_IS_DATA_ALLOCATOR (dalloc), NULL);
return GOG_DATA_ALLOCATOR_GET_CLASS (dalloc)->editor (dalloc, set,
dim_i, data_type);
}
Modified: trunk/goffice/graph/gog-data-allocator.h
==============================================================================
--- trunk/goffice/graph/gog-data-allocator.h (original)
+++ trunk/goffice/graph/gog-data-allocator.h Tue Apr 7 09:29:28 2009
@@ -35,12 +35,12 @@
int dim_i, GogDataType data_type);
} GogDataAllocatorClass;
-#define GOG_DATA_ALLOCATOR_TYPE (gog_data_allocator_get_type ())
-#define GOG_DATA_ALLOCATOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_DATA_ALLOCATOR_TYPE, GogDataAllocator))
-#define IS_GOG_DATA_ALLOCATOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_DATA_ALLOCATOR_TYPE))
-#define GOG_DATA_ALLOCATOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_DATA_ALLOCATOR_TYPE, GogDataAllocatorClass))
-#define IS_GOG_DATA_ALLOCATOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_DATA_ALLOCATOR_TYPE))
-#define GOG_DATA_ALLOCATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GOG_DATA_ALLOCATOR_TYPE, GogDataAllocatorClass))
+#define GOG_TYPE_DATA_ALLOCATOR (gog_data_allocator_get_type ())
+#define GOG_DATA_ALLOCATOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_DATA_ALLOCATOR, GogDataAllocator))
+#define GOG_IS_DATA_ALLOCATOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_DATA_ALLOCATOR))
+#define GOG_DATA_ALLOCATOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_DATA_ALLOCATOR, GogDataAllocatorClass))
+#define GOG_IS_DATA_ALLOCATOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_DATA_ALLOCATOR))
+#define GOG_DATA_ALLOCATOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GOG_TYPE_DATA_ALLOCATOR, GogDataAllocatorClass))
GType gog_data_allocator_get_type (void);
Modified: trunk/goffice/graph/gog-data-set.c
==============================================================================
--- trunk/goffice/graph/gog-data-set.c (original)
+++ trunk/goffice/graph/gog-data-set.c Tue Apr 7 09:29:28 2009
@@ -97,9 +97,9 @@
{
GogDatasetClass *klass;
- g_return_if_fail (val == NULL || IS_GO_DATA (val));
+ g_return_if_fail (val == NULL || GO_IS_DATA (val));
- if (set == NULL || !IS_GOG_DATASET (set)) {
+ if (set == NULL || !GOG_IS_DATASET (set)) {
g_warning ("gog_dataset_set_dim called with invalid GogDataset");
goto done;
}
@@ -236,13 +236,13 @@
dst_dat = NULL;
/* for scalar and vector data, try to transform to values first
if we find non finite, use strings */
- if (IS_GO_DATA_SCALAR (src_dat)) {
+ if (GO_IS_DATA_SCALAR (src_dat)) {
char const *str = go_data_scalar_get_str (GO_DATA_SCALAR (src_dat));
char *end;
double d = g_strtod (str, &end);
dst_dat =(*end == 0)? go_data_scalar_val_new (d):
go_data_scalar_str_new (g_strdup (str), TRUE);
- } else if (IS_GO_DATA_VECTOR (src_dat)) {
+ } else if (GO_IS_DATA_VECTOR (src_dat)) {
gboolean as_values = TRUE;
GODataVector *vec = GO_DATA_VECTOR (src_dat);
double *d = go_data_vector_get_values (vec);
@@ -263,7 +263,7 @@
str[i] = go_data_vector_get_str (vec, i);
dst_dat = go_data_vector_str_new ((char const* const*) str, n, g_free);
}
- } else if (IS_GO_DATA_MATRIX (src_dat)) {
+ } else if (GO_IS_DATA_MATRIX (src_dat)) {
/* only values are supported so don't care */
GODataMatrix *mat = GO_DATA_MATRIX (src_dat);
GODataMatrixSize size = go_data_matrix_get_size (mat);
Modified: trunk/goffice/graph/gog-data-set.h
==============================================================================
--- trunk/goffice/graph/gog-data-set.h (original)
+++ trunk/goffice/graph/gog-data-set.h Tue Apr 7 09:29:28 2009
@@ -45,12 +45,12 @@
void (*dim_changed) (GogDataset *set, int dim_i);
} GogDatasetClass;
-#define GOG_DATASET_TYPE (gog_dataset_get_type ())
-#define GOG_DATASET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_DATASET_TYPE, GogDataset))
-#define IS_GOG_DATASET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_DATASET_TYPE))
-#define GOG_DATASET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_DATASET_TYPE, GogDatasetClass))
-#define IS_GOG_DATASET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_DATASET_TYPE))
-#define GOG_DATASET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GOG_DATASET_TYPE, GogDatasetClass))
+#define GOG_TYPE_DATASET (gog_dataset_get_type ())
+#define GOG_DATASET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_DATASET, GogDataset))
+#define GOG_IS_DATASET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_DATASET))
+#define GOG_DATASET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_DATASET, GogDatasetClass))
+#define GOG_IS_DATASET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_DATASET))
+#define GOG_DATASET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GOG_TYPE_DATASET, GogDatasetClass))
GType gog_dataset_get_type (void);
Modified: trunk/goffice/graph/gog-equation.c
==============================================================================
--- trunk/goffice/graph/gog-equation.c (original)
+++ trunk/goffice/graph/gog-equation.c Tue Apr 7 09:29:28 2009
@@ -357,7 +357,7 @@
GSF_CLASS (GogEquation, gog_equation,
gog_equation_class_init, gog_equation_init,
- GOG_OUTLINED_OBJECT_TYPE);
+ GOG_TYPE_OUTLINED_OBJECT);
typedef struct {
GogOutlinedView base;
@@ -367,9 +367,9 @@
typedef GogOutlinedViewClass GogEquationViewClass;
-#define GOG_EQUATION_VIEW_TYPE (gog_equation_view_get_type ())
-#define GOG_EQUATION_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_EQUATION_VIEW_TYPE, GogEquationView))
-#define IS_GOG_EQUATION_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_EQUATION_VIEW_TYPE))
+#define GOG_TYPE_EQUATION_VIEW (gog_equation_view_get_type ())
+#define GOG_EQUATION_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_EQUATION_VIEW, GogEquationView))
+#define GOG_IS_EQUATION_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_EQUATION_VIEW))
static GogViewClass *equation_view_parent_klass;
@@ -452,5 +452,5 @@
GSF_CLASS (GogEquationView, gog_equation_view,
gog_equation_view_class_init, gog_equation_view_init,
- GOG_OUTLINED_VIEW_TYPE)
+ GOG_TYPE_OUTLINED_VIEW)
Modified: trunk/goffice/graph/gog-equation.h
==============================================================================
--- trunk/goffice/graph/gog-equation.h (original)
+++ trunk/goffice/graph/gog-equation.h Tue Apr 7 09:29:28 2009
@@ -27,10 +27,10 @@
G_BEGIN_DECLS
-#define GOG_EQUATION_TYPE (gog_equation_get_type ())
-#define GOG_EQUATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_EQUATION_TYPE, GogEquation))
-#define IS_GOG_EQUATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_EQUATION_TYPE))
-#define GOG_EQUATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_EQUATION_TYPE, GogEquationClass))
+#define GOG_TYPE_EQUATION (gog_equation_get_type ())
+#define GOG_EQUATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_EQUATION, GogEquation))
+#define GOG_IS_EQUATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_EQUATION))
+#define GOG_EQUATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_EQUATION, GogEquationClass))
GType gog_equation_get_type (void);
Modified: trunk/goffice/graph/gog-error-bar.c
==============================================================================
--- trunk/goffice/graph/gog-error-bar.c (original)
+++ trunk/goffice/graph/gog-error-bar.c Tue Apr 7 09:29:28 2009
@@ -160,7 +160,7 @@
} else {
GtkWidget *table = glade_xml_get_widget (gui, "values_table");
if (!editor->bar) {
- editor->bar = g_object_new (GOG_ERROR_BAR_TYPE, NULL);
+ editor->bar = g_object_new (GOG_TYPE_ERROR_BAR, NULL);
editor->bar->style->line.color = editor->color;
editor->bar->style->line.width = editor->line_width;
editor->bar->width = editor->width;
@@ -213,7 +213,7 @@
GogErrorBarEditor *editor;
unsigned int i;
- g_return_val_if_fail (IS_GOG_SERIES (series), NULL);
+ g_return_val_if_fail (GOG_IS_SERIES (series), NULL);
editor = g_new0 (GogErrorBarEditor, 1);
editor->series = series;
@@ -476,7 +476,7 @@
GSF_CLASS_FULL (GogErrorBar, gog_error_bar,
NULL, NULL, gog_error_bar_class_init, NULL,
gog_error_bar_init, G_TYPE_OBJECT, 0,
- GSF_INTERFACE (gog_error_bar_persist_init, GO_PERSIST_TYPE))
+ GSF_INTERFACE (gog_error_bar_persist_init, GO_TYPE_PERSIST))
/**
@@ -506,7 +506,7 @@
With a 0 value, it might be, because of rounding errors */
*min = *max = -1.;
- g_return_val_if_fail (IS_GOG_ERROR_BAR (bar), FALSE);
+ g_return_val_if_fail (GOG_IS_ERROR_BAR (bar), FALSE);
if (!gog_series_is_valid (bar->series))
return FALSE;
vec = GO_DATA_VECTOR (bar->series->values[bar->dim_i].data);
@@ -514,7 +514,7 @@
return FALSE;
value = go_data_vector_get_value (vec, index);
data = bar->series->values[bar->error_i].data;
- length = (IS_GO_DATA (data)) ? go_data_vector_get_len (GO_DATA_VECTOR (data)) : 0;
+ length = (GO_IS_DATA (data)) ? go_data_vector_get_len (GO_DATA_VECTOR (data)) : 0;
if ((bar->type == GOG_ERROR_BAR_TYPE_NONE) || isnan (value) || !go_finite (value))
return FALSE;
@@ -525,7 +525,7 @@
*max = go_data_vector_get_value (GO_DATA_VECTOR (data), index);
data = bar->series->values[bar->error_i + 1].data;
- length = (IS_GO_DATA (data))? go_data_vector_get_len (GO_DATA_VECTOR (data)): 0;
+ length = (GO_IS_DATA (data))? go_data_vector_get_len (GO_DATA_VECTOR (data)): 0;
if (length == 0)
*min = *max; /* use same values for + and - */
else if (length == 1)
@@ -563,7 +563,7 @@
int i, imax;
double tmp_min, tmp_max, plus, minus;
- g_return_if_fail (IS_GOG_ERROR_BAR (bar));
+ g_return_if_fail (GOG_IS_ERROR_BAR (bar));
if (!gog_series_is_valid (bar->series)) {
*min = DBL_MAX;
@@ -594,9 +594,9 @@
{
GogErrorBar* dbar;
- g_return_val_if_fail (IS_GOG_ERROR_BAR (bar), NULL);
+ g_return_val_if_fail (GOG_IS_ERROR_BAR (bar), NULL);
- dbar = g_object_new (GOG_ERROR_BAR_TYPE, NULL);
+ dbar = g_object_new (GOG_TYPE_ERROR_BAR, NULL);
dbar->type = bar->type;
dbar->series = bar->series;
dbar->dim_i = bar->dim_i;
Modified: trunk/goffice/graph/gog-error-bar.h
==============================================================================
--- trunk/goffice/graph/gog-error-bar.h (original)
+++ trunk/goffice/graph/gog-error-bar.h Tue Apr 7 09:29:28 2009
@@ -55,9 +55,9 @@
GogStyle* style;
};
-#define GOG_ERROR_BAR_TYPE (gog_error_bar_get_type ())
-#define GOG_ERROR_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_ERROR_BAR_TYPE, GogErrorBar))
-#define IS_GOG_ERROR_BAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_ERROR_BAR_TYPE))
+#define GOG_TYPE_ERROR_BAR (gog_error_bar_get_type ())
+#define GOG_ERROR_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_ERROR_BAR, GogErrorBar))
+#define GOG_IS_ERROR_BAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_ERROR_BAR))
GType gog_error_bar_get_type (void);
Modified: trunk/goffice/graph/gog-graph-impl.h
==============================================================================
--- trunk/goffice/graph/gog-graph-impl.h (original)
+++ trunk/goffice/graph/gog-graph-impl.h Tue Apr 7 09:29:28 2009
@@ -54,8 +54,8 @@
void (*remove_data) (GogGraph *graph, GOData *input);
} GogGraphClass;
-#define GOG_GRAPH_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_GRAPH_TYPE, GogGraphClass))
-#define IS_GOG_GRAPH_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_GRAPH_TYPE))
+#define GOG_GRAPH_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_GRAPH, GogGraphClass))
+#define GOG_IS_GRAPH_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_GRAPH))
/* protected */
gboolean gog_graph_request_update (GogGraph *graph);
Modified: trunk/goffice/graph/gog-graph.c
==============================================================================
--- trunk/goffice/graph/gog-graph.c (original)
+++ trunk/goffice/graph/gog-graph.c Tue Apr 7 09:29:28 2009
@@ -90,7 +90,7 @@
GObject *object = g_value_get_object (value);
if ((GODoc *) object == graph->doc)
break;
- if (IS_GO_DOC (object)) {
+ if (GO_IS_DOC (object)) {
graph->doc = (GODoc *) object;
gog_object_document_changed (GOG_OBJECT (graph), graph->doc);
}
@@ -340,7 +340,7 @@
g_param_spec_object ("theme",
_("Theme"),
_("The theme for elements of the graph"),
- GOG_THEME_TYPE,
+ GOG_TYPE_THEME,
GSF_PARAM_STATIC | G_PARAM_READWRITE));
g_object_class_install_property (gobject_klass, GRAPH_PROP_THEME_NAME,
g_param_spec_string ("theme-name",
@@ -364,7 +364,7 @@
g_param_spec_object ("document",
_("Document"),
_("the document for this graph"),
- GO_DOC_TYPE,
+ GO_TYPE_DOC,
GSF_PARAM_STATIC | G_PARAM_READWRITE));
}
@@ -392,7 +392,7 @@
GSF_CLASS (GogGraph, gog_graph,
gog_graph_class_init, gog_graph_init,
- GOG_OUTLINED_OBJECT_TYPE)
+ GOG_TYPE_OUTLINED_OBJECT)
/**
* gog_graph_validate_chart_layout :
@@ -411,7 +411,7 @@
unsigned i, max_col, max_row;
gboolean changed = FALSE;
- g_return_val_if_fail (IS_GOG_GRAPH (graph), FALSE);
+ g_return_val_if_fail (GOG_IS_GRAPH (graph), FALSE);
/* There won't be many of charts so we do the right thing */
@@ -475,14 +475,14 @@
unsigned
gog_graph_num_cols (GogGraph const *graph)
{
- g_return_val_if_fail (IS_GOG_GRAPH (graph), 1);
+ g_return_val_if_fail (GOG_IS_GRAPH (graph), 1);
return graph->num_cols;
}
unsigned
gog_graph_num_rows (GogGraph const *graph)
{
- g_return_val_if_fail (IS_GOG_GRAPH (graph), 1);
+ g_return_val_if_fail (GOG_IS_GRAPH (graph), 1);
return graph->num_rows;
}
@@ -503,7 +503,7 @@
GogTheme *
gog_graph_get_theme (GogGraph const *graph)
{
- g_return_val_if_fail (IS_GOG_GRAPH (graph), NULL);
+ g_return_val_if_fail (GOG_IS_GRAPH (graph), NULL);
return graph->theme;
}
@@ -515,7 +515,7 @@
for (ptr = object->children; ptr != NULL; ptr = ptr->next)
apply_theme (ptr->data, theme, force_auto);
- if (IS_GOG_STYLED_OBJECT (object)) {
+ if (GOG_IS_STYLED_OBJECT (object)) {
GogStyledObject *styled_object = (GogStyledObject *) object;
GogStyle *style;
@@ -533,8 +533,8 @@
void
gog_graph_set_theme (GogGraph *graph, GogTheme *theme)
{
- g_return_if_fail (IS_GOG_GRAPH (graph));
- g_return_if_fail (IS_GOG_THEME (theme));
+ g_return_if_fail (GOG_IS_GRAPH (graph));
+ g_return_if_fail (GOG_IS_THEME (theme));
graph->theme = theme;
@@ -551,7 +551,7 @@
GSList *
gog_graph_get_data (GogGraph const *graph)
{
- g_return_val_if_fail (IS_GOG_GRAPH (graph), NULL);
+ g_return_val_if_fail (GOG_IS_GRAPH (graph), NULL);
return graph->data;
}
@@ -573,8 +573,8 @@
if (dat == NULL)
return NULL;
- g_return_val_if_fail (IS_GOG_GRAPH (graph), dat);
- g_return_val_if_fail (IS_GO_DATA (dat), dat);
+ g_return_val_if_fail (GOG_IS_GRAPH (graph), dat);
+ g_return_val_if_fail (GO_IS_DATA (dat), dat);
/* Does it already exist in the graph ? */
res = g_hash_table_lookup (graph->data_refs, dat);
@@ -620,14 +620,14 @@
if (dat == NULL)
return;
- g_return_if_fail (IS_GO_DATA (dat));
+ g_return_if_fail (GO_IS_DATA (dat));
g_object_unref (dat);
if (graph == NULL)
return;
- g_return_if_fail (IS_GOG_GRAPH (graph));
+ g_return_if_fail (GOG_IS_GRAPH (graph));
/* once we've been destroyed the list is gone */
if (graph->data == NULL)
@@ -673,7 +673,7 @@
if (G_OBJECT (graph)->ref_count <= 0)
return FALSE;
- g_return_val_if_fail (IS_GOG_GRAPH (graph), FALSE);
+ g_return_val_if_fail (GOG_IS_GRAPH (graph), FALSE);
if (graph->idle_handler == 0) { /* higher priority than canvas */
graph->idle_handler = g_idle_add_full (G_PRIORITY_HIGH_IDLE,
@@ -710,7 +710,7 @@
void
gog_graph_get_size (GogGraph *graph, double *width, double *height)
{
- g_return_if_fail (IS_GOG_GRAPH (graph));
+ g_return_if_fail (GOG_IS_GRAPH (graph));
if (width != NULL)
*width = graph->width;
@@ -728,7 +728,7 @@
void
gog_graph_set_size (GogGraph *graph, double width, double height)
{
- g_return_if_fail (IS_GOG_GRAPH (graph));
+ g_return_if_fail (GOG_IS_GRAPH (graph));
if (width != graph->width || height != graph->height) {
graph->height = height;
@@ -764,9 +764,9 @@
void (*selection_changed) (GogGraphView *view, GogObject *gobj);
} GogGraphViewClass;
-#define GOG_GRAPH_VIEW_TYPE (gog_graph_view_get_type ())
-#define GOG_GRAPH_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_GRAPH_VIEW_TYPE, GogGraphView))
-#define IS_GOG_GRAPH_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_GRAPH_VIEW_TYPE))
+#define GOG_TYPE_GRAPH_VIEW (gog_graph_view_get_type ())
+#define GOG_GRAPH_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_GRAPH_VIEW, GogGraphView))
+#define GOG_IS_GRAPH_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_GRAPH_VIEW))
enum {
GRAPH_VIEW_PROP_0,
@@ -865,7 +865,7 @@
g_param_spec_object ("renderer",
_("Renderer"),
_("the renderer for this view"),
- GOG_RENDERER_TYPE,
+ GOG_TYPE_RENDERER,
GSF_PARAM_STATIC | G_PARAM_WRITABLE));
gog_graph_view_signals [GRAPH_VIEW_SELECTION_CHANGED] = g_signal_new ("selection-changed",
@@ -891,7 +891,7 @@
GSF_CLASS (GogGraphView, gog_graph_view,
gog_graph_view_class_init, gog_graph_view_init,
- GOG_OUTLINED_VIEW_TYPE)
+ GOG_TYPE_OUTLINED_VIEW)
#ifdef GOFFICE_WITH_GTK
static void
@@ -1008,7 +1008,7 @@
GogView *
gog_graph_view_get_selection (GogGraphView *gview)
{
- g_return_val_if_fail (IS_GOG_GRAPH_VIEW (gview), NULL);
+ g_return_val_if_fail (GOG_IS_GRAPH_VIEW (gview), NULL);
return gview->selected_view;
}
@@ -1026,8 +1026,8 @@
{
GogView *view;
- g_return_if_fail (IS_GOG_GRAPH_VIEW (gview));
- g_return_if_fail (IS_GOG_OBJECT (gobj));
+ g_return_if_fail (GOG_IS_GRAPH_VIEW (gview));
+ g_return_if_fail (GOG_IS_OBJECT (gobj));
if (gview->selected_object == gobj)
return;
@@ -1102,7 +1102,7 @@
GogRenderer *renderer;
gboolean result;
- g_return_val_if_fail (IS_GOG_GRAPH (graph), FALSE);
+ g_return_val_if_fail (GOG_IS_GRAPH (graph), FALSE);
g_return_val_if_fail (format != GO_IMAGE_FORMAT_UNKNOWN, FALSE);
renderer = gog_renderer_new (graph);
@@ -1126,7 +1126,7 @@
{
GogRenderer *renderer;
- g_return_if_fail (IS_GOG_GRAPH (graph));
+ g_return_if_fail (GOG_IS_GRAPH (graph));
renderer = gog_renderer_new (graph);
gog_renderer_render_to_cairo (renderer, cairo, w, h);
Modified: trunk/goffice/graph/gog-graph.h
==============================================================================
--- trunk/goffice/graph/gog-graph.h (original)
+++ trunk/goffice/graph/gog-graph.h Tue Apr 7 09:29:28 2009
@@ -34,9 +34,9 @@
G_BEGIN_DECLS
-#define GOG_GRAPH_TYPE (gog_graph_get_type ())
-#define GOG_GRAPH(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_GRAPH_TYPE, GogGraph))
-#define IS_GOG_GRAPH(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_GRAPH_TYPE))
+#define GOG_TYPE_GRAPH (gog_graph_get_type ())
+#define GOG_GRAPH(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_GRAPH, GogGraph))
+#define GOG_IS_GRAPH(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_GRAPH))
GType gog_graph_get_type (void);
@@ -59,9 +59,9 @@
void gog_graph_get_size (GogGraph *graph, double *width, double *height);
void gog_graph_set_size (GogGraph *graph, double width, double height);
-#define GOG_GRAPH_VIEW_TYPE (gog_graph_view_get_type ())
-#define GOG_GRAPH_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_GRAPH_VIEW_TYPE, GogGraphView))
-#define IS_GOG_GRAPH_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_GRAPH_VIEW_TYPE))
+#define GOG_TYPE_GRAPH_VIEW (gog_graph_view_get_type ())
+#define GOG_GRAPH_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_GRAPH_VIEW, GogGraphView))
+#define GOG_IS_GRAPH_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_GRAPH_VIEW))
GType gog_graph_view_get_type (void);
Modified: trunk/goffice/graph/gog-grid-line.c
==============================================================================
--- trunk/goffice/graph/gog-grid-line.c (original)
+++ trunk/goffice/graph/gog-grid-line.c Tue Apr 7 09:29:28 2009
@@ -63,7 +63,7 @@
gboolean
gog_grid_line_is_minor (GogGridLine *ggl)
{
- g_return_val_if_fail (IS_GOG_GRID_LINE (ggl), FALSE);
+ g_return_val_if_fail (GOG_IS_GRID_LINE (ggl), FALSE);
return ggl->is_minor;
}
@@ -134,15 +134,15 @@
GSF_CLASS (GogGridLine, gog_grid_line,
gog_grid_line_class_init, NULL,
- GOG_STYLED_OBJECT_TYPE)
+ GOG_TYPE_STYLED_OBJECT)
/************************************************************************/
typedef GogViewClass GogGridLineViewClass;
-#define GOG_GRID_LINE_VIEW_TYPE (gog_grid_line_view_get_type ())
-#define GOG_GRID_LINE_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_GRID_LINE_VIEW_TYPE, GogGridLineView))
-#define IS_GOG_GRID_LINE_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_GRID_LINE_VIEW_TYPE))
+#define GOG_TYPE_GRID_LINE_VIEW (gog_grid_line_view_get_type ())
+#define GOG_GRID_LINE_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_GRID_LINE_VIEW, GogGridLineView))
+#define GOG_IS_GRID_LINE_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_GRID_LINE_VIEW))
static void
gog_grid_line_xy_render (GogGridLine *grid_line, GogView *view,
@@ -916,4 +916,4 @@
static GSF_CLASS (GogGridLineView, gog_grid_line_view,
NULL /* gog_grid_line_view_class_init */, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
Modified: trunk/goffice/graph/gog-grid-line.h
==============================================================================
--- trunk/goffice/graph/gog-grid-line.h (original)
+++ trunk/goffice/graph/gog-grid-line.h Tue Apr 7 09:29:28 2009
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define GOG_GRID_LINE_TYPE (gog_grid_line_get_type ())
-#define GOG_GRID_LINE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_GRID_LINE_TYPE, GogGridLine))
-#define IS_GOG_GRID_LINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_GRID_LINE_TYPE))
+#define GOG_TYPE_GRID_LINE (gog_grid_line_get_type ())
+#define GOG_GRID_LINE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_GRID_LINE, GogGridLine))
+#define GOG_IS_GRID_LINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_GRID_LINE))
GType gog_grid_line_get_type (void);
Modified: trunk/goffice/graph/gog-grid.c
==============================================================================
--- trunk/goffice/graph/gog-grid.c (original)
+++ trunk/goffice/graph/gog-grid.c Tue Apr 7 09:29:28 2009
@@ -67,14 +67,14 @@
GogGridType
gog_grid_get_gtype (GogGrid const *grid)
{
- g_return_val_if_fail (IS_GOG_GRID (grid), GOG_GRID_UNKNOWN);
+ g_return_val_if_fail (GOG_IS_GRID (grid), GOG_GRID_UNKNOWN);
return grid->type;
}
void
gog_grid_set_gtype (GogGrid *grid, GogGridType type)
{
- g_return_if_fail (IS_GOG_GRID (grid));
+ g_return_if_fail (GOG_IS_GRID (grid));
grid->type = type;
}
@@ -131,16 +131,16 @@
GSF_CLASS (GogGrid, gog_grid,
gog_grid_class_init, gog_grid_init,
- GOG_STYLED_OBJECT_TYPE)
+ GOG_TYPE_STYLED_OBJECT)
/************************************************************************/
typedef GogView GogGridView;
typedef GogViewClass GogGridViewClass;
-#define GOG_GRID_VIEW_TYPE (gog_grid_view_get_type ())
-#define GOG_GRID_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_GRID_VIEW_TYPE, GogGridView))
-#define IS_GOG_GRID_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_GRID_VIEW_TYPE))
+#define GOG_TYPE_GRID_VIEW (gog_grid_view_get_type ())
+#define GOG_GRID_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_GRID_VIEW, GogGridView))
+#define GOG_IS_GRID_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_GRID_VIEW))
static void
@@ -344,4 +344,4 @@
static GSF_CLASS (GogGridView, gog_grid_view,
gog_grid_view_class_init, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
Modified: trunk/goffice/graph/gog-grid.h
==============================================================================
--- trunk/goffice/graph/gog-grid.h (original)
+++ trunk/goffice/graph/gog-grid.h Tue Apr 7 09:29:28 2009
@@ -34,9 +34,9 @@
GOG_GRID_TYPES
} GogGridType;
-#define GOG_GRID_TYPE (gog_grid_get_type ())
-#define GOG_GRID(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_GRID_TYPE, GogGrid))
-#define IS_GOG_GRID(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_GRID_TYPE))
+#define GOG_TYPE_GRID (gog_grid_get_type ())
+#define GOG_GRID(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_GRID, GogGrid))
+#define GOG_IS_GRID(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_GRID))
GType gog_grid_get_type (void);
Modified: trunk/goffice/graph/gog-guru.c
==============================================================================
--- trunk/goffice/graph/gog-guru.c (original)
+++ trunk/goffice/graph/gog-guru.c Tue Apr 7 09:29:28 2009
@@ -341,7 +341,7 @@
if (typesel->sample_graph_item == NULL) {
GtkAllocation *size = >K_WIDGET (typesel->canvas)->allocation;
typesel->sample_graph_item = foo_canvas_item_new (typesel->graph_group,
- GOG_CONTROL_FOOCANVAS_TYPE,
+ GOG_TYPE_CONTROL_FOOCANVAS,
"model", typesel->state->graph,
NULL);
cb_typesel_sample_plot_resize (FOO_CANVAS (typesel->canvas),
@@ -599,9 +599,9 @@
/* if we ever go back to the typeselector be sure to
* add the plot to the last selected chart */
s->chart = (GogChart *)
- gog_object_get_parent_typed (obj, GOG_CHART_TYPE);
+ gog_object_get_parent_typed (obj, GOG_TYPE_CHART);
s->plot = (GogPlot *)
- gog_object_get_parent_typed (obj, GOG_PLOT_TYPE);
+ gog_object_get_parent_typed (obj, GOG_TYPE_PLOT);
if (s->plot == NULL) {
if (s->chart == NULL && s->graph != NULL) {
@@ -935,7 +935,7 @@
"outline_color_rgba", 0x707070ff, /* grey */
NULL);
s->sample_graph_item = foo_canvas_item_new (foo_canvas_root (FOO_CANVAS (canvas)),
- GOG_CONTROL_FOOCANVAS_TYPE,
+ GOG_TYPE_CONTROL_FOOCANVAS,
"model", s->graph,
NULL);
gtk_widget_add_events (canvas, GDK_POINTER_MOTION_HINT_MASK);
@@ -1040,7 +1040,7 @@
NULL : s->register_closure->data;
instance_and_params[0].g_type = 0;
- g_value_init (&instance_and_params[0], GOG_GRAPH_TYPE);
+ g_value_init (&instance_and_params[0], GOG_TYPE_GRAPH);
g_value_set_instance (&instance_and_params[0], s->graph);
instance_and_params[1].g_type = 0;
@@ -1281,21 +1281,21 @@
g_closure_ref (closure);
if (graph != NULL) {
- g_return_val_if_fail (IS_GOG_GRAPH (graph), NULL);
+ g_return_val_if_fail (GOG_IS_GRAPH (graph), NULL);
state->graph = gog_graph_dup (graph);
state->chart = NULL;
state->plot = NULL;
} else {
state->plot = NULL;
- state->graph = g_object_new (GOG_GRAPH_TYPE, NULL);
+ state->graph = g_object_new (GOG_TYPE_GRAPH, NULL);
state->chart = GOG_CHART (gog_object_add_by_name (
GOG_OBJECT (state->graph), "Chart", NULL));
- if (IS_GO_DOC_CONTROL (dalloc))
+ if (GO_IS_DOC_CONTROL (dalloc))
g_object_set (state->graph,
"document", go_doc_control_get_doc (GO_DOC_CONTROL (dalloc)),
NULL);
- else if (IS_GO_DOC_CONTROL (cc))
+ else if (GO_IS_DOC_CONTROL (cc))
g_object_set (state->graph,
"document", go_doc_control_get_doc (GO_DOC_CONTROL (cc)),
NULL);
Modified: trunk/goffice/graph/gog-label.c
==============================================================================
--- trunk/goffice/graph/gog-label.c (original)
+++ trunk/goffice/graph/gog-label.c Tue Apr 7 09:29:28 2009
@@ -61,10 +61,10 @@
char *(*get_str) (GogText *text);
} GogTextClass;
-#define GOG_TEXT_TYPE (gog_text_get_type ())
-#define GOG_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TEXT_TYPE, GogText))
-#define IS_GOG_TEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TEXT_TYPE))
-#define GOG_TEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TEXT_TYPE, GogTextClass))
+#define GOG_TYPE_TEXT (gog_text_get_type ())
+#define GOG_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_TEXT, GogText))
+#define GOG_IS_TEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_TEXT))
+#define GOG_TEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_TEXT, GogTextClass))
static GType gog_text_get_type (void);
@@ -117,7 +117,7 @@
* in GogTheme, but it's not possible without breaking graph persistence
* compatibility */
parent = gog_object_get_parent (GOG_OBJECT (gso));
- if (IS_GOG_AXIS (parent)) {
+ if (GOG_IS_AXIS (parent)) {
GogChart *chart = GOG_CHART (gog_object_get_parent (parent));
if (!gog_chart_is_3d (chart)
&& gog_axis_get_atype (GOG_AXIS (parent)) == GOG_AXIS_Y
@@ -159,7 +159,7 @@
{
GogTextClass *klass;
- g_return_val_if_fail (IS_GOG_TEXT (text), NULL);
+ g_return_val_if_fail (GOG_IS_TEXT (text), NULL);
klass = GOG_TEXT_GET_CLASS (text);
@@ -171,7 +171,7 @@
GSF_CLASS_ABSTRACT (GogText, gog_text,
gog_text_class_init, gog_text_init,
- GOG_OUTLINED_OBJECT_TYPE);
+ GOG_TYPE_OUTLINED_OBJECT);
/************************************************************************/
@@ -217,7 +217,7 @@
{
GogLabel *label = GOG_LABEL (text);
- g_return_val_if_fail (IS_GOG_LABEL (label), NULL);
+ g_return_val_if_fail (GOG_IS_LABEL (label), NULL);
if (label->text.data != NULL)
return g_strdup (go_data_scalar_get_str (GO_DATA_SCALAR (label->text.data)));
@@ -276,8 +276,8 @@
GSF_CLASS_FULL (GogLabel, gog_label,
NULL, NULL, gog_label_class_init, NULL,
- NULL, GOG_TEXT_TYPE, 0,
- GSF_INTERFACE (gog_label_dataset_init, GOG_DATASET_TYPE))
+ NULL, GOG_TYPE_TEXT, 0,
+ GSF_INTERFACE (gog_label_dataset_init, GOG_TYPE_DATASET))
/************************************************************************/
@@ -438,16 +438,16 @@
GSF_CLASS (GogRegEqn, gog_reg_eqn,
gog_reg_eqn_class_init, gog_reg_eqn_init,
- GOG_TEXT_TYPE)
+ GOG_TYPE_TEXT)
/************************************************************************/
typedef GogOutlinedView GogTextView;
typedef GogOutlinedViewClass GogTextViewClass;
-#define GOG_LABEL_VIEW_TYPE (gog_label_view_get_type ())
-#define GOG_LABEL_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LABEL_VIEW_TYPE, GogLabelView))
-#define IS_GOG_LABEL_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LABEL_VIEW_TYPE))
+#define GOG_TYPE_LABEL_VIEW (gog_label_view_get_type ())
+#define GOG_LABEL_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LABEL_VIEW, GogLabelView))
+#define GOG_IS_LABEL_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LABEL_VIEW))
static GogViewClass *text_view_parent_klass;
@@ -515,4 +515,4 @@
GSF_CLASS (GogTextView, gog_text_view,
gog_text_view_class_init, NULL,
- GOG_OUTLINED_VIEW_TYPE)
+ GOG_TYPE_OUTLINED_VIEW)
Modified: trunk/goffice/graph/gog-label.h
==============================================================================
--- trunk/goffice/graph/gog-label.h (original)
+++ trunk/goffice/graph/gog-label.h Tue Apr 7 09:29:28 2009
@@ -27,15 +27,15 @@
G_BEGIN_DECLS
-#define GOG_LABEL_TYPE (gog_label_get_type ())
-#define GOG_LABEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LABEL_TYPE, GogLabel))
-#define IS_GOG_LABEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LABEL_TYPE))
+#define GOG_TYPE_LABEL (gog_label_get_type ())
+#define GOG_LABEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LABEL, GogLabel))
+#define GOG_IS_LABEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LABEL))
GType gog_label_get_type (void);
-#define GOG_REG_EQN_TYPE (gog_reg_eqn_get_type ())
-#define GOG_REG_EQN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_REG_EQN_TYPE, GogRegEqn))
-#define IS_GOG_REG_EQN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_REG_EQN_TYPE))
+#define GOG_TYPE_REG_EQN (gog_reg_eqn_get_type ())
+#define GOG_REG_EQN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_REG_EQN, GogRegEqn))
+#define GOG_IS_REG_EQN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_REG_EQN))
GType gog_reg_eqn_get_type (void);
Modified: trunk/goffice/graph/gog-legend.c
==============================================================================
--- trunk/goffice/graph/gog-legend.c (original)
+++ trunk/goffice/graph/gog-legend.c Tue Apr 7 09:29:28 2009
@@ -227,7 +227,7 @@
GSF_CLASS (GogLegend, gog_legend,
gog_legend_class_init, gog_legend_init,
- GOG_OUTLINED_OBJECT_TYPE)
+ GOG_TYPE_OUTLINED_OBJECT)
#define GLV_ELEMENT_HEIGHT_EM 1.2 /* Legend element height, in font size */
#define GLV_LINE_WIDTH_MAX_DEFAULT_EM 0.5 /* Maximum sample line width, in font size */
@@ -254,9 +254,9 @@
typedef GogOutlinedViewClass GogLegendViewClass;
-#define GOG_LEGEND_VIEW_TYPE (gog_legend_view_get_type ())
-#define GOG_LEGEND_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LEGEND_VIEW_TYPE, GogLegendView))
-#define IS_GOG_LEGEND_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LEGEND_VIEW_TYPE))
+#define GOG_TYPE_LEGEND_VIEW (gog_legend_view_get_type ())
+#define GOG_LEGEND_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LEGEND_VIEW, GogLegendView))
+#define GOG_IS_LEGEND_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LEGEND_VIEW))
static GogViewClass *lview_parent_klass;
@@ -592,4 +592,4 @@
static GSF_CLASS (GogLegendView, gog_legend_view,
gog_legend_view_class_init, NULL,
- GOG_OUTLINED_VIEW_TYPE)
+ GOG_TYPE_OUTLINED_VIEW)
Modified: trunk/goffice/graph/gog-legend.h
==============================================================================
--- trunk/goffice/graph/gog-legend.h (original)
+++ trunk/goffice/graph/gog-legend.h Tue Apr 7 09:29:28 2009
@@ -26,9 +26,9 @@
G_BEGIN_DECLS
-#define GOG_LEGEND_TYPE (gog_legend_get_type ())
-#define GOG_LEGEND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LEGEND_TYPE, GogLegend))
-#define IS_GOG_LEGEND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LEGEND_TYPE))
+#define GOG_TYPE_LEGEND (gog_legend_get_type ())
+#define GOG_LEGEND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LEGEND, GogLegend))
+#define GOG_IS_LEGEND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LEGEND))
GType gog_legend_get_type (void);
Modified: trunk/goffice/graph/gog-object-xml.c
==============================================================================
--- trunk/goffice/graph/gog-object-xml.c (original)
+++ trunk/goffice/graph/gog-object-xml.c Tue Apr 7 09:29:28 2009
@@ -77,7 +77,7 @@
xmlFree (type_name);
if (type != 0) {
val_obj = g_object_new (type, NULL);
- if (IS_GO_PERSIST (val_obj) &&
+ if (GO_IS_PERSIST (val_obj) &&
go_persist_dom_load (GO_PERSIST (val_obj), xml_node)) {
g_value_set_object (&res, val_obj);
success = TRUE;
@@ -159,7 +159,7 @@
case G_TYPE_OBJECT:
val_obj = g_value_get_object (&value);
if (val_obj != NULL) {
- if (IS_GO_PERSIST (val_obj)) {
+ if (GO_IS_PERSIST (val_obj)) {
gsf_xml_out_start_element (output, "property");
gsf_xml_out_add_cstr_unchecked (output, "name", pspec->name);
go_persist_sax_save (GO_PERSIST (val_obj), output);
@@ -245,7 +245,7 @@
GParamSpec **props;
GSList *ptr;
- g_return_if_fail (IS_GOG_OBJECT (obj));
+ g_return_if_fail (GOG_IS_OBJECT (obj));
gsf_xml_out_start_element (output, "GogObject");
@@ -267,9 +267,9 @@
g_free (props);
- if (IS_GO_PERSIST (obj)) /* anything special for this class */
+ if (GO_IS_PERSIST (obj)) /* anything special for this class */
go_persist_sax_save (GO_PERSIST (obj), output);
- if (IS_GOG_DATASET (obj)) /* convenience to save data */
+ if (GOG_IS_DATASET (obj)) /* convenience to save data */
gog_dataset_sax_save (GOG_DATASET (obj), output);
/* the children */
@@ -318,9 +318,9 @@
res->explicitly_typed_role = explicitly_typed_role;
- if (IS_GO_PERSIST (res))
+ if (GO_IS_PERSIST (res))
go_persist_dom_load (GO_PERSIST (res), node);
- if (IS_GOG_DATASET (res)) /* convenience to save data */
+ if (GOG_IS_DATASET (res)) /* convenience to save data */
gog_dataset_dom_load (GOG_DATASET (res), node);
for (ptr = node->xmlChildrenNode ; ptr != NULL ; ptr = ptr->next) {
@@ -370,7 +370,7 @@
if (NULL == state->obj)
return;
- g_return_if_fail (IS_GOG_DATASET (state->obj));
+ g_return_if_fail (GOG_IS_DATASET (state->obj));
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (0 == strcmp (attrs[0], "id"))
@@ -410,7 +410,7 @@
if (NULL == state->obj)
return;
- g_return_if_fail (IS_GOG_DATASET (state->obj));
+ g_return_if_fail (GOG_IS_DATASET (state->obj));
if (NULL != state->dimension) {
if (go_data_from_str (state->dimension, xin->content->str))
@@ -478,7 +478,7 @@
state->obj_stack = g_slist_prepend (state->obj_stack, state->obj);
state->obj = obj;
state->prop_pushed_obj = TRUE;
- if (IS_GO_PERSIST (obj))
+ if (GO_IS_PERSIST (obj))
go_persist_prep_sax (GO_PERSIST (obj), xin, attrs);
}
}
@@ -565,7 +565,7 @@
}
if (res != NULL) {
res->explicitly_typed_role = (type != NULL);
- if (IS_GO_PERSIST (res))
+ if (GO_IS_PERSIST (res))
go_persist_prep_sax (GO_PERSIST (res), xin, attrs);
}
Modified: trunk/goffice/graph/gog-object.c
==============================================================================
--- trunk/goffice/graph/gog-object.c (original)
+++ trunk/goffice/graph/gog-object.c Tue Apr 7 09:29:28 2009
@@ -287,7 +287,7 @@
(*klass->parent_changed) (ptr->data, was_set);
}
- if (IS_GOG_DATASET (child))
+ if (GOG_IS_DATASET (child))
gog_dataset_parent_changed (GOG_DATASET (child), was_set);
}
@@ -912,7 +912,7 @@
unsigned
gog_object_get_id (GogObject const *obj)
{
- g_return_val_if_fail (IS_GOG_OBJECT (obj), 0);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), 0);
g_return_val_if_fail (obj != NULL, 0);
return obj->id;
@@ -947,7 +947,7 @@
GSList *ptr;
GogObject *child;
- g_return_if_fail (IS_GOG_OBJECT (obj));
+ g_return_if_fail (GOG_IS_OBJECT (obj));
if (id == 0) {
gog_object_generate_id (obj);
@@ -1030,7 +1030,7 @@
}
g_free (props);
- if (IS_GOG_DATASET (src)) { /* convenience to save data */
+ if (GOG_IS_DATASET (src)) { /* convenience to save data */
if (datadup)
datadup (GOG_DATASET (src), GOG_DATASET (dst));
else
@@ -1055,7 +1055,7 @@
GogObject *
gog_object_get_parent (GogObject const *obj)
{
- g_return_val_if_fail (IS_GOG_OBJECT (obj), NULL);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), NULL);
return obj->parent;
}
@@ -1070,7 +1070,7 @@
GogObject *
gog_object_get_parent_typed (GogObject const *obj, GType t)
{
- g_return_val_if_fail (IS_GOG_OBJECT (obj), NULL);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), NULL);
for (; obj != NULL ; obj = obj->parent)
if (G_TYPE_CHECK_INSTANCE_TYPE (obj, t))
@@ -1087,10 +1087,10 @@
GogGraph *
gog_object_get_graph (GogObject const *obj)
{
- g_return_val_if_fail (IS_GOG_OBJECT (obj), NULL);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), NULL);
for (; obj != NULL ; obj = obj->parent)
- if (IS_GOG_GRAPH (obj))
+ if (GOG_IS_GRAPH (obj))
return GOG_GRAPH (obj);
return NULL;
}
@@ -1114,7 +1114,7 @@
char const *
gog_object_get_name (GogObject const *obj)
{
- g_return_val_if_fail (IS_GOG_OBJECT (obj), NULL);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), NULL);
return (obj->user_name != NULL && *obj->user_name != '\0') ? obj->user_name : obj->auto_name;
}
@@ -1133,7 +1133,7 @@
{
GogObject *tmp;
- g_return_if_fail (IS_GOG_OBJECT (obj));
+ g_return_if_fail (GOG_IS_OBJECT (obj));
if (obj->user_name == name)
return;
@@ -1161,7 +1161,7 @@
{
GSList *ptr, *res = NULL;
- g_return_val_if_fail (IS_GOG_OBJECT (obj), NULL);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), NULL);
if (filter == NULL)
return g_slist_copy (obj->children);
@@ -1219,9 +1219,9 @@
gboolean
gog_object_is_deletable (GogObject const *obj)
{
- g_return_val_if_fail (IS_GOG_OBJECT (obj), FALSE);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), FALSE);
- if (IS_GOG_GRAPH (obj))
+ if (GOG_IS_GRAPH (obj))
return FALSE;
return obj->role == NULL || obj->role->can_remove == NULL ||
@@ -1319,7 +1319,7 @@
GogObject const *parent;
GSList *ptr;
- g_return_if_fail (IS_GOG_OBJECT (obj));
+ g_return_if_fail (GOG_IS_OBJECT (obj));
if (inc_ok != NULL)
*inc_ok = FALSE;
@@ -1367,7 +1367,7 @@
GogObject *parent, *obj_follows;
GSList **ptr, *tmp;
- g_return_val_if_fail (IS_GOG_OBJECT (obj), NULL);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), NULL);
if (obj->parent == NULL || gog_object_get_graph (obj) == NULL)
return NULL;
@@ -1531,7 +1531,7 @@
if (gog_klass->use_parent_as_proxy) {
obj = obj->parent;
if (obj != NULL) {
- g_return_if_fail (IS_GOG_OBJECT (obj));
+ g_return_if_fail (GOG_IS_OBJECT (obj));
gog_object_emit_changed (obj, resize);
}
return;
@@ -1701,7 +1701,7 @@
gog_object_add_by_name (GogObject *parent,
char const *role, GogObject *child)
{
- g_return_val_if_fail (IS_GOG_OBJECT (parent), NULL);
+ g_return_val_if_fail (GOG_IS_OBJECT (parent), NULL);
return gog_object_add_by_role (parent,
gog_object_find_role_by_name (parent, role), child);
}
@@ -1731,7 +1731,7 @@
GogObjectPosition
gog_object_get_position_flags (GogObject const *obj, GogObjectPosition mask)
{
- g_return_val_if_fail (IS_GOG_OBJECT (obj), GOG_POSITION_SPECIAL & mask);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), GOG_POSITION_SPECIAL & mask);
return obj->position & mask;
}
@@ -1748,7 +1748,7 @@
gboolean
gog_object_set_position_flags (GogObject *obj, GogObjectPosition flags, GogObjectPosition mask)
{
- g_return_val_if_fail (IS_GOG_OBJECT (obj), FALSE);
+ g_return_val_if_fail (GOG_IS_OBJECT (obj), FALSE);
if (obj->role == NULL)
return FALSE;
Modified: trunk/goffice/graph/gog-object.h
==============================================================================
--- trunk/goffice/graph/gog-object.h (original)
+++ trunk/goffice/graph/gog-object.h Tue Apr 7 09:29:28 2009
@@ -132,12 +132,12 @@
void (*update_editor) (GogObject *obj);
} GogObjectClass;
-#define GOG_OBJECT_TYPE (gog_object_get_type ())
-#define GOG_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_OBJECT_TYPE, GogObject))
-#define IS_GOG_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_OBJECT_TYPE))
-#define GOG_OBJECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_OBJECT_TYPE, GogObjectClass))
-#define IS_GOG_OBJECT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_OBJECT_TYPE))
-#define GOG_OBJECT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_OBJECT_TYPE, GogObjectClass))
+#define GOG_TYPE_OBJECT (gog_object_get_type ())
+#define GOG_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_OBJECT, GogObject))
+#define GOG_IS_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_OBJECT))
+#define GOG_OBJECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_OBJECT, GogObjectClass))
+#define GOG_IS_OBJECT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_OBJECT))
+#define GOG_OBJECT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_OBJECT, GogObjectClass))
#define GOG_PARAM_FORCE_SAVE (1 << (G_PARAM_USER_SHIFT+1)) /* even if the value == default */
#define GOG_PARAM_POSITION (1 << (G_PARAM_USER_SHIFT+2)) /* position parameters */
Modified: trunk/goffice/graph/gog-outlined-object.c
==============================================================================
--- trunk/goffice/graph/gog-outlined-object.c (original)
+++ trunk/goffice/graph/gog-outlined-object.c Tue Apr 7 09:29:28 2009
@@ -92,12 +92,12 @@
GSF_CLASS (GogOutlinedObject, gog_outlined_object,
gog_outlined_object_class_init, gog_outlined_object_init,
- GOG_STYLED_OBJECT_TYPE)
+ GOG_TYPE_STYLED_OBJECT)
double
gog_outlined_object_get_pad (GogOutlinedObject const *goo)
{
- g_return_val_if_fail (IS_GOG_OUTLINED_OBJECT (goo), 0.);
+ g_return_val_if_fail (GOG_IS_OUTLINED_OBJECT (goo), 0.);
return goo->padding_pts;
}
@@ -173,4 +173,4 @@
GSF_CLASS (GogOutlinedView, gog_outlined_view,
gog_outlined_view_class_init, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
Modified: trunk/goffice/graph/gog-outlined-object.h
==============================================================================
--- trunk/goffice/graph/gog-outlined-object.h (original)
+++ trunk/goffice/graph/gog-outlined-object.h Tue Apr 7 09:29:28 2009
@@ -34,9 +34,9 @@
typedef GogStyledObjectClass GogOutlinedObjectClass;
-#define GOG_OUTLINED_OBJECT_TYPE (gog_outlined_object_get_type ())
-#define GOG_OUTLINED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_OUTLINED_OBJECT_TYPE, GogOutlinedObject))
-#define IS_GOG_OUTLINED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_OUTLINED_OBJECT_TYPE))
+#define GOG_TYPE_OUTLINED_OBJECT (gog_outlined_object_get_type ())
+#define GOG_OUTLINED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_OUTLINED_OBJECT, GogOutlinedObject))
+#define GOG_IS_OUTLINED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_OUTLINED_OBJECT))
GType gog_outlined_object_get_type (void);
double gog_outlined_object_get_pad (GogOutlinedObject const *goo);
@@ -49,10 +49,10 @@
gboolean call_parent_render;
} GogOutlinedViewClass;
-#define GOG_OUTLINED_VIEW_TYPE (gog_outlined_view_get_type ())
-#define GOG_OUTLINED_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_OUTLINED_VIEW_TYPE, GogOutlinedView))
-#define IS_GOG_OUTLINED_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_OUTLINED_VIEW_TYPE))
-#define GOG_OUTLINED_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_OUTLINED_VIEW_TYPE, GogOutlinedViewClass))
+#define GOG_TYPE_OUTLINED_VIEW (gog_outlined_view_get_type ())
+#define GOG_OUTLINED_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_OUTLINED_VIEW, GogOutlinedView))
+#define GOG_IS_OUTLINED_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_OUTLINED_VIEW))
+#define GOG_OUTLINED_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_OUTLINED_VIEW, GogOutlinedViewClass))
GType gog_outlined_view_get_type (void);
Modified: trunk/goffice/graph/gog-plot-engine.c
==============================================================================
--- trunk/goffice/graph/gog-plot-engine.c (original)
+++ trunk/goffice/graph/gog-plot-engine.c Tue Apr 7 09:29:28 2009
@@ -39,9 +39,9 @@
/***************************************************************************/
/* Support plot engines in plugins */
-#define GOG_PLOT_ENGINE_SERVICE_TYPE (gog_plot_engine_service_get_type ())
-#define GOG_PLOT_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PLOT_ENGINE_SERVICE_TYPE, GogPlotEngineService))
-#define IS_GOG_PLOT_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PLOT_ENGINE_SERVICE_TYPE))
+#define GOG_TYPE_PLOT_ENGINE_SERVICE (gog_plot_engine_service_get_type ())
+#define GOG_PLOT_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_PLOT_ENGINE_SERVICE, GogPlotEngineService))
+#define GOG_IS_PLOT_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_PLOT_ENGINE_SERVICE))
static GType gog_plot_engine_service_get_type (void);
@@ -69,7 +69,7 @@
GSF_CLASS (GogPlotEngineService, gog_plot_engine_service,
gog_plot_engine_service_class_init, NULL,
- GO_PLUGIN_SERVICE_GOBJECT_LOADER_TYPE)
+ GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER)
GogPlot *
gog_plot_new_by_name (char const *id)
@@ -114,9 +114,9 @@
/***************************************************************************/
/* Use a plugin service to define where to find plot types */
-#define GOG_PLOT_TYPE_SERVICE_TYPE (gog_plot_type_service_get_type ())
-#define GOG_PLOT_TYPE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PLOT_TYPE_SERVICE_TYPE, GogPlotTypeService))
-#define IS_GOG_PLOT_TYPE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PLOT_TYPE_SERVICE_TYPE))
+#define GOG_TYPE_PLOT_TYPE_SERVICE (gog_plot_type_service_get_type ())
+#define GOG_PLOT_TYPE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_PLOT_TYPE_SERVICE, GogPlotTypeService))
+#define GOG_IS_PLOT_TYPE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_PLOT_TYPE_SERVICE))
GType gog_plot_type_service_get_type (void);
@@ -351,14 +351,14 @@
GSF_CLASS (GogPlotTypeService, gog_plot_type_service,
gog_plot_type_service_class_init, gog_plot_type_service_init,
- GO_PLUGIN_SERVICE_SIMPLE_TYPE)
+ GO_TYPE_PLUGIN_SERVICE_SIMPLE)
/***************************************************************************/
/* Use a plugin service to define themes */
-#define GOG_THEME_SERVICE_TYPE (gog_theme_service_get_type ())
-#define GOG_THEME_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_THEME_SERVICE_TYPE, GogThemeService))
-#define IS_GOG_THEME_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_THEME_SERVICE_TYPE))
+#define GOG_TYPE_THEME_SERVICE (gog_theme_service_get_type ())
+#define GOG_THEME_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_THEME_SERVICE, GogThemeService))
+#define GOG_IS_THEME_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_THEME_SERVICE))
GType gog_theme_service_get_type (void);
@@ -403,14 +403,14 @@
GSF_CLASS (GogThemeService, gog_theme_service,
gog_theme_service_class_init, NULL,
- GO_PLUGIN_SERVICE_SIMPLE_TYPE)
+ GO_TYPE_PLUGIN_SERVICE_SIMPLE)
/***************************************************************************/
/* Support regression curves engines in plugins */
-#define GOG_TREND_LINE_ENGINE_SERVICE_TYPE (gog_trend_line_engine_service_get_type ())
-#define GOG_TREND_LINE_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TREND_LINE_ENGINE_SERVICE_TYPE, GogTrendLineEngineService))
-#define IS_GOG_TREND_LINE_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TREND_LINE_ENGINE_SERVICE_TYPE))
+#define GOG_TYPE_TREND_LINE_ENGINE_SERVICE (gog_trend_line_engine_service_get_type ())
+#define GOG_TREND_LINE_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_TREND_LINE_ENGINE_SERVICE, GogTrendLineEngineService))
+#define GOG_IS_TREND_LINE_ENGINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_TREND_LINE_ENGINE_SERVICE))
static GType gog_trend_line_engine_service_get_type (void);
@@ -438,7 +438,7 @@
GSF_CLASS (GogTrendLineEngineService, gog_trend_line_engine_service,
gog_trend_line_engine_service_class_init, NULL,
- GO_PLUGIN_SERVICE_GOBJECT_LOADER_TYPE)
+ GO_TYPE_PLUGIN_SERVICE_GOBJECT_LOADER)
GogTrendLine *
gog_trend_line_new_by_name (char const *id)
@@ -482,9 +482,9 @@
/***************************************************************************/
/* Use a plugin service to define regression curves types */
-#define GOG_TREND_LINE_SERVICE_TYPE (gog_trend_line_service_get_type ())
-#define GOG_TREND_LINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TREND_LINE_SERVICE_TYPE, GogTrendLineService))
-#define IS_GOG_TREND_LINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TREND_LINE_SERVICE_TYPE))
+#define GOG_TYPE_TREND_LINE_SERVICE (gog_trend_line_service_get_type ())
+#define GOG_TREND_LINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_TREND_LINE_SERVICE, GogTrendLineService))
+#define GOG_IS_TREND_LINE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_TREND_LINE_SERVICE))
GType gog_trend_line_service_get_type (void);
@@ -656,7 +656,7 @@
GSF_CLASS (GogTrendLineService, gog_trend_line_service,
gog_trend_line_service_class_init, gog_trend_line_service_init,
- GO_PLUGIN_SERVICE_SIMPLE_TYPE)
+ GO_TYPE_PLUGIN_SERVICE_SIMPLE)
/***************************************************************************/
Modified: trunk/goffice/graph/gog-plot-impl.h
==============================================================================
--- trunk/goffice/graph/gog-plot-impl.h (original)
+++ trunk/goffice/graph/gog-plot-impl.h Tue Apr 7 09:29:28 2009
@@ -84,17 +84,17 @@
void (*guru_helper) (GogPlot *plot, char const *hint);
} GogPlotClass;
-#define GOG_PLOT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_PLOT_TYPE, GogPlotClass))
-#define IS_GOG_PLOT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_PLOT_TYPE))
-#define GOG_PLOT_ITEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_PLOT_TYPE, GogPlotClass))
+#define GOG_PLOT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_PLOT, GogPlotClass))
+#define GOG_IS_PLOT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_PLOT))
+#define GOG_PLOT_ITEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_PLOT, GogPlotClass))
/* protected */
/*****************************************************************************/
-#define GOG_PLOT_VIEW_TYPE (gog_plot_view_get_type ())
-#define GOG_PLOT_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PLOT_VIEW_TYPE, GogPlotView))
-#define IS_GOG_PLOT_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PLOT_VIEW_TYPE))
+#define GOG_TYPE_PLOT_VIEW (gog_plot_view_get_type ())
+#define GOG_PLOT_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_PLOT_VIEW, GogPlotView))
+#define GOG_IS_PLOT_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_PLOT_VIEW))
typedef GogView GogPlotView;
typedef GogViewClass GogPlotViewClass;
Modified: trunk/goffice/graph/gog-plot.c
==============================================================================
--- trunk/goffice/graph/gog-plot.c (original)
+++ trunk/goffice/graph/gog-plot.c Tue Apr 7 09:29:28 2009
@@ -42,7 +42,7 @@
#include <gsf/gsf-impl-utils.h>
#include <string.h>
-#define GOG_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_PLOT_TYPE, GogPlotClass))
+#define GOG_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_PLOT, GogPlotClass))
enum {
PLOT_PROP_0,
@@ -87,7 +87,7 @@
GType type = klass->series_type;
if (type == 0)
- type = GOG_SERIES_TYPE;
+ type = GOG_TYPE_SERIES;
return g_object_new (type, NULL);
}
@@ -481,7 +481,7 @@
GogPlot *plot = GOG_PLOT (obj);
for (ptr = obj->children; ptr != NULL ; ptr = ptr->next)
- if (IS_GOG_SERIES (ptr->data))
+ if (GOG_IS_SERIES (ptr->data))
accum = g_slist_prepend (accum, ptr->data);
g_slist_free (plot->series);
plot->series = g_slist_reverse (accum);
@@ -570,7 +570,7 @@
GSF_CLASS_ABSTRACT (GogPlot, gog_plot,
gog_plot_class_init, gog_plot_init,
- GOG_OBJECT_TYPE)
+ GOG_TYPE_OBJECT)
GogPlot *
gog_plot_new_by_type (GogPlotType const *type)
@@ -601,7 +601,7 @@
{
GogObject *res;
- g_return_val_if_fail (IS_GOG_PLOT (plot), NULL);
+ g_return_val_if_fail (GOG_IS_PLOT (plot), NULL);
res = gog_object_add_by_name (GOG_OBJECT (plot), "Series", NULL);
return res ? GOG_SERIES (res) : NULL;
@@ -609,7 +609,7 @@
GogPlotDesc const *
gog_plot_description (GogPlot const *plot)
{
- g_return_val_if_fail (IS_GOG_PLOT (plot), NULL);
+ g_return_val_if_fail (GOG_IS_PLOT (plot), NULL);
return &plot->desc;
}
@@ -623,7 +623,7 @@
void
gog_plot_request_cardinality_update (GogPlot *plot)
{
- g_return_if_fail (IS_GOG_PLOT (plot));
+ g_return_if_fail (GOG_IS_PLOT (plot));
if (plot->cardinality_valid) {
GogChart *chart = gog_plot_get_chart (plot);
@@ -649,7 +649,7 @@
gboolean is_valid;
unsigned size = 0, no_legend = 0, i;
- g_return_if_fail (IS_GOG_PLOT (plot));
+ g_return_if_fail (GOG_IS_PLOT (plot));
plot->cardinality_valid = TRUE;
plot->index_num = i = index_num;
@@ -687,7 +687,7 @@
void
gog_plot_get_cardinality (GogPlot *plot, unsigned *full, unsigned *visible)
{
- g_return_if_fail (IS_GOG_PLOT (plot));
+ g_return_if_fail (GOG_IS_PLOT (plot));
if (!plot->cardinality_valid)
g_warning ("[GogPlot::get_cardinality] Invalid cardinality");
@@ -719,7 +719,7 @@
GogPlotClass *klass = GOG_PLOT_GET_CLASS (plot);
GList *overrides;
- g_return_if_fail (IS_GOG_PLOT (plot));
+ g_return_if_fail (GOG_IS_PLOT (plot));
if (!plot->cardinality_valid)
gog_plot_get_cardinality (plot, NULL, NULL);
@@ -792,7 +792,7 @@
GSList const *
gog_plot_get_series (GogPlot const *plot)
{
- g_return_val_if_fail (IS_GOG_PLOT (plot), NULL);
+ g_return_val_if_fail (GOG_IS_PLOT (plot), NULL);
return plot->series;
}
@@ -875,8 +875,8 @@
gog_plot_set_axis (GogPlot *plot, GogAxis *axis)
{
GogAxisType type;
- g_return_if_fail (IS_GOG_PLOT (plot));
- g_return_if_fail (IS_GOG_AXIS (axis));
+ g_return_if_fail (GOG_IS_PLOT (plot));
+ g_return_if_fail (GOG_IS_AXIS (axis));
type = gog_axis_get_atype (axis);
g_return_if_fail (type != GOG_AXIS_UNKNOWN);
@@ -901,7 +901,7 @@
if (id == 0)
return FALSE;
- g_return_val_if_fail (IS_GOG_PLOT (plot), FALSE);
+ g_return_val_if_fail (GOG_IS_PLOT (plot), FALSE);
g_return_val_if_fail (GOG_OBJECT (plot)->parent != NULL, FALSE);
chart = gog_plot_get_chart (plot);
@@ -962,7 +962,7 @@
{
GogAxisType type;
- g_return_if_fail (IS_GOG_PLOT (plot));
+ g_return_if_fail (GOG_IS_PLOT (plot));
for (type = 0 ; type < GOG_AXIS_TYPES ; type++)
if (plot->axis[type] != NULL && ((1 << type) & filter)) {
@@ -982,7 +982,7 @@
GogAxis *
gog_plot_get_axis (GogPlot const *plot, GogAxisType type)
{
- g_return_val_if_fail (IS_GOG_PLOT (plot), NULL);
+ g_return_val_if_fail (GOG_IS_PLOT (plot), NULL);
g_return_val_if_fail (type < GOG_AXIS_TYPES, NULL);
g_return_val_if_fail (GOG_AXIS_UNKNOWN < type, NULL);
return plot->axis[type];
@@ -992,7 +992,7 @@
gog_plot_update_3d (GogPlot *plot)
{
GogPlotClass *klass = GOG_PLOT_GET_CLASS (plot);
- g_return_if_fail (IS_GOG_PLOT (plot));
+ g_return_if_fail (GOG_IS_PLOT (plot));
if (klass->update_3d)
klass->update_3d (plot);
@@ -1025,7 +1025,7 @@
char *hint;
unsigned i;
- g_return_if_fail (IS_GOG_PLOT (plot));
+ g_return_if_fail (GOG_IS_PLOT (plot));
klass = GOG_PLOT_GET_CLASS (plot);
if (plot->guru_hints == NULL)
@@ -1221,4 +1221,4 @@
GSF_CLASS_ABSTRACT (GogPlotView, gog_plot_view,
gog_plot_view_class_init, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
Modified: trunk/goffice/graph/gog-plot.h
==============================================================================
--- trunk/goffice/graph/gog-plot.h (original)
+++ trunk/goffice/graph/gog-plot.h Tue Apr 7 09:29:28 2009
@@ -40,9 +40,9 @@
const GODateConventions *date_conv;
} GogPlotBoundInfo;
-#define GOG_PLOT_TYPE (gog_plot_get_type ())
-#define GOG_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PLOT_TYPE, GogPlot))
-#define IS_GOG_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PLOT_TYPE))
+#define GOG_TYPE_PLOT (gog_plot_get_type ())
+#define GOG_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_PLOT, GogPlot))
+#define GOG_IS_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_PLOT))
GType gog_plot_get_type (void);
GogPlot *gog_plot_new_by_type (GogPlotType const *type);
Modified: trunk/goffice/graph/gog-reg-curve.c
==============================================================================
--- trunk/goffice/graph/gog-reg-curve.c (original)
+++ trunk/goffice/graph/gog-reg-curve.c Tue Apr 7 09:29:28 2009
@@ -42,7 +42,7 @@
#include <goffice/gtk/goffice-gtk.h>
#endif
-#define GOG_REG_CURVE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_REG_CURVE_TYPE, GogRegCurveClass))
+#define GOG_REG_CURVE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_REG_CURVE, GogRegCurveClass))
static GObjectClass *reg_curve_parent_klass;
@@ -237,8 +237,8 @@
GSF_CLASS_FULL (GogRegCurve, gog_reg_curve,
NULL, NULL, gog_reg_curve_class_init, NULL,
- gog_reg_curve_init, GOG_TREND_LINE_TYPE, G_TYPE_FLAG_ABSTRACT,
- GSF_INTERFACE (gog_reg_curve_dataset_init, GOG_DATASET_TYPE))
+ gog_reg_curve_init, GOG_TYPE_TREND_LINE, G_TYPE_FLAG_ABSTRACT,
+ GSF_INTERFACE (gog_reg_curve_dataset_init, GOG_TYPE_DATASET))
static double
gog_reg_curve_get_value_at (GogRegCurve *reg_curve, double x)
@@ -282,9 +282,9 @@
typedef GogView GogRegCurveView;
typedef GogViewClass GogRegCurveViewClass;
-#define GOG_REG_CURVE_VIEW_TYPE (gog_reg_curve_view_get_type ())
-#define GOG_REG_CURVE_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_REG_CURVE_VIEW_TYPE, GogRegCurveView))
-#define IS_GOG_REG_CURVE_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_REG_CURVE_VIEW_TYPE))
+#define GOG_TYPE_REG_CURVE_VIEW (gog_reg_curve_view_get_type ())
+#define GOG_REG_CURVE_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_REG_CURVE_VIEW, GogRegCurveView))
+#define GOG_IS_REG_CURVE_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_REG_CURVE_VIEW))
static GogViewClass *reg_curve_view_parent_klass;
@@ -367,4 +367,4 @@
static GSF_CLASS (GogRegCurveView, gog_reg_curve_view,
gog_reg_curve_view_class_init, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
Modified: trunk/goffice/graph/gog-reg-curve.h
==============================================================================
--- trunk/goffice/graph/gog-reg-curve.h (original)
+++ trunk/goffice/graph/gog-reg-curve.h Tue Apr 7 09:29:28 2009
@@ -50,9 +50,9 @@
void (*populate_editor) (GogRegCurve *reg_curve, gpointer table);
} GogRegCurveClass;
-#define GOG_REG_CURVE_TYPE (gog_reg_curve_get_type ())
-#define GOG_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_REG_CURVE_TYPE, GogRegCurve))
-#define IS_GOG_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_REG_CURVE_TYPE))
+#define GOG_TYPE_REG_CURVE (gog_reg_curve_get_type ())
+#define GOG_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_REG_CURVE, GogRegCurve))
+#define GOG_IS_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_REG_CURVE))
GType gog_reg_curve_get_type (void);
Modified: trunk/goffice/graph/gog-renderer.c
==============================================================================
--- trunk/goffice/graph/gog-renderer.c (original)
+++ trunk/goffice/graph/gog-renderer.c Tue Apr 7 09:29:28 2009
@@ -105,8 +105,8 @@
void (*request_update) (GogRenderer *renderer);
} GogRendererClass;
-#define GOG_RENDERER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_RENDERER_TYPE, GogRendererClass))
-#define IS_GOG_RENDERER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_RENDERER_TYPE))
+#define GOG_RENDERER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_RENDERER, GogRendererClass))
+#define GOG_IS_RENDERER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_RENDERER))
#define GRC_LINEAR_SCALE(w,scale) (go_sub_epsilon (w) <= 0.0 ? GOG_RENDERER_HAIRLINE_WIDTH_PTS : w) * scale
@@ -438,9 +438,9 @@
gboolean is_outline;
double width;
- g_return_if_fail (IS_GOG_RENDERER (renderer));
+ g_return_if_fail (GOG_IS_RENDERER (renderer));
g_return_if_fail (renderer->cur_style != NULL);
- g_return_if_fail (IS_GO_PATH (path));
+ g_return_if_fail (GO_IS_PATH (path));
style = renderer->cur_style;
is_outline = style->interesting_fields & GOG_STYLE_OUTLINE;
@@ -465,9 +465,9 @@
{
GogStyle const *style;
- g_return_if_fail (IS_GOG_RENDERER (renderer));
+ g_return_if_fail (GOG_IS_RENDERER (renderer));
g_return_if_fail (renderer->cur_style != NULL);
- g_return_if_fail (IS_GO_PATH (path));
+ g_return_if_fail (GO_IS_PATH (path));
style = renderer->cur_style;
@@ -485,9 +485,9 @@
double width;
gboolean use_outline;
- g_return_if_fail (IS_GOG_RENDERER (renderer));
+ g_return_if_fail (GOG_IS_RENDERER (renderer));
g_return_if_fail (renderer->cur_style != NULL);
- g_return_if_fail (IS_GO_PATH (path));
+ g_return_if_fail (GO_IS_PATH (path));
style = renderer->cur_style;
use_outline = style->interesting_fields & GOG_STYLE_OUTLINE;
@@ -541,8 +541,8 @@
void
gog_renderer_push_clip (GogRenderer *rend, GOPath const *path)
{
- g_return_if_fail (IS_GOG_RENDERER (rend));
- g_return_if_fail (IS_GO_PATH (path));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
+ g_return_if_fail (GO_IS_PATH (path));
cairo_save (rend->cairo);
@@ -592,7 +592,7 @@
void
gog_renderer_pop_clip (GogRenderer *rend)
{
- g_return_if_fail (IS_GOG_RENDERER (rend));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
cairo_restore (rend->cairo);
}
@@ -605,8 +605,8 @@
gboolean narrow = r < 1.5;
double o, o_2;
- g_return_if_fail (IS_GOG_RENDERER (rend));
- g_return_if_fail (IS_GOG_STYLE (rend->cur_style));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
+ g_return_if_fail (GOG_IS_STYLE (rend->cur_style));
style = rend->cur_style;
narrow |= !gog_style_is_outline_visible (style);
@@ -662,8 +662,8 @@
gboolean narrow = (rect->w < 3.) || (rect->h < 3.);
double o, o_2;
- g_return_if_fail (IS_GOG_RENDERER (rend));
- g_return_if_fail (IS_GOG_STYLE (rend->cur_style));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
+ g_return_if_fail (GOG_IS_STYLE (rend->cur_style));
style = rend->cur_style;
narrow |= !gog_style_is_outline_visible (style);
@@ -791,7 +791,7 @@
{
cairo_surface_t *surface;
- g_return_if_fail (IS_GOG_RENDERER (rend));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
g_return_if_fail (rend->cur_style != NULL);
if (rend->is_vector && !rend->marker_as_surface) {
@@ -842,7 +842,7 @@
GogStyle const *style;
int iw, ih;
- g_return_if_fail (IS_GOG_RENDERER (rend));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
g_return_if_fail (rend->cur_style != NULL);
g_return_if_fail (text != NULL);
@@ -916,7 +916,7 @@
PangoRectangle logical;
cairo_t *cairo = rend->cairo;
- g_return_if_fail (IS_GOG_RENDERER (rend));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
g_return_if_fail (rend->cur_style != NULL);
g_return_if_fail (text != NULL);
g_return_if_fail (obr != NULL);
@@ -983,8 +983,8 @@
void
gog_renderer_push_style (GogRenderer *rend, GogStyle const *style)
{
- g_return_if_fail (IS_GOG_RENDERER (rend));
- g_return_if_fail (IS_GOG_STYLE (style));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
+ g_return_if_fail (GOG_IS_STYLE (style));
if (rend->cur_style != NULL)
rend->style_stack = g_slist_prepend (
@@ -1000,8 +1000,8 @@
void
gog_renderer_pop_style (GogRenderer *rend)
{
- g_return_if_fail (IS_GOG_RENDERER (rend));
- g_return_if_fail (IS_GOG_STYLE (rend->cur_style));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
+ g_return_if_fail (GOG_IS_STYLE (rend->cur_style));
g_object_unref ((gpointer)rend->cur_style);
if (rend->style_stack != NULL) {
@@ -1019,7 +1019,7 @@
void
gog_renderer_request_update (GogRenderer *renderer)
{
- g_return_if_fail (IS_GOG_RENDERER (renderer));
+ g_return_if_fail (GOG_IS_RENDERER (renderer));
if (renderer->needs_update)
return;
@@ -1049,8 +1049,8 @@
if (w <= 0 || h <= 0)
return FALSE;
- g_return_val_if_fail (IS_GOG_RENDERER (rend), FALSE);
- g_return_val_if_fail (IS_GOG_VIEW (rend->view), FALSE);
+ g_return_val_if_fail (GOG_IS_RENDERER (rend), FALSE);
+ g_return_val_if_fail (GOG_IS_VIEW (rend->view), FALSE);
size_changed = rend->w != w || rend->h != h;
if (size_changed) {
@@ -1134,7 +1134,7 @@
GdkPixbuf *
gog_renderer_get_pixbuf (GogRenderer *rend)
{
- g_return_val_if_fail (IS_GOG_RENDERER (rend), NULL);
+ g_return_val_if_fail (GOG_IS_RENDERER (rend), NULL);
if (rend->cairo_surface == NULL)
return NULL;
@@ -1158,7 +1158,7 @@
cairo_surface_t *
gog_renderer_get_cairo_surface (GogRenderer *rend)
{
- g_return_val_if_fail (IS_GOG_RENDERER (rend), NULL);
+ g_return_val_if_fail (GOG_IS_RENDERER (rend), NULL);
return rend->cairo_surface;
}
@@ -1199,9 +1199,9 @@
GogViewAllocation allocation;
double width_in_pts, height_in_pts;
- g_return_val_if_fail (IS_GOG_RENDERER (renderer), FALSE);
- g_return_val_if_fail (IS_GOG_VIEW (renderer->view), FALSE);
- g_return_val_if_fail (IS_GOG_GRAPH (renderer->model), FALSE);
+ g_return_val_if_fail (GOG_IS_RENDERER (renderer), FALSE);
+ g_return_val_if_fail (GOG_IS_VIEW (renderer->view), FALSE);
+ g_return_val_if_fail (GOG_IS_GRAPH (renderer->model), FALSE);
gog_graph_force_update (renderer->model);
gog_graph_get_size (renderer->model, &width_in_pts, &height_in_pts);
@@ -1259,7 +1259,7 @@
double width_in_pts, height_in_pts;
gboolean result;
- g_return_val_if_fail (IS_GOG_RENDERER (rend), FALSE);
+ g_return_val_if_fail (GOG_IS_RENDERER (rend), FALSE);
if (x_dpi <= 0.)
x_dpi = 96.;
@@ -1384,7 +1384,7 @@
double
gog_renderer_get_hairline_width_pts (GogRenderer const *rend)
{
- g_return_val_if_fail (IS_GOG_RENDERER (rend), GOG_RENDERER_HAIRLINE_WIDTH_PTS);
+ g_return_val_if_fail (GOG_IS_RENDERER (rend), GOG_RENDERER_HAIRLINE_WIDTH_PTS);
if (rend->is_vector
|| go_sub_epsilon (rend->scale) <= 0.0)
@@ -1399,7 +1399,7 @@
{
cairo_t *cairo;
- g_return_if_fail (IS_GOG_RENDERER (renderer));
+ g_return_if_fail (GOG_IS_RENDERER (renderer));
g_return_if_fail (GMATHML_IS_VIEW (mathml_view));
cairo = renderer->cairo;
@@ -1426,13 +1426,13 @@
GogRenderer*
gog_renderer_new (GogGraph *graph)
{
- return g_object_new (GOG_RENDERER_TYPE, "model", graph, NULL);
+ return g_object_new (GOG_TYPE_RENDERER, "model", graph, NULL);
}
static void
_cb_font_removed (GogRenderer *rend, GOFont const *font)
{
- g_return_if_fail (IS_GOG_RENDERER (rend));
+ g_return_if_fail (GOG_IS_RENDERER (rend));
gog_debug (0, g_warning ("notify a '%s' that %p is invalid",
G_OBJECT_TYPE_NAME (rend), font););
@@ -1574,13 +1574,13 @@
g_param_spec_object ("model",
_("Model"),
_("The GogGraph this renderer displays"),
- GOG_GRAPH_TYPE,
+ GOG_TYPE_GRAPH,
GSF_PARAM_STATIC | G_PARAM_READWRITE));
g_object_class_install_property (gobject_klass, RENDERER_PROP_VIEW,
g_param_spec_object ("view",
_("View"),
_("the GogView this renderer is displaying"),
- GOG_VIEW_TYPE,
+ GOG_TYPE_VIEW,
GSF_PARAM_STATIC | G_PARAM_READABLE));
renderer_signals [RENDERER_SIGNAL_REQUEST_UPDATE] = g_signal_new ("request-update",
Modified: trunk/goffice/graph/gog-renderer.h
==============================================================================
--- trunk/goffice/graph/gog-renderer.h (original)
+++ trunk/goffice/graph/gog-renderer.h Tue Apr 7 09:29:28 2009
@@ -81,10 +81,10 @@
#define GOG_RENDERER_GRIP_SIZE 4
-#define GOG_RENDERER_TYPE (gog_renderer_get_type ())
-#define GOG_RENDERER(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GOG_RENDERER_TYPE, GogRenderer))
-#define IS_GOG_RENDERER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GOG_RENDERER_TYPE))
-#define GOG_RENDERER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOG_RENDERER_TYPE, GogRendererClass))
+#define GOG_TYPE_RENDERER (gog_renderer_get_type ())
+#define GOG_RENDERER(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GOG_TYPE_RENDERER, GogRenderer))
+#define GOG_IS_RENDERER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GOG_TYPE_RENDERER))
+#define GOG_RENDERER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOG_TYPE_RENDERER, GogRendererClass))
GType gog_renderer_get_type (void);
Modified: trunk/goffice/graph/gog-series-impl.h
==============================================================================
--- trunk/goffice/graph/gog-series-impl.h (original)
+++ trunk/goffice/graph/gog-series-impl.h Tue Apr 7 09:29:28 2009
@@ -46,7 +46,7 @@
GOCmdContext *cc);
} GogSeriesElementClass;
-#define GOG_SERIES_ELEMENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_SERIES_ELEMENT_TYPE, GogSeriesElementClass))
+#define GOG_SERIES_ELEMENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_SERIES_ELEMENT, GogSeriesElementClass))
typedef enum {
GOG_SERIES_REQUIRED, /* it must be there */
@@ -108,9 +108,9 @@
GogDataset *(*get_interpolation_params) (GogSeries const *series);
} GogSeriesClass;
-#define GOG_SERIES_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_SERIES_TYPE, GogSeriesClass))
-#define IS_GOG_SERIES_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_SERIES_TYPE))
-#define GOG_SERIES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_SERIES_TYPE, GogSeriesClass))
+#define GOG_SERIES_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_SERIES, GogSeriesClass))
+#define GOG_IS_SERIES_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_SERIES))
+#define GOG_SERIES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_SERIES, GogSeriesClass))
/* protected */
void gog_series_check_validity (GogSeries *series);
Modified: trunk/goffice/graph/gog-series-lines.c
==============================================================================
--- trunk/goffice/graph/gog-series-lines.c (original)
+++ trunk/goffice/graph/gog-series-lines.c Tue Apr 7 09:29:28 2009
@@ -72,7 +72,7 @@
GSF_CLASS (GogSeriesLines, gog_series_lines,
gog_series_lines_class_init, NULL,
- GOG_STYLED_OBJECT_TYPE)
+ GOG_TYPE_STYLED_OBJECT)
static void
path_move_to (void *closure, GOPathPoint const *point)
Modified: trunk/goffice/graph/gog-series-lines.h
==============================================================================
--- trunk/goffice/graph/gog-series-lines.h (original)
+++ trunk/goffice/graph/gog-series-lines.h Tue Apr 7 09:29:28 2009
@@ -28,9 +28,9 @@
G_BEGIN_DECLS
-#define GOG_SERIES_LINES_TYPE (gog_series_lines_get_type ())
-#define GOG_SERIES_LINES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_SERIES_LINES_TYPE, GogSeriesLines))
-#define IS_GOG_SERIES_LINES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_SERIES_LINES_TYPE))
+#define GOG_TYPE_SERIES_LINES (gog_series_lines_get_type ())
+#define GOG_SERIES_LINES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_SERIES_LINES, GogSeriesLines))
+#define GOG_IS_SERIES_LINES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_SERIES_LINES))
GType gog_series_lines_get_type (void);
void gog_series_lines_stroke (GogSeriesLines *lines, GogRenderer *rend,
Modified: trunk/goffice/graph/gog-series.c
==============================================================================
--- trunk/goffice/graph/gog-series.c (original)
+++ trunk/goffice/graph/gog-series.c Tue Apr 7 09:29:28 2009
@@ -226,7 +226,7 @@
GSF_CLASS (GogSeriesElement, gog_series_element,
gog_series_element_class_init, NULL /*gog_series_element_init*/,
- GOG_STYLED_OBJECT_TYPE)
+ GOG_TYPE_STYLED_OBJECT)
/*****************************************************************************/
@@ -277,7 +277,7 @@
GogObject *gse;
if (type == 0)
- type = GOG_SERIES_ELEMENT_TYPE;
+ type = GOG_TYPE_SERIES_ELEMENT;
gse = g_object_new (type, NULL);
if (gse != NULL)
@@ -745,7 +745,7 @@
GogSeries *series = GOG_SERIES (set);
GogGraph *graph = gog_object_get_graph (GOG_OBJECT (series));
- g_return_if_fail (IS_GOG_PLOT (series->plot));
+ g_return_if_fail (GOG_IS_PLOT (series->plot));
g_return_if_fail (dim_i >= -1);
if (dim_i < 0) {
@@ -820,8 +820,8 @@
GSF_CLASS_FULL (GogSeries, gog_series,
NULL, NULL, gog_series_class_init, NULL,
- gog_series_init, GOG_STYLED_OBJECT_TYPE, 0,
- GSF_INTERFACE (gog_series_dataset_init, GOG_DATASET_TYPE))
+ gog_series_init, GOG_TYPE_STYLED_OBJECT, 0,
+ GSF_INTERFACE (gog_series_dataset_init, GOG_TYPE_DATASET))
/**
* gog_series_get_plot :
@@ -832,7 +832,7 @@
GogPlot *
gog_series_get_plot (GogSeries const *series)
{
- g_return_val_if_fail (IS_GOG_SERIES (series), NULL);
+ g_return_val_if_fail (GOG_IS_SERIES (series), NULL);
return series->plot;
}
@@ -845,7 +845,7 @@
gboolean
gog_series_is_valid (GogSeries const *series)
{
- g_return_val_if_fail (IS_GOG_SERIES (series), FALSE);
+ g_return_val_if_fail (GOG_IS_SERIES (series), FALSE);
return series->is_valid;
}
@@ -863,8 +863,8 @@
unsigned i;
GogSeriesDesc const *desc;
- g_return_if_fail (IS_GOG_SERIES (series));
- g_return_if_fail (IS_GOG_PLOT (series->plot));
+ g_return_if_fail (GOG_IS_SERIES (series));
+ g_return_if_fail (GOG_IS_PLOT (series->plot));
desc = &series->plot->desc.series;
for (i = series->plot->desc.series.num_dim; i-- > 0; )
@@ -885,7 +885,7 @@
gboolean
gog_series_has_legend (GogSeries const *series)
{
- g_return_val_if_fail (IS_GOG_SERIES (series), FALSE);
+ g_return_val_if_fail (GOG_IS_SERIES (series), FALSE);
return series->has_legend;
}
@@ -904,7 +904,7 @@
void
gog_series_set_index (GogSeries *series, int ind, gboolean is_manual)
{
- g_return_if_fail (IS_GOG_SERIES (series));
+ g_return_if_fail (GOG_IS_SERIES (series));
if (ind < 0) {
if (series->manual_index && series->plot != NULL)
@@ -935,7 +935,7 @@
GODataScalar *
gog_series_get_name (GogSeries const *series)
{
- g_return_val_if_fail (IS_GOG_SERIES (series), NULL);
+ g_return_val_if_fail (GOG_IS_SERIES (series), NULL);
return GO_DATA_SCALAR (series->values[-1].data);
}
@@ -993,7 +993,7 @@
int index;
GList *ptr;
- g_return_val_if_fail (IS_GOG_SERIES (series), -1);
+ g_return_val_if_fail (GOG_IS_SERIES (series), -1);
if ((desired_index >= (int) series->num_elements) ||
(desired_index < 0))
@@ -1029,7 +1029,7 @@
GList *ptr;
GogSeriesElement *element;
- g_return_val_if_fail (IS_GOG_SERIES (series), NULL);
+ g_return_val_if_fail (GOG_IS_SERIES (series), NULL);
for (ptr = series->overrides; ptr != NULL; ptr = ptr->next) {
element = GOG_SERIES_ELEMENT (ptr->data);
@@ -1126,7 +1126,7 @@
GogSeriesFillType
gog_series_get_fill_type (GogSeries const *series)
{
- g_return_val_if_fail (IS_GOG_SERIES (series), GOG_SERIES_FILL_TYPE_INVALID);
+ g_return_val_if_fail (GOG_IS_SERIES (series), GOG_SERIES_FILL_TYPE_INVALID);
return series->fill_type;
}
@@ -1136,7 +1136,7 @@
{
GogSeriesClass *series_klass;
- g_return_if_fail (IS_GOG_SERIES (series));
+ g_return_if_fail (GOG_IS_SERIES (series));
if (series->fill_type == fill_type)
return;
g_return_if_fail (fill_type >= 0 && fill_type < GOG_SERIES_FILL_TYPE_INVALID);
@@ -1156,7 +1156,7 @@
GogSeriesFillType fill_type;
unsigned int i;
- g_return_if_fail (IS_GOG_SERIES (series));
+ g_return_if_fail (GOG_IS_SERIES (series));
series_klass = GOG_SERIES_GET_CLASS (series);
g_return_if_fail (series_klass->valid_fill_type_list != NULL);
@@ -1176,7 +1176,7 @@
{
GogSeriesClass *series_klass;
- g_return_val_if_fail (IS_GOG_SERIES (series), GOG_SERIES_FILL_TYPE_INVALID);
+ g_return_val_if_fail (GOG_IS_SERIES (series), GOG_SERIES_FILL_TYPE_INVALID);
series_klass = GOG_SERIES_GET_CLASS (series);
g_return_val_if_fail (series_klass->valid_fill_type_list != NULL, GOG_SERIES_FILL_TYPE_INVALID);
@@ -1189,7 +1189,7 @@
{
GogSeriesClass *series_klass;
- g_return_val_if_fail (IS_GOG_SERIES (series), NULL);
+ g_return_val_if_fail (GOG_IS_SERIES (series), NULL);
series_klass = GOG_SERIES_GET_CLASS (series);
return (series_klass->get_interpolation_params)?
series_klass->get_interpolation_params (series):
Modified: trunk/goffice/graph/gog-series.h
==============================================================================
--- trunk/goffice/graph/gog-series.h (original)
+++ trunk/goffice/graph/gog-series.h Tue Apr 7 09:29:28 2009
@@ -43,14 +43,14 @@
GOG_SERIES_FILL_TYPE_INVALID
} GogSeriesFillType;
-#define GOG_SERIES_ELEMENT_TYPE (gog_series_element_get_type ())
-#define GOG_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_SERIES_ELEMENT_TYPE, GogSeriesElement))
-#define IS_GOG_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_SERIES_ELEMENT_TYPE))
+#define GOG_TYPE_SERIES_ELEMENT (gog_series_element_get_type ())
+#define GOG_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_SERIES_ELEMENT, GogSeriesElement))
+#define GOG_IS_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_SERIES_ELEMENT))
GType gog_series_element_get_type (void);
-#define GOG_SERIES_TYPE (gog_series_get_type ())
-#define GOG_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_SERIES_TYPE, GogSeries))
-#define IS_GOG_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_SERIES_TYPE))
+#define GOG_TYPE_SERIES (gog_series_get_type ())
+#define GOG_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_SERIES, GogSeries))
+#define GOG_IS_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_SERIES))
GType gog_series_get_type (void);
gboolean gog_series_is_valid (GogSeries const *series);
Modified: trunk/goffice/graph/gog-smoothed-curve.c
==============================================================================
--- trunk/goffice/graph/gog-smoothed-curve.c (original)
+++ trunk/goffice/graph/gog-smoothed-curve.c Tue Apr 7 09:29:28 2009
@@ -83,16 +83,16 @@
GSF_CLASS (GogSmoothedCurve, gog_smoothed_curve,
gog_smoothed_curve_class_init, gog_smoothed_curve_init,
- GOG_TREND_LINE_TYPE)
+ GOG_TYPE_TREND_LINE)
/****************************************************************************/
typedef GogView GogSmoothedCurveView;
typedef GogViewClass GogSmoothedCurveViewClass;
-#define GOG_SMOOTHED_CURVE_VIEW_TYPE (gog_smoothed_curve_view_get_type ())
-#define GOG_SMOOTHED_CURVE_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_SMOOTHED_CURVE_VIEW_TYPE, GogSmoothedCurveView))
-#define IS_GOG_SMOOTHED_CURVE_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_SMOOTHED_CURVE_VIEW_TYPE))
+#define GOG_TYPE_SMOOTHED_CURVE_VIEW (gog_smoothed_curve_view_get_type ())
+#define GOG_SMOOTHED_CURVE_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_SMOOTHED_CURVE_VIEW, GogSmoothedCurveView))
+#define GOG_IS_SMOOTHED_CURVE_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_SMOOTHED_CURVE_VIEW))
/*static GogViewClass *smoothed_curve_view_parent_klass; */
@@ -143,4 +143,4 @@
static GSF_CLASS (GogSmoothedCurveView, gog_smoothed_curve_view,
gog_smoothed_curve_view_class_init, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
Modified: trunk/goffice/graph/gog-smoothed-curve.h
==============================================================================
--- trunk/goffice/graph/gog-smoothed-curve.h (original)
+++ trunk/goffice/graph/gog-smoothed-curve.h Tue Apr 7 09:29:28 2009
@@ -41,9 +41,9 @@
} GogSmoothedCurveClass;
-#define GOG_SMOOTHED_CURVE_TYPE (gog_smoothed_curve_get_type ())
-#define GOG_SMOOTHED_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_SMOOTHED_CURVE_TYPE, GogSmoothedCurve))
-#define IS_GOG_SMOOTHED_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_SMOOTHED_CURVE_TYPE))
+#define GOG_TYPE_SMOOTHED_CURVE (gog_smoothed_curve_get_type ())
+#define GOG_SMOOTHED_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_SMOOTHED_CURVE, GogSmoothedCurve))
+#define GOG_IS_SMOOTHED_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_SMOOTHED_CURVE))
GType gog_smoothed_curve_get_type (void);
Modified: trunk/goffice/graph/gog-style.c
==============================================================================
--- trunk/goffice/graph/gog-style.c (original)
+++ trunk/goffice/graph/gog-style.c Tue Apr 7 09:29:28 2009
@@ -1043,7 +1043,7 @@
GogStyle *
gog_style_new (void)
{
- return g_object_new (GOG_STYLE_TYPE, NULL);
+ return g_object_new (GOG_TYPE_STYLE, NULL);
}
/**
@@ -1059,7 +1059,7 @@
{
GogStyle *dst;
- g_return_val_if_fail (IS_GOG_STYLE (src), NULL);
+ g_return_val_if_fail (GOG_IS_STYLE (src), NULL);
dst = gog_style_new ();
gog_style_assign (dst, src);
@@ -1072,8 +1072,8 @@
if (src == dst)
return;
- g_return_if_fail (IS_GOG_STYLE (src));
- g_return_if_fail (IS_GOG_STYLE (dst));
+ g_return_if_fail (GOG_IS_STYLE (src));
+ g_return_if_fail (GOG_IS_STYLE (dst));
if (GOG_FILL_STYLE_IMAGE == src->fill.type &&
src->fill.image.image != NULL)
@@ -1120,8 +1120,8 @@
if (src == dst)
return;
- g_return_if_fail (IS_GOG_STYLE (src));
- g_return_if_fail (IS_GOG_STYLE (dst));
+ g_return_if_fail (GOG_IS_STYLE (src));
+ g_return_if_fail (GOG_IS_STYLE (dst));
if (dst->outline.auto_dash)
dst->outline.dash_type = src->outline.dash_type;
@@ -1717,7 +1717,7 @@
GogStyle *style = GOG_STYLE (xin->user_state);
GODoc *doc = (GODoc *) g_object_get_data (G_OBJECT (gsf_xml_in_get_input (xin)), "document");
g_return_if_fail (style->fill.type == GOG_FILL_STYLE_IMAGE);
- g_return_if_fail (IS_GO_DOC (doc));
+ g_return_if_fail (GO_IS_DOC (doc));
/* TODO: load the pixels */
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (0 == strcmp (attrs[0], "type")) {
@@ -1880,7 +1880,7 @@
GSF_CLASS_FULL (GogStyle, gog_style,
NULL, NULL, gog_style_class_init, NULL,
gog_style_init, G_TYPE_OBJECT, 0,
- GSF_INTERFACE (gog_style_persist_init, GO_PERSIST_TYPE))
+ GSF_INTERFACE (gog_style_persist_init, GO_TYPE_PERSIST))
gboolean
gog_style_is_different_size (GogStyle const *a, GogStyle const *b)
@@ -1898,7 +1898,7 @@
gboolean
gog_style_is_marker_visible (GogStyle const *style)
{
- g_return_val_if_fail (IS_GOG_STYLE (style), FALSE);
+ g_return_val_if_fail (GOG_IS_STYLE (style), FALSE);
/* FIXME FIXME FIXME TODO : make this smarter */
return (style->interesting_fields & GOG_STYLE_MARKER) &&
@@ -1908,7 +1908,7 @@
gboolean
gog_style_is_outline_visible (GogStyle const *style)
{
- g_return_val_if_fail (IS_GOG_STYLE (style), FALSE);
+ g_return_val_if_fail (GOG_IS_STYLE (style), FALSE);
/* FIXME FIXME FIXME make this smarter */
return UINT_RGBA_A (style->outline.color) > 0 &&
@@ -1918,7 +1918,7 @@
gboolean
gog_style_is_line_visible (GogStyle const *style)
{
- g_return_val_if_fail (IS_GOG_STYLE (style), FALSE);
+ g_return_val_if_fail (GOG_IS_STYLE (style), FALSE);
/* FIXME FIXME FIXME TODO : make this smarter */
return UINT_RGBA_A (style->line.color) > 0 &&
@@ -1928,7 +1928,7 @@
gboolean
gog_style_is_fill_visible (const GogStyle *style)
{
- g_return_val_if_fail (IS_GOG_STYLE (style), FALSE);
+ g_return_val_if_fail (GOG_IS_STYLE (style), FALSE);
return (style->fill.type != GOG_FILL_STYLE_NONE);
}
@@ -1936,7 +1936,7 @@
void
gog_style_force_auto (GogStyle *style)
{
- g_return_if_fail (IS_GOG_STYLE (style));
+ g_return_if_fail (GOG_IS_STYLE (style));
if (style->marker.mark != NULL)
g_object_unref (G_OBJECT (style->marker.mark));
@@ -1965,8 +1965,8 @@
void
gog_style_set_marker (GogStyle *style, GOMarker *marker)
{
- g_return_if_fail (IS_GOG_STYLE (style));
- g_return_if_fail (IS_GO_MARKER (marker));
+ g_return_if_fail (GOG_IS_STYLE (style));
+ g_return_if_fail (GO_IS_MARKER (marker));
if (style->marker.mark != marker) {
if (style->marker.mark != NULL)
@@ -1986,7 +1986,7 @@
GOMarker const *
gog_style_get_marker (GogStyle *style)
{
- g_return_val_if_fail (IS_GOG_STYLE (style), NULL);
+ g_return_val_if_fail (GOG_IS_STYLE (style), NULL);
return style->marker.mark;
}
@@ -1996,7 +1996,7 @@
{
GOFont const *font;
- g_return_if_fail (IS_GOG_STYLE (style));
+ g_return_if_fail (GOG_IS_STYLE (style));
font = go_font_new_by_desc (desc);
if (font != NULL) {
@@ -2008,7 +2008,7 @@
void
gog_style_set_font (GogStyle *style, GOFont const *font)
{
- g_return_if_fail (IS_GOG_STYLE (style));
+ g_return_if_fail (GOG_IS_STYLE (style));
if (font != NULL) {
go_font_unref (style->font.font);
@@ -2019,7 +2019,7 @@
void
gog_style_set_fill_brightness (GogStyle *style, float brightness)
{
- g_return_if_fail (IS_GOG_STYLE (style));
+ g_return_if_fail (GOG_IS_STYLE (style));
g_return_if_fail (style->fill.type == GOG_FILL_STYLE_GRADIENT);
brightness = CLAMP (brightness, 0, 100.0);
@@ -2041,7 +2041,7 @@
void
gog_style_set_text_angle (GogStyle *style, double angle)
{
- g_return_if_fail (IS_GOG_STYLE (style));
+ g_return_if_fail (GOG_IS_STYLE (style));
style->text_layout.angle = CLAMP (angle, -180.0, 180.0);
style->text_layout.auto_angle = FALSE;
@@ -2085,7 +2085,7 @@
{2, 2, 0, 1}
};
- g_return_val_if_fail (IS_GOG_STYLE (style), NULL);
+ g_return_val_if_fail (GOG_IS_STYLE (style), NULL);
if (style->fill.type == GOG_FILL_STYLE_NONE)
return NULL;
Modified: trunk/goffice/graph/gog-style.h
==============================================================================
--- trunk/goffice/graph/gog-style.h (original)
+++ trunk/goffice/graph/gog-style.h Tue Apr 7 09:29:28 2009
@@ -36,9 +36,9 @@
G_BEGIN_DECLS
-#define GOG_STYLE_TYPE (gog_style_get_type ())
-#define GOG_STYLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_STYLE_TYPE, GogStyle))
-#define IS_GOG_STYLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_STYLE_TYPE))
+#define GOG_TYPE_STYLE (gog_style_get_type ())
+#define GOG_STYLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_STYLE, GogStyle))
+#define GOG_IS_STYLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_STYLE))
GType gog_style_get_type (void);
Modified: trunk/goffice/graph/gog-styled-object.c
==============================================================================
--- trunk/goffice/graph/gog-styled-object.c (original)
+++ trunk/goffice/graph/gog-styled-object.c Tue Apr 7 09:29:28 2009
@@ -190,7 +190,7 @@
g_param_spec_object ("style",
_("Style"),
_("A pointer to the GogStyle object"),
- GOG_STYLE_TYPE,
+ GOG_TYPE_STYLE,
GSF_PARAM_STATIC | G_PARAM_READWRITE | GO_PARAM_PERSISTENT));
}
@@ -202,7 +202,7 @@
GSF_CLASS (GogStyledObject, gog_styled_object,
gog_styled_object_class_init, gog_styled_object_init,
- GOG_OBJECT_TYPE)
+ GOG_TYPE_OBJECT)
/**
* gog_styled_object_set_style:
@@ -221,7 +221,7 @@
{
gboolean resize;
- g_return_val_if_fail (IS_GOG_STYLED_OBJECT (gso), FALSE);
+ g_return_val_if_fail (GOG_IS_STYLED_OBJECT (gso), FALSE);
if (gso->style == style)
return FALSE;
@@ -249,7 +249,7 @@
GogStyle *
gog_styled_object_get_style (GogStyledObject *gso)
{
- g_return_val_if_fail (IS_GOG_STYLED_OBJECT (gso), NULL);
+ g_return_val_if_fail (GOG_IS_STYLED_OBJECT (gso), NULL);
return gso->style;
}
Modified: trunk/goffice/graph/gog-styled-object.h
==============================================================================
--- trunk/goffice/graph/gog-styled-object.h (original)
+++ trunk/goffice/graph/gog-styled-object.h Tue Apr 7 09:29:28 2009
@@ -42,10 +42,10 @@
void (*style_changed) (GogStyledObject *obj, GogStyle const *new_style);
} GogStyledObjectClass;
-#define GOG_STYLED_OBJECT_TYPE (gog_styled_object_get_type ())
-#define GOG_STYLED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_STYLED_OBJECT_TYPE, GogStyledObject))
-#define IS_GOG_STYLED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_STYLED_OBJECT_TYPE))
-#define GOG_STYLED_OBJECT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_STYLED_OBJECT_TYPE, GogStyledObjectClass))
+#define GOG_TYPE_STYLED_OBJECT (gog_styled_object_get_type ())
+#define GOG_STYLED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_STYLED_OBJECT, GogStyledObject))
+#define GOG_IS_STYLED_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_STYLED_OBJECT))
+#define GOG_STYLED_OBJECT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_STYLED_OBJECT, GogStyledObjectClass))
GType gog_styled_object_get_type (void);
Modified: trunk/goffice/graph/gog-theme.c
==============================================================================
--- trunk/goffice/graph/gog-theme.c (original)
+++ trunk/goffice/graph/gog-theme.c Tue Apr 7 09:29:28 2009
@@ -235,7 +235,7 @@
GogTheme *
gog_theme_new (char const *name)
{
- GogTheme *theme = g_object_new (GOG_THEME_TYPE, NULL);
+ GogTheme *theme = g_object_new (GOG_TYPE_THEME, NULL);
theme->name = g_strdup (name);
return theme;
}
@@ -296,7 +296,7 @@
char const *
gog_theme_get_name (GogTheme const *theme)
{
- g_return_val_if_fail (IS_GOG_THEME (theme), "");
+ g_return_val_if_fail (GOG_IS_THEME (theme), "");
return theme->name;
}
@@ -418,7 +418,7 @@
void
gog_theme_registry_add (GogTheme *theme, gboolean is_default)
{
- g_return_if_fail (IS_GOG_THEME (theme));
+ g_return_if_fail (GOG_IS_THEME (theme));
/* TODO: Check for duplicated names and for already
* registered themes */
Modified: trunk/goffice/graph/gog-theme.h
==============================================================================
--- trunk/goffice/graph/gog-theme.h (original)
+++ trunk/goffice/graph/gog-theme.h Tue Apr 7 09:29:28 2009
@@ -26,9 +26,9 @@
G_BEGIN_DECLS
-#define GOG_THEME_TYPE (gog_theme_get_type ())
-#define GOG_THEME(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_THEME_TYPE, GogTheme))
-#define IS_GOG_THEME(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_THEME_TYPE))
+#define GOG_TYPE_THEME (gog_theme_get_type ())
+#define GOG_THEME(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_THEME, GogTheme))
+#define GOG_IS_THEME(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_THEME))
GType gog_theme_get_type (void);
Modified: trunk/goffice/graph/gog-trend-line.c
==============================================================================
--- trunk/goffice/graph/gog-trend-line.c (original)
+++ trunk/goffice/graph/gog-trend-line.c Tue Apr 7 09:29:28 2009
@@ -52,7 +52,7 @@
GSF_CLASS (GogTrendLine, gog_trend_line,
gog_trend_line_class_init, NULL,
- GOG_STYLED_OBJECT_TYPE)
+ GOG_TYPE_STYLED_OBJECT)
GogTrendLine *
gog_trend_line_new_by_type (GogTrendLineType const *type)
Modified: trunk/goffice/graph/gog-trend-line.h
==============================================================================
--- trunk/goffice/graph/gog-trend-line.h (original)
+++ trunk/goffice/graph/gog-trend-line.h Tue Apr 7 09:29:28 2009
@@ -30,9 +30,9 @@
typedef GogStyledObjectClass GogTrendLineClass;
-#define GOG_TREND_LINE_TYPE (gog_trend_line_get_type ())
-#define GOG_TREND_LINE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TREND_LINE_TYPE, GogTrendLine))
-#define IS_GOG_TREND_LINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TREND_LINE_TYPE))
+#define GOG_TYPE_TREND_LINE (gog_trend_line_get_type ())
+#define GOG_TREND_LINE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_TREND_LINE, GogTrendLine))
+#define GOG_IS_TREND_LINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_TREND_LINE))
GType gog_trend_line_get_type (void);
Modified: trunk/goffice/graph/gog-view.c
==============================================================================
--- trunk/goffice/graph/gog-view.c (original)
+++ trunk/goffice/graph/gog-view.c Tue Apr 7 09:29:28 2009
@@ -201,7 +201,7 @@
{
GogToolAction *action;
- g_return_val_if_fail (IS_GOG_VIEW (view), NULL);
+ g_return_val_if_fail (GOG_IS_VIEW (view), NULL);
g_return_val_if_fail (tool != NULL, NULL);
action = g_new0 (GogToolAction, 1);
@@ -590,13 +590,13 @@
g_param_spec_object ("parent",
_("Parent"),
_("the GogView parent"),
- GOG_VIEW_TYPE,
+ GOG_TYPE_VIEW,
GSF_PARAM_STATIC | G_PARAM_WRITABLE));
g_object_class_install_property (gobject_klass, GOG_VIEW_PROP_MODEL,
g_param_spec_object ("model",
_("Model"),
_("The GogObject this view displays"),
- GOG_OBJECT_TYPE,
+ GOG_TYPE_OBJECT,
GSF_PARAM_STATIC | G_PARAM_WRITABLE));
}
@@ -631,7 +631,7 @@
void
gog_view_queue_redraw (GogView *view)
{
- g_return_if_fail (IS_GOG_VIEW (view));
+ g_return_if_fail (GOG_IS_VIEW (view));
g_return_if_fail (view->renderer != NULL);
gog_renderer_request_update (view->renderer);
@@ -648,7 +648,7 @@
void
gog_view_queue_resize (GogView *view)
{
- g_return_if_fail (IS_GOG_VIEW (view));
+ g_return_if_fail (GOG_IS_VIEW (view));
g_return_if_fail (view->renderer != NULL);
gog_renderer_request_update (view->renderer);
@@ -744,7 +744,7 @@
gboolean
gog_view_update_sizes (GogView *view)
{
- g_return_val_if_fail (IS_GOG_VIEW (view), TRUE);
+ g_return_val_if_fail (GOG_IS_VIEW (view), TRUE);
g_return_val_if_fail (!view->being_updated, TRUE);
if (!view->allocation_valid)
@@ -864,8 +864,8 @@
GogObject const *obj, *old_target;
GSList *ptr;
- g_return_val_if_fail (IS_GOG_VIEW (container), NULL);
- g_return_val_if_fail (IS_GOG_OBJECT (target_model), NULL);
+ g_return_val_if_fail (GOG_IS_VIEW (container), NULL);
+ g_return_val_if_fail (GOG_IS_OBJECT (target_model), NULL);
/* @container is a view for @target_models parent */
obj = target_model;
@@ -907,7 +907,7 @@
GogTool *tool;
GSList const *ptr;
- g_return_if_fail (IS_GOG_VIEW (view));
+ g_return_if_fail (GOG_IS_VIEW (view));
for (ptr = gog_view_get_toolkit (view); ptr != NULL; ptr = ptr->next) {
tool = ptr->data;
@@ -926,7 +926,7 @@
GSList const *
gog_view_get_toolkit (GogView *view)
{
- g_return_val_if_fail (IS_GOG_VIEW (view), NULL);
+ g_return_val_if_fail (GOG_IS_VIEW (view), NULL);
if (view->toolkit == NULL) {
GogViewClass *klass = GOG_VIEW_GET_CLASS (view);
@@ -989,7 +989,7 @@
GSList const *ptr;
GSList *list;
- g_return_val_if_fail (IS_GOG_VIEW (view), NULL);
+ g_return_val_if_fail (GOG_IS_VIEW (view), NULL);
/* walk the list in reverse */
list = g_slist_reverse (g_slist_copy (view->children));
Modified: trunk/goffice/graph/gog-view.h
==============================================================================
--- trunk/goffice/graph/gog-view.h (original)
+++ trunk/goffice/graph/gog-view.h Tue Apr 7 09:29:28 2009
@@ -94,12 +94,12 @@
void (*build_toolkit) (GogView *view);
} GogViewClass;
-#define GOG_VIEW_TYPE (gog_view_get_type ())
-#define GOG_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_VIEW_TYPE, GogView))
-#define IS_GOG_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_VIEW_TYPE))
-#define GOG_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_VIEW_TYPE, GogViewClass))
-#define IS_GOG_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_VIEW_TYPE))
-#define GOG_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_VIEW_TYPE, GogViewClass))
+#define GOG_TYPE_VIEW (gog_view_get_type ())
+#define GOG_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_VIEW, GogView))
+#define GOG_IS_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_VIEW))
+#define GOG_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_TYPE_VIEW, GogViewClass))
+#define GOG_IS_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOG_TYPE_VIEW))
+#define GOG_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_VIEW, GogViewClass))
GType gog_view_get_type (void);
Modified: trunk/goffice/gtk/go-3d-rotation-sel.c
==============================================================================
--- trunk/goffice/gtk/go-3d-rotation-sel.c (original)
+++ trunk/goffice/gtk/go-3d-rotation-sel.c Tue Apr 7 09:29:28 2009
@@ -445,28 +445,28 @@
double
go_3d_rotation_sel_get_psi (GO3DRotationSel const *g3d)
{
- g_return_val_if_fail (IS_GO_3D_ROTATION_SEL (g3d), 0);
+ g_return_val_if_fail (GO_IS_3D_ROTATION_SEL (g3d), 0);
return g3d->psi;
}
double
go_3d_rotation_sel_get_theta (GO3DRotationSel const *g3d)
{
- g_return_val_if_fail (IS_GO_3D_ROTATION_SEL (g3d), 0);
+ g_return_val_if_fail (GO_IS_3D_ROTATION_SEL (g3d), 0);
return g3d->theta;
}
double
go_3d_rotation_sel_get_phi (GO3DRotationSel const *g3d)
{
- g_return_val_if_fail (IS_GO_3D_ROTATION_SEL (g3d), 0);
+ g_return_val_if_fail (GO_IS_3D_ROTATION_SEL (g3d), 0);
return g3d->phi;
}
double
go_3d_rotation_sel_get_fov (GO3DRotationSel const *g3d)
{
- g_return_val_if_fail (IS_GO_3D_ROTATION_SEL (g3d), 0);
+ g_return_val_if_fail (GO_IS_3D_ROTATION_SEL (g3d), 0);
return g3d->fov;
}
Modified: trunk/goffice/gtk/go-3d-rotation-sel.h
==============================================================================
--- trunk/goffice/gtk/go-3d-rotation-sel.h (original)
+++ trunk/goffice/gtk/go-3d-rotation-sel.h Tue Apr 7 09:29:28 2009
@@ -28,7 +28,7 @@
#define GO_3D_ROTATION_SEL_TYPE (go_3d_rotation_sel_get_type ())
#define GO_3D_ROTATION_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
GO_3D_ROTATION_SEL_TYPE, GO3DRotationSel))
-#define IS_GO_3D_ROTATION_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+#define GO_IS_3D_ROTATION_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
GO_3D_ROTATION_SEL_TYPE))
typedef struct _GO3DRotationSel GO3DRotationSel;
Modified: trunk/goffice/gtk/go-action-combo-color.c
==============================================================================
--- trunk/goffice/gtk/go-action-combo-color.c (original)
+++ trunk/goffice/gtk/go-action-combo-color.c Tue Apr 7 09:29:28 2009
@@ -35,9 +35,9 @@
} GOToolComboColor;
typedef GtkToolItemClass GOToolComboColorClass;
-#define GO_TOOL_COMBO_COLOR_TYPE (go_tool_combo_color_get_type ())
-#define GO_TOOL_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_CAST (o, GO_TOOL_COMBO_COLOR_TYPE, GOToolComboColor))
-#define IS_GO_TOOL_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_TYPE (o, GO_TOOL_COMBO_COLOR_TYPE))
+#define GO_TYPE_TOOL_COMBO_COLOR (go_tool_combo_color_get_type ())
+#define GO_TOOL_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_CAST (o, GO_TYPE_TOOL_COMBO_COLOR, GOToolComboColor))
+#define GO_IS_TOOL_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_TYPE (o, GO_TYPE_TOOL_COMBO_COLOR))
static GType go_tool_combo_color_get_type (void);
@@ -75,7 +75,7 @@
g_object_get (a, "stock-id", &stock_id, NULL);
if (stock_id == NULL)
return NULL;
- if (IS_GO_TOOL_COMBO_COLOR (tool)) {
+ if (GO_IS_TOOL_COMBO_COLOR (tool)) {
if (tool->parent)
size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (tool->parent));
else
@@ -170,7 +170,7 @@
go_action_combo_color_create_tool_item (GtkAction *a)
{
GOActionComboColor *caction = (GOActionComboColor *)a;
- GOToolComboColor *tool = g_object_new (GO_TOOL_COMBO_COLOR_TYPE, NULL);
+ GOToolComboColor *tool = g_object_new (GO_TYPE_TOOL_COMBO_COLOR, NULL);
char *title;
/* FIXME: We probably should re-do this when tool changes screen or
@@ -298,6 +298,6 @@
a->current_color = color;
for ( ; ptr != NULL ; ptr = ptr->next)
- if (IS_GO_TOOL_COMBO_COLOR (ptr->data))
+ if (GO_IS_TOOL_COMBO_COLOR (ptr->data))
go_combo_color_set_color (GO_TOOL_COMBO_COLOR (ptr->data)->combo, color);
}
Modified: trunk/goffice/gtk/go-action-combo-color.h
==============================================================================
--- trunk/goffice/gtk/go-action-combo-color.h (original)
+++ trunk/goffice/gtk/go-action-combo-color.h Tue Apr 7 09:29:28 2009
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define GO_ACTION_COMBO_COLOR_TYPE (go_action_combo_color ())
-#define GO_ACTION_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_ACTION_COMBO_COLOR_TYPE, GOActionComboColor))
-#define IS_GO_ACTION_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_ACTION_COMBO_COLOR_TYPE))
+#define GO_TYPE_ACTION_COMBO_COLOR (go_action_combo_color ())
+#define GO_ACTION_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_ACTION_COMBO_COLOR, GOActionComboColor))
+#define GO_IS_ACTION_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_ACTION_COMBO_COLOR))
typedef struct _GOActionComboColor GOActionComboColor;
Modified: trunk/goffice/gtk/go-action-combo-pixmaps.c
==============================================================================
--- trunk/goffice/gtk/go-action-combo-pixmaps.c (original)
+++ trunk/goffice/gtk/go-action-combo-pixmaps.c Tue Apr 7 09:29:28 2009
@@ -33,9 +33,9 @@
} GOToolComboPixmaps;
typedef GtkToolItemClass GOToolComboPixmapsClass;
-#define GO_TOOL_COMBO_PIXMAPS_TYPE (go_tool_combo_pixmaps_get_type ())
-#define GO_TOOL_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_CAST (o, GO_TOOL_COMBO_PIXMAPS_TYPE, GOToolComboPixmaps))
-#define IS_GO_TOOL_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_TYPE (o, GO_TOOL_COMBO_PIXMAPS_TYPE))
+#define GO_TYPE_TOOL_COMBO_PIXMAPS (go_tool_combo_pixmaps_get_type ())
+#define GO_TOOL_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_CAST (o, GO_TYPE_TOOL_COMBO_PIXMAPS, GOToolComboPixmaps))
+#define GO_IS_TOOL_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_TYPE (o, GO_TYPE_TOOL_COMBO_PIXMAPS))
static GType go_tool_combo_pixmaps_get_type (void);
@@ -83,7 +83,7 @@
if (stock_id == NULL)
return NULL;
- if (IS_GO_TOOL_COMBO_PIXMAPS (tool)) {
+ if (GO_IS_TOOL_COMBO_PIXMAPS (tool)) {
if (tool->parent)
size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (tool->parent));
else {
@@ -129,7 +129,7 @@
paction->updating_proxies = TRUE;
ptr = gtk_action_get_proxies (GTK_ACTION (paction));
for ( ; ptr != NULL ; ptr = ptr->next)
- if (IS_GO_COMBO_PIXMAPS (ptr->data) &&
+ if (GO_IS_COMBO_PIXMAPS (ptr->data) &&
go_combo_pixmaps_get_selected (ptr->data, NULL) != id)
go_combo_pixmaps_select_id (ptr->data, id);
paction->updating_proxies = FALSE;
@@ -141,7 +141,7 @@
go_action_combo_pixmaps_create_tool_item (GtkAction *a)
{
GOActionComboPixmaps *paction = (GOActionComboPixmaps *)a;
- GOToolComboPixmaps *tool = g_object_new (GO_TOOL_COMBO_PIXMAPS_TYPE, NULL);
+ GOToolComboPixmaps *tool = g_object_new (GO_TYPE_TOOL_COMBO_PIXMAPS, NULL);
GOActionComboPixmapsElement const *el = paction->elements;
tool->combo = go_combo_pixmaps_new (paction->ncols);
@@ -240,7 +240,7 @@
int
go_action_combo_pixmaps_get_selected (GOActionComboPixmaps *paction, int *indx)
{
- g_return_val_if_fail (IS_GO_ACTION_COMBO_PIXMAPS (paction), 0);
+ g_return_val_if_fail (GO_IS_ACTION_COMBO_PIXMAPS (paction), 0);
return paction->selected_id;
}
@@ -253,7 +253,7 @@
paction->selected_id = id;
for ( ; ptr != NULL ; ptr = ptr->next)
- if (IS_GO_TOOL_COMBO_PIXMAPS (ptr->data))
+ if (GO_IS_TOOL_COMBO_PIXMAPS (ptr->data))
res |= go_combo_pixmaps_select_id (
GO_TOOL_COMBO_PIXMAPS (ptr->data)->combo, id);
Modified: trunk/goffice/gtk/go-action-combo-pixmaps.h
==============================================================================
--- trunk/goffice/gtk/go-action-combo-pixmaps.h (original)
+++ trunk/goffice/gtk/go-action-combo-pixmaps.h Tue Apr 7 09:29:28 2009
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define GO_ACTION_COMBO_PIXMAPS_TYPE (go_action_combo_pixmaps_get_type ())
-#define GO_ACTION_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_ACTION_COMBO_PIXMAPS_TYPE, GOActionComboPixmaps))
-#define IS_GO_ACTION_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_ACTION_COMBO_PIXMAPS_TYPE))
+#define GO_TYPE_ACTION_COMBO_PIXMAPS (go_action_combo_pixmaps_get_type ())
+#define GO_ACTION_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_ACTION_COMBO_PIXMAPS, GOActionComboPixmaps))
+#define GO_IS_ACTION_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_ACTION_COMBO_PIXMAPS))
typedef struct _GOActionComboPixmaps GOActionComboPixmaps;
typedef struct {
Modified: trunk/goffice/gtk/go-action-combo-stack.c
==============================================================================
--- trunk/goffice/gtk/go-action-combo-stack.c (original)
+++ trunk/goffice/gtk/go-action-combo-stack.c Tue Apr 7 09:29:28 2009
@@ -54,9 +54,9 @@
KEY_COL
};
-#define GO_COMBO_STACK_TYPE (go_combo_stack_get_type ())
-#define GO_COMBO_STACK(o) G_TYPE_CHECK_INSTANCE_CAST (o, GO_COMBO_STACK_TYPE, GOComboStack)
-#define IS_GO_COMBO_STACK(o) G_TYPE_CHECK_INSTANCE_TYPE (o, GO_COMBO_STACK_TYPE)
+#define GO_TYPE_COMBO_STACK (go_combo_stack_get_type ())
+#define GO_COMBO_STACK(o) G_TYPE_CHECK_INSTANCE_CAST (o, GO_TYPE_COMBO_STACK, GOComboStack)
+#define GO_IS_COMBO_STACK(o) G_TYPE_CHECK_INSTANCE_TYPE (o, GO_TYPE_COMBO_STACK)
static GType go_combo_stack_get_type (void);
static guint go_combo_stack_signals [LAST_SIGNAL] = { 0, };
@@ -214,7 +214,7 @@
GSF_CLASS (GOComboStack, go_combo_stack,
go_combo_stack_class_init, go_combo_stack_init,
- GO_COMBO_BOX_TYPE)
+ GO_TYPE_COMBO_BOX)
/**************************************************************************/
@@ -224,9 +224,9 @@
} GOToolComboStack;
typedef GtkToolItemClass GOToolComboStackClass;
-#define GO_TOOL_COMBO_STACK_TYPE (go_tool_combo_stack_get_type ())
-#define GO_TOOL_COMBO_STACK(o) (G_TYPE_CHECK_INSTANCE_CAST (o, GO_TOOL_COMBO_STACK_TYPE, GOToolComboStack))
-#define IS_GO_TOOL_COMBO_STACK(o) (G_TYPE_CHECK_INSTANCE_TYPE (o, GO_TOOL_COMBO_STACK_TYPE))
+#define GO_TYPE_TOOL_COMBO_STACK (go_tool_combo_stack_get_type ())
+#define GO_TOOL_COMBO_STACK(o) (G_TYPE_CHECK_INSTANCE_CAST (o, GO_TYPE_TOOL_COMBO_STACK, GOToolComboStack))
+#define GO_IS_TOOL_COMBO_STACK(o) (G_TYPE_CHECK_INSTANCE_TYPE (o, GO_TYPE_TOOL_COMBO_STACK))
static GType go_tool_combo_stack_get_type (void);
@@ -290,13 +290,13 @@
GOActionComboStack *saction = (GOActionComboStack *)a;
GtkWidget *image;
GtkTreeView *tree_view;
- GOToolComboStack *tool = g_object_new (GO_TOOL_COMBO_STACK_TYPE, NULL);
+ GOToolComboStack *tool = g_object_new (GO_TYPE_TOOL_COMBO_STACK, NULL);
char *stock_id;
gboolean is_sensitive = gtk_tree_model_iter_n_children (saction->model, NULL) > 0;
GtkIconSize size;
GtkSettings *settings;
- tool->combo = g_object_new (GO_COMBO_STACK_TYPE, NULL);
+ tool->combo = g_object_new (GO_TYPE_COMBO_STACK, NULL);
tree_view = GTK_TREE_VIEW (tool->combo->list);
gtk_tree_view_set_model (tree_view, saction->model);
gtk_tree_view_set_headers_visible (tree_view, FALSE);
Modified: trunk/goffice/gtk/go-action-combo-stack.h
==============================================================================
--- trunk/goffice/gtk/go-action-combo-stack.h (original)
+++ trunk/goffice/gtk/go-action-combo-stack.h Tue Apr 7 09:29:28 2009
@@ -26,9 +26,9 @@
G_BEGIN_DECLS
-#define GO_ACTION_COMBO_STACK_TYPE (go_action_combo_stack_get_type ())
-#define GO_ACTION_COMBO_STACK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_ACTION_COMBO_STACK_TYPE, GOActionComboStack))
-#define IS_GO_ACTION_COMBO_STACK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_ACTION_COMBO_STACK_TYPE))
+#define GO_TYPE_ACTION_COMBO_STACK (go_action_combo_stack_get_type ())
+#define GO_ACTION_COMBO_STACK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_ACTION_COMBO_STACK, GOActionComboStack))
+#define GO_IS_ACTION_COMBO_STACK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_ACTION_COMBO_STACK))
typedef struct _GOActionComboStack GOActionComboStack;
Modified: trunk/goffice/gtk/go-action-combo-text.c
==============================================================================
--- trunk/goffice/gtk/go-action-combo-text.c (original)
+++ trunk/goffice/gtk/go-action-combo-text.c Tue Apr 7 09:29:28 2009
@@ -30,13 +30,13 @@
typedef struct {
GtkToolItem base;
- GoComboText *combo; /* container has a ref, not us */
+ GOComboText *combo; /* container has a ref, not us */
} GOToolComboText;
typedef GtkToolItemClass GOToolComboTextClass;
-#define GO_TOOL_COMBO_TEXT_TYPE (go_tool_combo_text_get_type ())
-#define GO_TOOL_COMBO_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST (o, GO_TOOL_COMBO_TEXT_TYPE, GOToolComboText))
-#define IS_GO_TOOL_COMBO_TEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE (o, GO_TOOL_COMBO_TEXT_TYPE))
+#define GO_TYPE_TOOL_COMBO_TEXT (go_tool_combo_text_get_type ())
+#define GO_TOOL_COMBO_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST (o, GO_TYPE_TOOL_COMBO_TEXT, GOToolComboText))
+#define GO_IS_TOOL_COMBO_TEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE (o, GO_TYPE_TOOL_COMBO_TEXT))
static GType go_tool_combo_text_get_type (void);
#if 0
@@ -116,7 +116,7 @@
}
static gboolean
-cb_entry_changed (GoComboText *ct, char const *text, GOActionComboText *taction)
+cb_entry_changed (GOComboText *ct, char const *text, GOActionComboText *taction)
{
set_entry_val (taction, text);
gtk_action_activate (GTK_ACTION (taction));
@@ -127,11 +127,11 @@
go_action_combo_text_create_tool_item (GtkAction *act)
{
GOActionComboText *taction = GO_ACTION_COMBO_TEXT (act);
- GOToolComboText *tool = g_object_new (GO_TOOL_COMBO_TEXT_TYPE, NULL);
+ GOToolComboText *tool = g_object_new (GO_TYPE_TOOL_COMBO_TEXT, NULL);
GSList *ptr;
int w = -1;
- tool->combo = (GoComboText *)go_combo_text_new (taction->case_sensitive ? NULL : g_strcase_equal);
+ tool->combo = (GOComboText *)go_combo_text_new (taction->case_sensitive ? NULL : g_strcase_equal);
if (taction->largest_elem != NULL)
w = g_utf8_strlen (taction->largest_elem, -1);
@@ -296,6 +296,6 @@
set_entry_val (taction, text);
for ( ; ptr != NULL ; ptr = ptr->next)
- if (IS_GO_TOOL_COMBO_TEXT (ptr->data))
+ if (GO_IS_TOOL_COMBO_TEXT (ptr->data))
go_combo_text_set_text (GO_TOOL_COMBO_TEXT (ptr->data)->combo, text, dir);
}
Modified: trunk/goffice/gtk/go-action-combo-text.h
==============================================================================
--- trunk/goffice/gtk/go-action-combo-text.h (original)
+++ trunk/goffice/gtk/go-action-combo-text.h Tue Apr 7 09:29:28 2009
@@ -26,9 +26,9 @@
G_BEGIN_DECLS
-#define GO_ACTION_COMBO_TEXT_TYPE (go_action_combo_text_get_type ())
-#define GO_ACTION_COMBO_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_ACTION_COMBO_TEXT_TYPE, GOActionComboText))
-#define IS_GO_ACTION_COMBO_TEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_ACTION_COMBO_TEXT_TYPE))
+#define GO_TYPE_ACTION_COMBO_TEXT (go_action_combo_text_get_type ())
+#define GO_ACTION_COMBO_TEXT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_ACTION_COMBO_TEXT, GOActionComboText))
+#define GO_IS_ACTION_COMBO_TEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_ACTION_COMBO_TEXT))
typedef struct _GOActionComboText GOActionComboText;
typedef enum { /* begin the search from : */
Modified: trunk/goffice/gtk/go-charmap-sel.c
==============================================================================
--- trunk/goffice/gtk/go-charmap-sel.c (original)
+++ trunk/goffice/gtk/go-charmap-sel.c Tue Apr 7 09:29:28 2009
@@ -300,7 +300,7 @@
static void
encodings_changed_cb (GOOptionMenu *optionmenu, GOCharmapSel *cs)
{
- g_return_if_fail (IS_GO_CHARMAP_SEL (cs));
+ g_return_if_fail (GO_IS_CHARMAP_SEL (cs));
g_return_if_fail (optionmenu == cs->encodings);
g_signal_emit (G_OBJECT (cs),
@@ -314,7 +314,7 @@
{
GSList sel = { GINT_TO_POINTER (item - 1), NULL};
- g_return_if_fail (cs != NULL && IS_GO_CHARMAP_SEL (cs));
+ g_return_if_fail (cs != NULL && GO_IS_CHARMAP_SEL (cs));
go_option_menu_set_history (cs->encodings, &sel);
}
@@ -439,7 +439,7 @@
cs_signals[CHARMAP_CHANGED] =
g_signal_new ("charmap_changed",
- GO_CHARMAP_SEL_TYPE,
+ GO_TYPE_CHARMAP_SEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GOCharmapSelClass, charmap_changed),
NULL, NULL,
@@ -558,7 +558,7 @@
GtkWidget *
go_charmap_sel_new (GOCharmapSelTestDirection test)
{
- return g_object_new (GO_CHARMAP_SEL_TYPE, "TestDirection", test, NULL);
+ return g_object_new (GO_TYPE_CHARMAP_SEL, "TestDirection", test, NULL);
}
gchar const *
@@ -570,7 +570,7 @@
g_get_charset (&locale_encoding);
- g_return_val_if_fail (IS_GO_CHARMAP_SEL (cs), locale_encoding);
+ g_return_val_if_fail (GO_IS_CHARMAP_SEL (cs), locale_encoding);
selection = GTK_MENU_ITEM (go_option_menu_get_history (cs->encodings));
encoding = (char const *) g_object_get_data (G_OBJECT (selection),
@@ -624,7 +624,7 @@
struct cb_find_entry cl;
CharsetInfo const *ci;
- g_return_val_if_fail (IS_GO_CHARMAP_SEL (cs), FALSE);
+ g_return_val_if_fail (GO_IS_CHARMAP_SEL (cs), FALSE);
g_return_val_if_fail (enc != NULL, FALSE);
ci = g_hash_table_lookup (encoding_hash, enc);
Modified: trunk/goffice/gtk/go-charmap-sel.h
==============================================================================
--- trunk/goffice/gtk/go-charmap-sel.h (original)
+++ trunk/goffice/gtk/go-charmap-sel.h Tue Apr 7 09:29:28 2009
@@ -29,9 +29,9 @@
G_BEGIN_DECLS
-#define GO_CHARMAP_SEL_TYPE (go_charmap_sel_get_type ())
-#define GO_CHARMAP_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_CHARMAP_SEL_TYPE, GOCharmapSel))
-#define IS_GO_CHARMAP_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_CHARMAP_SEL_TYPE))
+#define GO_TYPE_CHARMAP_SEL (go_charmap_sel_get_type ())
+#define GO_CHARMAP_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_TYPE_CHARMAP_SEL, GOCharmapSel))
+#define GO_IS_CHARMAP_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_TYPE_CHARMAP_SEL))
typedef struct _GOCharmapSel GOCharmapSel;
Modified: trunk/goffice/gtk/go-color-group.c
==============================================================================
--- trunk/goffice/gtk/go-color-group.c (original)
+++ trunk/goffice/gtk/go-color-group.c Tue Apr 7 09:29:28 2009
@@ -72,7 +72,7 @@
go_color_group_parent_class = g_type_class_peek (G_TYPE_OBJECT);
go_color_group_signals [HISTORY_CHANGED] =
g_signal_new ("history-changed",
- GO_COLOR_GROUP_TYPE,
+ GO_TYPE_COLOR_GROUP,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GOColorGroupClass, history_changed),
NULL, NULL,
@@ -203,7 +203,7 @@
go_color_group_add_color (GOColorGroup *cg, GOColor c)
{
unsigned i;
- g_return_if_fail (IS_GO_COLOR_GROUP (cg));
+ g_return_if_fail (GO_IS_COLOR_GROUP (cg));
for (i = GO_COLOR_GROUP_HISTORY_SIZE - 1 ; i > 0; i--)
if (cg->history[i] == c)
Modified: trunk/goffice/gtk/go-color-group.h
==============================================================================
--- trunk/goffice/gtk/go-color-group.h (original)
+++ trunk/goffice/gtk/go-color-group.h Tue Apr 7 09:29:28 2009
@@ -46,9 +46,9 @@
GOColor history[GO_COLOR_GROUP_HISTORY_SIZE];
} GOColorGroup;
-#define GO_COLOR_GROUP_TYPE (go_color_group_get_type ())
-#define GO_COLOR_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GO_COLOR_GROUP_TYPE, GOColorGroup))
-#define IS_GO_COLOR_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GO_COLOR_GROUP_TYPE))
+#define GO_TYPE_COLOR_GROUP (go_color_group_get_type ())
+#define GO_COLOR_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GO_TYPE_COLOR_GROUP, GOColorGroup))
+#define GO_IS_COLOR_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GO_TYPE_COLOR_GROUP))
GType go_color_group_get_type (void);
GOColorGroup *go_color_group_find (char const *name, gpointer context);
Modified: trunk/goffice/gtk/go-color-palette.c
==============================================================================
--- trunk/goffice/gtk/go-color-palette.c (original)
+++ trunk/goffice/gtk/go-color-palette.c Tue Apr 7 09:29:28 2009
@@ -516,7 +516,7 @@
int const rows = 6;
GONamedColor const *color_names = default_color_set;
- pal = g_object_new (GO_COLOR_PALETTE_TYPE, NULL);
+ pal = g_object_new (GO_TYPE_COLOR_PALETTE, NULL);
pal->default_set = color_names;
pal->default_color = default_color;
Modified: trunk/goffice/gtk/go-color-palette.h
==============================================================================
--- trunk/goffice/gtk/go-color-palette.h (original)
+++ trunk/goffice/gtk/go-color-palette.h Tue Apr 7 09:29:28 2009
@@ -37,10 +37,10 @@
typedef struct _GOColorPalette GOColorPalette;
-#define GO_COLOR_PALETTE_TYPE (go_color_palette_get_type ())
-#define GO_COLOR_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_COLOR_PALETTE_TYPE, GOColorPalette))
-#define GO_COLOR_PALETTE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), GO_COLOR_PALETTE_TYPE)
-#define IS_GO_COLOR_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_COLOR_PALETTE_TYPE))
+#define GO_TYPE_COLOR_PALETTE (go_color_palette_get_type ())
+#define GO_COLOR_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_TYPE_COLOR_PALETTE, GOColorPalette))
+#define GO_COLOR_PALETTE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), GO_TYPE_COLOR_PALETTE)
+#define GO_IS_COLOR_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_TYPE_COLOR_PALETTE))
GType go_color_palette_get_type (void);
Modified: trunk/goffice/gtk/go-combo-box.c
==============================================================================
--- trunk/goffice/gtk/go-combo-box.c (original)
+++ trunk/goffice/gtk/go-combo-box.c Tue Apr 7 09:29:28 2009
@@ -182,7 +182,7 @@
GObject *pdc;
g_return_if_fail (combo_box != NULL);
- g_return_if_fail (IS_GO_COMBO_BOX (combo_box));
+ g_return_if_fail (GO_IS_COMBO_BOX (combo_box));
gtk_widget_hide (combo_box->priv->toplevel);
gtk_widget_hide (combo_box->priv->popup);
@@ -601,7 +601,7 @@
/* protected */ void
go_combo_box_set_display (GOComboBox *combo_box, GtkWidget *display_widget)
{
- g_return_if_fail (IS_GO_COMBO_BOX (combo_box));
+ g_return_if_fail (GO_IS_COMBO_BOX (combo_box));
g_return_if_fail (GTK_IS_WIDGET (display_widget));
if (combo_box->priv->display_widget != NULL &&
@@ -636,7 +636,7 @@
gboolean torn_off)
{
g_return_if_fail (combo != NULL);
- g_return_if_fail (IS_GO_COMBO_BOX (combo));
+ g_return_if_fail (GO_IS_COMBO_BOX (combo));
if (combo->priv->torn_off != torn_off) {
combo->priv->torn_off = torn_off;
@@ -696,7 +696,7 @@
GtkWidget *tearable;
GtkWidget *vbox;
- g_return_if_fail (IS_GO_COMBO_BOX (combo));
+ g_return_if_fail (GO_IS_COMBO_BOX (combo));
g_return_if_fail (GTK_IS_WIDGET (display_widget));
GTK_BOX (combo)->spacing = 0;
@@ -750,7 +750,7 @@
go_combo_box_set_title (GOComboBox *combo, char const *title)
{
GOComboBoxClass *klass = G_TYPE_INSTANCE_GET_CLASS (combo,
- GO_COMBO_BOX_TYPE, GOComboBoxClass);
+ GO_TYPE_COMBO_BOX, GOComboBoxClass);
g_return_if_fail (klass != NULL);
@@ -777,7 +777,7 @@
void
go_combo_box_set_tearable (GOComboBox *combo, gboolean tearable)
{
- g_return_if_fail (IS_GO_COMBO_BOX (combo));
+ g_return_if_fail (GO_IS_COMBO_BOX (combo));
if (tearable){
gtk_widget_show (combo->priv->tearable);
@@ -790,7 +790,7 @@
void
go_combo_box_set_relief (GOComboBox *combo, GtkReliefStyle relief)
{
- g_return_if_fail (IS_GO_COMBO_BOX (combo));
+ g_return_if_fail (GO_IS_COMBO_BOX (combo));
gtk_button_set_relief (GTK_BUTTON (combo->priv->arrow_button), relief);
if (GTK_IS_BUTTON (combo->priv->display_widget))
Modified: trunk/goffice/gtk/go-combo-box.h
==============================================================================
--- trunk/goffice/gtk/go-combo-box.h (original)
+++ trunk/goffice/gtk/go-combo-box.h Tue Apr 7 09:29:28 2009
@@ -28,10 +28,10 @@
G_BEGIN_DECLS
-#define GO_COMBO_BOX_TYPE (go_combo_box_get_type())
-#define GO_COMBO_BOX(o) G_TYPE_CHECK_INSTANCE_CAST ((o), GO_COMBO_BOX_TYPE, GOComboBox)
-#define IS_GO_COMBO_BOX(o) G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_COMBO_BOX_TYPE)
-#define GO_COMBO_BOX_CLASS(k) G_TYPE_CHECK_CLASS_CAST ((k), GO_COMBO_BOX_TYPE, GOComboBoxClass)
+#define GO_TYPE_COMBO_BOX (go_combo_box_get_type())
+#define GO_COMBO_BOX(o) G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_COMBO_BOX, GOComboBox)
+#define GO_IS_COMBO_BOX(o) G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_COMBO_BOX)
+#define GO_COMBO_BOX_CLASS(k) G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_COMBO_BOX, GOComboBoxClass)
typedef struct _GOComboBox GOComboBox;
typedef struct _GOComboBoxPrivate GOComboBoxPrivate;
Modified: trunk/goffice/gtk/go-combo-color.c
==============================================================================
--- trunk/goffice/gtk/go-combo-color.c (original)
+++ trunk/goffice/gtk/go-combo-color.c Tue Apr 7 09:29:28 2009
@@ -173,7 +173,7 @@
static void
go_combo_color_class_init (GObjectClass *gobject_class)
{
- go_combo_color_parent_class = g_type_class_ref (GO_COMBO_BOX_TYPE);
+ go_combo_color_parent_class = g_type_class_ref (GO_TYPE_COMBO_BOX);
GO_COMBO_BOX_CLASS (gobject_class)->set_title = go_combo_color_set_title;
@@ -198,7 +198,7 @@
GSF_CLASS (GOComboColor, go_combo_color,
go_combo_color_class_init, go_combo_color_init,
- GO_COMBO_BOX_TYPE)
+ GO_TYPE_COMBO_BOX)
static void
cb_palette_color_changed (GOColorPalette *P, GOColor color,
@@ -244,7 +244,7 @@
GOColor
go_combo_color_get_color (GOComboColor *cc, gboolean *is_default)
{
- g_return_val_if_fail (IS_GO_COMBO_COLOR (cc), RGBA_BLACK);
+ g_return_val_if_fail (GO_IS_COMBO_COLOR (cc), RGBA_BLACK);
return go_color_palette_get_current_color (cc->palette, is_default, NULL);
}
@@ -260,7 +260,7 @@
go_combo_color_set_color_gdk (GOComboColor *cc, GdkColor *color)
{
/* FIXME FIXME FIXME convert to GOColor */
- g_return_if_fail (IS_GO_COMBO_COLOR (cc));
+ g_return_if_fail (GO_IS_COMBO_COLOR (cc));
if (color != NULL)
go_color_palette_set_current_color (cc->palette, GDK_TO_UINT (*color));
@@ -291,7 +291,7 @@
void
go_combo_color_set_instant_apply (GOComboColor *cc, gboolean active)
{
- g_return_if_fail (IS_GO_COMBO_COLOR (cc));
+ g_return_if_fail (GO_IS_COMBO_COLOR (cc));
cc->instant_apply = active;
}
@@ -319,7 +319,7 @@
void
go_combo_color_set_color_to_default (GOComboColor *cc)
{
- g_return_if_fail (IS_GO_COMBO_COLOR (cc));
+ g_return_if_fail (GO_IS_COMBO_COLOR (cc));
go_color_palette_set_color_to_default (cc->palette);
}
@@ -344,7 +344,7 @@
GOColor color;
gboolean is_default;
GdkPixbuf *pixbuf = NULL;
- GOComboColor *cc = g_object_new (GO_COMBO_COLOR_TYPE, NULL);
+ GOComboColor *cc = g_object_new (GO_TYPE_COMBO_COLOR, NULL);
cc->default_color = default_color;
if (icon != NULL &&
Modified: trunk/goffice/gtk/go-combo-color.h
==============================================================================
--- trunk/goffice/gtk/go-combo-color.h (original)
+++ trunk/goffice/gtk/go-combo-color.h Tue Apr 7 09:29:28 2009
@@ -37,10 +37,10 @@
G_BEGIN_DECLS
-#define GO_COMBO_COLOR_TYPE (go_combo_color_get_type ())
-#define GO_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_COMBO_COLOR_TYPE, GOComboColor))
-#define IS_GO_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_COMBO_COLOR_TYPE))
-#define GO_COMBO_COLOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), GO_COMBO_COLOR_TYPE)
+#define GO_TYPE_COMBO_COLOR (go_combo_color_get_type ())
+#define GO_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_COMBO_COLOR, GOComboColor))
+#define GO_IS_COMBO_COLOR(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_COMBO_COLOR))
+#define GO_COMBO_COLOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST(k), GO_TYPE_COMBO_COLOR)
typedef struct _GOComboColor GOComboColor;
Modified: trunk/goffice/gtk/go-combo-pixmaps.c
==============================================================================
--- trunk/goffice/gtk/go-combo-pixmaps.c (original)
+++ trunk/goffice/gtk/go-combo-pixmaps.c Tue Apr 7 09:29:28 2009
@@ -128,7 +128,7 @@
static void
go_combo_pixmaps_class_init (GObjectClass *gobject_class)
{
- go_combo_pixmaps_parent_class = g_type_class_ref (GO_COMBO_BOX_TYPE);
+ go_combo_pixmaps_parent_class = g_type_class_ref (GO_TYPE_COMBO_BOX);
gobject_class->finalize = go_combo_pixmaps_finalize;
go_combo_pixmaps_signals [CHANGED] =
@@ -143,7 +143,7 @@
GSF_CLASS (GOComboPixmaps, go_combo_pixmaps,
go_combo_pixmaps_class_init, go_combo_pixmaps_init,
- GO_COMBO_BOX_TYPE)
+ GO_TYPE_COMBO_BOX)
GOComboPixmaps *
go_combo_pixmaps_new (int ncols)
@@ -152,7 +152,7 @@
g_return_val_if_fail (ncols > 0, NULL);
- combo = g_object_new (GO_COMBO_PIXMAPS_TYPE, NULL);
+ combo = g_object_new (GO_TYPE_COMBO_PIXMAPS, NULL);
combo->cols = ncols;
return combo;
}
@@ -201,7 +201,7 @@
Element tmp;
int col, row;
- g_return_if_fail (IS_GO_COMBO_PIXMAPS (combo));
+ g_return_if_fail (GO_IS_COMBO_PIXMAPS (combo));
/* Wrap inside a vbox with a border so that we can see the focus indicator */
box = gtk_vbox_new (FALSE, 0);
@@ -241,7 +241,7 @@
gboolean
go_combo_pixmaps_select_index (GOComboPixmaps *combo, int i)
{
- g_return_val_if_fail (IS_GO_COMBO_PIXMAPS (combo), FALSE);
+ g_return_val_if_fail (GO_IS_COMBO_PIXMAPS (combo), FALSE);
g_return_val_if_fail (0 <= i, FALSE);
g_return_val_if_fail (i < (int)combo->elements->len, FALSE);
@@ -257,7 +257,7 @@
{
unsigned i;
- g_return_val_if_fail (IS_GO_COMBO_PIXMAPS (combo), FALSE);
+ g_return_val_if_fail (GO_IS_COMBO_PIXMAPS (combo), FALSE);
for (i = 0 ; i < combo->elements->len ; i++)
if (g_array_index (combo->elements, Element, i).id == id)
@@ -277,7 +277,7 @@
{
Element *el;
- g_return_val_if_fail (IS_GO_COMBO_PIXMAPS (combo), 0);
+ g_return_val_if_fail (GO_IS_COMBO_PIXMAPS (combo), 0);
el = &g_array_index (combo->elements, Element, combo->selected_index);
if (index != NULL)
@@ -288,7 +288,7 @@
GtkWidget *
go_combo_pixmaps_get_preview (GOComboPixmaps const *combo)
{
- g_return_val_if_fail (IS_GO_COMBO_PIXMAPS (combo), NULL);
+ g_return_val_if_fail (GO_IS_COMBO_PIXMAPS (combo), NULL);
return combo->preview_button;
}
Modified: trunk/goffice/gtk/go-combo-pixmaps.h
==============================================================================
--- trunk/goffice/gtk/go-combo-pixmaps.h (original)
+++ trunk/goffice/gtk/go-combo-pixmaps.h Tue Apr 7 09:29:28 2009
@@ -29,9 +29,9 @@
G_BEGIN_DECLS
-#define GO_COMBO_PIXMAPS_TYPE (go_combo_pixmaps_get_type ())
-#define GO_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_COMBO_PIXMAPS_TYPE, GOComboPixmaps))
-#define IS_GO_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_COMBO_PIXMAPS_TYPE))
+#define GO_TYPE_COMBO_PIXMAPS (go_combo_pixmaps_get_type ())
+#define GO_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_COMBO_PIXMAPS, GOComboPixmaps))
+#define GO_IS_COMBO_PIXMAPS(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_COMBO_PIXMAPS))
typedef struct _GOComboPixmaps GOComboPixmaps;
typedef struct _GOMenuPixmaps GOMenuPixmaps;
Modified: trunk/goffice/gtk/go-combo-text.c
==============================================================================
--- trunk/goffice/gtk/go-combo-text.c (original)
+++ trunk/goffice/gtk/go-combo-text.c Tue Apr 7 09:29:28 2009
@@ -24,11 +24,11 @@
typedef struct {
GOComboBoxClass base;
- gboolean (* selection_changed) (GoComboText *ct, GtkTreeSelection *selection);
- gboolean (* entry_changed) (GoComboText *ct, char const *new_str);
-} GoComboTextClass;
+ gboolean (* selection_changed) (GOComboText *ct, GtkTreeSelection *selection);
+ gboolean (* entry_changed) (GOComboText *ct, char const *new_str);
+} GOComboTextClass;
-#define GO_COMBO_TEXT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, go_combo_text_get_type (), GoComboTextClass)
+#define GO_COMBO_TEXT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, go_combo_text_get_type (), GOComboTextClass)
enum {
SELECTION_CHANGED,
@@ -44,7 +44,7 @@
* result to FALSE if there is no handler.
*/
static gboolean
-go_signal_emit (GoComboText *ct, int signal,
+go_signal_emit (GOComboText *ct, int signal,
gconstpointer arg, int default_ret)
{
gboolean result;
@@ -83,7 +83,7 @@
cb_list_changed (GtkTreeView *list, gpointer data)
{
GtkTreeSelection *selection = gtk_tree_view_get_selection (list);
- GoComboText *ct = GO_COMBO_TEXT (data);
+ GOComboText *ct = GO_COMBO_TEXT (data);
GtkEntry *entry = GTK_ENTRY (ct->entry);
gboolean accept_change;
GtkTreeModel *store;
@@ -108,7 +108,7 @@
static void
cb_scroll_size_request (GtkWidget *widget, GtkRequisition *requisition,
- GoComboText *ct)
+ GOComboText *ct)
{
GtkRequisition list_req;
int mon_width, mon_height;
@@ -159,7 +159,7 @@
}
static void
-cb_screen_changed (GoComboText *ct, GdkScreen *previous_screen)
+cb_screen_changed (GOComboText *ct, GdkScreen *previous_screen)
{
GtkWidget *w = GTK_WIDGET (ct);
GdkScreen *screen = gtk_widget_has_screen (w)
@@ -173,7 +173,7 @@
}
static void
-go_combo_text_init (GoComboText *ct)
+go_combo_text_init (GOComboText *ct)
{
GtkCellRenderer *renderer;
GtkListStore *store;
@@ -231,7 +231,7 @@
go_combo_text_destroy (GtkObject *object)
{
GtkObjectClass *parent;
- GoComboText *ct = GO_COMBO_TEXT (object);
+ GOComboText *ct = GO_COMBO_TEXT (object);
if (ct->list != NULL) {
g_signal_handlers_disconnect_by_func (G_OBJECT (ct),
@@ -239,7 +239,7 @@
ct->list = NULL;
}
- parent = g_type_class_peek (GO_COMBO_BOX_TYPE);
+ parent = g_type_class_peek (GO_TYPE_COMBO_BOX);
if (parent && parent->destroy)
(*parent->destroy) (object);
}
@@ -252,14 +252,14 @@
combo_text_signals [SELECTION_CHANGED] = g_signal_new ("selection_changed",
GO_TYPE_COMBO_TEXT,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GoComboTextClass, selection_changed),
+ G_STRUCT_OFFSET (GOComboTextClass, selection_changed),
NULL, NULL,
go__BOOLEAN__POINTER,
G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
combo_text_signals [ENTRY_CHANGED] = g_signal_new ("entry_changed",
GO_TYPE_COMBO_TEXT,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GoComboTextClass, entry_changed),
+ G_STRUCT_OFFSET (GOComboTextClass, entry_changed),
NULL, NULL,
go__BOOLEAN__POINTER,
G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
@@ -272,7 +272,7 @@
GtkWidget*
go_combo_text_new (GCompareFunc cmp_func)
{
- GoComboText *ct;
+ GOComboText *ct;
if (cmp_func == NULL)
cmp_func = &g_str_equal;
@@ -288,29 +288,29 @@
return go_combo_text_new (NULL);
}
-GSF_CLASS (GoComboText, go_combo_text,
+GSF_CLASS (GOComboText, go_combo_text,
go_combo_text_class_init, go_combo_text_init,
- GO_COMBO_BOX_TYPE)
+ GO_TYPE_COMBO_BOX)
GtkWidget *
-go_combo_text_get_entry (GoComboText *ct)
+go_combo_text_get_entry (GOComboText *ct)
{
- g_return_val_if_fail (IS_GO_COMBO_TEXT (ct), NULL);
+ g_return_val_if_fail (GO_IS_COMBO_TEXT (ct), NULL);
return ct->entry;
}
/**
* go_combo_text_set_text :
- * @ct : #GoComboText
+ * @ct : #GOComboText
* @text : the label for the new item
* @start : where to begin the search in the list.
*
* Returns: %TRUE if the item is found in the list.
*/
gboolean
-go_combo_text_set_text (GoComboText *ct, gchar const *text,
- GoComboTextSearch start)
+go_combo_text_set_text (GOComboText *ct, gchar const *text,
+ GOComboTextSearch start)
{
gboolean found = FALSE, result;
GtkTreeView *list;
@@ -319,7 +319,7 @@
GtkTreeSelection *selection;
char *label;
- g_return_val_if_fail (IS_GO_COMBO_TEXT (ct), FALSE);
+ g_return_val_if_fail (GO_IS_COMBO_TEXT (ct), FALSE);
g_return_val_if_fail (text != NULL, FALSE);
list = GTK_TREE_VIEW (ct->list);
@@ -381,12 +381,12 @@
**/
void
-go_combo_text_add_item (GoComboText *ct, char const *label)
+go_combo_text_add_item (GOComboText *ct, char const *label)
{
GtkListStore *store;
GtkTreeIter iter;
- g_return_if_fail (IS_GO_COMBO_TEXT (ct));
+ g_return_if_fail (GO_IS_COMBO_TEXT (ct));
g_return_if_fail (label != NULL);
store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (ct->list)));
Modified: trunk/goffice/gtk/go-combo-text.h
==============================================================================
--- trunk/goffice/gtk/go-combo-text.h (original)
+++ trunk/goffice/gtk/go-combo-text.h Tue Apr 7 09:29:28 2009
@@ -7,25 +7,25 @@
G_BEGIN_DECLS
#define GO_TYPE_COMBO_TEXT (go_combo_text_get_type ())
-#define GO_COMBO_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GO_TYPE_COMBO_TEXT, GoComboText))
-#define IS_GO_COMBO_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GO_TYPE_COMBO_TEXT))
+#define GO_COMBO_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GO_TYPE_COMBO_TEXT, GOComboText))
+#define GO_IS_COMBO_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GO_TYPE_COMBO_TEXT))
-typedef struct _GoComboText GoComboText;
+typedef struct _GoComboText GOComboText;
typedef enum { /* begin the search from : */
GO_COMBO_TEXT_FROM_TOP, /* the top of the list */
GO_COMBO_TEXT_CURRENT, /* the current selection */
GO_COMBO_TEXT_NEXT /* the next element after current */
-} GoComboTextSearch;
+} GOComboTextSearch;
GType go_combo_text_get_type (void);
GtkWidget *go_combo_text_new (GCompareFunc cmp_func);
GtkWidget *go_combo_text_glade_new (void);
-GtkWidget *go_combo_text_get_entry (GoComboText *ct);
+GtkWidget *go_combo_text_get_entry (GOComboText *ct);
-gboolean go_combo_text_set_text (GoComboText *ct, const gchar *text,
- GoComboTextSearch start);
-void go_combo_text_add_item (GoComboText *ct, const gchar *label);
+gboolean go_combo_text_set_text (GOComboText *ct, const gchar *text,
+ GOComboTextSearch start);
+void go_combo_text_add_item (GOComboText *ct, const gchar *label);
G_END_DECLS
Modified: trunk/goffice/gtk/go-font-sel.c
==============================================================================
--- trunk/goffice/gtk/go-font-sel.c (original)
+++ trunk/goffice/gtk/go-font-sel.c Tue Apr 7 09:29:28 2009
@@ -441,7 +441,7 @@
GtkWidget *
go_font_sel_new (void)
{
- return g_object_new (GO_FONT_SEL_TYPE, NULL);
+ return g_object_new (GO_TYPE_FONT_SEL, NULL);
}
void
@@ -458,7 +458,7 @@
void
go_font_sel_set_sample_text (GOFontSel *gfs, char const *text)
{
- g_return_if_fail (IS_GO_FONT_SEL (gfs));
+ g_return_if_fail (GO_IS_FONT_SEL (gfs));
foo_canvas_item_set (gfs->font_preview_text,
/* xgettext: This text is used as a sample when selecting a font
* please choose a translation that would produce common
@@ -470,7 +470,7 @@
GOFont const *
go_font_sel_get_font (GOFontSel const *gfs)
{
- g_return_val_if_fail (IS_GO_FONT_SEL (gfs), NULL);
+ g_return_val_if_fail (GO_IS_FONT_SEL (gfs), NULL);
return gfs->current;
}
@@ -540,7 +540,7 @@
void
go_font_sel_set_font (GOFontSel *gfs, GOFont const *font)
{
- g_return_if_fail (IS_GO_FONT_SEL (gfs));
+ g_return_if_fail (GO_IS_FONT_SEL (gfs));
go_font_sel_set_name (gfs, pango_font_description_get_family (font->desc));
go_font_sel_set_style (gfs,
Modified: trunk/goffice/gtk/go-font-sel.h
==============================================================================
--- trunk/goffice/gtk/go-font-sel.h (original)
+++ trunk/goffice/gtk/go-font-sel.h Tue Apr 7 09:29:28 2009
@@ -24,9 +24,9 @@
G_BEGIN_DECLS
-#define GO_FONT_SEL_TYPE (go_font_sel_get_type ())
-#define GO_FONT_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_FONT_SEL_TYPE, GOFontSel))
-#define IS_GO_FONT_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_FONT_SEL_TYPE))
+#define GO_TYPE_FONT_SEL (go_font_sel_get_type ())
+#define GO_FONT_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_TYPE_FONT_SEL, GOFontSel))
+#define GO_IS_FONT_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_TYPE_FONT_SEL))
typedef struct _GOFontSel GOFontSel;
Modified: trunk/goffice/gtk/go-format-sel.c
==============================================================================
--- trunk/goffice/gtk/go-format-sel.c (original)
+++ trunk/goffice/gtk/go-format-sel.c Tue Apr 7 09:29:28 2009
@@ -1164,7 +1164,7 @@
{
GOFormatFamily page;
- g_return_if_fail (IS_GO_FORMAT_SEL (gfs));
+ g_return_if_fail (GO_IS_FORMAT_SEL (gfs));
/* Attempt to extract general parameters from the current format */
page = study_format (gfs);
@@ -1254,7 +1254,7 @@
GtkWidget *tmp;
GtkTreeViewColumn *column;
- GoComboText *combo;
+ GOComboText *combo;
char const *name;
int i;
GOFormatFamily page;
@@ -1507,7 +1507,7 @@
{
GOFormatSel *gfs;
- gfs = g_object_new (GO_FORMAT_SEL_TYPE, NULL);
+ gfs = g_object_new (GO_TYPE_FORMAT_SEL, NULL);
if (gfs != NULL)
gfs->show_format_with_markup = use_markup;
@@ -1534,7 +1534,7 @@
void
go_format_sel_set_focus (GOFormatSel *gfs)
{
- g_return_if_fail (IS_GO_FORMAT_SEL (gfs));
+ g_return_if_fail (GO_IS_FORMAT_SEL (gfs));
gtk_widget_grab_focus (GTK_WIDGET (gfs->format.menu));
}
@@ -1543,9 +1543,9 @@
go_format_sel_set_style_format (GOFormatSel *gfs,
GOFormat *style_format)
{
- GoComboText *combo;
+ GOComboText *combo;
- g_return_if_fail (IS_GO_FORMAT_SEL (gfs));
+ g_return_if_fail (GO_IS_FORMAT_SEL (gfs));
g_return_if_fail (style_format != NULL);
go_format_ref (style_format);
@@ -1570,7 +1570,7 @@
go_format_sel_set_dateconv (GOFormatSel *gfs,
GODateConventions const *date_conv)
{
- g_return_if_fail (IS_GO_FORMAT_SEL (gfs));
+ g_return_if_fail (GO_IS_FORMAT_SEL (gfs));
g_return_if_fail (date_conv != NULL);
/* FIXME is it safe ? */
@@ -1583,21 +1583,21 @@
GOFormat *
go_format_sel_get_fmt (GOFormatSel *gfs)
{
- g_return_val_if_fail (IS_GO_FORMAT_SEL (gfs), NULL);
+ g_return_val_if_fail (GO_IS_FORMAT_SEL (gfs), NULL);
return gfs->format.spec;
}
GODateConventions const *
go_format_sel_get_dateconv (GOFormatSel *gfs)
{
- g_return_val_if_fail (IS_GO_FORMAT_SEL (gfs), NULL);
+ g_return_val_if_fail (GO_IS_FORMAT_SEL (gfs), NULL);
return gfs->date_conv;
}
void
go_format_sel_show_preview (GOFormatSel *gfs)
{
- g_return_if_fail (IS_GO_FORMAT_SEL (gfs));
+ g_return_if_fail (GO_IS_FORMAT_SEL (gfs));
gtk_widget_show (gfs->format.preview_box);
draw_format_preview (gfs, TRUE);
}
@@ -1605,7 +1605,7 @@
void
go_format_sel_hide_preview (GOFormatSel *gfs)
{
- g_return_if_fail (IS_GO_FORMAT_SEL (gfs));
+ g_return_if_fail (GO_IS_FORMAT_SEL (gfs));
gtk_widget_hide (gfs->format.preview_box);
}
@@ -1613,7 +1613,7 @@
go_format_sel_editable_enters (GOFormatSel *gfs,
GtkWindow *window)
{
- g_return_if_fail (IS_GO_FORMAT_SEL (gfs));
+ g_return_if_fail (GO_IS_FORMAT_SEL (gfs));
go_gtk_editable_enters (window, gfs->format.widget[F_DECIMAL_SPIN]);
go_gtk_editable_enters (window, gfs->format.widget[F_ENTRY]);
}
Modified: trunk/goffice/gtk/go-format-sel.h
==============================================================================
--- trunk/goffice/gtk/go-format-sel.h (original)
+++ trunk/goffice/gtk/go-format-sel.h Tue Apr 7 09:29:28 2009
@@ -25,9 +25,9 @@
G_BEGIN_DECLS
-#define GO_FORMAT_SEL_TYPE (go_format_sel_get_type ())
-#define GO_FORMAT_SEL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_FORMAT_SEL_TYPE, GOFormatSel))
-#define IS_GO_FORMAT_SEL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_FORMAT_SEL_TYPE))
+#define GO_TYPE_FORMAT_SEL (go_format_sel_get_type ())
+#define GO_FORMAT_SEL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_FORMAT_SEL, GOFormatSel))
+#define GO_IS_FORMAT_SEL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_FORMAT_SEL))
typedef struct _GOFormatSel GOFormatSel;
GType go_format_sel_get_type (void);
Modified: trunk/goffice/gtk/go-graph-widget.c
==============================================================================
--- trunk/goffice/gtk/go-graph-widget.c (original)
+++ trunk/goffice/gtk/go-graph-widget.c Tue Apr 7 09:29:28 2009
@@ -399,7 +399,7 @@
int width,
int height)
{
- g_return_if_fail (IS_GO_GRAPH_WIDGET (widget));
+ g_return_if_fail (GO_IS_GRAPH_WIDGET (widget));
g_return_if_fail (size_mode >= GO_GRAPH_WIDGET_SIZE_MODE_FIT &&
size_mode <= GO_GRAPH_WIDGET_SIZE_MODE_FIXED_SIZE);
g_return_if_fail (!(width >= 0 && height < 0));
@@ -433,11 +433,11 @@
if (graph == NULL) {
self_owned = TRUE;
- graph = (GogGraph *) g_object_new (GOG_GRAPH_TYPE, NULL);
+ graph = (GogGraph *) g_object_new (GOG_TYPE_GRAPH, NULL);
gog_object_add_by_name (GOG_OBJECT (graph), "Chart", NULL);
}
- ret = GTK_WIDGET (g_object_new (GO_GRAPH_WIDGET_TYPE, "graph", graph, NULL));
+ ret = GTK_WIDGET (g_object_new (GO_TYPE_GRAPH_WIDGET, "graph", graph, NULL));
go_graph_widget_set_size_mode (GO_GRAPH_WIDGET (ret), GO_GRAPH_WIDGET_SIZE_MODE_FIT, -1, -1);
if (self_owned)
@@ -459,7 +459,7 @@
GogGraph *
go_graph_widget_get_graph (GOGraphWidget *widget)
{
- g_return_val_if_fail (IS_GO_GRAPH_WIDGET (widget), NULL);
+ g_return_val_if_fail (GO_IS_GRAPH_WIDGET (widget), NULL);
return widget->graph;
}
@@ -472,7 +472,7 @@
GogChart *
go_graph_widget_get_chart (GOGraphWidget *widget)
{
- g_return_val_if_fail (IS_GO_GRAPH_WIDGET (widget), NULL);
+ g_return_val_if_fail (GO_IS_GRAPH_WIDGET (widget), NULL);
return (GogChart *) gog_object_get_child_by_name (
GOG_OBJECT (widget->graph), "Chart");
}
Modified: trunk/goffice/gtk/go-graph-widget.h
==============================================================================
--- trunk/goffice/gtk/go-graph-widget.h (original)
+++ trunk/goffice/gtk/go-graph-widget.h Tue Apr 7 09:29:28 2009
@@ -28,9 +28,9 @@
G_BEGIN_DECLS
-#define GO_GRAPH_WIDGET_TYPE (go_graph_widget_get_type ())
-#define GO_GRAPH_WIDGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_GRAPH_WIDGET_TYPE, GOGraphWidget))
-#define IS_GO_GRAPH_WIDGET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_GRAPH_WIDGET_TYPE))
+#define GO_TYPE_GRAPH_WIDGET (go_graph_widget_get_type ())
+#define GO_GRAPH_WIDGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_GRAPH_WIDGET, GOGraphWidget))
+#define GO_IS_GRAPH_WIDGET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_GRAPH_WIDGET))
typedef struct _GOGraphWidget GOGraphWidget;
typedef struct _GOGraphWidgetClass GOGraphWidgetClass;
Modified: trunk/goffice/gtk/go-locale-sel.c
==============================================================================
--- trunk/goffice/gtk/go-locale-sel.c (original)
+++ trunk/goffice/gtk/go-locale-sel.c Tue Apr 7 09:29:28 2009
@@ -363,7 +363,7 @@
{
char * locale;
- g_return_if_fail (IS_GO_LOCALE_SEL (ls));
+ g_return_if_fail (GO_IS_LOCALE_SEL (ls));
g_return_if_fail (optionmenu == ls->locales);
locale = go_locale_sel_get_locale (ls);
@@ -379,7 +379,7 @@
{
GSList sel = { GINT_TO_POINTER (item - 1), NULL};
- g_return_if_fail (ls != NULL && IS_GO_LOCALE_SEL (ls));
+ g_return_if_fail (ls != NULL && GO_IS_LOCALE_SEL (ls));
go_option_menu_set_history (ls->locales, &sel);
}
@@ -484,7 +484,7 @@
ls_signals[LOCALE_CHANGED] =
g_signal_new ("locale_changed",
- GO_LOCALE_SEL_TYPE,
+ GO_TYPE_LOCALE_SEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GOLocaleSelClass, locale_changed),
NULL, NULL,
@@ -525,7 +525,7 @@
GtkWidget *
go_locale_sel_new (void)
{
- return g_object_new (GO_LOCALE_SEL_TYPE, NULL);
+ return g_object_new (GO_TYPE_LOCALE_SEL, NULL);
}
gchar *
@@ -545,7 +545,7 @@
g_strfreev (parts);
}
- g_return_val_if_fail (IS_GO_LOCALE_SEL (ls), cur_locale_cp);
+ g_return_val_if_fail (GO_IS_LOCALE_SEL (ls), cur_locale_cp);
selection = GTK_MENU_ITEM (go_option_menu_get_history (ls->locales));
locale = (char const *) g_object_get_data (G_OBJECT (selection),
@@ -599,7 +599,7 @@
struct cb_find_entry cl;
LocaleInfo const *ci;
- g_return_val_if_fail (IS_GO_LOCALE_SEL (ls), FALSE);
+ g_return_val_if_fail (GO_IS_LOCALE_SEL (ls), FALSE);
g_return_val_if_fail (locale != NULL, FALSE);
ci = g_hash_table_lookup (locale_hash, locale);
@@ -631,7 +631,7 @@
void
go_locale_sel_set_sensitive (GOLocaleSel *ls, gboolean sensitive)
{
- g_return_if_fail (IS_GO_LOCALE_SEL (ls));
+ g_return_if_fail (GO_IS_LOCALE_SEL (ls));
gtk_widget_set_sensitive (GTK_WIDGET (ls->locales), sensitive);
}
Modified: trunk/goffice/gtk/go-locale-sel.h
==============================================================================
--- trunk/goffice/gtk/go-locale-sel.h (original)
+++ trunk/goffice/gtk/go-locale-sel.h Tue Apr 7 09:29:28 2009
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define GO_LOCALE_SEL_TYPE (go_locale_sel_get_type ())
-#define GO_LOCALE_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_LOCALE_SEL_TYPE, GOLocaleSel))
-#define IS_GO_LOCALE_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_LOCALE_SEL_TYPE))
+#define GO_TYPE_LOCALE_SEL (go_locale_sel_get_type ())
+#define GO_LOCALE_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_TYPE_LOCALE_SEL, GOLocaleSel))
+#define GO_IS_LOCALE_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_TYPE_LOCALE_SEL))
typedef struct _GOLocaleSel GOLocaleSel;
Modified: trunk/goffice/gtk/go-rotation-sel.c
==============================================================================
--- trunk/goffice/gtk/go-rotation-sel.c (original)
+++ trunk/goffice/gtk/go-rotation-sel.c Tue Apr 7 09:29:28 2009
@@ -279,20 +279,20 @@
GtkWidget *
go_rotation_sel_new (void)
{
- return g_object_new (GO_ROTATION_SEL_TYPE, NULL);
+ return g_object_new (GO_TYPE_ROTATION_SEL, NULL);
}
int
go_rotation_sel_get_rotation (GORotationSel const *grs)
{
- g_return_val_if_fail (IS_GO_ROTATION_SEL (grs), 0);
+ g_return_val_if_fail (GO_IS_ROTATION_SEL (grs), 0);
return grs->angle;
}
void
go_rotation_sel_set_rotation (GORotationSel *grs, int angle)
{
- g_return_if_fail (IS_GO_ROTATION_SEL (grs));
+ g_return_if_fail (GO_IS_ROTATION_SEL (grs));
if (grs->angle != angle) {
grs->angle = angle;
gtk_spin_button_set_value (grs->rotate_spinner, grs->angle);
Modified: trunk/goffice/gtk/go-rotation-sel.h
==============================================================================
--- trunk/goffice/gtk/go-rotation-sel.h (original)
+++ trunk/goffice/gtk/go-rotation-sel.h Tue Apr 7 09:29:28 2009
@@ -24,9 +24,9 @@
G_BEGIN_DECLS
-#define GO_ROTATION_SEL_TYPE (go_rotation_sel_get_type ())
-#define GO_ROTATION_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_ROTATION_SEL_TYPE, GORotationSel))
-#define IS_GO_ROTATION_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_ROTATION_SEL_TYPE))
+#define GO_TYPE_ROTATION_SEL (go_rotation_sel_get_type ())
+#define GO_ROTATION_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GO_TYPE_ROTATION_SEL, GORotationSel))
+#define GO_IS_ROTATION_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GO_TYPE_ROTATION_SEL))
typedef struct _GORotationSel GORotationSel;
Modified: trunk/goffice/math/go-distribution.c
==============================================================================
--- trunk/goffice/math/go-distribution.c (original)
+++ trunk/goffice/math/go-distribution.c Tue Apr 7 09:29:28 2009
@@ -85,7 +85,7 @@
return GO_DISTRIBUTION_INVALID;
}
-#define GO_DISTRIBUTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_DISTRIBUTION_TYPE, GODistributionClass))
+#define GO_DISTRIBUTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GO_TYPE_DISTRIBUTION, GODistributionClass))
struct _GODistribution {
GObject base;
@@ -289,7 +289,7 @@
GSF_CLASS_FULL (GODistribution, go_distribution, NULL,
NULL, go_distribution_class_init, NULL, go_distribution_init,
G_TYPE_OBJECT, G_TYPE_FLAG_ABSTRACT,
- GSF_INTERFACE (go_distribution_persist_init, GO_PERSIST_TYPE))
+ GSF_INTERFACE (go_distribution_persist_init, GO_TYPE_PERSIST))
void
go_distribution_scale (GODistribution *dist, double location, double scale)
@@ -403,9 +403,9 @@
} GODistNormal;
-#define GO_DIST_NORMAL_TYPE (go_dist_normal_get_type ())
-#define GO_DIST_NORMAL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_DIST_NORMAL_TYPE, GODistNormal))
-#define IS_GO_DIST_NORMAL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_DIST_NORMAL_TYPE))
+#define GO_TYPE_DIST_NORMAL (go_dist_normal_get_type ())
+#define GO_DIST_NORMAL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_DIST_NORMAL, GODistNormal))
+#define GO_IS_DIST_NORMAL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_DIST_NORMAL))
GType go_dist_normal_get_type (void);
@@ -455,7 +455,7 @@
GSF_CLASS (GODistNormal, go_dist_normal,
go_dist_normal_class_init, go_dist_normal_init,
- GO_DISTRIBUTION_TYPE)
+ GO_TYPE_DISTRIBUTION)
#endif /* DISTRIBUTION_LAST_PATH */
@@ -469,9 +469,9 @@
} GODistUniform;
-#define GO_DIST_UNIFORM_TYPE (go_dist_uniform_get_type ())
-#define GO_DIST_UNIFORM(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_DIST_UNIFORM_TYPE, GODistUniform))
-#define IS_GO_DIST_UNIFORM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_DIST_UNIFORM_TYPE))
+#define GO_TYPE_DIST_UNIFORM (go_dist_uniform_get_type ())
+#define GO_DIST_UNIFORM(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_DIST_UNIFORM, GODistUniform))
+#define GO_IS_DIST_UNIFORM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_DIST_UNIFORM))
GType go_dist_uniform_get_type (void);
@@ -528,7 +528,7 @@
GSF_CLASS (GODistUniform, go_dist_uniform,
go_dist_uniform_class_init, go_dist_uniform_init,
- GO_DISTRIBUTION_TYPE)
+ GO_TYPE_DISTRIBUTION)
#endif /* DISTRIBUTION_LAST_PATH */
@@ -542,9 +542,9 @@
} GODistCauchy;
-#define GO_DIST_CAUCHY_TYPE (go_dist_cauchy_get_type ())
-#define GO_DIST_CAUCHY(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_DIST_CAUCHY_TYPE, GODistCauchy))
-#define IS_GO_DIST_CAUCHY(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_DIST_CAUCHY_TYPE))
+#define GO_TYPE_DIST_CAUCHY (go_dist_cauchy_get_type ())
+#define GO_DIST_CAUCHY(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_DIST_CAUCHY, GODistCauchy))
+#define GO_IS_DIST_CAUCHY(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_DIST_CAUCHY))
GType go_dist_cauchy_get_type (void);
@@ -594,7 +594,7 @@
GSF_CLASS (GODistCauchy, go_dist_cauchy,
go_dist_cauchy_class_init, go_dist_cauchy_init,
- GO_DISTRIBUTION_TYPE)
+ GO_TYPE_DISTRIBUTION)
#endif /* DISTRIBUTION_LAST_PATH */
@@ -608,9 +608,9 @@
double shape;
} GODistWeibull;
-#define GO_DIST_WEIBULL_TYPE (go_dist_weibull_get_type ())
-#define GO_DIST_WEIBULL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_DIST_WEIBULL_TYPE, GODistWeibull))
-#define IS_GO_DIST_WEIBULL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_DIST_WEIBULL_TYPE))
+#define GO_TYPE_DIST_WEIBULL (go_dist_weibull_get_type ())
+#define GO_DIST_WEIBULL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_DIST_WEIBULL, GODistWeibull))
+#define GO_IS_DIST_WEIBULL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_DIST_WEIBULL))
GType go_dist_weibull_get_type (void);
@@ -706,7 +706,7 @@
GSF_CLASS (GODistWeibull, go_dist_weibull,
go_dist_weibull_class_init, go_dist_weibull_init,
- GO_DISTRIBUTION_TYPE)
+ GO_TYPE_DISTRIBUTION)
#endif /* DISTRIBUTION_LAST_PATH */
@@ -720,9 +720,9 @@
double shape;
} GODistLogNormal;
-#define GO_DIST_LOG_NORMAL_TYPE (go_dist_log_normal_get_type ())
-#define GO_DIST_LOG_NORMAL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_DIST_LOG_NORMAL_TYPE, GODistLogNormal))
-#define IS_GO_DIST_LOG_NORMAL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_DIST_LOG_NORMAL_TYPE))
+#define GO_TYPE_DIST_LOG_NORMAL (go_dist_log_normal_get_type ())
+#define GO_DIST_LOG_NORMAL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_DIST_LOG_NORMAL, GODistLogNormal))
+#define GO_IS_DIST_LOG_NORMAL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_DIST_LOG_NORMAL))
GType go_dist_log_normal_get_type (void);
@@ -818,7 +818,7 @@
GSF_CLASS (GODistLogNormal, go_dist_log_normal,
go_dist_log_normal_class_init, go_dist_log_normal_init,
- GO_DISTRIBUTION_TYPE)
+ GO_TYPE_DISTRIBUTION)
#endif /* DISTRIBUTION_LAST_PATH */
@@ -833,15 +833,15 @@
{
switch (type) {
case GO_DISTRIBUTION_NORMAL:
- return (GODistribution *) g_object_new (GO_DIST_NORMAL_TYPE, NULL);
+ return (GODistribution *) g_object_new (GO_TYPE_DIST_NORMAL, NULL);
case GO_DISTRIBUTION_UNIFORM:
- return (GODistribution *) g_object_new (GO_DIST_UNIFORM_TYPE, NULL);
+ return (GODistribution *) g_object_new (GO_TYPE_DIST_UNIFORM, NULL);
case GO_DISTRIBUTION_CAUCHY:
- return (GODistribution *) g_object_new (GO_DIST_CAUCHY_TYPE, NULL);
+ return (GODistribution *) g_object_new (GO_TYPE_DIST_CAUCHY, NULL);
case GO_DISTRIBUTION_WEIBULL:
- return (GODistribution *) g_object_new (GO_DIST_WEIBULL_TYPE, NULL);
+ return (GODistribution *) g_object_new (GO_TYPE_DIST_WEIBULL, NULL);
case GO_DISTRIBUTION_LOGNORMAL:
- return (GODistribution *) g_object_new (GO_DIST_LOG_NORMAL_TYPE, NULL);
+ return (GODistribution *) g_object_new (GO_TYPE_DIST_LOG_NORMAL, NULL);
default:
return NULL;
}
Modified: trunk/goffice/math/go-distribution.h
==============================================================================
--- trunk/goffice/math/go-distribution.h (original)
+++ trunk/goffice/math/go-distribution.h Tue Apr 7 09:29:28 2009
@@ -42,9 +42,9 @@
typedef struct _GODistribution GODistribution;
-#define GO_DISTRIBUTION_TYPE (go_distribution_get_type ())
-#define GO_DISTRIBUTION(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_DISTRIBUTION_TYPE, GODistribution))
-#define IS_GO_DISTRIBUTION(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_DISTRIBUTION_TYPE))
+#define GO_TYPE_DISTRIBUTION (go_distribution_get_type ())
+#define GO_DISTRIBUTION(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_DISTRIBUTION, GODistribution))
+#define GO_IS_DISTRIBUTION(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_DISTRIBUTION))
GType go_distribution_get_type (void);
Modified: trunk/goffice/ms-compat/god-drawing-ms-client-handler.h
==============================================================================
--- trunk/goffice/ms-compat/god-drawing-ms-client-handler.h (original)
+++ trunk/goffice/ms-compat/god-drawing-ms-client-handler.h Tue Apr 7 09:29:28 2009
@@ -21,12 +21,12 @@
G_BEGIN_DECLS
-#define GOD_DRAWING_MS_CLIENT_HANDLER_TYPE (god_drawing_ms_client_handler_get_type ())
-#define GOD_DRAWING_MS_CLIENT_HANDLER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_DRAWING_MS_CLIENT_HANDLER_TYPE, GodDrawingMsClientHandler))
-#define GOD_DRAWING_MS_CLIENT_HANDLER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_DRAWING_MS_CLIENT_HANDLER_TYPE, GodDrawingMsClientHandlerClass))
-#define GOD_DRAWING_MS_CLIENT_HANDLER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_DRAWING_MS_CLIENT_HANDLER_TYPE, GodDrawingMsClientHandlerClass))
-#define IS_GOD_DRAWING_MS_CLIENT_HANDLER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_DRAWING_MS_CLIENT_HANDLER_TYPE))
-#define IS_GOD_DRAWING_MS_CLIENT_HANDLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_DRAWING_MS_CLIENT_HANDLER_TYPE))
+#define GOD_TYPE_DRAWING_MS_CLIENT_HANDLER (god_drawing_ms_client_handler_get_type ())
+#define GOD_DRAWING_MS_CLIENT_HANDLER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_DRAWING_MS_CLIENT_HANDLER, GodDrawingMsClientHandler))
+#define GOD_DRAWING_MS_CLIENT_HANDLER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_DRAWING_MS_CLIENT_HANDLER, GodDrawingMsClientHandlerClass))
+#define GOD_DRAWING_MS_CLIENT_HANDLER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_TYPE_DRAWING_MS_CLIENT_HANDLER, GodDrawingMsClientHandlerClass))
+#define GOD_IS_DRAWING_MS_CLIENT_HANDLER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_DRAWING_MS_CLIENT_HANDLER))
+#define GOD_IS_DRAWING_MS_CLIENT_HANDLER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_DRAWING_MS_CLIENT_HANDLER))
typedef struct GodDrawingMsClientHandlerPrivate_ GodDrawingMsClientHandlerPrivate;
Modified: trunk/goffice/ms-compat/god-drawing-ms.c
==============================================================================
--- trunk/goffice/ms-compat/god-drawing-ms.c (original)
+++ trunk/goffice/ms-compat/god-drawing-ms.c Tue Apr 7 09:29:28 2009
@@ -542,7 +542,7 @@
{
ShapeParseState *parse_state = STACK_TOP->parse_state;
GodShape *shape;
- shape = g_object_new (GOD_SHAPE_TYPE, NULL);
+ shape = g_object_new (GOD_TYPE_SHAPE, NULL);
if (parse_state->prop_table) {
god_shape_set_prop_table (shape, parse_state->prop_table);
g_object_unref (parse_state->prop_table);
Modified: trunk/goffice/ms-compat/god-image-ms.c
==============================================================================
--- trunk/goffice/ms-compat/god-image-ms.c (original)
+++ trunk/goffice/ms-compat/god-image-ms.c Tue Apr 7 09:29:28 2009
@@ -39,7 +39,7 @@
{
GodImage *image;
- image = g_object_new (GOD_IMAGE_MS_TYPE, NULL);
+ image = g_object_new (GOD_TYPE_IMAGE_MS, NULL);
return image;
}
@@ -91,4 +91,4 @@
GSF_CLASS (GodImageMs, god_image_ms,
god_image_ms_class_init, god_image_ms_init,
- GOD_IMAGE_TYPE)
+ GOD_TYPE_IMAGE)
Modified: trunk/goffice/ms-compat/god-image-ms.h
==============================================================================
--- trunk/goffice/ms-compat/god-image-ms.h (original)
+++ trunk/goffice/ms-compat/god-image-ms.h Tue Apr 7 09:29:28 2009
@@ -19,12 +19,12 @@
G_BEGIN_DECLS
-#define GOD_IMAGE_MS_TYPE (god_image_ms_get_type ())
-#define GOD_IMAGE_MS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_IMAGE_MS_TYPE, GodImageMs))
-#define GOD_IMAGE_MS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_IMAGE_MS_TYPE, GodImageMsClass))
-#define GOD_IMAGE_MS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_IMAGE_MS_TYPE, GodImageMsClass))
-#define IS_GOD_IMAGE_MS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_IMAGE_MS_TYPE))
-#define IS_GOD_IMAGE_MS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_IMAGE_MS_TYPE))
+#define GOD_TYPE_IMAGE_MS (god_image_ms_get_type ())
+#define GOD_IMAGE_MS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOD_TYPE_IMAGE_MS, GodImageMs))
+#define GOD_IMAGE_MS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOD_TYPE_IMAGE_MS, GodImageMsClass))
+#define GOD_IMAGE_MS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GOD_TYPE_IMAGE_MS, GodImageMsClass))
+#define GOD_IS_IMAGE_MS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOD_TYPE_IMAGE_MS))
+#define GOD_IS_IMAGE_MS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOD_TYPE_IMAGE_MS))
typedef struct GodImageMsPrivate_ GodImageMsPrivate;
Modified: trunk/goffice/utils/go-geometry.h
==============================================================================
--- trunk/goffice/utils/go-geometry.h (original)
+++ trunk/goffice/utils/go-geometry.h Tue Apr 7 09:29:28 2009
@@ -75,7 +75,7 @@
GOGeometrySide go_geometry_calc_label_position (GOGeometryOBR *obr, double alpha, double offset,
GOGeometrySide side, GOGeometrySide anchor);
-#define GO_DIRECTION_TYPE (go_direction_get_type())
+#define GO_TYPE_DIRECTION (go_direction_get_type())
GType go_direction_get_type (void) G_GNUC_CONST;
gboolean go_direction_is_horizontal (GODirection d);
gboolean go_direction_is_forward (GODirection d);
Modified: trunk/goffice/utils/go-image.c
==============================================================================
--- trunk/goffice/utils/go-image.c (original)
+++ trunk/goffice/utils/go-image.c Tue Apr 7 09:29:28 2009
@@ -322,7 +322,7 @@
#ifdef GOFFICE_WITH_GTK
unsigned char *src, *dst;
- g_return_if_fail (IS_GO_IMAGE (image) && image->data && image->pixbuf);
+ g_return_if_fail (GO_IS_IMAGE (image) && image->data && image->pixbuf);
src = gdk_pixbuf_get_pixels (image->pixbuf);
dst = image->data;
@@ -339,7 +339,7 @@
{
unsigned char *src, *dst;
- g_return_if_fail (IS_GO_IMAGE (image) && image->data && image->pixbuf);
+ g_return_if_fail (GO_IS_IMAGE (image) && image->data && image->pixbuf);
dst = gdk_pixbuf_get_pixels (image->pixbuf);
src = image->data;
@@ -494,7 +494,7 @@
cairo_surface_t *surface ;
cairo_t *cairo;
- g_return_val_if_fail (IS_GO_IMAGE (image), NULL);
+ g_return_val_if_fail (GO_IS_IMAGE (image), NULL);
if (image->data == NULL && image->pixbuf == NULL)
return NULL;
if (image->data == NULL) {
@@ -521,7 +521,7 @@
cairo_surface_t *surface ;
cairo_pattern_t *pat;
- g_return_val_if_fail (IS_GO_IMAGE (image), NULL);
+ g_return_val_if_fail (GO_IS_IMAGE (image), NULL);
if (image->data == NULL && image->pixbuf == NULL)
return NULL;
if (image->data == NULL) {
@@ -546,7 +546,7 @@
GOImage *
go_image_new_from_pixbuf (GdkPixbuf *pixbuf)
{
- return g_object_new (GO_IMAGE_TYPE, "pixbuf", pixbuf, NULL);
+ return g_object_new (GO_TYPE_IMAGE, "pixbuf", pixbuf, NULL);
}
GdkPixbuf *
@@ -598,7 +598,7 @@
#ifdef GOFFICE_WITH_GTK
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (filename, error);
if (pixbuf) {
- GOImage *image = g_object_new (GO_IMAGE_TYPE,
+ GOImage *image = g_object_new (GO_TYPE_IMAGE,
"pixbuf", pixbuf,
NULL);
g_object_unref (pixbuf);
@@ -656,7 +656,7 @@
char const *
go_image_get_name (GOImage *image)
{
- g_return_val_if_fail (IS_GO_IMAGE (image), NULL);
+ g_return_val_if_fail (GO_IS_IMAGE (image), NULL);
return image->name;
}
@@ -666,8 +666,8 @@
#ifdef GOFFICE_WITH_GTK
void *pixels1, *pixels2;
int size;
- g_return_val_if_fail (IS_GO_IMAGE (first), FALSE);
- g_return_val_if_fail (IS_GO_IMAGE (second), FALSE);
+ g_return_val_if_fail (GO_IS_IMAGE (first), FALSE);
+ g_return_val_if_fail (GO_IS_IMAGE (second), FALSE);
if (!first->pixbuf)
go_image_get_pixbuf (first);
if (!second->pixbuf)
@@ -700,7 +700,7 @@
void
go_image_save (GOImage *image, GsfXMLOut *output)
{
- g_return_if_fail (IS_GO_IMAGE (image) && image->name);
+ g_return_if_fail (GO_IS_IMAGE (image) && image->name);
gsf_xml_out_start_element (output, "GOImage");
gsf_xml_out_add_cstr (output, "name", image->name);
gsf_xml_out_add_int (output, "width", image->width);
Modified: trunk/goffice/utils/go-image.h
==============================================================================
--- trunk/goffice/utils/go-image.h (original)
+++ trunk/goffice/utils/go-image.h Tue Apr 7 09:29:28 2009
@@ -64,9 +64,9 @@
* GOImage object *
******************/
-#define GO_IMAGE_TYPE (go_image_get_type ())
-#define GO_IMAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_IMAGE_TYPE, GOImage))
-#define IS_GO_IMAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_IMAGE_TYPE))
+#define GO_TYPE_IMAGE (go_image_get_type ())
+#define GO_IMAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_IMAGE, GOImage))
+#define GO_IS_IMAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_IMAGE))
GType go_image_get_type (void);
Modified: trunk/goffice/utils/go-marker.c
==============================================================================
--- trunk/goffice/utils/go-marker.c (original)
+++ trunk/goffice/utils/go-marker.c Tue Apr 7 09:29:28 2009
@@ -44,7 +44,7 @@
GObjectClass base;
} GOMarkerClass;
-#define GO_MARKER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GO_MARKER_TYPE, GOMarkerClass))
+#define GO_MARKER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GO_TYPE_MARKER, GOMarkerClass))
static char const square_path[] = "M-1,-1 L-1,1 1,1 1,-1 z";
static char const diamond_path[] = "M0,-1 L1,0 0,1 -1,0 z";
@@ -143,7 +143,7 @@
void
go_marker_set_shape (GOMarker *marker, GOMarkerShape shape)
{
- g_return_if_fail (IS_GO_MARKER (marker));
+ g_return_if_fail (GO_IS_MARKER (marker));
if (marker->shape == shape)
return;
@@ -159,7 +159,7 @@
void
go_marker_set_outline_color (GOMarker *marker, GOColor color)
{
- g_return_if_fail (IS_GO_MARKER (marker));
+ g_return_if_fail (GO_IS_MARKER (marker));
if (marker->outline_color == color)
return;
marker->outline_color = color;
@@ -174,7 +174,7 @@
void
go_marker_set_fill_color (GOMarker *marker, GOColor color)
{
- g_return_if_fail (IS_GO_MARKER (marker));
+ g_return_if_fail (GO_IS_MARKER (marker));
if (marker->fill_color == color)
return;
marker->fill_color = color;
@@ -195,7 +195,7 @@
void
go_marker_set_size (GOMarker *marker, int size)
{
- g_return_if_fail (IS_GO_MARKER (marker));
+ g_return_if_fail (GO_IS_MARKER (marker));
g_return_if_fail (size >= 0);
if (marker->size == size)
return;
@@ -229,7 +229,7 @@
GOMarker *
go_marker_new (void)
{
- return g_object_new (GO_MARKER_TYPE, NULL);
+ return g_object_new (GO_TYPE_MARKER, NULL);
}
/**
@@ -298,7 +298,7 @@
cairo_surface_t *current_cr_surface;
double half_size, offset;
- g_return_val_if_fail (IS_GO_MARKER (marker), NULL);
+ g_return_val_if_fail (GO_IS_MARKER (marker), NULL);
g_return_val_if_fail (cr != NULL, NULL);
current_cr_surface = cairo_get_target (cr);
Modified: trunk/goffice/utils/go-marker.h
==============================================================================
--- trunk/goffice/utils/go-marker.h (original)
+++ trunk/goffice/utils/go-marker.h Tue Apr 7 09:29:28 2009
@@ -29,9 +29,9 @@
G_BEGIN_DECLS
-#define GO_MARKER_TYPE (go_marker_get_type ())
-#define GO_MARKER(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_MARKER_TYPE, GOMarker))
-#define IS_GO_MARKER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_MARKER_TYPE))
+#define GO_TYPE_MARKER (go_marker_get_type ())
+#define GO_MARKER(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GO_TYPE_MARKER, GOMarker))
+#define GO_IS_MARKER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GO_TYPE_MARKER))
typedef enum {
GO_MARKER_NONE,
Modified: trunk/goffice/utils/go-path.c
==============================================================================
--- trunk/goffice/utils/go-path.c (original)
+++ trunk/goffice/utils/go-path.c Tue Apr 7 09:29:28 2009
@@ -162,7 +162,7 @@
{
GOPathDataBuffer *buffer;
- g_return_if_fail (IS_GO_PATH (path));
+ g_return_if_fail (GO_IS_PATH (path));
if (path->data_buffer_head == NULL)
return;
@@ -211,7 +211,7 @@
void
go_path_set_options (GOPath *path, GOPathOptions options)
{
- g_return_if_fail (IS_GO_PATH (path));
+ g_return_if_fail (GO_IS_PATH (path));
path->options = options;
}
@@ -219,7 +219,7 @@
GOPathOptions
go_path_get_options (GOPath const *path)
{
- g_return_val_if_fail (IS_GO_PATH (path), 0);
+ g_return_val_if_fail (GO_IS_PATH (path), 0);
return path->options;
}
@@ -231,7 +231,7 @@
GOPathDataBuffer *buffer = path->data_buffer_tail;
int i;
- g_return_if_fail (IS_GO_PATH (path));
+ g_return_if_fail (GO_IS_PATH (path));
if (buffer->n_actions + 1 > GO_PATH_DEFAULT_BUFFER_SIZE
|| buffer->n_points + n_points > GO_PATH_DEFAULT_BUFFER_SIZE)
@@ -300,7 +300,7 @@
gboolean fill;
gboolean draw_in, ellipse = FALSE;
- g_return_if_fail (IS_GO_PATH (path));
+ g_return_if_fail (GO_IS_PATH (path));
if (rx_out < rx_in) {
r = rx_out;
Modified: trunk/goffice/utils/go-path.h
==============================================================================
--- trunk/goffice/utils/go-path.h (original)
+++ trunk/goffice/utils/go-path.h Tue Apr 7 09:29:28 2009
@@ -60,7 +60,7 @@
typedef struct _GOPath GOPath;
-#define IS_GO_PATH(x) ((x) != NULL)
+#define GO_IS_PATH(x) ((x) != NULL)
GOPath *go_path_new (void);
void go_path_clear (GOPath *path);
Modified: trunk/goffice/utils/go-persist.c
==============================================================================
--- trunk/goffice/utils/go-persist.c (original)
+++ trunk/goffice/utils/go-persist.c Tue Apr 7 09:29:28 2009
@@ -44,20 +44,20 @@
gboolean
go_persist_dom_load (GOPersist *gp, xmlNode *node)
{
- g_return_val_if_fail (IS_GO_PERSIST (gp), FALSE);
+ g_return_val_if_fail (GO_IS_PERSIST (gp), FALSE);
return GO_PERSIST_GET_CLASS (gp)->dom_load (gp, node);
}
void
go_persist_sax_save (GOPersist const *gp, GsfXMLOut *output)
{
- g_return_if_fail (IS_GO_PERSIST (gp));
+ g_return_if_fail (GO_IS_PERSIST (gp));
GO_PERSIST_GET_CLASS (gp)->sax_save (gp, output);
}
void
go_persist_prep_sax (GOPersist *gp, GsfXMLIn *xin, xmlChar const **attrs)
{
- g_return_if_fail (IS_GO_PERSIST (gp));
+ g_return_if_fail (GO_IS_PERSIST (gp));
GO_PERSIST_GET_CLASS (gp)->prep_sax (gp, xin, attrs);
}
Modified: trunk/goffice/utils/go-persist.h
==============================================================================
--- trunk/goffice/utils/go-persist.h (original)
+++ trunk/goffice/utils/go-persist.h Tue Apr 7 09:29:28 2009
@@ -38,12 +38,12 @@
void (*sax_save) (GOPersist const *gp, GsfXMLOut *output);
} GOPersistClass;
-#define GO_PERSIST_TYPE (go_persist_get_type ())
-#define GO_PERSIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_PERSIST_TYPE, GOPersist))
-#define IS_GO_PERSIST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_PERSIST_TYPE))
-#define GO_PERSIST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_PERSIST_TYPE, GOPersistClass))
-#define IS_GO_PERSIST_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_PERSIST_TYPE))
-#define GO_PERSIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_PERSIST_TYPE, GOPersistClass))
+#define GO_TYPE_PERSIST (go_persist_get_type ())
+#define GO_PERSIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_PERSIST, GOPersist))
+#define GO_IS_PERSIST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_PERSIST))
+#define GO_PERSIST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GO_TYPE_PERSIST, GOPersistClass))
+#define GO_IS_PERSIST_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GO_TYPE_PERSIST))
+#define GO_PERSIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_TYPE_PERSIST, GOPersistClass))
GType go_persist_get_type (void);
Modified: trunk/goffice/utils/go-undo.c
==============================================================================
--- trunk/goffice/utils/go-undo.c (original)
+++ trunk/goffice/utils/go-undo.c Tue Apr 7 09:29:28 2009
@@ -24,9 +24,9 @@
{
GOUndoClass *uc;
- g_return_if_fail (IS_GO_UNDO (u));
+ g_return_if_fail (GO_IS_UNDO (u));
- uc = G_TYPE_INSTANCE_GET_CLASS (u, GO_UNDO_TYPE, GOUndoClass);
+ uc = G_TYPE_INSTANCE_GET_CLASS (u, GO_TYPE_UNDO, GOUndoClass);
uc->undo (u, data);
}
@@ -50,14 +50,14 @@
GOUndo *
go_undo_combine (GOUndo *a, GOUndo *b)
{
- g_return_val_if_fail (a == NULL || IS_GO_UNDO (a), NULL);
- g_return_val_if_fail (b == NULL || IS_GO_UNDO (b), NULL);
+ g_return_val_if_fail (a == NULL || GO_IS_UNDO (a), NULL);
+ g_return_val_if_fail (b == NULL || GO_IS_UNDO (b), NULL);
if (!a)
return b;
else if (!b)
return a;
- else if (IS_GO_UNDO_GROUP (a)) {
+ else if (GO_IS_UNDO_GROUP (a)) {
go_undo_group_add (GO_UNDO_GROUP (a), b);
return a;
} else {
@@ -118,20 +118,20 @@
}
GSF_CLASS (GOUndoGroup, go_undo_group,
- go_undo_group_class_init, go_undo_group_init, GO_UNDO_TYPE)
+ go_undo_group_class_init, go_undo_group_init, GO_TYPE_UNDO)
GOUndoGroup *
go_undo_group_new (void)
{
- return g_object_new (GO_UNDO_GROUP_TYPE, NULL);
+ return g_object_new (GO_TYPE_UNDO_GROUP, NULL);
}
/* Takes ownership of u. */
void
go_undo_group_add (GOUndoGroup *ug, GOUndo *u)
{
- g_return_if_fail (IS_GO_UNDO_GROUP (ug));
- g_return_if_fail (IS_GO_UNDO (u));
+ g_return_if_fail (GO_IS_UNDO_GROUP (ug));
+ g_return_if_fail (GO_IS_UNDO (u));
g_ptr_array_add (ug->undos, u);
}
@@ -171,13 +171,13 @@
GSF_CLASS (GOUndoBinary, go_undo_binary,
- go_undo_binary_class_init, NULL, GO_UNDO_TYPE)
+ go_undo_binary_class_init, NULL, GO_TYPE_UNDO)
GOUndo *
go_undo_binary_new (gpointer a, gpointer b, GOUndoBinaryFunc undo,
GFreeFunc fa, GFreeFunc fb)
{
- GOUndoBinary *ua = g_object_new (GO_UNDO_BINARY_TYPE, NULL);
+ GOUndoBinary *ua = g_object_new (GO_TYPE_UNDO_BINARY, NULL);
ua->a = a;
ua->b = b;
ua->undo = undo;
@@ -220,12 +220,12 @@
GSF_CLASS (GOUndoUnary, go_undo_unary,
- go_undo_unary_class_init, NULL, GO_UNDO_TYPE)
+ go_undo_unary_class_init, NULL, GO_TYPE_UNDO)
GOUndo *
go_undo_unary_new (gpointer a, GOUndoUnaryFunc undo, GFreeFunc fa)
{
- GOUndoUnary *ua = g_object_new (GO_UNDO_UNARY_TYPE, NULL);
+ GOUndoUnary *ua = g_object_new (GO_TYPE_UNDO_UNARY, NULL);
ua->a = a;
ua->undo = undo;
ua->disposea = fa;
Modified: trunk/goffice/utils/go-undo.h
==============================================================================
--- trunk/goffice/utils/go-undo.h (original)
+++ trunk/goffice/utils/go-undo.h Tue Apr 7 09:29:28 2009
@@ -7,9 +7,9 @@
/* ------------------------------------------------------------------------- */
-#define GO_UNDO_TYPE (go_undo_get_type ())
-#define GO_UNDO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_UNDO_TYPE, GOUndo))
-#define IS_GO_UNDO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_UNDO_TYPE))
+#define GO_TYPE_UNDO (go_undo_get_type ())
+#define GO_UNDO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_UNDO, GOUndo))
+#define GO_IS_UNDO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_UNDO))
GType go_undo_get_type (void);
@@ -35,9 +35,9 @@
/* ------------------------------------------------------------------------- */
/* Compound operations. */
-#define GO_UNDO_GROUP_TYPE (go_undo_group_get_type ())
-#define GO_UNDO_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_UNDO_GROUP_TYPE, GOUndoGroup))
-#define IS_GO_UNDO_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_UNDO_GROUP_TYPE))
+#define GO_TYPE_UNDO_GROUP (go_undo_group_get_type ())
+#define GO_UNDO_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_UNDO_GROUP, GOUndoGroup))
+#define GO_IS_UNDO_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_UNDO_GROUP))
GType go_undo_group_get_type (void);
@@ -58,9 +58,9 @@
/* ------------------------------------------------------------------------- */
-#define GO_UNDO_BINARY_TYPE (go_undo_binary_get_type ())
-#define GO_UNDO_BINARY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_UNDO_BINARY_TYPE, GOUndoBinary))
-#define IS_GO_UNDO_BINARY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_UNDO_BINARY_TYPE))
+#define GO_TYPE_UNDO_BINARY (go_undo_binary_get_type ())
+#define GO_UNDO_BINARY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_UNDO_BINARY, GOUndoBinary))
+#define GO_IS_UNDO_BINARY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_UNDO_BINARY))
GType go_undo_binary_get_type (void);
@@ -86,9 +86,9 @@
/* ------------------------------------------------------------------------- */
-#define GO_UNDO_UNARY_TYPE (go_undo_unary_get_type ())
-#define GO_UNDO_UNARY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_UNDO_UNARY_TYPE, GOUndoUnary))
-#define IS_GO_UNDO_UNARY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_UNDO_UNARY_TYPE))
+#define GO_TYPE_UNDO_UNARY (go_undo_unary_get_type ())
+#define GO_UNDO_UNARY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_UNDO_UNARY, GOUndoUnary))
+#define GO_IS_UNDO_UNARY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_UNDO_UNARY))
GType go_undo_unary_get_type (void);
Modified: trunk/goffice/utils/regutf8.c
==============================================================================
--- trunk/goffice/utils/regutf8.c (original)
+++ trunk/goffice/utils/regutf8.c Tue Apr 7 09:29:28 2009
@@ -283,7 +283,7 @@
/* ------------------------------------------------------------------------- */
static void
-kill_compiled (GoSearchReplace *sr)
+kill_compiled (GOSearchReplace *sr)
{
if (sr->comp_search) {
go_regfree (sr->comp_search);
@@ -295,7 +295,7 @@
/* ------------------------------------------------------------------------- */
static int
-go_search_replace_compile (GoSearchReplace *sr)
+go_search_replace_compile (GOSearchReplace *sr)
{
const char *pattern;
char *tmp;
@@ -346,7 +346,7 @@
* Returns: %TRUE if search-and-replace data is valid.
**/
gboolean
-go_search_replace_verify (GoSearchReplace *sr, gboolean repl, GError **err)
+go_search_replace_verify (GOSearchReplace *sr, gboolean repl, GError **err)
{
int comp_err;
g_return_val_if_fail (sr != NULL, err ? ((*err = NULL), FALSE) : FALSE);
@@ -541,7 +541,7 @@
static char *
-calculate_replacement (GoSearchReplace *sr, const char *src, const GORegmatch *pm)
+calculate_replacement (GOSearchReplace *sr, const char *src, const GORegmatch *pm)
{
char *res;
@@ -625,7 +625,7 @@
/* ------------------------------------------------------------------------- */
gboolean
-go_search_match_string (GoSearchReplace *sr, const char *src)
+go_search_match_string (GOSearchReplace *sr, const char *src)
{
int flags = 0;
@@ -672,7 +672,7 @@
* Returns NULL if nothing changed, or a g_malloc string otherwise.
*/
char *
-go_search_replace_string (GoSearchReplace *sr, const char *src)
+go_search_replace_string (GOSearchReplace *sr, const char *src)
{
int nmatch;
GORegmatch *pmatch;
@@ -773,7 +773,7 @@
static void
go_search_replace_finalize (GObject *obj)
{
- GoSearchReplace *sr = (GoSearchReplace *)obj;
+ GOSearchReplace *sr = (GOSearchReplace *)obj;
kill_compiled (sr);
g_free (sr->search_text);
@@ -790,7 +790,7 @@
GValue *value,
GParamSpec *pspec)
{
- GoSearchReplace *sr = (GoSearchReplace *)object;
+ GOSearchReplace *sr = (GOSearchReplace *)object;
switch (property_id) {
case PROP_SEARCH_TEXT:
@@ -820,7 +820,7 @@
/* ------------------------------------------------------------------------- */
static void
-go_search_replace_set_search_text (GoSearchReplace *sr, const char *text)
+go_search_replace_set_search_text (GOSearchReplace *sr, const char *text)
{
char *text_copy = g_strdup (text);
g_free (sr->search_text);
@@ -829,7 +829,7 @@
}
static void
-go_search_replace_set_replace_text (GoSearchReplace *sr, const char *text)
+go_search_replace_set_replace_text (GOSearchReplace *sr, const char *text)
{
char *text_copy = g_strdup (text);
g_free (sr->replace_text);
@@ -843,7 +843,7 @@
GValue const *value,
GParamSpec *pspec)
{
- GoSearchReplace *sr = (GoSearchReplace *)object;
+ GOSearchReplace *sr = (GOSearchReplace *)object;
switch (property_id) {
case PROP_SEARCH_TEXT:
@@ -944,5 +944,5 @@
/* ------------------------------------------------------------------------- */
-GSF_CLASS (GoSearchReplace, go_search_replace,
+GSF_CLASS (GOSearchReplace, go_search_replace,
go_search_replace_class_init, go_search_replace_init, G_TYPE_OBJECT)
Modified: trunk/goffice/utils/regutf8.h
==============================================================================
--- trunk/goffice/utils/regutf8.h (original)
+++ trunk/goffice/utils/regutf8.h Tue Apr 7 09:29:28 2009
@@ -78,9 +78,9 @@
/* -------------------------------------------------------------------------- */
-#define GO_SEARCH_REPLACE_TYPE (go_search_replace_get_type ())
-#define GO_SEARCH_REPLACE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_SEARCH_REPLACE_TYPE, GoSearchReplace))
-#define GO_IS_SEARCH_REPLACE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_SEARCH_REPLACE_TYPE))
+#define GO_TYPE_SEARCH_REPLACE (go_search_replace_get_type ())
+#define GO_SEARCH_REPLACE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GO_TYPE_SEARCH_REPLACE, GOSearchReplace))
+#define GO_IS_SEARCH_REPLACE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GO_TYPE_SEARCH_REPLACE))
typedef struct _GoSearchReplace {
GObject base;
@@ -97,20 +97,20 @@
/*< private >*/
gboolean plain_replace;
-} GoSearchReplace;
+} GOSearchReplace;
typedef struct {
GObjectClass g_object_class;
-} GoSearchReplaceClass;
+} GOSearchReplaceClass;
GQuark go_search_replace_error_quark (void);
GType go_search_replace_get_type (void);
-gboolean go_search_replace_verify (GoSearchReplace *sr, gboolean repl, GError **err);
+gboolean go_search_replace_verify (GOSearchReplace *sr, gboolean repl, GError **err);
-gboolean go_search_match_string (GoSearchReplace *sr, const char *src);
-char * go_search_replace_string (GoSearchReplace *sr, const char *src);
+gboolean go_search_match_string (GOSearchReplace *sr, const char *src);
+char * go_search_replace_string (GOSearchReplace *sr, const char *src);
const char *go_regexp_quote1 (GString *target, const char *s);
void go_regexp_quote (GString *target, const char *s);
Modified: trunk/plugins/plot_barcol/gog-1.5d.c
==============================================================================
--- trunk/plugins/plot_barcol/gog-1.5d.c (original)
+++ trunk/plugins/plot_barcol/gog-1.5d.c Tue Apr 7 09:29:28 2009
@@ -378,7 +378,7 @@
GSF_DYNAMIC_CLASS_ABSTRACT (GogPlot1_5d, gog_plot1_5d,
gog_plot1_5d_class_init, gog_plot1_5d_init,
- GOG_PLOT_TYPE)
+ GOG_TYPE_PLOT)
/*****************************************************************************/
@@ -641,7 +641,7 @@
g_param_spec_object ("errors",
_("Error bars"),
_("GogErrorBar *"),
- GOG_ERROR_BAR_TYPE,
+ GOG_TYPE_ERROR_BAR,
GSF_PARAM_STATIC | G_PARAM_READWRITE | GO_PARAM_PERSISTENT));
}
@@ -659,7 +659,7 @@
GSF_DYNAMIC_CLASS (GogSeries1_5d, gog_series1_5d,
gog_series1_5d_class_init, gog_series1_5d_init,
- GOG_SERIES_TYPE)
+ GOG_TYPE_SERIES)
/* Plugin initialization */
Modified: trunk/plugins/plot_barcol/gog-1.5d.h
==============================================================================
--- trunk/plugins/plot_barcol/gog-1.5d.h (original)
+++ trunk/plugins/plot_barcol/gog-1.5d.h Tue Apr 7 09:29:28 2009
@@ -60,7 +60,7 @@
#define GOG_PLOT1_5D_TYPE (gog_plot1_5d_get_type ())
#define GOG_PLOT1_5D(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PLOT1_5D_TYPE, GogPlot1_5d))
-#define IS_GOG_PLOT1_5D(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PLOT1_5D_TYPE))
+#define GOG_IS_PLOT1_5D(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PLOT1_5D_TYPE))
#define GOG_PLOT1_5D_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOG_PLOT1_5D_TYPE, GogPlot1_5dClass))
#define GOG_PLOT1_5D_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_PLOT1_5D_TYPE, GogPlot1_5dClass))
@@ -83,7 +83,7 @@
#define GOG_SERIES1_5D_TYPE (gog_series1_5d_get_type ())
#define GOG_SERIES1_5D(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_SERIES1_5D_TYPE, GogSeries1_5d))
-#define IS_GOG_SERIES1_5D(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_SERIES1_5D_TYPE))
+#define GOG_IS_SERIES1_5D(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_SERIES1_5D_TYPE))
GType gog_series1_5d_get_type (void);
void gog_series1_5d_register_type (GTypeModule *module);
Modified: trunk/plugins/plot_barcol/gog-barcol.c
==============================================================================
--- trunk/plugins/plot_barcol/gog-barcol.c (original)
+++ trunk/plugins/plot_barcol/gog-barcol.c Tue Apr 7 09:29:28 2009
@@ -41,29 +41,29 @@
typedef GogSeriesElement GogBarColSeriesElement;
typedef GogSeriesElementClass GogBarColSeriesElementClass;
-#define GOG_BARCOL_SERIES_ELEMENT_TYPE (gog_barcol_series_element_get_type ())
-#define GOG_BARCOL_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_BARCOL_SERIES_ELEMENT_TYPE, GogBarColSeriesElement))
-#define GOG_IS_BARCOL_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_BARCOL_SERIES_ELEMENT_TYPE))
+#define GOG_TYPE_BARCOL_SERIES_ELEMENT (gog_barcol_series_element_get_type ())
+#define GOG_BARCOL_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_BARCOL_SERIES_ELEMENT, GogBarColSeriesElement))
+#define GOG_IS_BARCOL_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_BARCOL_SERIES_ELEMENT))
GType gog_barcol_series_element_get_type (void);
GSF_DYNAMIC_CLASS (GogBarColSeriesElement, gog_barcol_series_element,
NULL, NULL,
- GOG_SERIES_ELEMENT_TYPE)
+ GOG_TYPE_SERIES_ELEMENT)
/******************************************************************************/
typedef GogSeries1_5d GogBarColSeries;
typedef GogSeries1_5dClass GogBarColSeriesClass;
-#define GOG_BARCOL_SERIES_TYPE (gog_barcol_series_eget_type ())
-#define GOG_BARCOL_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_BARCOL_SERIES_TYPE, GogBarColSeries))
-#define GOG_IS_BARCOL_SERIEST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_BARCOL_SERIES_TYPE))
+#define GOG_TYPE_BARCOL_SERIES (gog_barcol_series_eget_type ())
+#define GOG_BARCOL_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_BARCOL_SERIES, GogBarColSeries))
+#define GOG_IS_BARCOL_SERIEST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_BARCOL_SERIES))
GType gog_barcol_series_get_type (void);
static void
gog_barcol_series_class_init (GogSeriesClass *series_klass)
{
- series_klass->series_element_type = GOG_BARCOL_SERIES_ELEMENT_TYPE;
+ series_klass->series_element_type = GOG_TYPE_BARCOL_SERIES_ELEMENT;
}
GSF_DYNAMIC_CLASS (GogBarColSeries, gog_barcol_series,
@@ -570,4 +570,4 @@
GSF_DYNAMIC_CLASS (GogBarColView, gog_barcol_view,
gog_barcol_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
Modified: trunk/plugins/plot_barcol/gog-barcol.h
==============================================================================
--- trunk/plugins/plot_barcol/gog-barcol.h (original)
+++ trunk/plugins/plot_barcol/gog-barcol.h Tue Apr 7 09:29:28 2009
@@ -36,9 +36,9 @@
} GogBarColPlot;
typedef GogPlot1_5dClass GogBarColPlotClass;
-#define GOG_BARCOL_PLOT_TYPE (gog_barcol_plot_get_type ())
-#define GOG_BARCOL_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_BARCOL_PLOT_TYPE, GogBarColPlot))
-#define GOG_IS_PLOT_BARCOL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_BARCOL_PLOT_TYPE))
+#define GOG_TYPE_BARCOL_PLOT (gog_barcol_plot_get_type ())
+#define GOG_BARCOL_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_BARCOL_PLOT, GogBarColPlot))
+#define GOG_IS_PLOT_BARCOL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_BARCOL_PLOT))
GType gog_barcol_plot_get_type (void);
void gog_barcol_plot_register_type (GTypeModule *module);
Modified: trunk/plugins/plot_barcol/gog-dropbar.c
==============================================================================
--- trunk/plugins/plot_barcol/gog-dropbar.c (original)
+++ trunk/plugins/plot_barcol/gog-dropbar.c Tue Apr 7 09:29:28 2009
@@ -78,7 +78,7 @@
GSF_DYNAMIC_CLASS (GogDropBarPlot, gog_dropbar_plot,
gog_dropbar_plot_class_init, gog_dropbar_plot_init,
- GOG_BARCOL_PLOT_TYPE)
+ GOG_TYPE_BARCOL_PLOT)
/*****************************************************************************/
typedef GogPlotView GogDropBarView;
@@ -320,4 +320,4 @@
GSF_DYNAMIC_CLASS (GogDropBarView, gog_dropbar_view,
gog_dropbar_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
Modified: trunk/plugins/plot_barcol/gog-dropbar.h
==============================================================================
--- trunk/plugins/plot_barcol/gog-dropbar.h (original)
+++ trunk/plugins/plot_barcol/gog-dropbar.h Tue Apr 7 09:29:28 2009
@@ -31,9 +31,9 @@
typedef GogBarColPlot GogDropBarPlot;
typedef GogPlot1_5dClass GogDropBarPlotClass;
-#define GOG_DROPBAR_PLOT_TYPE (gog_dropbar_plot_get_type ())
-#define GOG_DROPBAR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_DROPBAR_PLOT_TYPE, GogDropBarPlot))
-#define GOG_IS_PLOT_DROPBAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_DROPBAR_PLOT_TYPE))
+#define GOG_TYPE_DROPBAR_PLOT (gog_dropbar_plot_get_type ())
+#define GOG_DROPBAR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_DROPBAR_PLOT, GogDropBarPlot))
+#define GOG_IS_PLOT_DROPBAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_DROPBAR_PLOT))
GType gog_dropbar_plot_get_type (void);
void gog_dropbar_plot_register_type (GTypeModule *module);
Modified: trunk/plugins/plot_barcol/gog-line.c
==============================================================================
--- trunk/plugins/plot_barcol/gog-line.c (original)
+++ trunk/plugins/plot_barcol/gog-line.c Tue Apr 7 09:29:28 2009
@@ -55,9 +55,9 @@
typedef GogSeriesElement GogLineSeriesElement;
typedef GogSeriesElementClass GogLineSeriesElementClass;
-#define GOG_LINE_SERIES_ELEMENT_TYPE (gog_line_series_element_get_type ())
-#define GOG_LINE_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LINE_SERIES_ELEMENT_TYPE, GogLinelSeriesElement))
-#define GOG_IS_LINE_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LINE_SERIES_ELEMENT_TYPE))
+#define GOG_TYPE_LINE_SERIES_ELEMENT (gog_line_series_element_get_type ())
+#define GOG_LINE_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LINE_SERIES_ELEMENT, GogLinelSeriesElement))
+#define GOG_IS_LINE_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LINE_SERIES_ELEMENT))
GType gog_line_series_element_get_type (void);
static void
@@ -81,16 +81,16 @@
GSF_DYNAMIC_CLASS (GogLineSeriesElement, gog_line_series_element,
gog_line_series_element_class_init, NULL,
- GOG_SERIES_ELEMENT_TYPE)
+ GOG_TYPE_SERIES_ELEMENT)
/******************************************************************************/
typedef GogView GogLineSeriesView;
typedef GogViewClass GogLineSeriesViewClass;
-#define GOG_LINE_SERIES_VIEW_TYPE (gog_line_series_view_get_type ())
-#define GOG_LINE_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LINE_SERIES_VIEW_TYPE, GogLineSeriesView))
-#define IS_GOG_LINE_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LINE_SERIES_VIEW_TYPE))
+#define GOG_TYPE_LINE_SERIES_VIEW (gog_line_series_view_get_type ())
+#define GOG_LINE_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LINE_SERIES_VIEW, GogLineSeriesView))
+#define GOG_IS_LINE_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LINE_SERIES_VIEW))
static void
gog_line_series_view_render (GogView *view, GogViewAllocation const *bbox)
@@ -120,7 +120,7 @@
GSF_DYNAMIC_CLASS (GogLineSeriesView, gog_line_series_view,
gog_line_series_view_class_init, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
/*****************************************************************************/
@@ -133,9 +133,9 @@
static GogStyledObjectClass *series_parent_klass;
GType gog_line_series_get_type (void);
-#define GOG_LINE_SERIES_TYPE (gog_line_series_get_type ())
-#define GOG_LINE_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LINE_SERIES_TYPE, GogLineSeries))
-#define IS_GOG_LINE_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LINE_SERIES_TYPE))
+#define GOG_TYPE_LINE_SERIES (gog_line_series_get_type ())
+#define GOG_LINE_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LINE_SERIES, GogLineSeries))
+#define GOG_IS_LINE_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LINE_SERIES))
static void
gog_line_series_init_style (GogStyledObject *gso, GogStyle *style)
@@ -175,7 +175,7 @@
}
/* update children */
for (ptr = obj->children; ptr != NULL; ptr = ptr->next)
- if (!IS_GOG_SERIES_LINES (ptr->data))
+ if (!GOG_IS_SERIES_LINES (ptr->data))
gog_object_request_update (GOG_OBJECT (ptr->data));
}
@@ -212,7 +212,7 @@
gog_klass->view_type = gog_line_series_view_get_type ();
gog_klass->update = gog_line_series_update;
series_klass->get_xy_data = gog_line_series_get_xy_data;
- series_klass->series_element_type = GOG_LINE_SERIES_ELEMENT_TYPE;
+ series_klass->series_element_type = GOG_TYPE_LINE_SERIES_ELEMENT;
}
GSF_DYNAMIC_CLASS (GogLineSeries, gog_line_series,
@@ -223,7 +223,7 @@
child_added_cb (GogLinePlot *plot, GogObject *obj)
{
/* we only accept regression curves for not stacked plots */
- if (IS_GOG_SERIES (obj) && plot->base.type == GOG_1_5D_NORMAL)
+ if (GOG_IS_SERIES (obj) && plot->base.type == GOG_1_5D_NORMAL)
(GOG_SERIES (obj))->acceptable_children =
GOG_SERIES_ACCEPT_TREND_LINE;
}
@@ -382,7 +382,7 @@
GSF_DYNAMIC_CLASS (GogAreaPlot, gog_area_plot,
gog_area_plot_class_init, gog_area_plot_init,
- GOG_LINE_PLOT_TYPE)
+ GOG_TYPE_LINE_PLOT)
/*****************************************************************************/
@@ -763,4 +763,4 @@
GSF_DYNAMIC_CLASS (GogLineView, gog_line_view,
gog_line_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
Modified: trunk/plugins/plot_barcol/gog-line.h
==============================================================================
--- trunk/plugins/plot_barcol/gog-line.h (original)
+++ trunk/plugins/plot_barcol/gog-line.h Tue Apr 7 09:29:28 2009
@@ -29,18 +29,18 @@
typedef struct _GogLinePlot GogLinePlot;
typedef GogPlot1_5dClass GogLinePlotClass;
-#define GOG_LINE_PLOT_TYPE (gog_line_plot_get_type ())
-#define GOG_LINE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LINE_PLOT_TYPE, GogLinePlot))
-#define GOG_IS_PLOT_LINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LINE_PLOT_TYPE))
+#define GOG_TYPE_LINE_PLOT (gog_line_plot_get_type ())
+#define GOG_LINE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LINE_PLOT, GogLinePlot))
+#define GOG_IS_PLOT_LINE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LINE_PLOT))
GType gog_line_plot_get_type (void);
void gog_line_plot_register_type (GTypeModule *module);
/*************************************************************************/
-#define GOG_AREA_PLOT_TYPE (gog_area_plot_get_type ())
-#define GOG_AREA_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_AREA_PLOT_TYPE, GogAreaPlot))
-#define GOG_IS_PLOT_AREA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_AREA_PLOT_TYPE))
+#define GOG_TYPE_AREA_PLOT (gog_area_plot_get_type ())
+#define GOG_AREA_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_AREA_PLOT, GogAreaPlot))
+#define GOG_IS_PLOT_AREA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_AREA_PLOT))
typedef GogLinePlot GogAreaPlot;
typedef GogLinePlotClass GogAreaPlotClass;
Modified: trunk/plugins/plot_barcol/gog-minmax.c
==============================================================================
--- trunk/plugins/plot_barcol/gog-minmax.c (original)
+++ trunk/plugins/plot_barcol/gog-minmax.c Tue Apr 7 09:29:28 2009
@@ -460,4 +460,4 @@
GSF_DYNAMIC_CLASS (GogMinMaxView, gog_minmax_view,
gog_minmax_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
Modified: trunk/plugins/plot_barcol/gog-minmax.h
==============================================================================
--- trunk/plugins/plot_barcol/gog-minmax.h (original)
+++ trunk/plugins/plot_barcol/gog-minmax.h Tue Apr 7 09:29:28 2009
@@ -38,9 +38,9 @@
} GogMinMaxPlot;
typedef GogPlot1_5dClass GogMinMaxPlotClass;
-#define GOG_MINMAX_PLOT_TYPE (gog_minmax_plot_get_type ())
-#define GOG_MINMAX_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_MINMAX_PLOT_TYPE, GogMinMaxPlot))
-#define GOG_IS_PLOT_MINMAX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_MINMAX_PLOT_TYPE))
+#define GOG_TYPE_MINMAX_PLOT (gog_minmax_plot_get_type ())
+#define GOG_MINMAX_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_MINMAX_PLOT, GogMinMaxPlot))
+#define GOG_IS_PLOT_MINMAX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_MINMAX_PLOT))
GType gog_minmax_plot_get_type (void);
void gog_minmax_plot_register_type (GTypeModule *module);
Modified: trunk/plugins/plot_distrib/go-distribution-prefs.c
==============================================================================
--- trunk/plugins/plot_distrib/go-distribution-prefs.c (original)
+++ trunk/plugins/plot_distrib/go-distribution-prefs.c Tue Apr 7 09:29:28 2009
@@ -105,7 +105,7 @@
prefs->dalloc = dalloc;
prefs->table = GTK_TABLE (res);
g_object_get (obj, "distribution", &dist, NULL);
- g_return_val_if_fail (IS_GO_DISTRIBUTION (dist), NULL);
+ g_return_val_if_fail (GO_IS_DISTRIBUTION (dist), NULL);
dist_type = go_distribution_get_distribution_type (dist);
g_object_set (res, "border-width", 12, "row-spacing", 12, "column-spacing", 24, NULL);
Modified: trunk/plugins/plot_distrib/gog-boxplot.c
==============================================================================
--- trunk/plugins/plot_distrib/gog-boxplot.c (original)
+++ trunk/plugins/plot_distrib/gog-boxplot.c Tue Apr 7 09:29:28 2009
@@ -181,9 +181,9 @@
} GogBoxPlotSeries;
typedef GogSeriesClass GogBoxPlotSeriesClass;
-#define GOG_BOX_PLOT_SERIES_TYPE (gog_box_plot_series_get_type ())
-#define GOG_BOX_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_BOX_PLOT_SERIES_TYPE, GogBoxPlotSeries))
-#define IS_GOG_BOX_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_BOX_PLOT_SERIES_TYPE))
+#define GOG_TYPE_BOX_PLOT_SERIES (gog_box_plot_series_get_type ())
+#define GOG_BOX_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_BOX_PLOT_SERIES, GogBoxPlotSeries))
+#define GOG_IS_BOX_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_BOX_PLOT_SERIES))
GType gog_box_plot_series_get_type (void);
@@ -410,7 +410,7 @@
GSF_DYNAMIC_CLASS (GogBoxPlot, gog_box_plot,
gog_box_plot_class_init, gog_box_plot_init,
- GOG_PLOT_TYPE)
+ GOG_TYPE_PLOT)
/*****************************************************************************/
typedef GogPlotView GogBoxPlotView;
@@ -581,7 +581,7 @@
GSF_DYNAMIC_CLASS (GogBoxPlotView, gog_box_plot_view,
gog_box_plot_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
/*****************************************************************************/
@@ -654,4 +654,4 @@
GSF_DYNAMIC_CLASS (GogBoxPlotSeries, gog_box_plot_series,
gog_box_plot_series_class_init, NULL,
- GOG_SERIES_TYPE)
+ GOG_TYPE_SERIES)
Modified: trunk/plugins/plot_distrib/gog-boxplot.h
==============================================================================
--- trunk/plugins/plot_distrib/gog-boxplot.h (original)
+++ trunk/plugins/plot_distrib/gog-boxplot.h Tue Apr 7 09:29:28 2009
@@ -29,9 +29,9 @@
typedef struct _GogBoxPlot GogBoxPlot;
typedef GogPlotClass GogBoxPlotClass;
-#define GOG_BOX_PLOT_TYPE (gog_box_plot_get_type ())
-#define GOG_BOX_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_BOX_PLOT_TYPE, GogBoxPlot))
-#define GOG_IS_BOX_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_BOX_PLOT_TYPE))
+#define GOG_TYPE_BOX_PLOT (gog_box_plot_get_type ())
+#define GOG_BOX_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_BOX_PLOT, GogBoxPlot))
+#define GOG_IS_BOX_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_BOX_PLOT))
GType gog_box_plot_get_type (void);
Modified: trunk/plugins/plot_distrib/gog-histogram.c
==============================================================================
--- trunk/plugins/plot_distrib/gog-histogram.c (original)
+++ trunk/plugins/plot_distrib/gog-histogram.c Tue Apr 7 09:29:28 2009
@@ -33,9 +33,9 @@
#include <glib/gi18n-lib.h>
#include <gsf/gsf-impl-utils.h>
-#define GOG_HISTOGRAM_PLOT_SERIES_TYPE (gog_histogram_plot_series_get_type ())
-#define GOG_HISTOGRAM_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_HISTOGRAM_PLOT_SERIES_TYPE, GogHistogramPlotSeries))
-#define IS_GOG_HISTOGRAM_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_HISTOGRAM_PLOT_SERIES_TYPE))
+#define GOG_TYPE_HISTOGRAM_PLOT_SERIES (gog_histogram_plot_series_get_type ())
+#define GOG_HISTOGRAM_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_HISTOGRAM_PLOT_SERIES, GogHistogramPlotSeries))
+#define GOG_IS_HISTOGRAM_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_HISTOGRAM_PLOT_SERIES))
typedef struct {
GogSeries base;
@@ -207,7 +207,7 @@
GSF_DYNAMIC_CLASS (GogHistogramPlot, gog_histogram_plot,
gog_histogram_plot_class_init, gog_histogram_plot_init,
- GOG_PLOT_TYPE)
+ GOG_TYPE_PLOT)
/*****************************************************************************/
typedef GogPlotView GogHistogramPlotView;
@@ -327,16 +327,16 @@
GSF_DYNAMIC_CLASS (GogHistogramPlotView, gog_histogram_plot_view,
gog_histogram_plot_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
/*****************************************************************************/
typedef GogView GogHistogramSeriesView;
typedef GogViewClass GogHistogramSeriesViewClass;
-#define GOG_HISTOGRAM_SERIES_VIEW_TYPE (gog_histogram_series_view_get_type ())
-#define GOG_HISTOGRAM_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_HISTOGRAM_SERIES_VIEW_TYPE, GogHistogramSeriesView))
-#define IS_GOG_HISTOGRAM_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_HISTOGRAM_SERIES_VIEW_TYPE))
+#define GOG_TYPE_HISTOGRAM_SERIES_VIEW (gog_histogram_series_view_get_type ())
+#define GOG_HISTOGRAM_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_HISTOGRAM_SERIES_VIEW, GogHistogramSeriesView))
+#define GOG_IS_HISTOGRAM_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_HISTOGRAM_SERIES_VIEW))
static void
gog_histogram_series_view_render (GogView *view, GogViewAllocation const *bbox)
@@ -366,7 +366,7 @@
GSF_DYNAMIC_CLASS (GogHistogramSeriesView, gog_histogram_series_view,
gog_histogram_series_view_class_init, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
/*****************************************************************************/
@@ -432,7 +432,7 @@
/* update children */
for (ptr = obj->children; ptr != NULL; ptr = ptr->next)
- if (!IS_GOG_SERIES_LINES (ptr->data))
+ if (!GOG_IS_SERIES_LINES (ptr->data))
gog_object_request_update (GOG_OBJECT (ptr->data));
/* queue plot for redraw */
@@ -508,4 +508,4 @@
GSF_DYNAMIC_CLASS (GogHistogramPlotSeries, gog_histogram_plot_series,
gog_histogram_plot_series_class_init, gog_histogram_plot_series_init,
- GOG_SERIES_TYPE)
+ GOG_TYPE_SERIES)
Modified: trunk/plugins/plot_distrib/gog-histogram.h
==============================================================================
--- trunk/plugins/plot_distrib/gog-histogram.h (original)
+++ trunk/plugins/plot_distrib/gog-histogram.h Tue Apr 7 09:29:28 2009
@@ -36,9 +36,9 @@
} GogHistogramPlot;
typedef GogPlotClass GogHistogramPlotClass;
-#define GOG_HISTOGRAM_PLOT_TYPE (gog_histogram_plot_get_type ())
-#define GOG_HISTOGRAM_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_HISTOGRAM_PLOT_TYPE, GogHistogramPlot))
-#define GOG_IS_HISTOGRAM_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_HISTOGRAM_PLOT_TYPE))
+#define GOG_TYPE_HISTOGRAM_PLOT (gog_histogram_plot_get_type ())
+#define GOG_HISTOGRAM_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_HISTOGRAM_PLOT, GogHistogramPlot))
+#define GOG_IS_HISTOGRAM_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_HISTOGRAM_PLOT))
GType gog_histogram_plot_get_type (void);
Modified: trunk/plugins/plot_distrib/gog-probability-plot.c
==============================================================================
--- trunk/plugins/plot_distrib/gog-probability-plot.c (original)
+++ trunk/plugins/plot_distrib/gog-probability-plot.c Tue Apr 7 09:29:28 2009
@@ -35,9 +35,9 @@
#include <math.h>
#include <string.h>
-#define GOG_PROBABILITY_PLOT_SERIES_TYPE (gog_probability_plot_series_get_type ())
-#define GOG_PROBABILITY_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PROBABILITY_PLOT_SERIES_TYPE, GogProbabilityPlotSeries))
-#define IS_GOG_PROBABILITY_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PROBABILITY_PLOT_SERIES_TYPE))
+#define GOG_TYPE_PROBABILITY_PLOT_SERIES (gog_probability_plot_series_get_type ())
+#define GOG_PROBABILITY_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_PROBABILITY_PLOT_SERIES, GogProbabilityPlotSeries))
+#define GOG_IS_PROBABILITY_PLOT_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_PROBABILITY_PLOT_SERIES))
typedef struct {
GogSeries base;
@@ -237,7 +237,7 @@
g_param_spec_object ("distribution",
_("Distribution"),
_("A pointer to the GODistribution used by this plot"),
- GO_DISTRIBUTION_TYPE,
+ GO_TYPE_DISTRIBUTION,
GSF_PARAM_STATIC | G_PARAM_READWRITE | GO_PARAM_PERSISTENT));
g_object_class_install_property (gobject_klass, PROBABILITY_PLOT_PROP_SHAPE_PARAM1,
g_param_spec_string ("param1",
@@ -341,8 +341,8 @@
GSF_DYNAMIC_CLASS_FULL (GogProbabilityPlot, gog_probability_plot,
NULL, NULL, gog_probability_plot_class_init, NULL,
- gog_probability_plot_init, GOG_PLOT_TYPE, 0,
- GSF_INTERFACE (gog_probability_plot_dataset_init, GOG_DATASET_TYPE))
+ gog_probability_plot_init, GOG_TYPE_PLOT, 0,
+ GSF_INTERFACE (gog_probability_plot_dataset_init, GOG_TYPE_DATASET))
/************************************************,*****************************/
typedef GogPlotView GogProbabilityPlotView;
@@ -402,7 +402,7 @@
GSF_DYNAMIC_CLASS (GogProbabilityPlotView, gog_probability_plot_view,
gog_probability_plot_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
/****************************************************************************/
@@ -478,4 +478,4 @@
GSF_DYNAMIC_CLASS (GogProbabilityPlotSeries, gog_probability_plot_series,
gog_probability_plot_series_class_init, NULL,
- GOG_SERIES_TYPE)
+ GOG_TYPE_SERIES)
Modified: trunk/plugins/plot_distrib/gog-probability-plot.h
==============================================================================
--- trunk/plugins/plot_distrib/gog-probability-plot.h (original)
+++ trunk/plugins/plot_distrib/gog-probability-plot.h Tue Apr 7 09:29:28 2009
@@ -44,9 +44,9 @@
} shape_params[2];
} GogProbabilityPlot;
-#define GOG_PROBABILITY_PLOT_TYPE (gog_probability_plot_get_type ())
-#define GOG_PROBABILITY_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PROBABILITY_PLOT_TYPE, GogProbabilityPlot))
-#define GOG_IS_PROBABILITY_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PROBABILITY_PLOT_TYPE))
+#define GOG_TYPE_PROBABILITY_PLOT (gog_probability_plot_get_type ())
+#define GOG_PROBABILITY_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_PROBABILITY_PLOT, GogProbabilityPlot))
+#define GOG_IS_PROBABILITY_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_PROBABILITY_PLOT))
GType gog_probability_plot_get_type (void);
Modified: trunk/plugins/plot_pie/gog-pie.c
==============================================================================
--- trunk/plugins/plot_pie/gog-pie.c (original)
+++ trunk/plugins/plot_pie/gog-pie.c Tue Apr 7 09:29:28 2009
@@ -112,7 +112,7 @@
GSF_DYNAMIC_CLASS (GogPieSeriesElement, gog_pie_series_element,
gog_pie_series_element_class_init, NULL /*gog_pie_series_element_init*/,
- GOG_SERIES_ELEMENT_TYPE)
+ GOG_TYPE_SERIES_ELEMENT)
/*****************************************************************************/
@@ -278,7 +278,7 @@
GSF_DYNAMIC_CLASS (GogPiePlot, gog_pie_plot,
gog_pie_plot_class_init, gog_pie_plot_init,
- GOG_PLOT_TYPE)
+ GOG_TYPE_PLOT)
static void
gog_pie_plot_set_default_separation (GogPiePlot *pie, double separation)
@@ -385,7 +385,7 @@
GSF_DYNAMIC_CLASS (GogRingPlot, gog_ring_plot,
gog_ring_plot_class_init, gog_ring_plot_init,
- GOG_PIE_PLOT_TYPE)
+ GOG_TYPE_PIE_PLOT)
/*****************************************************************************/
@@ -804,7 +804,7 @@
GSF_DYNAMIC_CLASS (GogPieView, gog_pie_view,
gog_pie_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
/*****************************************************************************/
@@ -892,7 +892,7 @@
series_parent_klass = g_type_class_peek_parent (gobject_klass);
gog_klass->update = gog_pie_series_update;
- series_klass->series_element_type = GOG_PIE_SERIES_ELEMENT_TYPE;
+ series_klass->series_element_type = GOG_TYPE_PIE_SERIES_ELEMENT;
gobject_klass->set_property = gog_pie_series_set_property;
gobject_klass->get_property = gog_pie_series_get_property;
@@ -913,7 +913,7 @@
GSF_DYNAMIC_CLASS (GogPieSeries, gog_pie_series,
gog_pie_series_class_init, NULL,
- GOG_SERIES_TYPE)
+ GOG_TYPE_SERIES)
G_MODULE_EXPORT void
go_plugin_init (GOPlugin *plugin, GOCmdContext *cc)
Modified: trunk/plugins/plot_pie/gog-pie.h
==============================================================================
--- trunk/plugins/plot_pie/gog-pie.h (original)
+++ trunk/plugins/plot_pie/gog-pie.h Tue Apr 7 09:29:28 2009
@@ -33,9 +33,9 @@
double separation;
} GogPieSeriesElement;
-#define GOG_PIE_SERIES_ELEMENT_TYPE (gog_pie_series_element_get_type ())
-#define GOG_PIE_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PIE_SERIES_ELEMENT_TYPE, GogPieSeriesElement))
-#define IS_GOG_PIE_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PIE_SERIES_ELEMENT_TYPE))
+#define GOG_TYPE_PIE_SERIES_ELEMENT (gog_pie_series_element_get_type ())
+#define GOG_PIE_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_PIE_SERIES_ELEMENT, GogPieSeriesElement))
+#define GOG_IS_PIE_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_PIE_SERIES_ELEMENT))
GType gog_pie_series_element_get_type (void);
@@ -48,9 +48,9 @@
gboolean in_3d;
} GogPiePlot;
-#define GOG_PIE_PLOT_TYPE (gog_pie_plot_get_type ())
-#define GOG_PIE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PIE_PLOT_TYPE, GogPiePlot))
-#define GOG_IS_PIE_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PIE_PLOT_TYPE))
+#define GOG_TYPE_PIE_PLOT (gog_pie_plot_get_type ())
+#define GOG_PIE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_PIE_PLOT, GogPiePlot))
+#define GOG_IS_PIE_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_PIE_PLOT))
GType gog_pie_plot_get_type (void);
@@ -60,9 +60,9 @@
float center_size;
} GogRingPlot;
-#define GOG_RING_PLOT_TYPE (gog_ring_plot_get_type ())
-#define GOG_RING_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_RING_PLOT_TYPE, GogRingPlot))
-#define GOG_IS_RING_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_RING_PLOT_TYPE))
+#define GOG_TYPE_RING_PLOT (gog_ring_plot_get_type ())
+#define GOG_RING_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_RING_PLOT, GogRingPlot))
+#define GOG_IS_RING_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_RING_PLOT))
GType gog_ring_plot_get_type (void);
@@ -76,9 +76,9 @@
float *extensions;
} GogPieSeries;
-#define GOG_PIE_SERIES_TYPE (gog_pie_series_get_type ())
-#define GOG_PIE_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_PIE_SERIES_TYPE, GogPieSeries))
-#define GOG_IS_PIE_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_PIE_SERIES_TYPE))
+#define GOG_TYPE_PIE_SERIES (gog_pie_series_get_type ())
+#define GOG_PIE_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_PIE_SERIES, GogPieSeries))
+#define GOG_IS_PIE_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_PIE_SERIES))
GType gog_pie_series_get_type (void);
Modified: trunk/plugins/plot_radar/gog-radar.c
==============================================================================
--- trunk/plugins/plot_radar/gog-radar.c (original)
+++ trunk/plugins/plot_radar/gog-radar.c Tue Apr 7 09:29:28 2009
@@ -76,9 +76,9 @@
SERIES_PROP_FILL_TYPE
};
-#define GOG_RT_SERIES_TYPE (gog_rt_series_get_type ())
-#define GOG_RT_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_RT_SERIES_TYPE, GogRTSeries))
-#define GOG_IS_RT_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_RT_SERIES_TYPE))
+#define GOG_TYPE_RT_SERIES (gog_rt_series_get_type ())
+#define GOG_RT_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_RT_SERIES, GogRTSeries))
+#define GOG_IS_RT_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_RT_SERIES))
static GType gog_rt_series_get_type (void);
static GType gog_polar_series_get_type (void);
@@ -237,7 +237,7 @@
GSF_DYNAMIC_CLASS (GogRTPlot, gog_rt_plot,
gog_rt_plot_class_init, gog_rt_plot_init,
- GOG_PLOT_TYPE)
+ GOG_TYPE_PLOT)
/*****************************************************************************/
@@ -311,13 +311,13 @@
GSF_DYNAMIC_CLASS (GogRadarPlot, gog_radar_plot,
gog_radar_plot_class_init, NULL,
- GOG_RT_PLOT_TYPE)
+ GOG_TYPE_RT_PLOT)
/*****************************************************************************/
-#define GOG_RADAR_AREA_PLOT_TYPE (gog_radar_area_plot_get_type ())
-#define GOG_RADAR_AREA_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_RADAR_AREA_PLOT_TYPE, GogRadarAreaPlot))
-#define GOG_IS_PLOT_RADAR_AREA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_RADAR_AREA_PLOT_TYPE))
+#define GOG_TYPE_RADAR_AREA_PLOT (gog_radar_area_plot_get_type ())
+#define GOG_RADAR_AREA_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_RADAR_AREA_PLOT, GogRadarAreaPlot))
+#define GOG_IS_PLOT_RADAR_AREA(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_RADAR_AREA_PLOT))
typedef GogRadarPlot GogRadarAreaPlot;
typedef GogRadarPlotClass GogRadarAreaPlotClass;
@@ -352,7 +352,7 @@
GSF_DYNAMIC_CLASS (GogRadarAreaPlot, gog_radar_area_plot,
gog_radar_area_plot_class_init, gog_radar_area_plot_init,
- GOG_RADAR_PLOT_TYPE)
+ GOG_TYPE_RADAR_PLOT)
/*****************************************************************************/
@@ -422,7 +422,7 @@
GSF_DYNAMIC_CLASS (GogPolarPlot, gog_polar_plot,
gog_polar_plot_class_init, NULL,
- GOG_RT_PLOT_TYPE)
+ GOG_TYPE_RT_PLOT)
/*****************************************************************************/
@@ -633,7 +633,7 @@
GSF_DYNAMIC_CLASS (GogColorPolarPlot, gog_color_polar_plot,
gog_color_polar_plot_class_init, gog_color_polar_plot_init,
- GOG_POLAR_PLOT_TYPE)
+ GOG_TYPE_POLAR_PLOT)
/*****************************************************************************/
@@ -882,7 +882,7 @@
GSF_DYNAMIC_CLASS (GogRTView, gog_rt_view,
gog_rt_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
/*****************************************************************************/
@@ -997,7 +997,7 @@
GSF_DYNAMIC_CLASS (GogRTSeries, gog_rt_series,
gog_rt_series_class_init, gog_rt_series_init,
- GOG_SERIES_TYPE)
+ GOG_TYPE_SERIES)
/*****************************************************************************/
@@ -1021,7 +1021,7 @@
GSF_DYNAMIC_CLASS (GogPolarSeries, gog_polar_series,
gog_polar_series_class_init, NULL,
- GOG_RT_SERIES_TYPE)
+ GOG_TYPE_RT_SERIES)
/*****************************************************************************/
@@ -1064,7 +1064,7 @@
GSF_DYNAMIC_CLASS (GogColorPolarSeries, gog_color_polar_series,
gog_color_polar_series_class_init, NULL,
- GOG_RT_SERIES_TYPE)
+ GOG_TYPE_RT_SERIES)
G_MODULE_EXPORT void
go_plugin_init (GOPlugin *plugin, GOCmdContext *cc)
Modified: trunk/plugins/plot_radar/gog-radar.h
==============================================================================
--- trunk/plugins/plot_radar/gog-radar.h (original)
+++ trunk/plugins/plot_radar/gog-radar.h Tue Apr 7 09:29:28 2009
@@ -48,27 +48,27 @@
gboolean hide_outliers;
} GogColorPolarPlot;
-#define GOG_RT_PLOT_TYPE (gog_rt_plot_get_type ())
-#define GOG_RT_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_RT_PLOT_TYPE, GogRTPlot))
-#define GOG_IS_PLOT_RT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_RT_PLOT_TYPE))
+#define GOG_TYPE_RT_PLOT (gog_rt_plot_get_type ())
+#define GOG_RT_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_RT_PLOT, GogRTPlot))
+#define GOG_IS_PLOT_RT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_RT_PLOT))
GType gog_rt_plot_get_type (void);
-#define GOG_RADAR_PLOT_TYPE (gog_radar_plot_get_type ())
-#define GOG_RADAR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_RADAR_PLOT_TYPE, GogRadarPlot))
-#define GOG_IS_PLOT_RADAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_RADAR_PLOT_TYPE))
+#define GOG_TYPE_RADAR_PLOT (gog_radar_plot_get_type ())
+#define GOG_RADAR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_RADAR_PLOT, GogRadarPlot))
+#define GOG_IS_PLOT_RADAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_RADAR_PLOT))
GType gog_radar_plot_get_type (void);
-#define GOG_POLAR_PLOT_TYPE (gog_polar_plot_get_type ())
-#define GOG_POLAR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_POLAR_PLOT_TYPE, GogPolarPlot))
-#define GOG_IS_PLOT_POLAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_POLAR_PLOT_TYPE))
+#define GOG_TYPE_POLAR_PLOT (gog_polar_plot_get_type ())
+#define GOG_POLAR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_POLAR_PLOT, GogPolarPlot))
+#define GOG_IS_PLOT_POLAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_POLAR_PLOT))
GType gog_polar_plot_get_type (void);
-#define GOG_COLOR_POLAR_PLOT_TYPE (gog_color_polar_plot_get_type ())
-#define GOG_COLOR_POLAR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_COLOR_POLAR_PLOT_TYPE, GogColorPolarPlot))
-#define GOG_IS_PLOT_COLOR_POLAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_COLOR_POLAR_PLOT_TYPE))
+#define GOG_TYPE_COLOR_POLAR_PLOT (gog_color_polar_plot_get_type ())
+#define GOG_COLOR_POLAR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_COLOR_POLAR_PLOT, GogColorPolarPlot))
+#define GOG_IS_PLOT_COLOR_POLAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_COLOR_POLAR_PLOT))
GType gog_color_polar_plot_get_type (void);
Modified: trunk/plugins/plot_surface/gog-contour.c
==============================================================================
--- trunk/plugins/plot_surface/gog-contour.c (original)
+++ trunk/plugins/plot_surface/gog-contour.c Tue Apr 7 09:29:28 2009
@@ -237,7 +237,7 @@
GSF_DYNAMIC_CLASS (GogContourPlot, gog_contour_plot,
gog_contour_plot_class_init, gog_contour_plot_init,
- GOG_XYZ_PLOT_TYPE)
+ GOG_TYPE_XYZ_PLOT)
/*****************************************************************************/
@@ -1041,4 +1041,4 @@
GSF_DYNAMIC_CLASS (GogContourView, gog_contour_view,
gog_contour_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
Modified: trunk/plugins/plot_surface/gog-contour.h
==============================================================================
--- trunk/plugins/plot_surface/gog-contour.h (original)
+++ trunk/plugins/plot_surface/gog-contour.h Tue Apr 7 09:29:28 2009
@@ -36,9 +36,9 @@
typedef GogXYZPlot GogContourPlot;
typedef GogXYZPlotClass GogContourPlotClass;
-#define GOG_CONTOUR_PLOT_TYPE (gog_contour_plot_get_type ())
-#define GOG_CONTOUR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_CONTOUR_PLOT_TYPE, GogContourPlot))
-#define GOG_IS_PLOT_CONTOUR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_CONTOUR_PLOT_TYPE))
+#define GOG_TYPE_CONTOUR_PLOT (gog_contour_plot_get_type ())
+#define GOG_CONTOUR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_CONTOUR_PLOT, GogContourPlot))
+#define GOG_IS_PLOT_CONTOUR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_CONTOUR_PLOT))
GType gog_contour_plot_get_type (void);
void gog_contour_plot_register_type (GTypeModule *module);
Modified: trunk/plugins/plot_surface/gog-surface.c
==============================================================================
--- trunk/plugins/plot_surface/gog-surface.c (original)
+++ trunk/plugins/plot_surface/gog-surface.c Tue Apr 7 09:29:28 2009
@@ -95,7 +95,7 @@
GSF_DYNAMIC_CLASS (GogSurfacePlot, gog_surface_plot,
gog_surface_plot_class_init, gog_surface_plot_init,
- GOG_XYZ_PLOT_TYPE)
+ GOG_TYPE_XYZ_PLOT)
/*****************************************************************************/
@@ -271,4 +271,4 @@
GSF_DYNAMIC_CLASS (GogSurfaceView, gog_surface_view,
gog_surface_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
Modified: trunk/plugins/plot_surface/gog-surface.h
==============================================================================
--- trunk/plugins/plot_surface/gog-surface.h (original)
+++ trunk/plugins/plot_surface/gog-surface.h Tue Apr 7 09:29:28 2009
@@ -36,9 +36,9 @@
typedef GogXYZPlot GogSurfacePlot;
typedef GogXYZPlotClass GogSurfacePlotClass;
-#define GOG_SURFACE_PLOT_TYPE (gog_surface_plot_get_type ())
-#define GOG_SURFACE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_SURFACE_PLOT_TYPE, GogSurfacePlot))
-#define GOG_IS_SURFACE_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_SURFACE_PLOT_TYPE))
+#define GOG_TYPE_SURFACE_PLOT (gog_surface_plot_get_type ())
+#define GOG_SURFACE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_SURFACE_PLOT, GogSurfacePlot))
+#define GOG_IS_SURFACE_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_SURFACE_PLOT))
GType gog_surface_plot_get_type (void);
void gog_surface_plot_register_type (GTypeModule *module);
Modified: trunk/plugins/plot_surface/gog-xyz-surface.c
==============================================================================
--- trunk/plugins/plot_surface/gog-xyz-surface.c (original)
+++ trunk/plugins/plot_surface/gog-xyz-surface.c Tue Apr 7 09:29:28 2009
@@ -367,8 +367,8 @@
GSF_DYNAMIC_CLASS (GogXYZContourPlot, gog_xyz_contour_plot,
gog_xyz_contour_plot_class_init, gog_xyz_surface_plot_init,
- GOG_CONTOUR_PLOT_TYPE)
+ GOG_TYPE_CONTOUR_PLOT)
GSF_DYNAMIC_CLASS (GogXYZSurfacePlot, gog_xyz_surface_plot,
gog_xyz_surface_plot_class_init, gog_xyz_surface_plot_init,
- GOG_SURFACE_PLOT_TYPE)
+ GOG_TYPE_SURFACE_PLOT)
Modified: trunk/plugins/plot_surface/gog-xyz-surface.h
==============================================================================
--- trunk/plugins/plot_surface/gog-xyz-surface.h (original)
+++ trunk/plugins/plot_surface/gog-xyz-surface.h Tue Apr 7 09:29:28 2009
@@ -37,9 +37,9 @@
typedef GogContourPlot GogXYZContourPlot;
typedef GogContourPlotClass GogXYZContourPlotClass;
-#define GOG_XYZ_CONTOUR_PLOT_TYPE (gog_xyz_contour_plot_get_type ())
-#define GOG_XYZ_CONTOUR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XYZ_CONTOUR_PLOT_TYPE, GogXYZContourPlot))
-#define GOG_IS_XYZ_CONTOUR_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XYZ_CONTOUR_PLOT_TYPE))
+#define GOG_TYPE_XYZ_CONTOUR_PLOT (gog_xyz_contour_plot_get_type ())
+#define GOG_XYZ_CONTOUR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XYZ_CONTOUR_PLOT, GogXYZContourPlot))
+#define GOG_IS_XYZ_CONTOUR_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XYZ_CONTOUR_PLOT))
GType gog_xyz_contour_plot_get_type (void);
@@ -55,9 +55,9 @@
typedef GogSurfacePlot GogXYZSurfacePlot;
typedef GogSurfacePlotClass GogXYZSurfacePlotClass;
-#define GOG_XYZ_SURFACE_PLOT_TYPE (gog_xyz_surface_plot_get_type ())
-#define GOG_XYZ_SURFACE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XYZ_SURFACE_PLOT_TYPE, GogXYZSurfacePlot))
-#define GOG_IS_XYZ_SURFACE_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XYZ_SURFACE_PLOT_TYPE))
+#define GOG_TYPE_XYZ_SURFACE_PLOT (gog_xyz_surface_plot_get_type ())
+#define GOG_XYZ_SURFACE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XYZ_SURFACE_PLOT, GogXYZSurfacePlot))
+#define GOG_IS_XYZ_SURFACE_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XYZ_SURFACE_PLOT))
GType gog_xyz_surface_plot_get_type (void);
Modified: trunk/plugins/plot_surface/gog-xyz.c
==============================================================================
--- trunk/plugins/plot_surface/gog-xyz.c (original)
+++ trunk/plugins/plot_surface/gog-xyz.c Tue Apr 7 09:29:28 2009
@@ -425,7 +425,7 @@
GSF_DYNAMIC_CLASS_ABSTRACT (GogXYZPlot, gog_xyz_plot,
gog_xyz_plot_class_init, gog_xyz_plot_init,
- GOG_PLOT_TYPE)
+ GOG_TYPE_PLOT)
/*****************************************************************************/
@@ -499,7 +499,7 @@
GSF_DYNAMIC_CLASS (GogXYZSeries, gog_xyz_series,
gog_xyz_series_class_init, NULL,
- GOG_SERIES_TYPE)
+ GOG_TYPE_SERIES)
/*****************************************************************************/
Modified: trunk/plugins/plot_surface/gog-xyz.h
==============================================================================
--- trunk/plugins/plot_surface/gog-xyz.h (original)
+++ trunk/plugins/plot_surface/gog-xyz.h Tue Apr 7 09:29:28 2009
@@ -47,9 +47,9 @@
GODataVector *x_vals, *y_vals;
} GogXYZPlot;
-#define GOG_XYZ_PLOT_TYPE (gog_xyz_plot_get_type ())
-#define GOG_XYZ_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XYZ_PLOT_TYPE, GogXYZPlot))
-#define GOG_IS_PLOT_XYZ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XYZ_PLOT_TYPE))
+#define GOG_TYPE_XYZ_PLOT (gog_xyz_plot_get_type ())
+#define GOG_XYZ_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XYZ_PLOT, GogXYZPlot))
+#define GOG_IS_PLOT_XYZ(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XYZ_PLOT))
GType gog_xyz_plot_get_type (void);
@@ -63,7 +63,7 @@
GODataVector * (*get_y_vals) (GogXYZPlot *plot);
} GogXYZPlotClass;
-#define GOG_XYZ_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_XYZ_PLOT_TYPE, GogXYZPlotClass))
+#define GOG_XYZ_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_XYZ_PLOT, GogXYZPlotClass))
double *gog_xyz_plot_build_matrix (GogXYZPlot const *plot, gboolean *cardinality_changed);
GODataVector *gog_xyz_plot_get_x_vals (GogXYZPlot *plot);
@@ -76,9 +76,9 @@
} GogXYZSeries;
typedef GogSeriesClass GogXYZSeriesClass;
-#define GOG_XYZ_SERIES_TYPE (gog_xyz_series_get_type ())
-#define GOG_XYZ_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XYZ_SERIES_TYPE, GogXYZSeries))
-#define GOG_IS_XYZ_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XYZ_SERIES_TYPE))
+#define GOG_TYPE_XYZ_SERIES (gog_xyz_series_get_type ())
+#define GOG_XYZ_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XYZ_SERIES, GogXYZSeries))
+#define GOG_IS_XYZ_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XYZ_SERIES))
GType gog_xyz_series_get_type (void);
Modified: trunk/plugins/plot_surface/xl-surface.c
==============================================================================
--- trunk/plugins/plot_surface/xl-surface.c (original)
+++ trunk/plugins/plot_surface/xl-surface.c Tue Apr 7 09:29:28 2009
@@ -83,7 +83,7 @@
GSF_DYNAMIC_CLASS (XLXYZSeries, xl_xyz_series,
xl_xyz_series_class_init, NULL,
- GOG_SERIES_TYPE)
+ GOG_TYPE_SERIES)
/*****************************************************************************/
@@ -328,7 +328,7 @@
GSF_DYNAMIC_CLASS (XLContourPlot, xl_contour_plot,
xl_contour_plot_class_init, xl_contour_plot_init,
- GOG_CONTOUR_PLOT_TYPE)
+ GOG_TYPE_CONTOUR_PLOT)
/*****************************************************************************/
@@ -420,5 +420,5 @@
GSF_DYNAMIC_CLASS (XLSurfacePlot, xl_surface_plot,
xl_surface_plot_class_init, xl_surface_plot_init,
- GOG_SURFACE_PLOT_TYPE)
+ GOG_TYPE_SURFACE_PLOT)
Modified: trunk/plugins/plot_xy/gog-xy.c
==============================================================================
--- trunk/plugins/plot_xy/gog-xy.c (original)
+++ trunk/plugins/plot_xy/gog-xy.c Tue Apr 7 09:29:28 2009
@@ -248,7 +248,7 @@
GSF_DYNAMIC_CLASS (Gog2DPlot, gog_2d_plot,
gog_2d_plot_class_init, gog_2d_plot_init,
- GOG_PLOT_TYPE)
+ GOG_TYPE_PLOT)
enum {
GOG_XY_PROP_0,
@@ -260,7 +260,7 @@
static GogObjectClass *xy_parent_klass;
-#define GOG_XY_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_XY_PLOT_TYPE, GogXYPlotClass))
+#define GOG_XY_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_XY_PLOT, GogXYPlotClass))
static char const *
gog_xy_plot_type_name (G_GNUC_UNUSED GogObject const *item)
@@ -405,7 +405,7 @@
static GogObjectClass *bubble_parent_klass;
-#define GOG_BUBBLE_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_BUBBLE_PLOT_TYPE, GogBubblePlotClass))
+#define GOG_BUBBLE_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_BUBBLE_PLOT, GogBubblePlotClass))
static void gog_bubble_plot_adjust_bounds (Gog2DPlot *model, double *x_min, double *x_max, double *y_min, double *y_max);
@@ -595,7 +595,7 @@
static GogObjectClass *map_parent_klass;
-#define GOG_XY_COLOR_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_XY_COLOR_PLOT_TYPE, GogXYColorPlotClass))
+#define GOG_XY_COLOR_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_XY_COLOR_PLOT, GogXYColorPlotClass))
static void
gog_xy_color_plot_clear_formats (GogXYColorPlot *map)
@@ -1302,16 +1302,16 @@
GSF_DYNAMIC_CLASS (GogXYView, gog_xy_view,
gog_xy_view_class_init, NULL,
- GOG_PLOT_VIEW_TYPE)
+ GOG_TYPE_PLOT_VIEW)
/*****************************************************************************/
typedef GogView GogXYSeriesView;
typedef GogViewClass GogXYSeriesViewClass;
-#define GOG_XY_SERIES_VIEW_TYPE (gog_xy_series_view_get_type ())
-#define GOG_XY_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XY_SERIES_VIEW_TYPE, GogXYSeriesView))
-#define IS_GOG_XY_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XY_SERIES_VIEW_TYPE))
+#define GOG_TYPE_XY_SERIES_VIEW (gog_xy_series_view_get_type ())
+#define GOG_XY_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XY_SERIES_VIEW, GogXYSeriesView))
+#define GOG_IS_XY_SERIES_VIEW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XY_SERIES_VIEW))
static void
gog_xy_series_view_render (GogView *view, GogViewAllocation const *bbox)
@@ -1341,7 +1341,7 @@
GSF_DYNAMIC_CLASS (GogXYSeriesView, gog_xy_series_view,
gog_xy_series_view_class_init, NULL,
- GOG_VIEW_TYPE)
+ GOG_TYPE_VIEW)
/*****************************************************************************/
@@ -1395,9 +1395,9 @@
typedef GogSeriesElement GogXYSeriesElement;
typedef GogSeriesElementClass GogXYSeriesElementClass;
-#define GOG_XY_SERIES_ELEMENT_TYPE (gog_xy_series_element_get_type ())
-#define GOG_XY_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XY_SERIES_ELEMENT_TYPE, GogXYSeriesElement))
-#define IS_GOG_XY_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XY_SERIES_ELEMENT_TYPE))
+#define GOG_TYPE_XY_SERIES_ELEMENT (gog_xy_series_element_get_type ())
+#define GOG_XY_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XY_SERIES_ELEMENT, GogXYSeriesElement))
+#define GOG_IS_XY_SERIES_ELEMENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XY_SERIES_ELEMENT))
GType gog_xy_series_element_get_type (void);
static void
@@ -1426,7 +1426,7 @@
GSF_DYNAMIC_CLASS (GogXYSeriesElement, gog_xy_series_element,
gog_xy_series_element_class_init, NULL,
- GOG_SERIES_ELEMENT_TYPE)
+ GOG_TYPE_SERIES_ELEMENT)
/****************************************************************************/
@@ -1438,9 +1438,9 @@
typedef GogObjectClass GogXYInterpolationClampsClass;
-#define GOG_XY_INTERPOLATION_CLAMPS_TYPE (gog_xy_interpolation_clamps_get_type ())
-#define GOG_XY_INTERPOLATION_CLAMPS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XY_INTERPOLATION_CLAMPS_TYPE, GogXYInterpolationClamps))
-#define GOG_IS_XY_INTERPOLATION_CLAMPS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XY_INTERPOLATION_CLAMPS_TYPE))
+#define GOG_TYPE_XY_INTERPOLATION_CLAMPS (gog_xy_interpolation_clamps_get_type ())
+#define GOG_XY_INTERPOLATION_CLAMPS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XY_INTERPOLATION_CLAMPS, GogXYInterpolationClamps))
+#define GOG_IS_XY_INTERPOLATION_CLAMPS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XY_INTERPOLATION_CLAMPS))
GType gog_xy_interpolation_clamps_get_type (void);
static GObjectClass *interp_parent_klass;
@@ -1465,7 +1465,7 @@
gog_xy_interpolation_clamps_dataset_dim_changed (GogDataset *set, int dim_i)
{
GogXYInterpolationClamps *clamps = GOG_XY_INTERPOLATION_CLAMPS (set);
- clamps->series->clamped_derivs[dim_i] = (IS_GO_DATA_SCALAR ((clamps->derivs + dim_i)->data))?
+ clamps->series->clamped_derivs[dim_i] = (GO_IS_DATA_SCALAR ((clamps->derivs + dim_i)->data))?
go_data_scalar_get_value (GO_DATA_SCALAR ((clamps->derivs + dim_i)->data)): 0.;
gog_object_request_update (GOG_OBJECT (clamps->series));
}
@@ -1505,8 +1505,8 @@
GSF_CLASS_FULL (GogXYInterpolationClamps, gog_xy_interpolation_clamps,
NULL, NULL, gog_xy_interpolation_clamps_class_init, NULL,
- gog_xy_interpolation_clamps_init, GOG_OBJECT_TYPE, 0,
- GSF_INTERFACE (gog_xy_interpolation_clamps_dataset_init, GOG_DATASET_TYPE))
+ gog_xy_interpolation_clamps_init, GOG_TYPE_OBJECT, 0,
+ GSF_INTERFACE (gog_xy_interpolation_clamps_dataset_init, GOG_TYPE_DATASET))
/****************************************************************************/
@@ -1548,7 +1548,7 @@
/* update children */
for (ptr = obj->children; ptr != NULL; ptr = ptr->next)
- if (!IS_GOG_SERIES_LINES (ptr->data))
+ if (!GOG_IS_SERIES_LINES (ptr->data))
gog_object_request_update (GOG_OBJECT (ptr->data));
/* queue plot for redraw */
@@ -1569,7 +1569,7 @@
(GOG_SERIES (series))->acceptable_children = GOG_SERIES_ACCEPT_TREND_LINE;
series->x_errors = series->y_errors = NULL;
series->hdroplines = series->vdroplines = NULL;
- series->interpolation_props = g_object_new (GOG_XY_INTERPOLATION_CLAMPS_TYPE, NULL);
+ series->interpolation_props = g_object_new (GOG_TYPE_XY_INTERPOLATION_CLAMPS, NULL);
GOG_XY_INTERPOLATION_CLAMPS (series->interpolation_props)->series = series;
gog_dataset_set_dim (series->interpolation_props, 0, go_data_scalar_val_new (0.), NULL);
gog_dataset_set_dim (series->interpolation_props, 1, go_data_scalar_val_new (0.), NULL);
@@ -1819,7 +1819,7 @@
series_klass->has_interpolation = TRUE;
series_klass->has_fill_type = TRUE;
- series_klass->series_element_type = GOG_XY_SERIES_ELEMENT_TYPE;
+ series_klass->series_element_type = GOG_TYPE_XY_SERIES_ELEMENT;
series_klass->get_interpolation_params = gog_xy_series_get_interpolation_params;
gog_object_register_roles (gog_klass, roles, G_N_ELEMENTS (roles));
@@ -1828,13 +1828,13 @@
g_param_spec_object ("x-errors",
_("X error bars"),
_("GogErrorBar *"),
- GOG_ERROR_BAR_TYPE,
+ GOG_TYPE_ERROR_BAR,
GSF_PARAM_STATIC | G_PARAM_READWRITE | GO_PARAM_PERSISTENT));
g_object_class_install_property (gobject_klass, SERIES_PROP_YERRORS,
g_param_spec_object ("y-errors",
_("Y error bars"),
_("GogErrorBar *"),
- GOG_ERROR_BAR_TYPE,
+ GOG_TYPE_ERROR_BAR,
GSF_PARAM_STATIC | G_PARAM_READWRITE | GO_PARAM_PERSISTENT));
g_object_class_install_property (gobject_klass, SERIES_PROP_INVALID_AS_ZERO,
g_param_spec_boolean ("invalid-as-zero",
@@ -1860,7 +1860,7 @@
GSF_DYNAMIC_CLASS (GogXYSeries, gog_xy_series,
gog_xy_series_class_init, gog_xy_series_init,
- GOG_SERIES_TYPE)
+ GOG_TYPE_SERIES)
G_MODULE_EXPORT void
go_plugin_init (GOPlugin *plugin, GOCmdContext *cc)
Modified: trunk/plugins/plot_xy/gog-xy.h
==============================================================================
--- trunk/plugins/plot_xy/gog-xy.h (original)
+++ trunk/plugins/plot_xy/gog-xy.h Tue Apr 7 09:29:28 2009
@@ -69,21 +69,21 @@
GType gog_2d_plot_get_type (void);
-#define GOG_XY_PLOT_TYPE (gog_xy_plot_get_type ())
-#define GOG_XY_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XY_PLOT_TYPE, GogXYPlot))
-#define GOG_IS_XY_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XY_PLOT_TYPE))
+#define GOG_TYPE_XY_PLOT (gog_xy_plot_get_type ())
+#define GOG_XY_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XY_PLOT, GogXYPlot))
+#define GOG_IS_XY_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XY_PLOT))
GType gog_xy_plot_get_type (void);
-#define GOG_BUBBLE_PLOT_TYPE (gog_bubble_plot_get_type ())
-#define GOG_BUBBLE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_BUBBLE_PLOT_TYPE, GogBubblePlot))
-#define GOG_IS_BUBBLE_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_BUBBLE_PLOT_TYPE))
+#define GOG_TYPE_BUBBLE_PLOT (gog_bubble_plot_get_type ())
+#define GOG_BUBBLE_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_BUBBLE_PLOT, GogBubblePlot))
+#define GOG_IS_BUBBLE_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_BUBBLE_PLOT))
GType gog_bubble_plot_get_type (void);
-#define GOG_XY_COLOR_PLOT_TYPE (gog_xy_color_plot_get_type ())
-#define GOG_XY_COLOR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XY_COLOR_PLOT_TYPE, GogXYColorPlot))
-#define GOG_IS_XY_COLOR_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XY_COLOR_PLOT_TYPE))
+#define GOG_TYPE_XY_COLOR_PLOT (gog_xy_color_plot_get_type ())
+#define GOG_XY_COLOR_PLOT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XY_COLOR_PLOT, GogXYColorPlot))
+#define GOG_IS_XY_COLOR_PLOT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XY_COLOR_PLOT))
GType gog_xy_color_plot_get_type (void);
@@ -98,9 +98,9 @@
GogDataset *interpolation_props;
} GogXYSeries;
-#define GOG_XY_SERIES_TYPE (gog_xy_series_get_type ())
-#define GOG_XY_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_XY_SERIES_TYPE, GogXYSeries))
-#define GOG_IS_XY_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_XY_SERIES_TYPE))
+#define GOG_TYPE_XY_SERIES (gog_xy_series_get_type ())
+#define GOG_XY_SERIES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_XY_SERIES, GogXYSeries))
+#define GOG_IS_XY_SERIES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_XY_SERIES))
G_END_DECLS
Modified: trunk/plugins/reg_linear/gog-exp-reg.c
==============================================================================
--- trunk/plugins/reg_linear/gog-exp-reg.c (original)
+++ trunk/plugins/reg_linear/gog-exp-reg.c Tue Apr 7 09:29:28 2009
@@ -79,4 +79,4 @@
GSF_DYNAMIC_CLASS (GogExpRegCurve, gog_exp_reg_curve,
gog_exp_reg_curve_class_init, NULL,
- GOG_LIN_REG_CURVE_TYPE)
+ GOG_TYPE_LIN_REG_CURVE)
Modified: trunk/plugins/reg_linear/gog-exp-reg.h
==============================================================================
--- trunk/plugins/reg_linear/gog-exp-reg.h (original)
+++ trunk/plugins/reg_linear/gog-exp-reg.h Tue Apr 7 09:29:28 2009
@@ -29,9 +29,9 @@
typedef GogLinRegCurve GogExpRegCurve;
typedef GogLinRegCurveClass GogExpRegCurveClass;
-#define GOG_EXP_REG_CURVE_TYPE (gog_exp_reg_curve_get_type ())
-#define GOG_EXP_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_EXP_REG_CURVE_TYPE, GogExpRegCurve))
-#define GOG_IS_EXP_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_EXP_REG_CURVE_TYPE))
+#define GOG_TYPE_EXP_REG_CURVE (gog_exp_reg_curve_get_type ())
+#define GOG_EXP_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_EXP_REG_CURVE, GogExpRegCurve))
+#define GOG_IS_EXP_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_EXP_REG_CURVE))
GType gog_exp_reg_curve_get_type (void);
void gog_exp_reg_curve_register_type (GTypeModule *module);
Modified: trunk/plugins/reg_linear/gog-lin-reg.c
==============================================================================
--- trunk/plugins/reg_linear/gog-lin-reg.c (original)
+++ trunk/plugins/reg_linear/gog-lin-reg.c Tue Apr 7 09:29:28 2009
@@ -36,7 +36,7 @@
GOFFICE_PLUGIN_MODULE_HEADER;
-#define GOG_LIN_REG_CURVE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_LIN_REG_CURVE_TYPE, GogLinRegCurveClass))
+#define GOG_LIN_REG_CURVE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_LIN_REG_CURVE, GogLinRegCurveClass))
static GogObjectClass *gog_lin_reg_curve_parent_klass;
@@ -287,7 +287,7 @@
GSF_DYNAMIC_CLASS (GogLinRegCurve, gog_lin_reg_curve,
gog_lin_reg_curve_class_init, gog_lin_reg_curve_init,
- GOG_REG_CURVE_TYPE)
+ GOG_TYPE_REG_CURVE)
/* Plugin initialization */
Modified: trunk/plugins/reg_linear/gog-lin-reg.h
==============================================================================
--- trunk/plugins/reg_linear/gog-lin-reg.h (original)
+++ trunk/plugins/reg_linear/gog-lin-reg.h Tue Apr 7 09:29:28 2009
@@ -46,9 +46,9 @@
double const *y_vals, int n);
} GogLinRegCurveClass;
-#define GOG_LIN_REG_CURVE_TYPE (gog_lin_reg_curve_get_type ())
-#define GOG_LIN_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LIN_REG_CURVE_TYPE, GogLinRegCurve))
-#define GOG_IS_LIN_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LIN_REG_CURVE_TYPE))
+#define GOG_TYPE_LIN_REG_CURVE (gog_lin_reg_curve_get_type ())
+#define GOG_LIN_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LIN_REG_CURVE, GogLinRegCurve))
+#define GOG_IS_LIN_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LIN_REG_CURVE))
GType gog_lin_reg_curve_get_type (void);
void gog_lin_reg_curve_register_type (GTypeModule *module);
Modified: trunk/plugins/reg_linear/gog-log-reg.c
==============================================================================
--- trunk/plugins/reg_linear/gog-log-reg.c (original)
+++ trunk/plugins/reg_linear/gog-log-reg.c Tue Apr 7 09:29:28 2009
@@ -111,4 +111,4 @@
GSF_DYNAMIC_CLASS (GogLogRegCurve, gog_log_reg_curve,
gog_log_reg_curve_class_init, NULL,
- GOG_LIN_REG_CURVE_TYPE)
+ GOG_TYPE_LIN_REG_CURVE)
Modified: trunk/plugins/reg_linear/gog-log-reg.h
==============================================================================
--- trunk/plugins/reg_linear/gog-log-reg.h (original)
+++ trunk/plugins/reg_linear/gog-log-reg.h Tue Apr 7 09:29:28 2009
@@ -29,9 +29,9 @@
typedef GogLinRegCurve GogLogRegCurve;
typedef GogLinRegCurveClass GogLogRegCurveClass;
-#define GOG_LOG_REG_CURVE_TYPE (gog_log_reg_curve_get_type ())
-#define GOG_LOG_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LOG_REG_CURVE_TYPE, GogLogRegCurve))
-#define GOG_IS_LOG_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LOG_REG_CURVE_TYPE))
+#define GOG_TYPE_LOG_REG_CURVE (gog_log_reg_curve_get_type ())
+#define GOG_LOG_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LOG_REG_CURVE, GogLogRegCurve))
+#define GOG_IS_LOG_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LOG_REG_CURVE))
GType gog_log_reg_curve_get_type (void);
void gog_log_reg_curve_register_type (GTypeModule *module);
Modified: trunk/plugins/reg_linear/gog-polynom-reg.c
==============================================================================
--- trunk/plugins/reg_linear/gog-polynom-reg.c (original)
+++ trunk/plugins/reg_linear/gog-polynom-reg.c Tue Apr 7 09:29:28 2009
@@ -255,4 +255,4 @@
GSF_DYNAMIC_CLASS (GogPolynomRegCurve, gog_polynom_reg_curve,
gog_polynom_reg_curve_class_init, gog_polynom_reg_curve_init,
- GOG_LIN_REG_CURVE_TYPE)
+ GOG_TYPE_LIN_REG_CURVE)
Modified: trunk/plugins/reg_linear/gog-polynom-reg.h
==============================================================================
--- trunk/plugins/reg_linear/gog-polynom-reg.h (original)
+++ trunk/plugins/reg_linear/gog-polynom-reg.h Tue Apr 7 09:29:28 2009
@@ -29,9 +29,9 @@
typedef GogLinRegCurve GogPolynomRegCurve;
typedef GogLinRegCurveClass GogPolynomRegCurveClass;
-#define GOG_POLYNOM_REG_CURVE_TYPE (gog_polynom_reg_curve_get_type ())
-#define GOG_POLYNOM_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_POLYNOM_REG_CURVE_TYPE, GogPolynomRegCurve))
-#define GOG_IS_POLYNOM_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_POLYNOM_REG_CURVE_TYPE))
+#define GOG_TYPE_POLYNOM_REG_CURVE (gog_polynom_reg_curve_get_type ())
+#define GOG_POLYNOM_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_POLYNOM_REG_CURVE, GogPolynomRegCurve))
+#define GOG_IS_POLYNOM_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_POLYNOM_REG_CURVE))
GType gog_polynom_reg_curve_get_type (void);
void gog_polynom_reg_curve_register_type (GTypeModule *module);
Modified: trunk/plugins/reg_linear/gog-power-reg.c
==============================================================================
--- trunk/plugins/reg_linear/gog-power-reg.c (original)
+++ trunk/plugins/reg_linear/gog-power-reg.c Tue Apr 7 09:29:28 2009
@@ -79,4 +79,4 @@
GSF_DYNAMIC_CLASS (GogPowerRegCurve, gog_power_reg_curve,
gog_power_reg_curve_class_init, NULL,
- GOG_LIN_REG_CURVE_TYPE)
+ GOG_TYPE_LIN_REG_CURVE)
Modified: trunk/plugins/reg_linear/gog-power-reg.h
==============================================================================
--- trunk/plugins/reg_linear/gog-power-reg.h (original)
+++ trunk/plugins/reg_linear/gog-power-reg.h Tue Apr 7 09:29:28 2009
@@ -29,9 +29,9 @@
typedef GogLinRegCurve GogPowerRegCurve;
typedef GogLinRegCurveClass GogPowerRegCurveClass;
-#define GOG_POWER_REG_CURVE_TYPE (gog_power_reg_curve_get_type ())
-#define GOG_POWER_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_POWER_REG_CURVE_TYPE, GogPowerRegCurve))
-#define GOG_IS_POWER_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_POWER_REG_CURVE_TYPE))
+#define GOG_TYPE_POWER_REG_CURVE (gog_power_reg_curve_get_type ())
+#define GOG_POWER_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_POWER_REG_CURVE, GogPowerRegCurve))
+#define GOG_IS_POWER_REG_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_POWER_REG_CURVE))
GType gog_power_reg_curve_get_type (void);
void gog_power_reg_curve_register_type (GTypeModule *module);
Modified: trunk/plugins/reg_logfit/gog-logfit.c
==============================================================================
--- trunk/plugins/reg_logfit/gog-logfit.c (original)
+++ trunk/plugins/reg_logfit/gog-logfit.c Tue Apr 7 09:29:28 2009
@@ -165,7 +165,7 @@
GSF_DYNAMIC_CLASS (GogLogFitCurve, gog_log_fit_curve,
gog_log_fit_curve_class_init, gog_log_fit_curve_init,
- GOG_REG_CURVE_TYPE)
+ GOG_TYPE_REG_CURVE)
/* Plugin initialization */
Modified: trunk/plugins/reg_logfit/gog-logfit.h
==============================================================================
--- trunk/plugins/reg_logfit/gog-logfit.h (original)
+++ trunk/plugins/reg_logfit/gog-logfit.h Tue Apr 7 09:29:28 2009
@@ -31,9 +31,9 @@
typedef GogRegCurveClass GogLogFitCurveClass;
-#define GOG_LOG_FIT_CURVE_TYPE (gog_log_fit_curve_get_type ())
-#define GOG_LOG_FIT_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_LOG_FIT_CURVE_TYPE, GogLogFitCurve))
-#define GOG_IS_LOG_FIT_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_LOG_FIT_CURVE_TYPE))
+#define GOG_TYPE_LOG_FIT_CURVE (gog_log_fit_curve_get_type ())
+#define GOG_LOG_FIT_CURVE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_LOG_FIT_CURVE, GogLogFitCurve))
+#define GOG_IS_LOG_FIT_CURVE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_LOG_FIT_CURVE))
GType gog_log_fit_curve_get_type (void);
Modified: trunk/plugins/smoothing/gog-exp-smooth.c
==============================================================================
--- trunk/plugins/smoothing/gog-exp-smooth.c (original)
+++ trunk/plugins/smoothing/gog-exp-smooth.c Tue Apr 7 09:29:28 2009
@@ -274,5 +274,5 @@
GSF_DYNAMIC_CLASS_FULL (GogExpSmooth, gog_exp_smooth,
NULL, NULL, gog_exp_smooth_class_init, NULL,
- gog_exp_smooth_init, GOG_SMOOTHED_CURVE_TYPE, 0,
- GSF_INTERFACE (gog_exp_smooth_dataset_init, GOG_DATASET_TYPE))
+ gog_exp_smooth_init, GOG_TYPE_SMOOTHED_CURVE, 0,
+ GSF_INTERFACE (gog_exp_smooth_dataset_init, GOG_TYPE_DATASET))
Modified: trunk/plugins/smoothing/gog-exp-smooth.h
==============================================================================
--- trunk/plugins/smoothing/gog-exp-smooth.h (original)
+++ trunk/plugins/smoothing/gog-exp-smooth.h Tue Apr 7 09:29:28 2009
@@ -33,9 +33,9 @@
} GogExpSmooth;
typedef GogSmoothedCurveClass GogExpSmoothClass;
-#define GOG_EXP_SMOOTH_TYPE (gog_exp_smooth_get_type ())
-#define GOG_EXP_SMOOTH(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_EXP_SMOOTH_TYPE, GogExpSmooth))
-#define GOG_IS_EXP_SMOOTH(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_EXP_SMOOTH_TYPE))
+#define GOG_TYPE_EXP_SMOOTH (gog_exp_smooth_get_type ())
+#define GOG_EXP_SMOOTH(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_EXP_SMOOTH, GogExpSmooth))
+#define GOG_IS_EXP_SMOOTH(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_EXP_SMOOTH))
GType gog_exp_smooth_get_type (void);
void gog_exp_smooth_register_type (GTypeModule *module);
Modified: trunk/plugins/smoothing/gog-moving-avg.c
==============================================================================
--- trunk/plugins/smoothing/gog-moving-avg.c (original)
+++ trunk/plugins/smoothing/gog-moving-avg.c Tue Apr 7 09:29:28 2009
@@ -215,4 +215,4 @@
GSF_DYNAMIC_CLASS (GogMovingAvg, gog_moving_avg,
gog_moving_avg_class_init, gog_moving_avg_init,
- GOG_SMOOTHED_CURVE_TYPE)
+ GOG_TYPE_SMOOTHED_CURVE)
Modified: trunk/plugins/smoothing/gog-moving-avg.h
==============================================================================
--- trunk/plugins/smoothing/gog-moving-avg.h (original)
+++ trunk/plugins/smoothing/gog-moving-avg.h Tue Apr 7 09:29:28 2009
@@ -33,9 +33,9 @@
} GogMovingAvg;
typedef GogSmoothedCurveClass GogMovingAvgClass;
-#define GOG_MOVING_AVG_TYPE (gog_moving_avg_get_type ())
-#define GOG_MOVING_AVG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_MOVING_AVG_TYPE, GogMovingAvg))
-#define GOG_IS_MOVING_AVG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_MOVING_AVG_TYPE))
+#define GOG_TYPE_MOVING_AVG (gog_moving_avg_get_type ())
+#define GOG_MOVING_AVG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOG_TYPE_MOVING_AVG, GogMovingAvg))
+#define GOG_IS_MOVING_AVG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOG_TYPE_MOVING_AVG))
GType gog_moving_avg_get_type (void);
void gog_moving_avg_register_type (GTypeModule *module);
Modified: trunk/tests/go-demo.c
==============================================================================
--- trunk/tests/go-demo.c (original)
+++ trunk/tests/go-demo.c Tue Apr 7 09:29:28 2009
@@ -36,7 +36,7 @@
#include <goffice/graph/gog-style.h>
#include <goffice/gtk/go-graph-widget.h>
-typedef struct _GoDemoPrivate GoDemoPrivate;
+typedef struct _GoDemoPrivate GODemoPrivate;
struct _GoDemoPrivate {
GtkWidget *toplevel;
GladeXML *xml;
@@ -87,7 +87,7 @@
static void
btn_regen_clicked (GtkButton *button, gpointer user_data)
{
- GoDemoPrivate *priv = (GoDemoPrivate *)user_data;
+ GODemoPrivate *priv = (GODemoPrivate *)user_data;
int i;
/* get data from widgets */
for (i = 0; i < 6; i++) {
@@ -124,7 +124,7 @@
/* Get the embedded graph */
graph = go_graph_widget_get_graph (GO_GRAPH_WIDGET (w));
/* Add a title */
- label = (GogLabel *) g_object_new (GOG_LABEL_TYPE, NULL);
+ label = (GogLabel *) g_object_new (GOG_TYPE_LABEL, NULL);
data = go_data_scalar_str_new (service_id, FALSE);
gog_dataset_set_dim (GOG_DATASET (label), 0, data, NULL);
gog_object_add_by_name (GOG_OBJECT (graph), "Title", GOG_OBJECT (label));
@@ -307,7 +307,7 @@
}
static void
-init_data_widgets (GoDemoPrivate *priv)
+init_data_widgets (GODemoPrivate *priv)
{
int i;
char *wname = NULL;
@@ -453,14 +453,14 @@
main (int argc, char *argv[])
{
GtkWidget *window;
- GoDemoPrivate *priv;
+ GODemoPrivate *priv;
const gchar *glade_file;
gtk_init (&argc, &argv);
/* Initialize libgoffice */
libgoffice_init ();
/* Initialize plugins manager */
- go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_PLUGIN_LOADER_MODULE_TYPE);
+ go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_resize (GTK_WINDOW (window), 800, 800);
@@ -468,7 +468,7 @@
gtk_window_set_title (GTK_WINDOW (window), "GOffice demo");
g_signal_connect (window, "destroy", gtk_main_quit, NULL);
- priv = g_new0 (GoDemoPrivate, 1);
+ priv = g_new0 (GODemoPrivate, 1);
#define GO_DEMO_GLADE "go-demo.glade"
glade_file = "./" GO_DEMO_GLADE;
if (!g_file_test (glade_file, G_FILE_TEST_EXISTS))
Modified: trunk/tests/pie-demo.c
==============================================================================
--- trunk/tests/pie-demo.c (original)
+++ trunk/tests/pie-demo.c Tue Apr 7 09:29:28 2009
@@ -59,7 +59,7 @@
/* Initialize libgoffice */
libgoffice_init ();
/* Initialize plugins manager */
- go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_PLUGIN_LOADER_MODULE_TYPE);
+ go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_resize (GTK_WINDOW (window), 300, 340);
@@ -80,7 +80,7 @@
/* Get the embedded graph */
graph = go_graph_widget_get_graph (GO_GRAPH_WIDGET (w));
/* Add a title */
- label = (GogLabel *) g_object_new (GOG_LABEL_TYPE, NULL);
+ label = (GogLabel *) g_object_new (GOG_TYPE_LABEL, NULL);
data = go_data_scalar_str_new (title, FALSE);
gog_dataset_set_dim (GOG_DATASET (label), 0, data, NULL);
gog_object_add_by_name (GOG_OBJECT (graph), "Title", GOG_OBJECT (label));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
