From 4821883bfaa7c345650c047315529bbfe9cc92ec Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 8 May 2019 11:31:54 -0700 Subject: [PATCH] libsysprof-ui: use symbol versioning macros --- src/libsysprof-ui/meson.build | 13 +++++++----- src/libsysprof-ui/pointcache.h | 5 +---- src/libsysprof-ui/sp-callgraph-view.h | 13 ++++++++---- src/libsysprof-ui/sp-cell-renderer-percent.c | 2 ++ src/libsysprof-ui/sp-cell-renderer-percent.h | 11 ++++++---- src/libsysprof-ui/sp-color-cycle.c | 2 ++ src/libsysprof-ui/sp-color-cycle.h | 13 ++++++++---- src/libsysprof-ui/sp-cpu-visualizer-row.c | 2 ++ src/libsysprof-ui/sp-cpu-visualizer-row.h | 9 +++++---- src/libsysprof-ui/sp-empty-state-view.c | 2 ++ src/libsysprof-ui/sp-empty-state-view.h | 10 +++++----- src/libsysprof-ui/sp-failed-state-view.c | 2 ++ src/libsysprof-ui/sp-failed-state-view.h | 9 +++++---- src/libsysprof-ui/sp-line-visualizer-row.c | 2 ++ src/libsysprof-ui/sp-line-visualizer-row.h | 12 +++++++---- src/libsysprof-ui/sp-mark-visualizer-row.c | 2 ++ src/libsysprof-ui/sp-mark-visualizer-row.h | 5 +++++ src/libsysprof-ui/sp-model-filter.c | 2 ++ src/libsysprof-ui/sp-model-filter.h | 12 +++++++---- src/libsysprof-ui/sp-multi-paned.c | 2 ++ src/libsysprof-ui/sp-multi-paned.h | 10 ++++++---- src/libsysprof-ui/sp-process-model-row.c | 2 ++ src/libsysprof-ui/sp-process-model-row.h | 12 ++++++----- src/libsysprof-ui/sp-profiler-menu-button.c | 2 ++ src/libsysprof-ui/sp-profiler-menu-button.h | 10 ++++++---- src/libsysprof-ui/sp-recording-state-view.c | 2 ++ src/libsysprof-ui/sp-recording-state-view.h | 9 +++++---- src/libsysprof-ui/sp-theme-manager.c | 2 ++ src/libsysprof-ui/sp-theme-manager.h | 9 +++++---- src/libsysprof-ui/sp-visualizer-list.c | 2 ++ src/libsysprof-ui/sp-visualizer-list.h | 5 +---- src/libsysprof-ui/sp-visualizer-row-private.h | 5 +---- src/libsysprof-ui/sp-visualizer-row.c | 2 ++ src/libsysprof-ui/sp-visualizer-row.h | 5 +---- src/libsysprof-ui/sp-visualizer-ticks.c | 2 ++ src/libsysprof-ui/sp-visualizer-ticks.h | 5 +---- src/libsysprof-ui/sp-visualizer-view.c | 2 ++ src/libsysprof-ui/sp-visualizer-view.h | 13 ++++++++---- src/libsysprof-ui/sp-zoom-manager.c | 2 ++ src/libsysprof-ui/sp-zoom-manager.h | 20 +++++++++++++++---- src/libsysprof-ui/sysprof-ui.h | 5 +---- 41 files changed, 165 insertions(+), 91 deletions(-) diff --git a/src/libsysprof-ui/meson.build b/src/libsysprof-ui/meson.build index 6c5c9b48..36d879b0 100644 --- a/src/libsysprof-ui/meson.build +++ b/src/libsysprof-ui/meson.build @@ -59,12 +59,15 @@ libsysprof_ui_deps = [ libsysprof_dep, ] -libsysprof_ui = shared_library('sysprof-ui-@0@'.format(libsysprof_api_version), +libsysprof_ui = shared_library( + 'sysprof-ui-@0@'.format(libsysprof_api_version), libsysprof_ui_public_sources + libsysprof_ui_private_sources + libsysprof_ui_resources, - dependencies: libsysprof_ui_deps, - install_dir: get_option('libdir'), - install: true, - c_args: [ '-DSYSPROF_UI_COMPILATION' ], + + dependencies: libsysprof_ui_deps, + install_dir: get_option('libdir'), + install: true, + c_args: [ '-DSYSPROF_UI_COMPILATION' ], + gnu_symbol_visibility: 'hidden', ) libsysprof_ui_dep = declare_dependency( diff --git a/src/libsysprof-ui/pointcache.h b/src/libsysprof-ui/pointcache.h index a3b50b98..3aed8179 100644 --- a/src/libsysprof-ui/pointcache.h +++ b/src/libsysprof-ui/pointcache.h @@ -18,8 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef POINT_CACHE_H -#define POINT_CACHE_H +#pragma once #include @@ -51,5 +50,3 @@ const Point *point_cache_get_points (PointCache *self, G_DEFINE_AUTOPTR_CLEANUP_FUNC (PointCache, point_cache_unref) G_END_DECLS - -#endif /* POINT_CACHE_H */ diff --git a/src/libsysprof-ui/sp-callgraph-view.h b/src/libsysprof-ui/sp-callgraph-view.h index 9cc0d71d..b7359431 100644 --- a/src/libsysprof-ui/sp-callgraph-view.h +++ b/src/libsysprof-ui/sp-callgraph-view.h @@ -18,17 +18,19 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_CALLGRAPH_VIEW_H -#define SP_CALLGRAPH_VIEW_H +#pragma once #include #include "sp-callgraph-profile.h" +#include "sysprof-version-macros.h" + G_BEGIN_DECLS #define SP_TYPE_CALLGRAPH_VIEW (sp_callgraph_view_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpCallgraphView, sp_callgraph_view, SP, CALLGRAPH_VIEW, GtkBin) struct _SpCallgraphViewClass @@ -40,13 +42,16 @@ struct _SpCallgraphViewClass gpointer padding[8]; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_callgraph_view_new (void); +SYSPROF_AVAILABLE_IN_ALL SpCallgraphProfile *sp_callgraph_view_get_profile (SpCallgraphView *self); +SYSPROF_AVAILABLE_IN_ALL void sp_callgraph_view_set_profile (SpCallgraphView *self, SpCallgraphProfile *profile); +SYSPROF_AVAILABLE_IN_ALL gchar *sp_callgraph_view_screenshot (SpCallgraphView *self); +SYSPROF_AVAILABLE_IN_ALL guint sp_callgraph_view_get_n_functions (SpCallgraphView *self); G_END_DECLS - -#endif /* SP_CALLGRAPH_VIEW_H */ diff --git a/src/libsysprof-ui/sp-cell-renderer-percent.c b/src/libsysprof-ui/sp-cell-renderer-percent.c index 898df21f..ddd50f0a 100644 --- a/src/libsysprof-ui/sp-cell-renderer-percent.c +++ b/src/libsysprof-ui/sp-cell-renderer-percent.c @@ -18,6 +18,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +#include "config.h" + #include #include "sp-cell-renderer-percent.h" diff --git a/src/libsysprof-ui/sp-cell-renderer-percent.h b/src/libsysprof-ui/sp-cell-renderer-percent.h index 56fc57f8..f83a7088 100644 --- a/src/libsysprof-ui/sp-cell-renderer-percent.h +++ b/src/libsysprof-ui/sp-cell-renderer-percent.h @@ -18,11 +18,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_CELL_RENDERER_PERCENT_H -#define SP_CELL_RENDERER_PERCENT_H +#pragma once #include +#include "sysprof-version-macros.h" + G_BEGIN_DECLS #define SP_TYPE_CELL_RENDERER_PERCENT (sp_cell_renderer_percent_get_type()) @@ -48,12 +49,14 @@ struct _SpCellRendererPercentClass gpointer padding[4]; }; +SYSPROF_AVAILABLE_IN_ALL GType sp_cell_renderer_percent_get_type (void); +SYSPROF_AVAILABLE_IN_ALL GtkCellRenderer *sp_cell_renderer_percent_new (void); +SYSPROF_AVAILABLE_IN_ALL gdouble sp_cell_renderer_percent_get_percent (SpCellRendererPercent *self); +SYSPROF_AVAILABLE_IN_ALL void sp_cell_renderer_percent_set_percent (SpCellRendererPercent *self, gdouble percent); G_END_DECLS - -#endif /* SP_CELL_RENDERER_PERCENT_H */ diff --git a/src/libsysprof-ui/sp-color-cycle.c b/src/libsysprof-ui/sp-color-cycle.c index 80b7f63e..01503ed1 100644 --- a/src/libsysprof-ui/sp-color-cycle.c +++ b/src/libsysprof-ui/sp-color-cycle.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-color-cycle" +#include "config.h" + #include "sp-color-cycle.h" G_DEFINE_BOXED_TYPE (SpColorCycle, sp_color_cycle, sp_color_cycle_ref, sp_color_cycle_unref) diff --git a/src/libsysprof-ui/sp-color-cycle.h b/src/libsysprof-ui/sp-color-cycle.h index 4d79d489..8e7f7a47 100644 --- a/src/libsysprof-ui/sp-color-cycle.h +++ b/src/libsysprof-ui/sp-color-cycle.h @@ -18,25 +18,30 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_COLOR_CYCLE_H -#define SP_COLOR_CYCLE_H +#pragma once #include +#include "sysprof-version-macros.h" + G_BEGIN_DECLS #define SP_TYPE_COLOR_CYCLE (sp_color_cycle_get_type()) typedef struct _SpColorCycle SpColorCycle; +SYSPROF_AVAILABLE_IN_ALL GType sp_color_cycle_get_type (void); +SYSPROF_AVAILABLE_IN_ALL SpColorCycle *sp_color_cycle_ref (SpColorCycle *self); +SYSPROF_AVAILABLE_IN_ALL void sp_color_cycle_unref (SpColorCycle *self); +SYSPROF_AVAILABLE_IN_ALL SpColorCycle *sp_color_cycle_new (void); +SYSPROF_AVAILABLE_IN_ALL void sp_color_cycle_reset (SpColorCycle *self); +SYSPROF_AVAILABLE_IN_ALL void sp_color_cycle_next (SpColorCycle *self, GdkRGBA *rgba); G_END_DECLS - -#endif /* SP_COLOR_CYCLE_H */ diff --git a/src/libsysprof-ui/sp-cpu-visualizer-row.c b/src/libsysprof-ui/sp-cpu-visualizer-row.c index 33ebfe73..04613cd2 100644 --- a/src/libsysprof-ui/sp-cpu-visualizer-row.c +++ b/src/libsysprof-ui/sp-cpu-visualizer-row.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-cpu-visualizer-row" +#include "config.h" + #include "sp-capture-condition.h" #include "sp-capture-cursor.h" #include "sp-color-cycle.h" diff --git a/src/libsysprof-ui/sp-cpu-visualizer-row.h b/src/libsysprof-ui/sp-cpu-visualizer-row.h index d2c58f23..d25399f0 100644 --- a/src/libsysprof-ui/sp-cpu-visualizer-row.h +++ b/src/libsysprof-ui/sp-cpu-visualizer-row.h @@ -18,19 +18,20 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_CPU_VISUALIZER_ROW_H -#define SP_CPU_VISUALIZER_ROW_H +#pragma once #include "sp-line-visualizer-row.h" +#include "sysprof-version-macros.h" + G_BEGIN_DECLS #define SP_TYPE_CPU_VISUALIZER_ROW (sp_cpu_visualizer_row_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_FINAL_TYPE (SpCpuVisualizerRow, sp_cpu_visualizer_row, SP, CPU_VISUALIZER_ROW, SpLineVisualizerRow) +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_cpu_visualizer_row_new (void); G_END_DECLS - -#endif /* SP_CPU_VISUALIZER_ROW_H */ diff --git a/src/libsysprof-ui/sp-empty-state-view.c b/src/libsysprof-ui/sp-empty-state-view.c index fb551a7c..dc29d590 100644 --- a/src/libsysprof-ui/sp-empty-state-view.c +++ b/src/libsysprof-ui/sp-empty-state-view.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-empty-state-view" +#include "config.h" + #include #include "sp-empty-state-view.h" diff --git a/src/libsysprof-ui/sp-empty-state-view.h b/src/libsysprof-ui/sp-empty-state-view.h index 45ad927b..e2667cf7 100644 --- a/src/libsysprof-ui/sp-empty-state-view.h +++ b/src/libsysprof-ui/sp-empty-state-view.h @@ -18,15 +18,17 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_EMPTY_STATE_VIEW_H -#define SP_EMPTY_STATE_VIEW_H +#pragma once #include +#include "sysprof-version-macros.h" + G_BEGIN_DECLS #define SP_TYPE_EMPTY_STATE_VIEW (sp_empty_state_view_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpEmptyStateView, sp_empty_state_view, SP, EMPTY_STATE_VIEW, GtkBin) struct _SpEmptyStateViewClass @@ -36,9 +38,7 @@ struct _SpEmptyStateViewClass gpointer padding[4]; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_empty_state_view_new (void); G_END_DECLS - -#endif /* SP_EMPTY_STATE_VIEW_H */ - diff --git a/src/libsysprof-ui/sp-failed-state-view.c b/src/libsysprof-ui/sp-failed-state-view.c index 654a7a9d..cef7cc31 100644 --- a/src/libsysprof-ui/sp-failed-state-view.c +++ b/src/libsysprof-ui/sp-failed-state-view.c @@ -18,6 +18,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +#include "config.h" + #include "sp-failed-state-view.h" G_DEFINE_TYPE (SpFailedStateView, sp_failed_state_view, GTK_TYPE_BIN) diff --git a/src/libsysprof-ui/sp-failed-state-view.h b/src/libsysprof-ui/sp-failed-state-view.h index 08268840..c201cb4d 100644 --- a/src/libsysprof-ui/sp-failed-state-view.h +++ b/src/libsysprof-ui/sp-failed-state-view.h @@ -18,17 +18,18 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_FAILED_STATE_VIEW_H -#define SP_FAILED_STATE_VIEW_H +#pragma once #include #include "sp-profiler.h" +#include "sysprof-version-macros.h" G_BEGIN_DECLS #define SP_TYPE_FAILED_STATE_VIEW (sp_failed_state_view_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpFailedStateView, sp_failed_state_view, SP, FAILED_STATE_VIEW, GtkBin) struct _SpFailedStateViewClass @@ -38,10 +39,10 @@ struct _SpFailedStateViewClass gpointer padding[4]; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_failed_state_view_new (void); +SYSPROF_AVAILABLE_IN_ALL void sp_failed_state_view_set_profiler (SpFailedStateView *self, SpProfiler *profiler); G_END_DECLS - -#endif /* SP_FAILED_STATE_VIEW_H */ diff --git a/src/libsysprof-ui/sp-line-visualizer-row.c b/src/libsysprof-ui/sp-line-visualizer-row.c index c43123d3..358e5440 100644 --- a/src/libsysprof-ui/sp-line-visualizer-row.c +++ b/src/libsysprof-ui/sp-line-visualizer-row.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-line-visualizer-row" +#include "config.h" + #include #include diff --git a/src/libsysprof-ui/sp-line-visualizer-row.h b/src/libsysprof-ui/sp-line-visualizer-row.h index 5679f7f5..fff8f116 100644 --- a/src/libsysprof-ui/sp-line-visualizer-row.h +++ b/src/libsysprof-ui/sp-line-visualizer-row.h @@ -18,15 +18,16 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_LINE_VISUALIZER_ROW_H -#define SP_LINE_VISUALIZER_ROW_H +#pragma once #include "sp-visualizer-row.h" +#include "sysprof-version-macros.h" G_BEGIN_DECLS #define SP_TYPE_LINE_VISUALIZER_ROW (sp_line_visualizer_row_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpLineVisualizerRow, sp_line_visualizer_row, SP, LINE_VISUALIZER_ROW, SpVisualizerRow) struct _SpLineVisualizerRowClass @@ -40,18 +41,21 @@ struct _SpLineVisualizerRowClass gpointer _reserved[16]; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_line_visualizer_row_new (void); +SYSPROF_AVAILABLE_IN_ALL void sp_line_visualizer_row_clear (SpLineVisualizerRow *self); +SYSPROF_AVAILABLE_IN_ALL void sp_line_visualizer_row_add_counter (SpLineVisualizerRow *self, guint counter_id, const GdkRGBA *color); +SYSPROF_AVAILABLE_IN_ALL void sp_line_visualizer_row_set_line_width (SpLineVisualizerRow *self, guint counter_id, gdouble width); +SYSPROF_AVAILABLE_IN_ALL void sp_line_visualizer_row_set_fill (SpLineVisualizerRow *self, guint counter_id, const GdkRGBA *color); G_END_DECLS - -#endif /* SP_LINE_VISUALIZER_ROW_H */ diff --git a/src/libsysprof-ui/sp-mark-visualizer-row.c b/src/libsysprof-ui/sp-mark-visualizer-row.c index 383b5331..9aa68e77 100644 --- a/src/libsysprof-ui/sp-mark-visualizer-row.c +++ b/src/libsysprof-ui/sp-mark-visualizer-row.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-mark-visualizer-row" +#include "config.h" + #include "sp-capture-condition.h" #include "sp-capture-cursor.h" #include "rectangles.h" diff --git a/src/libsysprof-ui/sp-mark-visualizer-row.h b/src/libsysprof-ui/sp-mark-visualizer-row.h index 4e08a183..6c504ee4 100644 --- a/src/libsysprof-ui/sp-mark-visualizer-row.h +++ b/src/libsysprof-ui/sp-mark-visualizer-row.h @@ -21,11 +21,13 @@ #pragma once #include "sp-visualizer-row.h" +#include "sysprof-version-macros.h" G_BEGIN_DECLS #define SP_TYPE_MARK_VISUALIZER_ROW (sp_mark_visualizer_row_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpMarkVisualizerRow, sp_mark_visualizer_row, SP, MARK_VISUALIZER_ROW, SpVisualizerRow) struct _SpMarkVisualizerRowClass @@ -36,8 +38,11 @@ struct _SpMarkVisualizerRowClass gpointer _reserved[16]; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_mark_visualizer_row_new (void); +SYSPROF_AVAILABLE_IN_ALL const gchar *sp_mark_visualizer_row_get_group (SpMarkVisualizerRow *self); +SYSPROF_AVAILABLE_IN_ALL void sp_mark_visualizer_row_set_group (SpMarkVisualizerRow *self, const gchar *group); diff --git a/src/libsysprof-ui/sp-model-filter.c b/src/libsysprof-ui/sp-model-filter.c index 9dea38e0..0e183ce9 100644 --- a/src/libsysprof-ui/sp-model-filter.c +++ b/src/libsysprof-ui/sp-model-filter.c @@ -18,6 +18,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +#include "config.h" + #include "sp-model-filter.h" typedef struct diff --git a/src/libsysprof-ui/sp-model-filter.h b/src/libsysprof-ui/sp-model-filter.h index c47bb80d..08f6e379 100644 --- a/src/libsysprof-ui/sp-model-filter.h +++ b/src/libsysprof-ui/sp-model-filter.h @@ -18,11 +18,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_MODEL_FILTER_H -#define SP_MODEL_FILTER_H +#pragma once #include +#include "sysprof-version-macros.h" + G_BEGIN_DECLS #define SP_TYPE_MODEL_FILTER (sp_model_filter_get_type()) @@ -30,6 +31,7 @@ G_BEGIN_DECLS typedef gboolean (*SpModelFilterFunc) (GObject *object, gpointer user_data); +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpModelFilter, sp_model_filter, SP, MODEL_FILTER, GObject) struct _SpModelFilterClass @@ -39,14 +41,16 @@ struct _SpModelFilterClass gpointer padding[8]; }; +SYSPROF_AVAILABLE_IN_ALL SpModelFilter *sp_model_filter_new (GListModel *child_model); +SYSPROF_AVAILABLE_IN_ALL GListModel *sp_model_filter_get_child_model (SpModelFilter *self); +SYSPROF_AVAILABLE_IN_ALL void sp_model_filter_invalidate (SpModelFilter *self); +SYSPROF_AVAILABLE_IN_ALL void sp_model_filter_set_filter_func (SpModelFilter *self, SpModelFilterFunc filter_func, gpointer filter_func_data, GDestroyNotify filter_func_data_destroy); G_END_DECLS - -#endif /* SP_MODEL_FILTER_H */ diff --git a/src/libsysprof-ui/sp-multi-paned.c b/src/libsysprof-ui/sp-multi-paned.c index 2a2c8df6..499f244f 100644 --- a/src/libsysprof-ui/sp-multi-paned.c +++ b/src/libsysprof-ui/sp-multi-paned.c @@ -19,6 +19,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +#include "config.h" + #include "sp-multi-paned.h" #define HANDLE_WIDTH 10 diff --git a/src/libsysprof-ui/sp-multi-paned.h b/src/libsysprof-ui/sp-multi-paned.h index 4618595e..c7ae7b0d 100644 --- a/src/libsysprof-ui/sp-multi-paned.h +++ b/src/libsysprof-ui/sp-multi-paned.h @@ -19,15 +19,17 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_MULTI_PANED_H -#define SP_MULTI_PANED_H +#pragma once #include +#include "sysprof-version-macros.h" + G_BEGIN_DECLS #define SP_TYPE_MULTI_PANED (sp_multi_paned_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpMultiPaned, sp_multi_paned, SP, MULTI_PANED, GtkContainer) struct _SpMultiPanedClass @@ -49,9 +51,9 @@ struct _SpMultiPanedClass gpointer _reserved8; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_multi_paned_new (void); +SYSPROF_AVAILABLE_IN_ALL guint sp_multi_paned_get_n_children (SpMultiPaned *self); G_END_DECLS - -#endif /* SP_MULTI_PANED_H */ diff --git a/src/libsysprof-ui/sp-process-model-row.c b/src/libsysprof-ui/sp-process-model-row.c index f4d7c432..e749659d 100644 --- a/src/libsysprof-ui/sp-process-model-row.c +++ b/src/libsysprof-ui/sp-process-model-row.c @@ -18,6 +18,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +#include "config.h" + #include "sp-process-model-row.h" typedef struct diff --git a/src/libsysprof-ui/sp-process-model-row.h b/src/libsysprof-ui/sp-process-model-row.h index ffa76e5d..ce238620 100644 --- a/src/libsysprof-ui/sp-process-model-row.h +++ b/src/libsysprof-ui/sp-process-model-row.h @@ -18,17 +18,18 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_PROCESS_MODEL_ROW_H -#define SP_PROCESS_MODEL_ROW_H +#pragma once #include #include "sp-process-model-item.h" +#include "sysprof-version-macros.h" G_BEGIN_DECLS #define SP_TYPE_PROCESS_MODEL_ROW (sp_process_model_row_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpProcessModelRow, sp_process_model_row, SP, PROCESS_MODEL_ROW, GtkListBoxRow) struct _SpProcessModelRowClass @@ -38,13 +39,14 @@ struct _SpProcessModelRowClass gpointer padding[4]; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_process_model_row_new (SpProcessModelItem *item); +SYSPROF_AVAILABLE_IN_ALL SpProcessModelItem *sp_process_model_row_get_item (SpProcessModelRow *self); +SYSPROF_AVAILABLE_IN_ALL gboolean sp_process_model_row_get_selected (SpProcessModelRow *self); +SYSPROF_AVAILABLE_IN_ALL void sp_process_model_row_set_selected (SpProcessModelRow *self, gboolean selected); G_END_DECLS - -#endif /* SP_PROCESS_MODEL_ROW_H */ - diff --git a/src/libsysprof-ui/sp-profiler-menu-button.c b/src/libsysprof-ui/sp-profiler-menu-button.c index 12e4a7f5..2db897b4 100644 --- a/src/libsysprof-ui/sp-profiler-menu-button.c +++ b/src/libsysprof-ui/sp-profiler-menu-button.c @@ -18,6 +18,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +#include "config.h" + #include #include diff --git a/src/libsysprof-ui/sp-profiler-menu-button.h b/src/libsysprof-ui/sp-profiler-menu-button.h index 040a9e6c..d761e30f 100644 --- a/src/libsysprof-ui/sp-profiler-menu-button.h +++ b/src/libsysprof-ui/sp-profiler-menu-button.h @@ -18,17 +18,18 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_PROFILER_MENU_BUTTON_H -#define SP_PROFILER_MENU_BUTTON_H +#pragma once #include #include "sp-profiler.h" +#include "sysprof-version-macros.h" G_BEGIN_DECLS #define SP_TYPE_PROFILER_MENU_BUTTON (sp_profiler_menu_button_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpProfilerMenuButton, sp_profiler_menu_button, SP, PROFILER_MENU_BUTTON, GtkMenuButton) struct _SpProfilerMenuButtonClass @@ -38,11 +39,12 @@ struct _SpProfilerMenuButtonClass gpointer padding[8]; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_profiler_menu_button_new (void); +SYSPROF_AVAILABLE_IN_ALL void sp_profiler_menu_button_set_profiler (SpProfilerMenuButton *self, SpProfiler *profiler); +SYSPROF_AVAILABLE_IN_ALL SpProfiler *sp_profiler_menu_button_get_profiler (SpProfilerMenuButton *self); G_END_DECLS - -#endif /* SP_PROFILER_MENU_BUTTON_H */ diff --git a/src/libsysprof-ui/sp-recording-state-view.c b/src/libsysprof-ui/sp-recording-state-view.c index cdbec300..fde6616d 100644 --- a/src/libsysprof-ui/sp-recording-state-view.c +++ b/src/libsysprof-ui/sp-recording-state-view.c @@ -18,6 +18,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +#include "config.h" + #include "sp-recording-state-view.h" typedef struct diff --git a/src/libsysprof-ui/sp-recording-state-view.h b/src/libsysprof-ui/sp-recording-state-view.h index 5654c065..d05e4b67 100644 --- a/src/libsysprof-ui/sp-recording-state-view.h +++ b/src/libsysprof-ui/sp-recording-state-view.h @@ -18,17 +18,18 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_RECORDING_STATE_VIEW_H -#define SP_RECORDING_STATE_VIEW_H +#pragma once #include #include "sp-profiler.h" +#include "sysprof-version-macros.h" G_BEGIN_DECLS #define SP_TYPE_RECORDING_STATE_VIEW (sp_recording_state_view_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpRecordingStateView, sp_recording_state_view, SP, RECORDING_STATE_VIEW, GtkBin) struct _SpRecordingStateViewClass @@ -38,10 +39,10 @@ struct _SpRecordingStateViewClass gpointer padding[4]; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_recording_state_view_new (void); +SYSPROF_AVAILABLE_IN_ALL void sp_recording_state_view_set_profiler (SpRecordingStateView *self, SpProfiler *profiler); G_END_DECLS - -#endif /* SP_RECORDING_STATE_VIEW_H */ diff --git a/src/libsysprof-ui/sp-theme-manager.c b/src/libsysprof-ui/sp-theme-manager.c index 03f4d39a..f8efdc8f 100644 --- a/src/libsysprof-ui/sp-theme-manager.c +++ b/src/libsysprof-ui/sp-theme-manager.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-theme-manager" +#include "config.h" + #include "sp-theme-manager.h" struct _SpThemeManager diff --git a/src/libsysprof-ui/sp-theme-manager.h b/src/libsysprof-ui/sp-theme-manager.h index f0101351..e1562e95 100644 --- a/src/libsysprof-ui/sp-theme-manager.h +++ b/src/libsysprof-ui/sp-theme-manager.h @@ -18,8 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_THEME_MANAGER_H -#define SP_THEME_MANAGER_H +#pragma once #include @@ -27,16 +26,18 @@ G_BEGIN_DECLS #define SP_TYPE_THEME_MANAGER (sp_theme_manager_get_type()) +G_GNUC_INTERNAL G_DECLARE_FINAL_TYPE (SpThemeManager, sp_theme_manager, SP, THEME_MANAGER, GObject) +G_GNUC_INTERNAL SpThemeManager *sp_theme_manager_get_default (void); +G_GNUC_INTERNAL void sp_theme_manager_unregister (SpThemeManager *self, guint registration_id); +G_GNUC_INTERNAL guint sp_theme_manager_register_resource (SpThemeManager *self, const gchar *theme_name, const gchar *variant, const gchar *resource); G_END_DECLS - -#endif /* SP_THEME_MANAGER_H */ diff --git a/src/libsysprof-ui/sp-visualizer-list.c b/src/libsysprof-ui/sp-visualizer-list.c index 7a4279b8..02833dcf 100644 --- a/src/libsysprof-ui/sp-visualizer-list.c +++ b/src/libsysprof-ui/sp-visualizer-list.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-visualizer-list" +#include "config.h" + #include #include diff --git a/src/libsysprof-ui/sp-visualizer-list.h b/src/libsysprof-ui/sp-visualizer-list.h index 6fe89272..5235b879 100644 --- a/src/libsysprof-ui/sp-visualizer-list.h +++ b/src/libsysprof-ui/sp-visualizer-list.h @@ -18,8 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_VISUALIZER_LIST_H -#define SP_VISUALIZER_LIST_H +#pragma once #include @@ -55,5 +54,3 @@ void sp_visualizer_list_set_zoom_manager (SpVisualizerList *self, SpZoomManager *zoom_manager); G_END_DECLS - -#endif /* SP_VISUALIZER_LIST_H */ diff --git a/src/libsysprof-ui/sp-visualizer-row-private.h b/src/libsysprof-ui/sp-visualizer-row-private.h index c000a993..761dc711 100644 --- a/src/libsysprof-ui/sp-visualizer-row-private.h +++ b/src/libsysprof-ui/sp-visualizer-row-private.h @@ -18,8 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_VISUALIZER_ROW_PRIVATE_H -#define SP_VISUALIZER_ROW_PRIVATE_H +#pragma once #include "sp-visualizer-row.h" @@ -28,5 +27,3 @@ G_BEGIN_DECLS gint _sp_visualizer_row_get_graph_width (SpVisualizerRow *self); G_END_DECLS - -#endif /* SP_VISUALIZER_ROW_PRIVATE_H */ diff --git a/src/libsysprof-ui/sp-visualizer-row.c b/src/libsysprof-ui/sp-visualizer-row.c index 8e2a9fe2..bc5c6f7d 100644 --- a/src/libsysprof-ui/sp-visualizer-row.c +++ b/src/libsysprof-ui/sp-visualizer-row.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-visualizer-row" +#include "config.h" + #include "sp-visualizer-row.h" #include "sp-visualizer-row-private.h" diff --git a/src/libsysprof-ui/sp-visualizer-row.h b/src/libsysprof-ui/sp-visualizer-row.h index f7885a7d..50fb5f8d 100644 --- a/src/libsysprof-ui/sp-visualizer-row.h +++ b/src/libsysprof-ui/sp-visualizer-row.h @@ -18,8 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_VISUALIZER_ROW_H -#define SP_VISUALIZER_ROW_H +#pragma once #include @@ -74,5 +73,3 @@ void sp_visualizer_row_translate_points (SpVisualizerRow guint n_out_points); G_END_DECLS - -#endif /* SP_VISUALIZER_ROW_H */ diff --git a/src/libsysprof-ui/sp-visualizer-ticks.c b/src/libsysprof-ui/sp-visualizer-ticks.c index 777e2502..d57dfb38 100644 --- a/src/libsysprof-ui/sp-visualizer-ticks.c +++ b/src/libsysprof-ui/sp-visualizer-ticks.c @@ -18,6 +18,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +#include "config.h" + #include #include "sp-visualizer-ticks.h" diff --git a/src/libsysprof-ui/sp-visualizer-ticks.h b/src/libsysprof-ui/sp-visualizer-ticks.h index 15317597..6fc530e6 100644 --- a/src/libsysprof-ui/sp-visualizer-ticks.h +++ b/src/libsysprof-ui/sp-visualizer-ticks.h @@ -18,8 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_VISUALIZER_TICKS_H -#define SP_VISUALIZER_TICKS_H +#pragma once #include @@ -41,5 +40,3 @@ void sp_visualizer_ticks_set_time_range (SpVisualizerTicks *self, gint64 end_time); G_END_DECLS - -#endif /* SP_VISUALIZER_TICKS_H */ diff --git a/src/libsysprof-ui/sp-visualizer-view.c b/src/libsysprof-ui/sp-visualizer-view.c index 6ee0c1fb..0a4d4ed4 100644 --- a/src/libsysprof-ui/sp-visualizer-view.c +++ b/src/libsysprof-ui/sp-visualizer-view.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-visualizer-view" +#include "config.h" + #include #include "sp-theme-manager.h" diff --git a/src/libsysprof-ui/sp-visualizer-view.h b/src/libsysprof-ui/sp-visualizer-view.h index 15c73967..615c50ad 100644 --- a/src/libsysprof-ui/sp-visualizer-view.h +++ b/src/libsysprof-ui/sp-visualizer-view.h @@ -18,8 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_VISUALIZER_VIEW_H -#define SP_VISUALIZER_VIEW_H +#pragma once #include #include @@ -27,11 +26,13 @@ #include "sp-visualizer-row.h" #include "sp-selection.h" #include "sp-zoom-manager.h" +#include "sysprof-version-macros.h" G_BEGIN_DECLS #define SP_TYPE_VISUALIZER_VIEW (sp_visualizer_view_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_DERIVABLE_TYPE (SpVisualizerView, sp_visualizer_view, SP, VISUALIZER_VIEW, GtkBin) struct _SpVisualizerViewClass @@ -61,15 +62,19 @@ struct _SpVisualizerViewClass gpointer _reserved16; }; +SYSPROF_AVAILABLE_IN_ALL GtkWidget *sp_visualizer_view_new (void); +SYSPROF_AVAILABLE_IN_ALL SpCaptureReader *sp_visualizer_view_get_reader (SpVisualizerView *self); +SYSPROF_AVAILABLE_IN_ALL void sp_visualizer_view_set_reader (SpVisualizerView *self, SpCaptureReader *reader); +SYSPROF_AVAILABLE_IN_ALL SpZoomManager *sp_visualizer_view_get_zoom_manager (SpVisualizerView *self); +SYSPROF_AVAILABLE_IN_ALL void sp_visualizer_view_set_zoom_manager (SpVisualizerView *self, SpZoomManager *zoom_manager); +SYSPROF_AVAILABLE_IN_ALL SpSelection *sp_visualizer_view_get_selection (SpVisualizerView *self); G_END_DECLS - -#endif /* SP_VISUALIZER_VIEW_H */ diff --git a/src/libsysprof-ui/sp-zoom-manager.c b/src/libsysprof-ui/sp-zoom-manager.c index 03fd359a..b648e897 100644 --- a/src/libsysprof-ui/sp-zoom-manager.c +++ b/src/libsysprof-ui/sp-zoom-manager.c @@ -20,6 +20,8 @@ #define G_LOG_DOMAIN "sp-zoom-manager" +#include "config.h" + #include #include diff --git a/src/libsysprof-ui/sp-zoom-manager.h b/src/libsysprof-ui/sp-zoom-manager.h index 29c82316..ca187986 100644 --- a/src/libsysprof-ui/sp-zoom-manager.h +++ b/src/libsysprof-ui/sp-zoom-manager.h @@ -18,33 +18,45 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SP_ZOOM_MANAGER_H -#define SP_ZOOM_MANAGER_H +#pragma once #include +#include "sysprof-version-macros.h" + G_BEGIN_DECLS #define SP_TYPE_ZOOM_MANAGER (sp_zoom_manager_get_type()) +SYSPROF_AVAILABLE_IN_ALL G_DECLARE_FINAL_TYPE (SpZoomManager, sp_zoom_manager, SP, ZOOM_MANAGER, GObject) +SYSPROF_AVAILABLE_IN_ALL SpZoomManager *sp_zoom_manager_new (void); +SYSPROF_AVAILABLE_IN_ALL gboolean sp_zoom_manager_get_can_zoom_in (SpZoomManager *self); +SYSPROF_AVAILABLE_IN_ALL gboolean sp_zoom_manager_get_can_zoom_out (SpZoomManager *self); +SYSPROF_AVAILABLE_IN_ALL gboolean sp_zoom_manager_get_min_zoom (SpZoomManager *self); +SYSPROF_AVAILABLE_IN_ALL gboolean sp_zoom_manager_get_max_zoom (SpZoomManager *self); +SYSPROF_AVAILABLE_IN_ALL void sp_zoom_manager_set_min_zoom (SpZoomManager *self, gdouble min_zoom); +SYSPROF_AVAILABLE_IN_ALL void sp_zoom_manager_set_max_zoom (SpZoomManager *self, gdouble max_zoom); +SYSPROF_AVAILABLE_IN_ALL void sp_zoom_manager_zoom_in (SpZoomManager *self); +SYSPROF_AVAILABLE_IN_ALL void sp_zoom_manager_zoom_out (SpZoomManager *self); +SYSPROF_AVAILABLE_IN_ALL void sp_zoom_manager_reset (SpZoomManager *self); +SYSPROF_AVAILABLE_IN_ALL gdouble sp_zoom_manager_get_zoom (SpZoomManager *self); +SYSPROF_AVAILABLE_IN_ALL void sp_zoom_manager_set_zoom (SpZoomManager *self, gdouble zoom); G_END_DECLS - -#endif /* SP_ZOOM_MANAGER_H */ diff --git a/src/libsysprof-ui/sysprof-ui.h b/src/libsysprof-ui/sysprof-ui.h index bfe93f24..bdbf7f3a 100644 --- a/src/libsysprof-ui/sysprof-ui.h +++ b/src/libsysprof-ui/sysprof-ui.h @@ -18,8 +18,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef SYSPROF_UI_H -#define SYSPROF_UI_H +#pragma once #include @@ -47,5 +46,3 @@ G_BEGIN_DECLS #undef SYSPROF_UI_INSIDE G_END_DECLS - -#endif /* SYSPROF_UI_H */