X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsCacheItem.cpp;h=2960ae6002d84484c244acb718edeb3b733d7bc6;hb=06254d11dfdf670fab3548dc2a2674e7a261262c;hp=882c44b46b8e3a5f5be5db4250c7fd5b85c80d2d;hpb=f07105d0e5d7feea9a09abea413bfd5d4d059108;p=lyx.git

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index 882c44b46b..2960ae6002 100644
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -17,29 +17,20 @@
 #include "GraphicsImage.h"
 
 #include "ConverterCache.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "Format.h"
 
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/FileMonitor.h"
-#include "support/lyxlib.h"
 
 #include <boost/bind.hpp>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileMonitor;
-using support::FileName;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::tempName;
-using support::unzipFile;
-
-using std::endl;
-using std::string;
-
-
 namespace graphics {
 
 class CacheItem::Impl : public boost::signals::trackable {
@@ -381,7 +372,8 @@ void CacheItem::Impl::convertToDisplayFormat()
 	FileName filename;
 	zipped_ = filename_.isZippedFile();
 	if (zipped_) {
-		unzipped_filename_ = tempName(FileName(), filename_.toFilesystemEncoding());
+		unzipped_filename_ = FileName::tempName(
+			filename_.toFilesystemEncoding());
 		if (unzipped_filename_.empty()) {
 			setStatus(ErrorConverting);
 			LYXERR(Debug::GRAPHICS, "\tCould not create temporary file.");
@@ -424,7 +416,7 @@ void CacheItem::Impl::convertToDisplayFormat()
 
 	// Add some stuff to create a uniquely named temporary file.
 	// This file is deleted in loadImage after it is loaded into memory.
-	FileName const to_file_base(tempName(FileName(), "CacheItem"));
+	FileName const to_file_base = FileName::tempName("CacheItem");
 	remove_loaded_file_ = true;
 
 	// Remove the temp file, we only want the name...