Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / xformsImage.h

diff --git a/src/frontends/xforms/xformsImage.h b/src/frontends/xforms/xformsImage.h
index 4ee651894fbf988e58c30fd491fcee83716bc7f5..f7e7e8eb0f2662945012978d6c86516db85ba3be 100644 (file)
--- a/src/frontends/xforms/xformsImage.h
+++ b/src/frontends/xforms/xformsImage.h
@@ -16,7 +16,6 @@
 #ifndef XFORMSIMAGE_H
 #define XFORMSIMAGE_H
 
-
 #include "graphics/GraphicsImage.h"
 
 #include <X11/X.h>
@@ -42,8 +41,8 @@ public:
        Pixmap getPixmap() const;
 
        /// Internal callbacks.
-       void statusCB(string const &);
-       void errorCB(string const &);
+       void statusCB(std::string const &);
+       void errorCB(std::string const &);
 
 private:
        /// Create a copy
@@ -58,7 +57,7 @@ private:
         *  The process is asynchronous, so this method starts the loading.
         *  When finished, the Image::finishedLoading signal is emitted.
         */
-       virtual void load_impl(string const & filename);
+       virtual void load_impl(std::string const & filename);
        /** Generate the pixmap, based on the current state of
         *  image_ (clipped, rotated, scaled etc).
         *  Uses the params to decide on color, grayscale etc.