All useage of ArdourPrompter checks for a valid result.

[ardour.git] / gtk2_ardour / visual_time_axis.h

diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h
index 2768a0aac017ec32382138f74d5c231448136646..4be2da3b9a495eeb7ec12d64ac15ac02728a3347 100644 (file)
--- a/gtk2_ardour/visual_time_axis.h
+++ b/gtk2_ardour/visual_time_axis.h
@@ -21,7 +21,9 @@
 #ifndef __ardour_visual_time_axis_h__
 #define __ardour_visual_time_axis_h__
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+
 #include <gtkmm2ext/selector.h>
 
 #include "ardour_dialog.h"
@@ -83,7 +85,7 @@ class VisualTimeAxis : public TimeAxisView
                 * @param name the new name of this TimeAxis
                 * @param src the identity of the object that initiated the change
                 */
-               virtual void set_time_axis_name(std::string name, void* src) ;
+               virtual void set_time_axis_name(const string & name, void* src) ;
 
                
                //---------------------------------------------------------------------------------------//
@@ -112,7 +114,7 @@ class VisualTimeAxis : public TimeAxisView
                /**
                 * Emitted when we have changed the gui, and what we have shanged
                 */
-               sigc::signal<void,string,void*> gui_changed ;
+               sigc::signal<void,const string &,void*> gui_changed ;
                
                /**
                 * Emitted when this Visual Time Axis has been removed
@@ -121,12 +123,12 @@ class VisualTimeAxis : public TimeAxisView
                 * the destructor, this allows us to capture the source of the deletion
                 * event
                 */
-               sigc::signal<void,std::string,void*> VisualTimeAxisRemoved ;
+               sigc::signal<void,const string &,void*> VisualTimeAxisRemoved ;
                
                /**
                 * Emitted when we have changed the name of this TimeAxis
                 */
-               sigc::signal<void,std::string,std::string,void*> NameChanged ;
+               sigc::signal<void,const string &,const string &,void*> NameChanged ;
 
                /**
                 * Emitted when this time axis has been selected for removal
@@ -144,7 +146,7 @@ class VisualTimeAxis : public TimeAxisView
                 * @param sess the current session
                 * @param canvas the parent canvas object
                 */
-               VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
+               VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
                
                
                //---------------------------------------------------------------------------------------//
@@ -241,10 +243,6 @@ class VisualTimeAxis : public TimeAxisView
                /** the name of this TimeAxis object */
                std::string time_axis_name ;
                
-               /** used to get a new name for this TimeAxis */
-               ArdourPrompter* name_prompter ;
-               
-               
                //---------------------------------------------------------------------------------------//
                // Super class methods not handled by VisualTimeAxis