Add context menu for outline operations. Choice of words might not be best.

[lyx.git] / src / graphics / GraphicsLoader.cpp

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index c5a6326d82460683c97e3541119e310cd151da3c..8a3d7bb5394c2a5e47a5e1350d35d47f918f1a05 100644 (file)
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -16,8 +16,8 @@
 #include "GraphicsImage.h"
 #include "GraphicsParams.h"
 #include "GraphicsCache.h"
-#include "debug.h"
 
+#include "support/debug.h"
 #include "support/Timeout.h"
 
 #include <boost/bind.hpp>
@@ -25,15 +25,12 @@
 #include <set>
 #include <queue>
 
-using std::string;
-using std::endl;
-using std::list;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace graphics {
 
-using support::FileName;
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -53,11 +50,11 @@ private:
        /// This class is a singleton class... use LoaderQueue::get() instead
        LoaderQueue();
        /// The in-progress loading queue (elements are unique here).
-       std::list<Cache::ItemPtr> cache_queue_;
+       list<Cache::ItemPtr> cache_queue_;
        /// Used to make the insertion of new elements faster.
-       std::set<Cache::ItemPtr> cache_set_;
+       set<Cache::ItemPtr> cache_set_;
        /// Newly touched elements go here. loadNext moves them to cache_queue_
-       std::queue<Cache::ItemPtr> bucket_;
+       queue<Cache::ItemPtr> bucket_;
        ///
        Timeout timer;
        ///
@@ -145,7 +142,7 @@ void LoaderQueue::touch(Cache::ItemPtr const & item)
                list<Cache::ItemPtr>::iterator
                        end = cache_queue_.end();
 
-               it = std::find(it, end, item);
+               it = find(it, end, item);
                if (it != end)
                        cache_queue_.erase(it);
        }