[beast: 7/14] BEAST: use Bse diagnostics and BSE_CONVENIENCE

[Tim Janik <timj src gnome org>]

commit 759682f1e800609e2e27553dc4c6391ebc79a8fc
Author: Tim Janik <timj gnu org>
Date:   Tue Mar 14 00:46:23 2017 +0100

    BEAST: use Bse diagnostics and BSE_CONVENIENCE
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/Makefile.am         |    2 +-
 beast-gtk/bstdefs.hh          |    7 +++++++
 beast-gtk/bstgrowbar.cc       |    2 +-
 beast-gtk/bstlogadjustment.cc |    1 -
 beast-gtk/bstlogadjustment.hh |    2 +-
 beast-gtk/bstutils.hh         |    1 -
 6 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/beast-gtk/Makefile.am b/beast-gtk/Makefile.am
index 3d5291a..bb59bb5 100644
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = gxk res icons
 
 AM_CPPFLAGS += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"BEAST\""
-AM_CXXFLAGS += $(BEAST_CFLAGS) $(GXK_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE \
+AM_CXXFLAGS += $(BEAST_CFLAGS) $(GXK_CFLAGS) $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DBSE_CONVENIENCE \
                        -DG_DISABLE_CONST_RETURNS -DGTK_ENABLE_BROKEN # -DGTK_DISABLE_DEPRECATED 
-DGTK_DISABLE_COMPAT_H
 AM_CPPFLAGS += $(PYTHON_CPPFLAGS)
 AM_LDFLAGS  += $(PYTHON_LDFLAGS)
diff --git a/beast-gtk/bstdefs.hh b/beast-gtk/bstdefs.hh
index cfb29ac..7bc86c6 100644
--- a/beast-gtk/bstdefs.hh
+++ b/beast-gtk/bstdefs.hh
@@ -6,6 +6,13 @@
 #include "bstzoomedwindow.hh"
 #include "bse/bse.hh"
 
+// == using Bse types ==
+using Bse::Any;
+using Bse::String;
+using Bse::printout;
+using Bse::printerr;
+using Bse::string_format;
+
 /* --- generic constants --- */
 typedef enum {
   BST_QUANTIZE_NONE            = 0,
diff --git a/beast-gtk/bstgrowbar.cc b/beast-gtk/bstgrowbar.cc
index 4fe3540..dead589 100644
--- a/beast-gtk/bstgrowbar.cc
+++ b/beast-gtk/bstgrowbar.cc
@@ -1,5 +1,4 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-#include <sfi/glib-extra.hh>
 #include "bstgrowbar.hh"
 #include "bstdefs.hh"
 #include <gtk/gtkhbox.h>
@@ -10,6 +9,7 @@
 #include <gxk/gxkutils.hh>
 
 
+
 /* --- prototypes --- */
 static gboolean draw_grow_sign   (GtkWidget *widget, GdkEventExpose *event, BstGrowBar *self);
 static gboolean draw_shrink_sign (GtkWidget *widget, GdkEventExpose *event, BstGrowBar *self);
diff --git a/beast-gtk/bstlogadjustment.cc b/beast-gtk/bstlogadjustment.cc
index d577f00..64e3021 100644
--- a/beast-gtk/bstlogadjustment.cc
+++ b/beast-gtk/bstlogadjustment.cc
@@ -1,5 +1,4 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-#include <sfi/glib-extra.hh>
 #include "bstlogadjustment.hh"
 
 #include <math.h>
diff --git a/beast-gtk/bstlogadjustment.hh b/beast-gtk/bstlogadjustment.hh
index a3dd848..eea1716 100644
--- a/beast-gtk/bstlogadjustment.hh
+++ b/beast-gtk/bstlogadjustment.hh
@@ -2,7 +2,7 @@
 #ifndef __BST_LOG_ADJUSTMENT_H__
 #define __BST_LOG_ADJUSTMENT_H__
 
-#include       <gtk/gtkadjustment.h>
+#include "bstdefs.hh"
 
 /* --- type macros --- */
 #define BST_TYPE_LOG_ADJUSTMENT              (bst_log_adjustment_get_type ())
diff --git a/beast-gtk/bstutils.hh b/beast-gtk/bstutils.hh
index 20185af..d77d290 100644
--- a/beast-gtk/bstutils.hh
+++ b/beast-gtk/bstutils.hh
@@ -2,7 +2,6 @@
 #ifndef __BST_UTILS_H__
 #define __BST_UTILS_H__
 #include "bstbseutils.hh"
-#include <gtk/gtk.h>
 #include "bstdefs.hh"
 #include "bstcluehunter.hh"
 /* generated type IDs, idl types */