Make enter button work in GTK text dialog

[lyx.git] / src / graphics / GraphicsCache.h

diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h
index 41427e07b33ce3e72609f662df7672a8765e5642..9d20e9abc327f5ce032385d627e8de21f36d247f 100644 (file)
--- a/src/graphics/GraphicsCache.h
+++ b/src/graphics/GraphicsCache.h
@@ -20,12 +20,13 @@
 #ifndef GRAPHICSCACHE_H
 #define GRAPHICSCACHE_H
 
-#include "support/std_string.h"
-#include <vector>
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include <vector>
+#include <string>
+
 
 namespace lyx {
 namespace graphics {
@@ -42,16 +43,16 @@ public:
         *  Other formats can be loaded if a converter to a loadable format
         *  can be defined.
         */
-       std::vector<string> loadableFormats() const;
+       std::vector<std::string> loadableFormats() const;
 
        /// Add a graphics file to the cache.
-       void add(string const & file) const;
+       void add(std::string const & file) const;
 
        /// Remove a file from the cache.
-       void remove(string const & file) const;
+       void remove(std::string const & file) const;
 
        /// Returns \c true if the file is in the cache.
-       bool inCache(string const & file) const;
+       bool inCache(std::string const & file) const;
 
        /** Get the cache item associated with file.
         *  Returns an empty container if there is no such item.
@@ -65,7 +66,7 @@ public:
         */
        typedef boost::shared_ptr<CacheItem> ItemPtr;
        ///
-       ItemPtr const item(string const & file) const;
+       ItemPtr const item(std::string const & file) const;
 
 private:
        /** Make the c-tor, d-tor private so we can control how many objects