enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / libs / canvas / stateful_image.cc

diff --git a/libs/canvas/stateful_image.cc b/libs/canvas/stateful_image.cc
index b372ade7b878f6d74f3008749f54949c058e76c2..5f04d9488c0929d2b6391a1643846676886d238d 100644 (file)
--- a/libs/canvas/stateful_image.cc
+++ b/libs/canvas/stateful_image.cc
@@ -11,7 +11,7 @@
 #include "canvas/stateful_image.h"
 #include "canvas/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ArdourCanvas;
 using PBD::error;
@@ -46,7 +46,7 @@ StatefulImage::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context)
        Rect self = item_to_window (Rect (0, 0, image->get_width(), image->get_height()));
 
        boost::optional<Rect> draw = self.intersection (area);
-       
+
        if (!draw) {
                return;
        }
@@ -89,30 +89,30 @@ int
 StatefulImage::load_states (const XMLNode& node)
 {
        const XMLNodeList& nodes (node.children());
-       
+
        _states.clear ();
-       
+
        for (XMLNodeList::const_iterator i = nodes.begin(); i != nodes.end(); ++i) {
                State s;
                States::size_type id;
                const XMLProperty* prop;
-               
+
                if ((prop = (*i)->property ("id")) == 0) {
                        error << _("no ID for state") << endmsg;
                        continue;
                }
-               sscanf (prop->value().c_str(), "%zd", &id);
+               sscanf (prop->value().c_str(), "%" G_GSIZE_FORMAT, &id);
 
                if ((prop = (*i)->property ("image")) == 0) {
                        error << _("no image for state") << endmsg;
                        continue;
                }
-               
+
                if ((s.image = find_image (prop->value())) == 0) {
                        error << string_compose (_("image %1 not found for state"), prop->value()) << endmsg;
                        continue;
                }
-               
+
                if (_states.size() < id) {
                        _states.reserve (id);
                }
@@ -134,12 +134,12 @@ StatefulImage::find_image (const std::string& name)
 
        std::string path;
 
-       if (!find_file_in_search_path (_image_search_path, name, path)) {
+       if (!find_file (_image_search_path, name, path)) {
                error << string_compose (_("Image named %1 not found"),
                                         name) << endmsg;
                return ImageHandle();
        }
-       
+
        return Cairo::ImageSurface::create_from_png (path);
 }