Remove cruft

[ardour.git] / gtk2_ardour / meter_strip.cc

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index c3b08345254ec4dde2a3e5b8d27b7d5a6b03723d..98a005a0361b1318b646b7d5da03f66e36227d62 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -30,14 +30,15 @@
 #include "ardour/audio_track.h"
 #include "ardour/midi_track.h"
 
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/keyboard.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/rgb_macros.h>
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/rgb_macros.h"
+
+#include "widgets/tooltips.h"
 
 #include "gui_thread.h"
 #include "ardour_window.h"
-#include "tooltips.h"
 #include "ui_config.h"
 #include "utils.h"
 
@@ -48,6 +49,7 @@
 #include "pbd/i18n.h"
 
 using namespace ARDOUR;
+using namespace ArdourWidgets;
 using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
@@ -182,8 +184,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        name_label.set_layout_ellipsize_width(48 * PANGO_SCALE);
        name_label.set_size_request(PX_SCALE(18, 18), PX_SCALE(50, 50));
        name_label.set_alignment(-1.0, .5);
-       set_tooltip (name_label, _route->name());
-       set_tooltip (*level_meter, _route->name());
+       set_tooltip (name_label, Gtkmm2ext::markup_escape_text (_route->name()));
+       set_tooltip (*level_meter, Gtkmm2ext::markup_escape_text (_route->name()));
 
        number_label.set_corner_radius(2);
        number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
@@ -486,7 +488,7 @@ MeterStrip::set_tick_bar (int m)
        } else {
                n = meter_ticks1_area.get_name();
                if (n.substr(0,3) == "Bar") {
-                       meter_ticks1_area.set_name(n.substr(3,-1));
+                       meter_ticks1_area.set_name (n.substr (3));
                }
        }
        if (_tick_bar & 2) {
@@ -497,7 +499,7 @@ MeterStrip::set_tick_bar (int m)
        } else {
                n = meter_ticks2_area.get_name();
                if (n.substr(0,3) == "Bar") {
-                       meter_ticks2_area.set_name(n.substr(3,-1));
+                       meter_ticks2_area.set_name (n.substr (3));
                }
        }
 }