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

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

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index f9fbce598b64da0c2dd6c4d249446cad49872eba..13d42a2bfecdaeefcb9d0a94fdd462d6a67bc4c2 100644 (file)
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -17,12 +17,12 @@
 #include "GraphicsImage.h"
 
 #include "ConverterCache.h"
-#include "support/debug.h"
 #include "Format.h"
 
+#include "support/debug.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/FileMonitor.h"
-#include "support/lyxlib.h"
 
 #include <boost/bind.hpp>
 
@@ -324,7 +324,7 @@ static string const findTargetFormat(string const & from)
        FormatList const formats = lyx::graphics::Image::loadableFormats();
 
         // There must be a format to load from.
-       BOOST_ASSERT(!formats.empty());
+       LASSERT(!formats.empty(), /**/);
 
        // Use the standard converter if we don't know the format to load
        // from.
@@ -372,7 +372,7 @@ void CacheItem::Impl::convertToDisplayFormat()
        FileName filename;
        zipped_ = filename_.isZippedFile();
        if (zipped_) {
-               unzipped_filename_ = FileName::tempName(FileName(),
+               unzipped_filename_ = FileName::tempName(
                        filename_.toFilesystemEncoding());
                if (unzipped_filename_.empty()) {
                        setStatus(ErrorConverting);
@@ -416,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 = FileName::tempName(FileName(), "CacheItem");
+       FileName const to_file_base = FileName::tempName("CacheItem");
        remove_loaded_file_ = true;
 
        // Remove the temp file, we only want the name...