[beast: 6/15] BEAST: remove 'extern "C"' from all API
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 6/15] BEAST: remove 'extern "C"' from all API
- Date: Fri, 28 Oct 2016 11:17:09 +0000 (UTC)
commit d1d6e7e34f766e923ca80f517ea0ae2d32f371d3
Author: Tim Janik <timj gnu org>
Date: Wed Oct 26 22:31:09 2016 +0200
BEAST: remove 'extern "C"' from all API
Signed-off-by: Tim Janik <timj gnu org>
beast-gtk/bstapp.hh | 4 ----
beast-gtk/bstasciipixbuf.hh | 8 --------
beast-gtk/bstauxdialogs.hh | 4 ----
beast-gtk/bstbseutils.hh | 3 ---
beast-gtk/bstbuseditor.hh | 4 ----
beast-gtk/bstbusmixer.hh | 4 ----
beast-gtk/bstbusview.hh | 4 ----
beast-gtk/bstcanvaslink.hh | 8 --------
beast-gtk/bstcanvassource.hh | 4 ----
beast-gtk/bstcluehunter.hh | 8 --------
beast-gtk/bstdbmeter.hh | 4 ----
beast-gtk/bstdefs.hh | 4 ----
beast-gtk/bstdial.hh | 8 --------
beast-gtk/bsteventroll.hh | 4 ----
beast-gtk/bsteventrollctrl.hh | 4 ----
beast-gtk/bstfiledialog.hh | 4 ----
beast-gtk/bstgconfig.hh | 4 ----
beast-gtk/bstgrowbar.hh | 4 ----
beast-gtk/bstitemseqdialog.hh | 4 ----
beast-gtk/bstitemview.hh | 4 ----
beast-gtk/bstkeybindings.hh | 4 ----
beast-gtk/bstknob.hh | 4 ----
beast-gtk/bstlogadjustment.hh | 4 ----
beast-gtk/bstmenus.hh | 4 ----
beast-gtk/bstmsgabsorb.hh | 4 ----
beast-gtk/bstparam.hh | 4 ----
beast-gtk/bstparamview.hh | 4 ----
beast-gtk/bstpartdialog.hh | 4 ----
beast-gtk/bstpartview.hh | 4 ----
beast-gtk/bstpatterncolumns.hh | 4 ----
beast-gtk/bstpatternctrl.hh | 4 ----
beast-gtk/bstpatternview.hh | 4 ----
beast-gtk/bstpianoroll.hh | 4 ----
beast-gtk/bstpianorollctrl.hh | 4 ----
beast-gtk/bstplayback.hh | 8 --------
beast-gtk/bstpreferences.hh | 4 ----
beast-gtk/bstprocedure.hh | 4 ----
beast-gtk/bstprofiler.hh | 4 ----
beast-gtk/bstprojectctrl.hh | 4 ----
beast-gtk/bstqsampler.hh | 4 ----
beast-gtk/bstsampleeditor.hh | 8 --------
beast-gtk/bstscrollgraph.hh | 4 ----
beast-gtk/bstsegment.hh | 4 ----
beast-gtk/bstsequence.hh | 8 --------
beast-gtk/bstservermonitor.hh | 8 --------
beast-gtk/bstskinconfig.hh | 4 ----
beast-gtk/bstsnetrouter.hh | 4 ----
beast-gtk/bstsnifferscope.hh | 4 ----
beast-gtk/bstsplash.hh | 4 ----
beast-gtk/bstsupershell.hh | 4 ----
beast-gtk/bsttrackroll.hh | 4 ----
beast-gtk/bsttrackrollctrl.hh | 4 ----
beast-gtk/bsttracksynthdialog.hh | 4 ----
beast-gtk/bsttrackview.hh | 4 ----
beast-gtk/bsttreestores.hh | 4 ----
beast-gtk/bstusermessage.hh | 4 ----
beast-gtk/bstutils.hh | 4 ----
beast-gtk/bstwaveeditor.hh | 8 --------
beast-gtk/bstwaveview.hh | 4 ----
beast-gtk/bstxframe.hh | 8 --------
beast-gtk/bstxkb.hh | 8 --------
beast-gtk/bstzoomedwindow.hh | 8 --------
beast-gtk/gxk/gxkaction.hh | 4 ----
beast-gtk/gxk/gxkassortment.hh | 4 ----
beast-gtk/gxk/gxkauxwidgets.hh | 4 ----
beast-gtk/gxk/gxkcanvas.hh | 4 ----
beast-gtk/gxk/gxkcellrendererpopup.hh | 4 ----
beast-gtk/gxk/gxkdialog.hh | 4 ----
beast-gtk/gxk/gxkglobals.hh | 4 ----
beast-gtk/gxk/gxkimagecache.hh | 4 ----
beast-gtk/gxk/gxkled.hh | 4 ----
beast-gtk/gxk/gxklistwrapper.hh | 4 ----
beast-gtk/gxk/gxklogadjustment.hh | 4 ----
beast-gtk/gxk/gxkmenubutton.hh | 4 ----
beast-gtk/gxk/gxknotebook.hh | 4 ----
beast-gtk/gxk/gxkparam.hh | 4 ----
beast-gtk/gxk/gxkpolygon.hh | 4 ----
beast-gtk/gxk/gxkrackeditor.hh | 4 ----
beast-gtk/gxk/gxkrackitem.hh | 4 ----
beast-gtk/gxk/gxkracktable.hh | 4 ----
beast-gtk/gxk/gxkradget.hh | 4 ----
beast-gtk/gxk/gxkradgetfactory.hh | 4 ----
beast-gtk/gxk/gxkscrollcanvas.hh | 4 ----
beast-gtk/gxk/gxksimplelabel.hh | 4 ----
beast-gtk/gxk/gxkspline.hh | 4 ----
beast-gtk/gxk/gxkstatusbar.hh | 4 ----
beast-gtk/gxk/gxkstock.hh | 4 ----
beast-gtk/gxk/gxktexttools.hh | 4 ----
beast-gtk/gxk/gxkutils.hh | 4 ----
89 files changed, 0 insertions(+), 403 deletions(-)
---
diff --git a/beast-gtk/bstapp.hh b/beast-gtk/bstapp.hh
index 4c0a2a9..614b51e 100644
--- a/beast-gtk/bstapp.hh
+++ b/beast-gtk/bstapp.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_APP (bst_app_get_type ())
#define BST_APP(object) (GTK_CHECK_CAST ((object), BST_TYPE_APP, BstApp))
@@ -97,6 +95,4 @@ void bst_app_create_default (BstApp *app);
BstApp* bst_app_find (SfiProxy project);
void bst_app_show_release_notes (BstApp *app);
-G_END_DECLS
-
#endif /* __BST_APP_H__ */
diff --git a/beast-gtk/bstasciipixbuf.hh b/beast-gtk/bstasciipixbuf.hh
index ce22434..91871c5 100644
--- a/beast-gtk/bstasciipixbuf.hh
+++ b/beast-gtk/bstasciipixbuf.hh
@@ -4,10 +4,6 @@
#include "bstutils.hh"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
void bst_ascii_pixbuf_ref (void);
GdkPixbuf* bst_ascii_pixbuf_new (gchar character,
@@ -17,8 +13,4 @@ void bst_ascii_pixbuf_unref (void);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_ASCII_PIXBUF_H__ */
diff --git a/beast-gtk/bstauxdialogs.hh b/beast-gtk/bstauxdialogs.hh
index 9f39550..ab496b7 100644
--- a/beast-gtk/bstauxdialogs.hh
+++ b/beast-gtk/bstauxdialogs.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- list popup dialog --- */
typedef void (*BstListPopupHandler) (GtkWidget *dialog,
gchar **strings,
@@ -33,6 +31,4 @@ gboolean bst_key_combo_popup (const gchar *function,
GdkModifierType *modifier);
-G_END_DECLS
-
#endif /* __BST_AUX_DIALOGS_H__ */
diff --git a/beast-gtk/bstbseutils.hh b/beast-gtk/bstbseutils.hh
index 0facb5d..be911bc 100644
--- a/beast-gtk/bstbseutils.hh
+++ b/beast-gtk/bstbseutils.hh
@@ -3,7 +3,6 @@
#define __BST_BSE_UTILS_H__
#include <sfi/sfi.hh> /* needed by bstoldbseapi.h */
#include "bstdefs.hh"
-G_BEGIN_DECLS
#define SFIDL_SKIPDEF__BseErrorType // replaced by Bse::Error
#define BseErrorType Bse::Error
#define SFIDL_SKIPDEF__BseMidiSignalType // replaced by Bse::MidiSignal
@@ -43,8 +42,6 @@ uint bst_path_leaf_index (const String &path, char separa
Bse::Category bst_category_find (const String &pattern);
-G_END_DECLS
-
namespace Bse {
const char* error_blurb (Bse::Error error_value); ///< Retrieve the description of an error value
} // Bse
diff --git a/beast-gtk/bstbuseditor.hh b/beast-gtk/bstbuseditor.hh
index e24ae89..e4a363d 100644
--- a/beast-gtk/bstbuseditor.hh
+++ b/beast-gtk/bstbuseditor.hh
@@ -5,8 +5,6 @@
#include "bstitemview.hh"
#include "bstdbmeter.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_BUS_EDITOR (bst_bus_editor_get_type ())
#define BST_BUS_EDITOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_BUS_EDITOR,
BstBusEditor))
@@ -38,6 +36,4 @@ GtkWidget* bst_bus_editor_new (SfiProxy song);
void bst_bus_editor_set_bus (BstBusEditor *self,
SfiProxy item);
-G_END_DECLS
-
#endif /* __BST_BUS_EDITOR_H__ */
diff --git a/beast-gtk/bstbusmixer.hh b/beast-gtk/bstbusmixer.hh
index 1b1f7f0..a2ebddf 100644
--- a/beast-gtk/bstbusmixer.hh
+++ b/beast-gtk/bstbusmixer.hh
@@ -4,8 +4,6 @@
#include "bstitemview.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_BUS_MIXER (bst_bus_mixer_get_type ())
#define BST_BUS_MIXER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_BUS_MIXER,
BstBusMixer))
@@ -34,6 +32,4 @@ struct _BstBusMixerClass
GType bst_bus_mixer_get_type (void);
GtkWidget* bst_bus_mixer_new (SfiProxy song);
-G_END_DECLS
-
#endif /* __BST_BUS_MIXER_H__ */
diff --git a/beast-gtk/bstbusview.hh b/beast-gtk/bstbusview.hh
index 1500d86..152b5ef 100644
--- a/beast-gtk/bstbusview.hh
+++ b/beast-gtk/bstbusview.hh
@@ -4,8 +4,6 @@
#include "bstitemview.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_BUS_VIEW (bst_bus_view_get_type ())
#define BST_BUS_VIEW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_BUS_VIEW, BstBusView))
@@ -32,6 +30,4 @@ struct _BstBusViewClass
GType bst_bus_view_get_type (void);
GtkWidget* bst_bus_view_new (SfiProxy song);
-G_END_DECLS
-
#endif /* __BST_BUS_VIEW_H__ */
diff --git a/beast-gtk/bstcanvaslink.hh b/beast-gtk/bstcanvaslink.hh
index bbed95b..ae94911 100644
--- a/beast-gtk/bstcanvaslink.hh
+++ b/beast-gtk/bstcanvaslink.hh
@@ -6,10 +6,6 @@
#include "bstcanvassource.hh"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_CANVAS_LINK (bst_canvas_link_get_type ())
@@ -71,8 +67,4 @@ BstCanvasSource* bst_canvas_link_csource_at (BstCanvasLink *clink,
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_CANVAS_LINK_H__ */
diff --git a/beast-gtk/bstcanvassource.hh b/beast-gtk/bstcanvassource.hh
index 17635eb..4ae2e5e 100644
--- a/beast-gtk/bstcanvassource.hh
+++ b/beast-gtk/bstcanvassource.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_CANVAS_SOURCE (bst_canvas_source_get_type ())
#define BST_CANVAS_SOURCE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_CANVAS_SOURCE,
BstCanvasSource))
@@ -85,6 +83,4 @@ void bst_canvas_source_toggle_info (BstCanvasSource *csource)
void bst_canvas_source_set_channel_hints (BstCanvasSource *csource,
gboolean on_off);
-G_END_DECLS
-
#endif /* __BST_CANVAS_SOURCE_H__ */
diff --git a/beast-gtk/bstcluehunter.hh b/beast-gtk/bstcluehunter.hh
index 67dceae..938391f 100644
--- a/beast-gtk/bstcluehunter.hh
+++ b/beast-gtk/bstcluehunter.hh
@@ -4,10 +4,6 @@
#include <gxk/gxk.hh>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
/* --- type macros --- */
#define BST_TYPE_CLUE_HUNTER (bst_clue_hunter_get_type ())
@@ -81,9 +77,5 @@ gpointer bst_clue_hunter_from_entry (gpointer entry);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_CLUE_HUNTER_H__ */
diff --git a/beast-gtk/bstdbmeter.hh b/beast-gtk/bstdbmeter.hh
index 5e9cb1a..f8fa488 100644
--- a/beast-gtk/bstdbmeter.hh
+++ b/beast-gtk/bstdbmeter.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- DB Setup --- */
typedef struct {
double db;
@@ -128,6 +126,4 @@ BstDBLabeling* bst_db_meter_get_labeling (BstDBMeter *self,
void bst_db_scale_hook_up_param (GtkRange *range,
GxkParam *param);
-G_END_DECLS
-
#endif /* __BST_DB_METER_H__ */
diff --git a/beast-gtk/bstdefs.hh b/beast-gtk/bstdefs.hh
index 13573ec..9865594 100644
--- a/beast-gtk/bstdefs.hh
+++ b/beast-gtk/bstdefs.hh
@@ -9,8 +9,6 @@
// == G++ attributes ==
#define __unused __attribute__ ((unused))
-G_BEGIN_DECLS
-
/* --- generic constants --- */
typedef enum {
BST_QUANTIZE_NONE = 0,
@@ -82,6 +80,4 @@ void bst_main_loop_wakeup ();
extern gboolean bst_developer_hints;
extern gboolean bst_debug_extensions;
-G_END_DECLS
-
#endif /* __BST_DEFS_H__ */
diff --git a/beast-gtk/bstdial.hh b/beast-gtk/bstdial.hh
index db82782..2387190 100644
--- a/beast-gtk/bstdial.hh
+++ b/beast-gtk/bstdial.hh
@@ -5,10 +5,6 @@
#include "bstutils.hh"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#define BST_TYPE_DIAL (bst_dial_get_type ())
#define BST_DIAL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_DIAL, BstDial))
@@ -72,9 +68,5 @@ void bst_dial_set_align_widget (BstDial *dial,
gboolean width_align,
gboolean height_align);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_DIAL_H__ */
diff --git a/beast-gtk/bsteventroll.hh b/beast-gtk/bsteventroll.hh
index b0c0bf5..3993ce5 100644
--- a/beast-gtk/bsteventroll.hh
+++ b/beast-gtk/bsteventroll.hh
@@ -4,8 +4,6 @@
#include "bstsegment.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_EVENT_ROLL (bst_event_roll_get_type ())
#define BST_EVENT_ROLL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_EVENT_ROLL,
BstEventRoll))
@@ -115,6 +113,4 @@ gdouble bst_event_roll_segment_value (BstEventRoll *self,
guint tick);
void bst_event_roll_clear_segment (BstEventRoll *self);
-G_END_DECLS
-
#endif /* __BST_EVENT_ROLL_H__ */
diff --git a/beast-gtk/bsteventrollctrl.hh b/beast-gtk/bsteventrollctrl.hh
index 3007b5a..03950f5 100644
--- a/beast-gtk/bsteventrollctrl.hh
+++ b/beast-gtk/bsteventrollctrl.hh
@@ -4,8 +4,6 @@
#include "bsteventroll.hh"
-G_BEGIN_DECLS
-
typedef struct {
/* misc data */
guint ref_count;
@@ -46,6 +44,4 @@ gboolean bst_event_roll_controller_has_selection (BstEventRollCo
guint64
action_stamp);
-G_END_DECLS
-
#endif /* __BST_EVENT_ROLL_CONTROLLER_H__ */
diff --git a/beast-gtk/bstfiledialog.hh b/beast-gtk/bstfiledialog.hh
index 22006f8..32483c4 100644
--- a/beast-gtk/bstfiledialog.hh
+++ b/beast-gtk/bstfiledialog.hh
@@ -5,8 +5,6 @@
#include "bstutils.hh"
#include "bstapp.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_FILE_DIALOG (bst_file_dialog_get_type ())
@@ -101,8 +99,6 @@ void bst_file_dialog_set_handler (BstFileDialog *self,
gpointer handler_data,
GDestroyNotify destroy);
-G_END_DECLS
-
// == Flags Enumeration Operators in C++ ==
#ifdef __cplusplus
constexpr BstFileDialogMode operator& (BstFileDialogMode s1, BstFileDialogMode s2) { return
BstFileDialogMode (s1 & (long long unsigned) s2); }
diff --git a/beast-gtk/bstgconfig.hh b/beast-gtk/bstgconfig.hh
index 6a2d5ea..233f909 100644
--- a/beast-gtk/bstgconfig.hh
+++ b/beast-gtk/bstgconfig.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- BstGConfig - configurable defaults --- */
#define BST_GUI_ENABLE_ERROR_BELL BST_GCONFIG (gui_enable_error_bell)
#define BST_SNET_ANTI_ALIASED BST_GCONFIG (snet_anti_aliased)
@@ -28,6 +26,4 @@ void bst_gconfig_push_updates (void);
Bse::Error bst_rc_dump (const gchar *file_name);
Bse::Error bst_rc_parse (const gchar *file_name);
-G_END_DECLS
-
#endif /* __BST_GCONFIG_H__ */
diff --git a/beast-gtk/bstgrowbar.hh b/beast-gtk/bstgrowbar.hh
index 74b53ae..f4ccbc3 100644
--- a/beast-gtk/bstgrowbar.hh
+++ b/beast-gtk/bstgrowbar.hh
@@ -5,8 +5,6 @@
#include <gtk/gtkalignment.h>
#include <gtk/gtkrange.h>
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_GROW_BAR (bst_grow_bar_get_type ())
#define BST_GROW_BAR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_GROW_BAR, BstGrowBar))
@@ -63,6 +61,4 @@ void bst_grow_bar_set_tooltips (BstGrowBar *self,
const gchar *scroll_tip,
const gchar *grow_tip);
-G_END_DECLS
-
#endif /* __BST_GROW_BAR_H__ */
diff --git a/beast-gtk/bstitemseqdialog.hh b/beast-gtk/bstitemseqdialog.hh
index 2078548..4b3185c 100644
--- a/beast-gtk/bstitemseqdialog.hh
+++ b/beast-gtk/bstitemseqdialog.hh
@@ -5,8 +5,6 @@
#include "bstutils.hh"
#include "bstwaveview.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_ITEM_SEQ_DIALOG (bst_item_seq_dialog_get_type ())
#define BST_ITEM_SEQ_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_ITEM_SEQ_DIALOG,
BstItemSeqDialog))
@@ -61,6 +59,4 @@ void bst_item_seq_dialog_set (BstItemSeqDialog *self,
-G_END_DECLS
-
#endif /* __BST_ITEM_SEQ_DIALOG_H__ */
diff --git a/beast-gtk/bstitemview.hh b/beast-gtk/bstitemview.hh
index f67288f..f937116 100644
--- a/beast-gtk/bstitemview.hh
+++ b/beast-gtk/bstitemview.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_ITEM_VIEW (bst_item_view_get_type ())
#define BST_ITEM_VIEW(object) (GTK_CHECK_CAST ((object), BST_TYPE_ITEM_VIEW, BstItemView))
@@ -80,6 +78,4 @@ GtkTreeModel* bst_item_view_adapt_list_wrapper (BstItemView *self,
GxkListWrapper *lwrapper);
-G_END_DECLS
-
#endif /* __BST_ITEM_VIEW_H__ */
diff --git a/beast-gtk/bstkeybindings.hh b/beast-gtk/bstkeybindings.hh
index 8841667..978f363 100644
--- a/beast-gtk/bstkeybindings.hh
+++ b/beast-gtk/bstkeybindings.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- typedefs & structures --- */
typedef enum /*< skip >*/
@@ -72,6 +70,4 @@ Bse::Error bst_key_binding_parse (const gchar
GSList *kbindings);
GParamSpec* bst_key_binding_item_pspec (void);
-G_END_DECLS
-
#endif /* __BST_KEY_BINDINGS_H__ */
diff --git a/beast-gtk/bstknob.hh b/beast-gtk/bstknob.hh
index b84f614..7afbdc0 100644
--- a/beast-gtk/bstknob.hh
+++ b/beast-gtk/bstknob.hh
@@ -5,8 +5,6 @@
#include <gtk/gtkadjustment.h>
#include <gtk/gtkimage.h>
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_KNOB (bst_knob_get_type ())
#define BST_KNOB(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_KNOB, BstKnob))
@@ -68,6 +66,4 @@ void bst_knob_set_adjustment (BstKnob *knob,
GtkAdjustment* bst_knob_get_adjustment (BstKnob *knob);
void bst_knob_set_update_policy (BstKnob *knob,
GtkUpdateType policy);
-G_END_DECLS
-
#endif /* __BST_KNOB_H__ */
diff --git a/beast-gtk/bstlogadjustment.hh b/beast-gtk/bstlogadjustment.hh
index e4f99fe..a3dd848 100644
--- a/beast-gtk/bstlogadjustment.hh
+++ b/beast-gtk/bstlogadjustment.hh
@@ -4,8 +4,6 @@
#include <gtk/gtkadjustment.h>
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_LOG_ADJUSTMENT (bst_log_adjustment_get_type ())
#define BST_LOG_ADJUSTMENT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_LOG_ADJUSTMENT,
BstLogAdjustment))
@@ -49,6 +47,4 @@ void bst_log_adjustment_setup (BstLogAdjustment *ladj,
gdouble base,
gdouble n_steps);
-G_END_DECLS
-
#endif /* __BST_LOG_ADJUSTMENT_H__ */
diff --git a/beast-gtk/bstmenus.hh b/beast-gtk/bstmenus.hh
index 591eee9..b6eedc2 100644
--- a/beast-gtk/bstmenus.hh
+++ b/beast-gtk/bstmenus.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- BstChoice --- */
/* BstChoice are simple inlined popup menus for modal selections.
*/
@@ -71,8 +69,6 @@ BstChoice* bst_choice_alloc (BstChoiceFlags type,
const String &icon_stock_id,
const Bse::Icon &bseicon);
-G_END_DECLS
-
// == Flags Enumeration Operators in C++ ==
#ifdef __cplusplus
constexpr BstChoiceFlags operator& (BstChoiceFlags s1, BstChoiceFlags s2) { return BstChoiceFlags (s1 &
(long long unsigned) s2); }
diff --git a/beast-gtk/bstmsgabsorb.hh b/beast-gtk/bstmsgabsorb.hh
index 4338a6d..8f01e0b 100644
--- a/beast-gtk/bstmsgabsorb.hh
+++ b/beast-gtk/bstmsgabsorb.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- access config file --- */
#define BST_STRDUP_ABSORBRC_FILE() (g_strconcat (g_get_home_dir (), "/.beast/absorbrc", NULL))
@@ -25,6 +23,4 @@ Bst::MsgAbsorbStringSeq* bst_msg_absorb_config_box_get (GtkWidget *box);
void bst_msg_absorb_config_save (void);
void bst_msg_absorb_config_load (void);
-G_END_DECLS
-
#endif /* __BST_MSG_ABSORB_H__ */
diff --git a/beast-gtk/bstparam.hh b/beast-gtk/bstparam.hh
index 173c7c4..d5c63a0 100644
--- a/beast-gtk/bstparam.hh
+++ b/beast-gtk/bstparam.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- parameters gmasks --- */
BstGMask* bst_param_create_gmask (GxkParam *param,
const gchar *editor_name,
@@ -50,8 +48,6 @@ void _bst_init_params (void);
-G_END_DECLS
-
#endif /* __BST_PARAM_H__ */
/* vim:set ts=8 sts=2 sw=2: */
diff --git a/beast-gtk/bstparamview.hh b/beast-gtk/bstparamview.hh
index 5edb184..3139293 100644
--- a/beast-gtk/bstparamview.hh
+++ b/beast-gtk/bstparamview.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_PARAM_VIEW (bst_param_view_get_type ())
#define BST_PARAM_VIEW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_PARAM_VIEW,
BstParamView))
@@ -52,6 +50,4 @@ void bst_param_view_set_mask (BstParamView *param_view,
-G_END_DECLS
-
#endif /* __BST_PARAM_VIEW_H__ */
diff --git a/beast-gtk/bstpartdialog.hh b/beast-gtk/bstpartdialog.hh
index 5461fe6..dbf1bbd 100644
--- a/beast-gtk/bstpartdialog.hh
+++ b/beast-gtk/bstpartdialog.hh
@@ -9,8 +9,6 @@
#include "bstpianorollctrl.hh"
#include "bsteventrollctrl.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_PART_DIALOG (bst_part_dialog_get_type ())
#define BST_PART_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_PART_DIALOG,
BstPartDialog))
@@ -45,6 +43,4 @@ struct _BstPartDialogClass
GType bst_part_dialog_get_type (void);
void bst_part_dialog_set_part (BstPartDialog *self, Bse::PartH part = Bse::PartH());
-G_END_DECLS
-
#endif /* __BST_PART_DIALOG_H__ */
diff --git a/beast-gtk/bstpartview.hh b/beast-gtk/bstpartview.hh
index f198af0..9cbf4e1 100644
--- a/beast-gtk/bstpartview.hh
+++ b/beast-gtk/bstpartview.hh
@@ -4,8 +4,6 @@
#include "bstitemview.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_PART_VIEW (bst_part_view_get_type ())
#define BST_PART_VIEW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_PART_VIEW,
BstPartView))
@@ -32,6 +30,4 @@ struct _BstPartViewClass
GType bst_part_view_get_type (void);
GtkWidget* bst_part_view_new (SfiProxy song);
-G_END_DECLS
-
#endif /* __BST_PART_VIEW_H__ */
diff --git a/beast-gtk/bstpatterncolumns.hh b/beast-gtk/bstpatterncolumns.hh
index 22fe0f1..6e9d5de 100644
--- a/beast-gtk/bstpatterncolumns.hh
+++ b/beast-gtk/bstpatterncolumns.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- enums --- */
typedef enum /*< skip >*/
{
@@ -148,8 +146,6 @@ BstPatternColumn* bst_pattern_column_create (BstPatternLType ltype,
BstPatternLFlags lflags);
gboolean bst_pattern_column_has_notes (BstPatternColumn *column);
-G_END_DECLS
-
// == Flags Enumeration Operators in C++ ==
#ifdef __cplusplus
constexpr BstPatternLFlags operator& (BstPatternLFlags s1, BstPatternLFlags s2) { return BstPatternLFlags
(s1 & (long long unsigned) s2); }
diff --git a/beast-gtk/bstpatternctrl.hh b/beast-gtk/bstpatternctrl.hh
index 5adc62a..3ff7192 100644
--- a/beast-gtk/bstpatternctrl.hh
+++ b/beast-gtk/bstpatternctrl.hh
@@ -4,8 +4,6 @@
#include "bstpatternview.hh"
-G_BEGIN_DECLS
-
typedef struct {
GxkParam *vraster;
GxkParam *steps;
@@ -30,6 +28,4 @@ BstKeyBinding* bst_pattern_controller_generic_keys (void);
BstKeyBinding* bst_pattern_controller_default_piano_keys (void);
BstKeyBinding* bst_pattern_controller_piano_keys (void);
-G_END_DECLS
-
#endif /* __BST_PATTERN_CONTROLLER_H__ */
diff --git a/beast-gtk/bstpatternview.hh b/beast-gtk/bstpatternview.hh
index 57ac049..2eb4858 100644
--- a/beast-gtk/bstpatternview.hh
+++ b/beast-gtk/bstpatternview.hh
@@ -4,8 +4,6 @@
#include "bstpatterncolumns.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_PATTERN_VIEW (bst_pattern_view_get_type ())
#define BST_PATTERN_VIEW(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_PATTERN_VIEW,
BstPatternView))
@@ -132,6 +130,4 @@ guint bst_pattern_view_set_layout (BstPatternView *s
const gchar *layout);
-G_END_DECLS
-
#endif /* __BST_PATTERN_VIEW_H__ */
diff --git a/beast-gtk/bstpianoroll.hh b/beast-gtk/bstpianoroll.hh
index 01df588..db767cb 100644
--- a/beast-gtk/bstpianoroll.hh
+++ b/beast-gtk/bstpianoroll.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_PIANO_ROLL (bst_piano_roll_get_type ())
#define BST_PIANO_ROLL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_PIANO_ROLL,
BstPianoRoll))
@@ -110,6 +108,4 @@ void bst_piano_roll_set_marker (BstPianoRoll *self,
BstPianoRollMarkerType mtype);
-G_END_DECLS
-
#endif /* __BST_PIANO_ROLL_H__ */
diff --git a/beast-gtk/bstpianorollctrl.hh b/beast-gtk/bstpianorollctrl.hh
index 35b122d..de0f5e9 100644
--- a/beast-gtk/bstpianorollctrl.hh
+++ b/beast-gtk/bstpianorollctrl.hh
@@ -4,8 +4,6 @@
#include "bstpianoroll.hh"
-G_BEGIN_DECLS
-
typedef struct {
/* misc data */
guint ref_count;
@@ -50,6 +48,4 @@ gboolean bst_piano_roll_controller_has_selection (BstPianoRollCo
guint64 action_stamp);
-G_END_DECLS
-
#endif /* __BST_PIANO_ROLL_CONTROLLER_H__ */
diff --git a/beast-gtk/bstplayback.hh b/beast-gtk/bstplayback.hh
index d576933..7459bd4 100644
--- a/beast-gtk/bstplayback.hh
+++ b/beast-gtk/bstplayback.hh
@@ -4,10 +4,6 @@
#include "bstutils.hh"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
/* --- typedefs & structures --- */
typedef void (*BstPlayBackNotify) (gpointer data,
@@ -52,8 +48,4 @@ void bst_play_back_handle_destroy (BstPlayBackHandle *handle);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_PLAY_BACK_H__ */
diff --git a/beast-gtk/bstpreferences.hh b/beast-gtk/bstpreferences.hh
index 6c932b3..d508db5 100644
--- a/beast-gtk/bstpreferences.hh
+++ b/beast-gtk/bstpreferences.hh
@@ -4,8 +4,6 @@
#include "bstparamview.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_PREFERENCES (bst_preferences_get_type ())
#define BST_PREFERENCES(object) (GTK_CHECK_CAST ((object), BST_TYPE_PREFERENCES,
BstPreferences))
@@ -57,6 +55,4 @@ void bst_preferences_default_revert (BstPreferences *prefs);
void bst_preferences_create_buttons (BstPreferences *prefs,
GxkDialog *dialog);
-G_END_DECLS
-
#endif /* __BST_PREFERENCES_H__ */
diff --git a/beast-gtk/bstprocedure.hh b/beast-gtk/bstprocedure.hh
index 088ff6c..d76d595 100644
--- a/beast-gtk/bstprocedure.hh
+++ b/beast-gtk/bstprocedure.hh
@@ -4,8 +4,6 @@
#include "bstparamview.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_PROCEDURE_SHELL (bst_procedure_shell_get_type ())
#define BST_PROCEDURE_SHELL(object) (GTK_CHECK_CAST ((object), BST_TYPE_PROCEDURE_SHELL,
BstProcedureShell))
@@ -68,6 +66,4 @@ void bst_procedure_exec_modal (const gchar *procedure_name,
GParamSpec* bst_procedure_ref_pspec (const gchar *procedure_name,
const gchar *parameter);
-G_END_DECLS
-
#endif /* __BST_PROCEDURE_H__ */
diff --git a/beast-gtk/bstprofiler.hh b/beast-gtk/bstprofiler.hh
index ec811fd..bee5c93 100644
--- a/beast-gtk/bstprofiler.hh
+++ b/beast-gtk/bstprofiler.hh
@@ -4,11 +4,7 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
GtkWidget* bst_profiler_window_get (void);
-G_END_DECLS
-
#endif /* __BST_PROFILER_H__ */
diff --git a/beast-gtk/bstprojectctrl.hh b/beast-gtk/bstprojectctrl.hh
index 381db2d..7336422 100644
--- a/beast-gtk/bstprojectctrl.hh
+++ b/beast-gtk/bstprojectctrl.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_PROJECT_CTRL (bst_project_ctrl_get_type ())
#define BST_PROJECT_CTRL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_PROJECT_CTRL,
BstProjectCtrl))
@@ -37,6 +35,4 @@ void bst_project_ctrl_play (BstProjectCtrl *self);
void bst_project_ctrl_stop (BstProjectCtrl *self);
-G_END_DECLS
-
#endif /* __BST_PROJECT_CTRL_H__ */
diff --git a/beast-gtk/bstqsampler.hh b/beast-gtk/bstqsampler.hh
index 927db95..f6e1172 100644
--- a/beast-gtk/bstqsampler.hh
+++ b/beast-gtk/bstqsampler.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_QSAMPLER (bst_qsampler_get_type ())
#define BST_QSAMPLER(object) (GTK_CHECK_CAST ((object), BST_TYPE_QSAMPLER, BstQSampler))
@@ -179,6 +177,4 @@ void bst_qsampler_set_source_from_esample (BstQSampler *qsampler,
SfiProxy esample,
guint nth_channel);
-G_END_DECLS
-
#endif /* __BST_QSAMPLER_H__ */
diff --git a/beast-gtk/bstsampleeditor.hh b/beast-gtk/bstsampleeditor.hh
index 06ebf3f..a23e1c2 100644
--- a/beast-gtk/bstsampleeditor.hh
+++ b/beast-gtk/bstsampleeditor.hh
@@ -5,10 +5,6 @@
#include "bstqsampler.hh"
#include "bstplayback.hh"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_SAMPLE_EDITOR (bst_sample_editor_get_type ())
@@ -54,8 +50,4 @@ void bst_sample_editor_set_sample (BstSampleEditor *sample_editor,
void bst_sample_editor_rebuild (BstSampleEditor *sample_editor);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_SAMPLE_EDITOR_H__ */
diff --git a/beast-gtk/bstscrollgraph.hh b/beast-gtk/bstscrollgraph.hh
index d844040..b34dca3 100644
--- a/beast-gtk/bstscrollgraph.hh
+++ b/beast-gtk/bstscrollgraph.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_SCROLLGRAPH (bst_scrollgraph_get_type ())
#define BST_SCROLLGRAPH(object) (G_TYPE_CHECK_INSTANCE_CAST ((object),
BST_TYPE_SCROLLGRAPH, BstScrollgraph))
@@ -51,6 +49,4 @@ GtkWidget* bst_scrollgraph_build_dialog (GtkWidget *alive_object,
SfiProxy source,
guint ochannel);
-G_END_DECLS
-
#endif /* __BST_SCROLLGRAPH_H__ */
diff --git a/beast-gtk/bstsegment.hh b/beast-gtk/bstsegment.hh
index 6882f51..b0c7e40 100644
--- a/beast-gtk/bstsegment.hh
+++ b/beast-gtk/bstsegment.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- structures & typedefs --- */
typedef enum {
@@ -59,6 +57,4 @@ void bst_segment_draw (BstSegment *self,
GtkStyle *style);
void bst_segment_clear (BstSegment *self);
-G_END_DECLS
-
#endif /* __BST_SEGMENT_H__ */
diff --git a/beast-gtk/bstsequence.hh b/beast-gtk/bstsequence.hh
index 229123e..8c77be2 100644
--- a/beast-gtk/bstsequence.hh
+++ b/beast-gtk/bstsequence.hh
@@ -5,10 +5,6 @@
#include <gtk/gtk.h>
#include "bstbseutils.hh"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
/* --- type macros --- */
#define BST_TYPE_SEQUENCE (bst_sequence_get_type ())
@@ -45,9 +41,5 @@ void bst_sequence_set_seq (BstSequence *seq,
BseNoteSequence *sdata);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_SEQUENCE_H__ */
diff --git a/beast-gtk/bstservermonitor.hh b/beast-gtk/bstservermonitor.hh
index c5b9811..31f9052 100644
--- a/beast-gtk/bstservermonitor.hh
+++ b/beast-gtk/bstservermonitor.hh
@@ -5,10 +5,6 @@
#include "bstparamview.hh"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_SERVER_MONITOR (bst_server_monitor_get_type ())
@@ -42,8 +38,4 @@ void bst_server_monitor_update (BstServerMonitor *smon);
void bst_server_monitor_rebuild (BstServerMonitor *smon);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_SERVER_MONITOR_H__ */
diff --git a/beast-gtk/bstskinconfig.hh b/beast-gtk/bstskinconfig.hh
index 0011b03..8fe10c2 100644
--- a/beast-gtk/bstskinconfig.hh
+++ b/beast-gtk/bstskinconfig.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- access skin config --- */
#define BST_SKIN_CONFIG(field) (* bst_skin_config_get_global ()) . field
#define BST_SKIN_CONFIG_STRDUP_PATH(field) sfi_path_get_filename (BST_SKIN_CONFIG (field).c_str(),
bst_skin_config_dirname())
@@ -30,6 +28,4 @@ Bse::Error bst_skin_dump (const gchar *file_name);
Bse::Error bst_skin_parse (const gchar *file_name);
-G_END_DECLS
-
#endif /* __BST_SKIN_CONFIG_H__ */
diff --git a/beast-gtk/bstsnetrouter.hh b/beast-gtk/bstsnetrouter.hh
index f41f856..28707df 100644
--- a/beast-gtk/bstsnetrouter.hh
+++ b/beast-gtk/bstsnetrouter.hh
@@ -5,8 +5,6 @@
#include "bstcanvassource.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_SNET_ROUTER (bst_snet_router_get_type ())
#define BST_SNET_ROUTER(object) (GTK_CHECK_CAST ((object), BST_TYPE_SNET_ROUTER,
BstSNetRouter))
@@ -59,6 +57,4 @@ BstCanvasSource* bst_snet_router_csource_from_source (BstSNetRouter *snet_route
BstSNetRouter* bst_snet_router_build_page (Bse::SNetH snet);
-G_END_DECLS
-
#endif /* __BST_SNET_ROUTER_H__ */
diff --git a/beast-gtk/bstsnifferscope.hh b/beast-gtk/bstsnifferscope.hh
index 75d6d3f..1b15387 100644
--- a/beast-gtk/bstsnifferscope.hh
+++ b/beast-gtk/bstsnifferscope.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_SNIFFER_SCOPE (bst_sniffer_scope_get_type ())
#define BST_SNIFFER_SCOPE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_SNIFFER_SCOPE,
BstSnifferScope))
@@ -41,6 +39,4 @@ void bst_source_queue_probe_request (SfiProxy source,
BstSourceProbeFeature pfeature,
gfloat frequency);
-G_END_DECLS
-
#endif /* __BST_SNIFFER_SCOPE_H__ */
diff --git a/beast-gtk/bstsplash.hh b/beast-gtk/bstsplash.hh
index 59524c8..8890b1b 100644
--- a/beast-gtk/bstsplash.hh
+++ b/beast-gtk/bstsplash.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_SPLASH (bst_splash_get_type ())
#define BST_SPLASH(object) (GTK_CHECK_CAST ((object), BST_TYPE_SPLASH, BstSplash))
@@ -67,6 +65,4 @@ void bst_splash_animate_strings (GtkWidget *splash,
const gchar **strings);
-G_END_DECLS
-
#endif /* __BST_SPLASH_H__ */
diff --git a/beast-gtk/bstsupershell.hh b/beast-gtk/bstsupershell.hh
index bd0a194..1e01d50 100644
--- a/beast-gtk/bstsupershell.hh
+++ b/beast-gtk/bstsupershell.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_SUPER_SHELL (bst_super_shell_get_type ())
#define BST_SUPER_SHELL(object) (GTK_CHECK_CAST ((object), BST_TYPE_SUPER_SHELL,
BstSuperShell))
@@ -35,6 +33,4 @@ GType bst_super_shell_get_type (void);
void bst_super_shell_set_super (BstSuperShell *super_shell, Bse::SuperH super);
GtkWidget* bst_super_shell_create_label (BstSuperShell *super_shell);
-G_END_DECLS
-
#endif /* __BST_SUPER_SHELL_H__ */
diff --git a/beast-gtk/bsttrackroll.hh b/beast-gtk/bsttrackroll.hh
index 520ca65..7701355 100644
--- a/beast-gtk/bsttrackroll.hh
+++ b/beast-gtk/bsttrackroll.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define BST_TYPE_TRACK_ROLL (bst_track_roll_get_type ())
#define BST_TRACK_ROLL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_TRACK_ROLL,
BstTrackRoll))
@@ -129,6 +127,4 @@ void bst_track_roll_set_marker (BstTrackRoll *self,
BstTrackRollMarkerType mtype);
-G_END_DECLS
-
#endif /* __BST_TRACK_ROLL_H__ */
diff --git a/beast-gtk/bsttrackrollctrl.hh b/beast-gtk/bsttrackrollctrl.hh
index fde79bb..e370a20 100644
--- a/beast-gtk/bsttrackrollctrl.hh
+++ b/beast-gtk/bsttrackrollctrl.hh
@@ -5,8 +5,6 @@
#include "bsttrackroll.hh"
-G_BEGIN_DECLS
-
typedef struct _BstTrackRollUtil BstTrackRollUtil;
typedef struct {
/* misc data */
@@ -45,6 +43,4 @@ GxkActionList* bst_track_roll_controller_hpanel_actions (BstTrackRollCon
GxkActionList* bst_track_roll_controller_quant_actions (BstTrackRollController *self);
-G_END_DECLS
-
#endif /* __BST_TRACK_ROLL_CONTROLLER_H__ */
diff --git a/beast-gtk/bsttracksynthdialog.hh b/beast-gtk/bsttracksynthdialog.hh
index df5dd67..8247e05 100644
--- a/beast-gtk/bsttracksynthdialog.hh
+++ b/beast-gtk/bsttracksynthdialog.hh
@@ -5,8 +5,6 @@
#include "bstutils.hh"
#include "bstwaveview.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_TRACK_SYNTH_DIALOG (bst_track_synth_dialog_get_type ())
@@ -63,6 +61,4 @@ void bst_track_synth_dialog_set (BstTrackSynthDialog *self,
-G_END_DECLS
-
#endif /* __BST_TRACK_SYNTH_DIALOG_H__ */
diff --git a/beast-gtk/bsttrackview.hh b/beast-gtk/bsttrackview.hh
index 8bcf952..3ccb571 100644
--- a/beast-gtk/bsttrackview.hh
+++ b/beast-gtk/bsttrackview.hh
@@ -6,8 +6,6 @@
#include "bsttrackroll.hh"
#include "bsttrackrollctrl.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_TRACK_VIEW (bst_track_view_get_type ())
#define BST_TRACK_VIEW(object) (GTK_CHECK_CAST ((object), BST_TYPE_TRACK_VIEW, BstTrackView))
@@ -39,6 +37,4 @@ GtkWidget* bst_track_view_new (SfiProxy song);
-G_END_DECLS
-
#endif /* __BST_TRACK_VIEW_H__ */
diff --git a/beast-gtk/bsttreestores.hh b/beast-gtk/bsttreestores.hh
index ba64c86..5b562af 100644
--- a/beast-gtk/bsttreestores.hh
+++ b/beast-gtk/bsttreestores.hh
@@ -4,8 +4,6 @@
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- file store --- */
enum {
@@ -84,6 +82,4 @@ void bst_child_list_wrapper_proxy_changed (GxkListWrapper *self,
SfiProxy item);
-G_END_DECLS
-
#endif /* __BST_TREE_STORES_H__ */
diff --git a/beast-gtk/bstusermessage.hh b/beast-gtk/bstusermessage.hh
index 25681d2..c270ad7 100644
--- a/beast-gtk/bstusermessage.hh
+++ b/beast-gtk/bstusermessage.hh
@@ -2,8 +2,6 @@
#ifndef __BST_USER_MESSAGE_H__
#define __BST_USER_MESSAGE_H__
#include "bstutils.hh"
-G_BEGIN_DECLS
-
/* --- structures --- */
typedef enum {
BST_MSG_ERROR = int64 (Bse::UserMessageType::ERROR),
@@ -79,6 +77,4 @@ BstMsgBit* bst_msg_bit_create_choice (guint id,
__mt, RAPICORN_ARRAY_SIZE (__ba), __ba);
\
__result; })
-G_END_DECLS
-
#endif /* __BST_USER_MESSAGE_H__ */
diff --git a/beast-gtk/bstutils.hh b/beast-gtk/bstutils.hh
index 08cbb96..ff54a9a 100644
--- a/beast-gtk/bstutils.hh
+++ b/beast-gtk/bstutils.hh
@@ -21,8 +21,6 @@ void event_loop_quit (uint8 exit_code = 0);
extern Bse::ServerH bse_server;
-G_BEGIN_DECLS
-
/* --- GUI utilities --- */
void bst_status_set_error (Bse::Error error, const String &message);
#define bst_status_eprintf(error, ...) bst_status_set_error (error, Rapicorn::string_format
(__VA_ARGS__))
@@ -213,8 +211,6 @@ Bst::GConfig* bst_gconfig_get_global (void);
/* --- internal --- */
void _bst_init_utils (void);
void _bst_init_radgets (void);
-G_END_DECLS
-
// == mouse button checks ==
bool bst_mouse_button_activate (GdkEvent *event);
diff --git a/beast-gtk/bstwaveeditor.hh b/beast-gtk/bstwaveeditor.hh
index a7ea804..ed93e49 100644
--- a/beast-gtk/bstwaveeditor.hh
+++ b/beast-gtk/bstwaveeditor.hh
@@ -5,10 +5,6 @@
#include "bstqsampler.hh"
#include "bstplayback.hh"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_WAVE_EDITOR (bst_wave_editor_get_type ())
@@ -73,8 +69,4 @@ void bst_wave_editor_set_esample (BstWaveEditor *self,
SfiProxy editable_sample);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_WAVE_EDITOR_H__ */
diff --git a/beast-gtk/bstwaveview.hh b/beast-gtk/bstwaveview.hh
index c7c475c..65ea276 100644
--- a/beast-gtk/bstwaveview.hh
+++ b/beast-gtk/bstwaveview.hh
@@ -4,8 +4,6 @@
#include "bstitemview.hh"
-G_BEGIN_DECLS
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_WAVE_VIEW (bst_wave_view_get_type ())
@@ -36,6 +34,4 @@ GtkWidget* bst_wave_view_new (SfiProxy wrepo);
void bst_wave_view_set_editable (BstWaveView *self,
gboolean enabled);
-G_END_DECLS
-
#endif /* __BST_WAVE_VIEW_H__ */
diff --git a/beast-gtk/bstxframe.hh b/beast-gtk/bstxframe.hh
index d017905..18c7cdd 100644
--- a/beast-gtk/bstxframe.hh
+++ b/beast-gtk/bstxframe.hh
@@ -4,10 +4,6 @@
#include <gtk/gtkframe.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#define BST_TYPE_XFRAME (bst_xframe_get_type ())
#define BST_XFRAME(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), BST_TYPE_XFRAME, BstXFrame))
@@ -44,9 +40,5 @@ void bst_xframe_set_cover_widget (BstXFrame *xframe,
GtkWidget *widget,
gboolean steal_button);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_XFRAME_H__ */
diff --git a/beast-gtk/bstxkb.hh b/beast-gtk/bstxkb.hh
index a98f1f4..59adc69 100644
--- a/beast-gtk/bstxkb.hh
+++ b/beast-gtk/bstxkb.hh
@@ -4,10 +4,6 @@
#include <glib.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
/* --- prototypes --- */
gboolean bst_xkb_open (const gchar *display,
@@ -26,8 +22,4 @@ void bst_xkb_parse_symbol (const gchar *symbol,
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_XKB_H__ */
diff --git a/beast-gtk/bstzoomedwindow.hh b/beast-gtk/bstzoomedwindow.hh
index fcf9dbf..16b0c14 100644
--- a/beast-gtk/bstzoomedwindow.hh
+++ b/beast-gtk/bstzoomedwindow.hh
@@ -5,10 +5,6 @@
#include <gtk/gtkscrolledwindow.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
/* --- Gtk+ type macros --- */
#define BST_TYPE_ZOOMED_WINDOW (bst_zoomed_window_get_type ())
@@ -41,8 +37,4 @@ struct _BstZoomedWindowClass
GtkType bst_zoomed_window_get_type (void);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
#endif /* __BST_ZOOMED_WINDOW_H__ */
diff --git a/beast-gtk/gxk/gxkaction.hh b/beast-gtk/gxk/gxkaction.hh
index 31e4bf6..94247bc 100644
--- a/beast-gtk/gxk/gxkaction.hh
+++ b/beast-gtk/gxk/gxkaction.hh
@@ -4,8 +4,6 @@
#include "gxkutils.hh"
-G_BEGIN_DECLS
-
#define GXK_ACTION_PRIORITY (G_PRIORITY_HIGH - 10)
@@ -160,6 +158,4 @@ void gxk_action_group_dispose (GxkActionGroup *agroup);
GxkActionGroup* gxk_action_toggle_new (void);
-G_END_DECLS
-
#endif /* __GXK_ACTION_H__ */
diff --git a/beast-gtk/gxk/gxkassortment.hh b/beast-gtk/gxk/gxkassortment.hh
index dab577a..cdba2b8 100644
--- a/beast-gtk/gxk/gxkassortment.hh
+++ b/beast-gtk/gxk/gxkassortment.hh
@@ -4,8 +4,6 @@
#include "gxkutils.hh"
-G_BEGIN_DECLS
-
#define GXK_ASSORTMENT_PRIORITY (G_PRIORITY_HIGH - 10)
/* --- assortment --- */
@@ -94,6 +92,4 @@ void gxk_window_remove_assortment_client (GtkWindow *window,
gpointer client_data);
-G_END_DECLS
-
#endif /* __GXK_ASSORTMENT_H__ */
diff --git a/beast-gtk/gxk/gxkauxwidgets.hh b/beast-gtk/gxk/gxkauxwidgets.hh
index a54219d..6a27cb4 100644
--- a/beast-gtk/gxk/gxkauxwidgets.hh
+++ b/beast-gtk/gxk/gxkauxwidgets.hh
@@ -5,8 +5,6 @@
#include "gxkutils.hh"
#include "gxkradget.hh"
-G_BEGIN_DECLS
-
/* --- menu item --- */
#define GXK_TYPE_MENU_ITEM (gxk_menu_item_get_type ())
#define GXK_MENU_ITEM(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_MENU_ITEM,
GxkMenuItem))
@@ -92,6 +90,4 @@ GType gxk_back_shade_get_type (void);
-G_END_DECLS
-
#endif /* __GXK_AUX_WIDGETS_H__ */
diff --git a/beast-gtk/gxk/gxkcanvas.hh b/beast-gtk/gxk/gxkcanvas.hh
index 2b98c31..a86d6fc 100644
--- a/beast-gtk/gxk/gxkcanvas.hh
+++ b/beast-gtk/gxk/gxkcanvas.hh
@@ -5,8 +5,6 @@
#include <gxk/gxkglobals.hh>
#include <libgnomecanvas/libgnomecanvas.h>
-G_BEGIN_DECLS
-
/* --- functions --- */
GnomeCanvasPoints* gnome_canvas_points_new0 (guint num_points);
GnomeCanvasPoints* gnome_canvas_points_newv (guint num_points,
@@ -30,6 +28,4 @@ void gnome_canvas_set_zoom (GnomeCanvas *canvas,
void gnome_canvas_FIXME_hard_update (GnomeCanvas *canvas);
-G_END_DECLS
-
#endif /* __GXK_CANVAS_H__ */
diff --git a/beast-gtk/gxk/gxkcellrendererpopup.hh b/beast-gtk/gxk/gxkcellrendererpopup.hh
index 1edb57d..ef715cd 100644
--- a/beast-gtk/gxk/gxkcellrendererpopup.hh
+++ b/beast-gtk/gxk/gxkcellrendererpopup.hh
@@ -6,8 +6,6 @@
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtkeventbox.h>
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_CELL_RENDERER_POPUP (gxk_cell_renderer_popup_get_type ())
#define GXK_CELL_RENDERER_POPUP(object) (G_TYPE_CHECK_INSTANCE_CAST ((object),
GXK_TYPE_CELL_RENDERER_POPUP, GxkCellRendererPopup))
@@ -71,6 +69,4 @@ void gxk_proxy_editable_set_cell_editable (GxkProxyEditable *self,
GtkCellEditable *ecell);
-G_END_DECLS
-
#endif /* __GXK_CELL_RENDERER_POPUP_H__ */
diff --git a/beast-gtk/gxk/gxkdialog.hh b/beast-gtk/gxk/gxkdialog.hh
index 298d529..4c9b703 100644
--- a/beast-gtk/gxk/gxkdialog.hh
+++ b/beast-gtk/gxk/gxkdialog.hh
@@ -4,8 +4,6 @@
#include "gxkutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_DIALOG (gxk_dialog_get_type ())
#define GXK_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_DIALOG, GxkDialog))
@@ -112,8 +110,6 @@ GtkWidget* gxk_dialog_action_multi (GxkDialog *dialog,
const gchar *icon_stock_id,
GxkDialogMultiFlags multi_mode);
-G_END_DECLS
-
// == Flags Enumeration Operators in C++ ==
#ifdef __cplusplus
constexpr GxkDialogFlags operator& (GxkDialogFlags s1, GxkDialogFlags s2) { return GxkDialogFlags (s1 &
(long long unsigned) s2); }
diff --git a/beast-gtk/gxk/gxkglobals.hh b/beast-gtk/gxk/gxkglobals.hh
index 3ff845a..eb9c507 100644
--- a/beast-gtk/gxk/gxkglobals.hh
+++ b/beast-gtk/gxk/gxkglobals.hh
@@ -5,8 +5,6 @@
#include <sfi/glib-extra.hh>
#include <gtk/gtk.h>
-G_BEGIN_DECLS
-
/* --- i18n and gettext helpers --- */
#ifdef GXK_COMPILATION
# define GXK_I18N_DOMAIN NULL
@@ -56,8 +54,6 @@ void gxk_init_assortments (void);
void gxk_init_radget_types (void);
-G_END_DECLS
-
// == Flags Enumeration Operators in C++ ==
#ifdef __cplusplus
constexpr GdkEventMask operator& (GdkEventMask s1, GdkEventMask s2) { return GdkEventMask (s1 & (long
long unsigned) s2); }
diff --git a/beast-gtk/gxk/gxkimagecache.hh b/beast-gtk/gxk/gxkimagecache.hh
index f5d4df1..4200fb9 100644
--- a/beast-gtk/gxk/gxkimagecache.hh
+++ b/beast-gtk/gxk/gxkimagecache.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkutils.hh>
-G_BEGIN_DECLS
-
typedef struct {
gchar *file_name;
GdkColor tint;
@@ -24,6 +22,4 @@ GdkPixmap* gxk_image_cache_use_pixmap (const gchar *file_name,
void gxk_image_cache_unuse_pixmap (GdkPixmap *pixmap);
-G_END_DECLS
-
#endif /* __GXK_IMAGE_CACHE_H__ */
diff --git a/beast-gtk/gxk/gxkled.hh b/beast-gtk/gxk/gxkled.hh
index 713e32f..797393d 100644
--- a/beast-gtk/gxk/gxkled.hh
+++ b/beast-gtk/gxk/gxkled.hh
@@ -4,8 +4,6 @@
#include "gxkutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_LED (gxk_led_get_type ())
#define GXK_LED(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_LED, GxkLed))
@@ -46,6 +44,4 @@ void gxk_led_set_border_width (GxkLed *self,
guint border_width);
-G_END_DECLS
-
#endif /* __GXK_LED_H__ */
diff --git a/beast-gtk/gxk/gxklistwrapper.hh b/beast-gtk/gxk/gxklistwrapper.hh
index d0f6d45..2dba282 100644
--- a/beast-gtk/gxk/gxklistwrapper.hh
+++ b/beast-gtk/gxk/gxklistwrapper.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkglobals.hh>
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_LIST_WRAPPER (gxk_list_wrapper_get_type ())
#define GXK_LIST_WRAPPER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_LIST_WRAPPER,
GxkListWrapper))
@@ -66,6 +64,4 @@ void gxk_list_wrapper_get_iter_at (GxkListWrapper *self,
GtkTreeIter *iter,
guint index);
-G_END_DECLS
-
#endif /* __GXK_LIST_WRAPPER_H__ */
diff --git a/beast-gtk/gxk/gxklogadjustment.hh b/beast-gtk/gxk/gxklogadjustment.hh
index 515c05b..5792253 100644
--- a/beast-gtk/gxk/gxklogadjustment.hh
+++ b/beast-gtk/gxk/gxklogadjustment.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkutils.hh>
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_ADAPTER_ADJUSTMENT (gxk_adapter_adjustment_get_type ())
#define GXK_ADAPTER_ADJUSTMENT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object),
GXK_TYPE_ADAPTER_ADJUSTMENT, GxkAdapterAdjustment))
@@ -97,6 +95,4 @@ void gxk_log_adjustment_setup (GxkLogAdjustment *self,
gdouble center,
gdouble base,
gdouble n_steps);
-G_END_DECLS
-
#endif /* __GXK_LOG_ADJUSTMENT_H__ */
diff --git a/beast-gtk/gxk/gxkmenubutton.hh b/beast-gtk/gxk/gxkmenubutton.hh
index a733dad..422d238 100644
--- a/beast-gtk/gxk/gxkmenubutton.hh
+++ b/beast-gtk/gxk/gxkmenubutton.hh
@@ -5,8 +5,6 @@
#include "gxkutils.hh"
#include "gxkassortment.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_MENU_BUTTON (gxk_menu_button_get_type ())
#define GXK_MENU_BUTTON(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_MENU_BUTTON,
GxkMenuButton))
@@ -39,6 +37,4 @@ GType gxk_menu_button_get_type (void);
void gxk_menu_button_update (GxkMenuButton *self);
-G_END_DECLS
-
#endif /* __GXK_MENU_BUTTON_H__ */
diff --git a/beast-gtk/gxk/gxknotebook.hh b/beast-gtk/gxk/gxknotebook.hh
index a414355..139f753 100644
--- a/beast-gtk/gxk/gxknotebook.hh
+++ b/beast-gtk/gxk/gxknotebook.hh
@@ -4,8 +4,6 @@
#include "gxkassortment.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_NOTEBOOK (gxk_notebook_get_type ())
#define GXK_NOTEBOOK(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_NOTEBOOK,
GxkNotebook))
@@ -31,6 +29,4 @@ GType gxk_notebook_get_type (void);
void gxk_notebook_set_assortment (GxkNotebook *self,
GxkAssortment *assortment);
-G_END_DECLS
-
#endif /* __GXK_NOTEBOOK_H__ */
diff --git a/beast-gtk/gxk/gxkparam.hh b/beast-gtk/gxk/gxkparam.hh
index a808447..f2f0459 100644
--- a/beast-gtk/gxk/gxkparam.hh
+++ b/beast-gtk/gxk/gxkparam.hh
@@ -4,8 +4,6 @@
#include "gxkutils.hh"
-G_BEGIN_DECLS
-
/* --- macros --- */
#define GXK_IS_PARAM(p) (p && G_IS_PARAM_SPEC (p->pspec))
@@ -172,8 +170,6 @@ GtkAdjustment* gxk_param_get_adjustment_with_stepping (GxkParam *param,
GtkAdjustment* gxk_param_get_log_adjustment (GxkParam *param);
GtkAdjustment* gxk_param_get_decibel_adjustment (GxkParam *param);
-G_END_DECLS
-
#endif /* __GXK_PARAM_H__ */
/* vim:set ts=8 sts=2 sw=2: */
diff --git a/beast-gtk/gxk/gxkpolygon.hh b/beast-gtk/gxk/gxkpolygon.hh
index c619f38..f59bdaa 100644
--- a/beast-gtk/gxk/gxkpolygon.hh
+++ b/beast-gtk/gxk/gxkpolygon.hh
@@ -4,8 +4,6 @@
#include "gxkutils.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_POLYGON (gxk_polygon_get_type ())
#define GXK_POLYGON(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_POLYGON, GxkPolygon))
@@ -68,6 +66,4 @@ extern GxkPolygonGraph gxk_polygon_forward;
extern GxkPolygonGraph gxk_polygon_next;
extern GxkPolygonGraph gxk_polygon_last;
-G_END_DECLS
-
#endif /* __GXK_POLYGON_H__ */
diff --git a/beast-gtk/gxk/gxkrackeditor.hh b/beast-gtk/gxk/gxkrackeditor.hh
index d04066a..d56c080 100644
--- a/beast-gtk/gxk/gxkrackeditor.hh
+++ b/beast-gtk/gxk/gxkrackeditor.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkracktable.hh>
-G_BEGIN_DECLS
-
struct _GxkRackEditor {
GdkWindow *iwindow;
gint rfx, rfy, rfw, rfh;
@@ -57,6 +55,4 @@ void gxk_rack_table_adjust_editor (GxkRackTable *self);
void gxk_rack_table_unmap_editor (GxkRackTable *self);
-G_END_DECLS
-
#endif /* __GXK_RACK_EDITOR_H__ */
diff --git a/beast-gtk/gxk/gxkrackitem.hh b/beast-gtk/gxk/gxkrackitem.hh
index 5c97197..68cffef 100644
--- a/beast-gtk/gxk/gxkrackitem.hh
+++ b/beast-gtk/gxk/gxkrackitem.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkracktable.hh>
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_RACK_ITEM (gxk_rack_item_get_type ())
#define GXK_RACK_ITEM(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_RACK_ITEM,
GxkRackItem))
@@ -43,6 +41,4 @@ gboolean gxk_rack_item_set_area (GxkRackItem *self,
gint hspan,
gint vspan);
-G_END_DECLS
-
#endif /* __GXK_RACK_ITEM_H__ */
diff --git a/beast-gtk/gxk/gxkracktable.hh b/beast-gtk/gxk/gxkracktable.hh
index b392fc9..81ed332 100644
--- a/beast-gtk/gxk/gxkracktable.hh
+++ b/beast-gtk/gxk/gxkracktable.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkutils.hh>
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_RACK_TABLE (gxk_rack_table_get_type ())
#define GXK_RACK_TABLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_RACK_TABLE,
GxkRackTable))
@@ -74,6 +72,4 @@ void gxk_rack_table_cover_up (GxkRackTable *self);
void gxk_rack_table_uncover (GxkRackTable *self);
-G_END_DECLS
-
#endif /* __GXK_RACK_TABLE_H__ */
diff --git a/beast-gtk/gxk/gxkradget.hh b/beast-gtk/gxk/gxkradget.hh
index 43687ae..9bc364f 100644
--- a/beast-gtk/gxk/gxkradget.hh
+++ b/beast-gtk/gxk/gxkradget.hh
@@ -4,8 +4,6 @@
#include "gxkutils.hh"
-G_BEGIN_DECLS
-
/* --- structures --- */
#define GXK_RADGET G_OBJECT
#define GXK_IS_RADGET G_IS_OBJECT
@@ -106,6 +104,4 @@ GxkRadget* gxk_radget_data_get_scope_radget (GxkRadgetData *gdgdata);
gchar* gxk_radget_data_dup_expand (GxkRadgetData *gdgdata,
const gchar *expression);
-G_END_DECLS
-
#endif /* __GXK_RADGET_H__ */
diff --git a/beast-gtk/gxk/gxkradgetfactory.hh b/beast-gtk/gxk/gxkradgetfactory.hh
index 968f3ca..27a9364 100644
--- a/beast-gtk/gxk/gxkradgetfactory.hh
+++ b/beast-gtk/gxk/gxkradgetfactory.hh
@@ -5,8 +5,6 @@
#include "gxkradget.hh"
#include "gxkaction.hh"
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_RADGET_FACTORY (gxk_radget_factory_get_type ())
@@ -72,6 +70,4 @@ extern const GxkRadgetType *gxk_radget_factory_def;
extern const GxkRadgetType *gxk_factory_branch_def;
-G_END_DECLS
-
#endif /* __GXK_RADGET_FACTORY_H__ */
diff --git a/beast-gtk/gxk/gxkscrollcanvas.hh b/beast-gtk/gxk/gxkscrollcanvas.hh
index 551bf28..2502769 100644
--- a/beast-gtk/gxk/gxkscrollcanvas.hh
+++ b/beast-gtk/gxk/gxkscrollcanvas.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkutils.hh>
-G_BEGIN_DECLS
-
/* --- type macros --- */
#define GXK_TYPE_SCROLL_CANVAS (gxk_scroll_canvas_get_type ())
#define GXK_SCROLL_CANVAS(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GXK_TYPE_SCROLL_CANVAS,
GxkScrollCanvas))
@@ -230,6 +228,4 @@ void gxk_scroll_canvas_move_marker (GxkScrollCanvas
guint y);
void gxk_scroll_canvas_class_skin_changed (GxkScrollCanvasClass*);
-G_END_DECLS
-
#endif /* __GXK_SCROLL_CANVAS_H__ */
diff --git a/beast-gtk/gxk/gxksimplelabel.hh b/beast-gtk/gxk/gxksimplelabel.hh
index 6eb842b..131d5e6 100644
--- a/beast-gtk/gxk/gxksimplelabel.hh
+++ b/beast-gtk/gxk/gxksimplelabel.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkutils.hh>
-G_BEGIN_DECLS
-
#define GXK_TYPE_SIMPLE_LABEL (gxk_simple_label_get_type ())
#define GXK_SIMPLE_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GXK_TYPE_SIMPLE_LABEL,
GxkSimpleLabel))
#define GXK_SIMPLE_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GXK_TYPE_SIMPLE_LABEL,
GxkSimpleLabelClass))
@@ -34,6 +32,4 @@ GType gxk_simple_label_get_type (void) G_GNUC_CONST;
void gxk_simple_label_set_mnemonic_widget (GxkSimpleLabel *self,
GtkWidget *widget);
-G_END_DECLS
-
#endif /* __GXK_SIMPLE_LABEL_H__ */
diff --git a/beast-gtk/gxk/gxkspline.hh b/beast-gtk/gxk/gxkspline.hh
index 3212838..1fbbbc8 100644
--- a/beast-gtk/gxk/gxkspline.hh
+++ b/beast-gtk/gxk/gxkspline.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkglobals.hh>
-G_BEGIN_DECLS
-
typedef struct _GxkSpline GxkSpline;
typedef struct {
double x, y;
@@ -38,6 +36,4 @@ void gxk_spline_free (GxkSpline *spline);
-G_END_DECLS
-
#endif /* __GXK_SPLINE_H__ */
diff --git a/beast-gtk/gxk/gxkstatusbar.hh b/beast-gtk/gxk/gxkstatusbar.hh
index d50e415..d831c33 100644
--- a/beast-gtk/gxk/gxkstatusbar.hh
+++ b/beast-gtk/gxk/gxkstatusbar.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkutils.hh>
-G_BEGIN_DECLS
-
/* --- status percentages --- */
#define GXK_STATUS_PROGRESS (+200.0)
#define GXK_STATUS_DONE (+100.0)
@@ -43,6 +41,4 @@ void gxk_status_push_progress_window (gpointer widget);
void gxk_status_pop_progress_window (void);
-G_END_DECLS
-
#endif /* __GXK_STATUS_BAR_H__ */
diff --git a/beast-gtk/gxk/gxkstock.hh b/beast-gtk/gxk/gxkstock.hh
index 1d3083f..de9d730 100644
--- a/beast-gtk/gxk/gxkstock.hh
+++ b/beast-gtk/gxk/gxkstock.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkutils.hh>
-G_BEGIN_DECLS
-
/* --- icon sizes --- */
#define GXK_ICON_SIZE_BUTTON (gxk_size_button)
#define GXK_ICON_SIZE_BIG_BUTTON (gxk_size_big_button)
@@ -60,6 +58,4 @@ extern GtkIconSize gxk_size_info_sign;
extern GtkIconSize gxk_size_palette;
-G_END_DECLS
-
#endif /* __GXK_STOCK_H__ */
diff --git a/beast-gtk/gxk/gxktexttools.hh b/beast-gtk/gxk/gxktexttools.hh
index c4494e4..88f18e4 100644
--- a/beast-gtk/gxk/gxktexttools.hh
+++ b/beast-gtk/gxk/gxktexttools.hh
@@ -4,8 +4,6 @@
#include "gxkutils.hh"
-G_BEGIN_DECLS
-
/* --- text tools flags --- */
typedef enum /*< skip >*/
{
@@ -87,8 +85,6 @@ void gxk_text_buffer_add_textgets_to_view (GtkTextBuffer *tbuffer,
GtkTextView *tview);
-G_END_DECLS
-
// == Flags Enumeration Operators in C++ ==
#ifdef __cplusplus
constexpr GxkScrollTextFlags operator& (GxkScrollTextFlags s1, GxkScrollTextFlags s2) { return
GxkScrollTextFlags (s1 & (long long unsigned) s2); }
diff --git a/beast-gtk/gxk/gxkutils.hh b/beast-gtk/gxk/gxkutils.hh
index e8ce742..e7f88de 100644
--- a/beast-gtk/gxk/gxkutils.hh
+++ b/beast-gtk/gxk/gxkutils.hh
@@ -4,8 +4,6 @@
#include <gxk/gxkglobals.hh>
-G_BEGIN_DECLS
-
/* --- generated includes --- */
/* type IDs */
#include <gxk/gxkgentypes.h>
@@ -345,6 +343,4 @@ gchar* gxk_zfile_uncompress (guint uncompressed_size,
guint cdata_size);
-G_END_DECLS
-
#endif /* __GXK_UTILS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
