[beast: 13/14] BSE: rename 'UserMessageType utype' to avoid reserved Python keywords

[Tim Janik <timj src gnome org>]

commit 2dc5e58d655115e242b5b25b9484f4c5442d921e
Author: Tim Janik <timj gnu org>
Date:   Mon Jan 4 18:12:38 2016 +0100

    BSE: rename 'UserMessageType utype' to avoid reserved Python keywords
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bstusermessage.cc |    4 ++--
 bse/bseapi.idl              |    2 +-
 bse/bsejanitor.proc         |    2 +-
 bse/bseserver.cc            |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/beast-gtk/bstusermessage.cc b/beast-gtk/bstusermessage.cc
index 77ad6b8..5e97d28 100644
--- a/beast-gtk/bstusermessage.cc
+++ b/beast-gtk/bstusermessage.cc
@@ -754,14 +754,14 @@ server_user_message (const Bse::UserMessage &umsg)
   };
   BstMessage msg = { 0, };
   msg.log_domain = "BSE";
-  msg.type = convert_msg_type (umsg.type);
+  msg.type = convert_msg_type (umsg.utype);
   msg.title = umsg.title.c_str();
   msg.primary = umsg.text1.c_str();
   msg.secondary = umsg.text2.c_str();
   msg.details = umsg.text3.c_str();
   Bse::String cfg = Bse::string_format (_("Show messages about %s"), umsg.label.c_str());
   msg.config_check = cfg.c_str();
-  const Rapicorn::Aida::EnumValue ev = Rapicorn::Aida::enum_info<Bse::UserMessageType>().find_value 
(umsg.type);
+  const Rapicorn::Aida::EnumValue ev = Rapicorn::Aida::enum_info<Bse::UserMessageType>().find_value 
(umsg.utype);
   msg.ident = ev.ident;
   msg.label = NULL;
   msg.janitor = 0;
diff --git a/bse/bseapi.idl b/bse/bseapi.idl
index 1f3f907..9cdf540 100644
--- a/bse/bseapi.idl
+++ b/bse/bseapi.idl
@@ -416,7 +416,7 @@ enum UserMessageType {
 
 /// Structure for submission of user interface messages from BSE.
 record UserMessage {
-  UserMessageType type;         ///< Severity classification for this message.
+  UserMessageType utype;        ///< Severity classification for this message.
   String          title;        ///< Usually GUI window title.
   String          text1;        ///< Primary message to the user, should be limited to 80-100 chars.
   String          text2;        ///< Explanatory (secondary) message no limitations recommended.
diff --git a/bse/bsejanitor.proc b/bse/bsejanitor.proc
index 1180cd2..81c268e 100644
--- a/bse/bsejanitor.proc
+++ b/bse/bsejanitor.proc
@@ -393,7 +393,7 @@ PROCEDURE (bse-script-send-message, "Script/Message") {
     {
       using namespace Bse;
       UserMessage umsg;
-      umsg.type = stupid_convert (mtype ? mtype[0] : 0);
+      umsg.utype = stupid_convert (mtype ? mtype[0] : 0);
       umsg.title = text0 ? text0 : "WARNING";
       umsg.text1 = text1;
       if (text2)
diff --git a/bse/bseserver.cc b/bse/bseserver.cc
index 6d2a8b5..c8ef4ef 100644
--- a/bse/bseserver.cc
+++ b/bse/bseserver.cc
@@ -428,7 +428,7 @@ bse_server_require_pcm_input (BseServer *server)
       if (!BSE_DEVICE_READABLE (server->pcm_device))
         {
           UserMessage umsg;
-          umsg.type = Bse::WARNING;
+          umsg.utype = Bse::WARNING;
           umsg.title = _("Audio Recording Failed");
           umsg.text1 = _("Failed to start recording from audio device.");
           umsg.text2 = _("An audio project is in use which processes an audio input signal, but the audio 
device "
@@ -482,7 +482,7 @@ server_open_pcm_device (BseServer *server,
   if (!server->pcm_device)
     {
       UserMessage umsg;
-      umsg.type = Bse::ERROR;
+      umsg.utype = Bse::ERROR;
       umsg.title = _("Audio I/O Failed");
       umsg.text1 = _("No available audio device was found.");
       umsg.text2 = _("No available audio device could be found and opened successfully. "
@@ -509,7 +509,7 @@ server_open_midi_device (BseServer *server)
       if (server->midi_device)
         {
           UserMessage umsg;
-          umsg.type = Bse::WARNING;
+          umsg.utype = Bse::WARNING;
           umsg.title = _("MIDI I/O Failed");
           umsg.text1 = _("MIDI input or output is not available.");
           umsg.text2 = _("No available MIDI device could be found and opened successfully. "
@@ -567,7 +567,7 @@ bse_server_open_devices (BseServer *self)
          if (error)
            {
               UserMessage umsg;
-              umsg.type = Bse::ERROR;
+              umsg.utype = Bse::ERROR;
               umsg.title = _("Disk Recording Failed");
               umsg.text1 = _("Failed to start PCM recording to disk.");
               umsg.text2 = _("An error occoured while opening the recording file, selecting a different "