Fixed some valgrind errors from using uninitialized variables in

[ardour.git] / gtk2_ardour / utils.h

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 221329727e0512e393d0b5029459b44080856168..c0b7aac52449f4681d0e91a92be71f1a53c6043d 100644 (file)
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -26,6 +26,8 @@
 #include <ardour/types.h>
 #include <libgnomecanvasmm/line.h>
 #include <gdkmm/types.h>
+#include <glibmm/ustring.h>
+
 #include "canvas.h"
 
 namespace Gtk {
@@ -50,13 +52,8 @@ slider_position_to_gain (double pos)
        return pow (2.0,(sqrt(sqrt(sqrt(pos)))*198.0-192.0)/6.0);
 }
 
-std::string short_version (std::string, std::string::size_type target_length);
-std::string fit_to_pixels (const std::string &, int pixel_width, const std::string & font);
+Glib::ustring fit_to_pixels (const Glib::ustring&, int pixel_width, Pango::FontDescription& font, int& actual_width);
 
-int    atoi (const std::string&);
-double atof (const std::string&);
-void   strip_whitespace_edges (std::string& str);
-void   url_decode (std::string&);
 gint   just_hide_it (GdkEventAny*, Gtk::Window*);
 void   allow_keyboard_focus (bool);
 
@@ -65,7 +62,6 @@ unsigned char* xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h);
 
 ArdourCanvas::Points* get_canvas_points (std::string who, uint32_t npoints);
 
-int channel_combo_get_channel_count (Gtk::ComboBoxText& combo);
 Pango::FontDescription get_font_for_style (std::string widgetname);
 
 gint pane_handler (GdkEventButton*, Gtk::Paned*);
@@ -77,4 +73,10 @@ bool canvas_item_visible (ArdourCanvas::Item* item);
 
 void set_color (Gdk::Color&, int);
 
+bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev);
+
+Glib::RefPtr<Gdk::Pixbuf> get_xpm(std::string);
+static std::map<std::string, Glib::RefPtr<Gdk::Pixbuf> > xpm_map;
+const char* const *get_xpm_data (std::string path);
+
 #endif /* __ardour_gtk_utils_h__ */