pimpl not needed here

[lyx.git] / src / insets / InsetGraphics.cpp

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 8dfb2e896ae52afe87559b5cb94a73f4c8aacf05..7d1ea0bd4d81c8828234bd15136b314ed30b789c 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -76,6 +76,7 @@ TODO
 #include "frontends/alert.h"
 
 #include "support/convert.h"
+#include "support/docstream.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h" // sum
 #include "support/lstrings.h"
@@ -449,7 +450,8 @@ docstring const InsetGraphics::createDocBookAttributes() const
        // Calculate the options part of the command, we must do it to a string
        // stream since we copied the code from createLatexParams() ;-)
 
-       // FIXME: av: need to translate spec -> Docbook XSL spec (http://www.sagehill.net/docbookxsl/ImageSizing.html)
+       // FIXME: av: need to translate spec -> Docbook XSL spec
+       // (http://www.sagehill.net/docbookxsl/ImageSizing.html)
        // Right now it only works with my version of db2latex :-)
 
        odocstringstream options;
@@ -483,7 +485,7 @@ docstring const InsetGraphics::createDocBookAttributes() const
 
 namespace {
 
-enum CopyStatus {
+enum GraphicsCopyStatus {
        SUCCESS,
        FAILURE,
        IDENTICAL_PATHS,
@@ -491,7 +493,7 @@ enum CopyStatus {
 };
 
 
-std::pair<CopyStatus, FileName> const
+std::pair<GraphicsCopyStatus, FileName> const
 copyFileIfNeeded(FileName const & file_in, FileName const & file_out)
 {
        unsigned long const checksum_in  = support::sum(file_in);
@@ -512,12 +514,12 @@ copyFileIfNeeded(FileName const & file_in, FileName const & file_out)
                        << std::endl;
        }
 
-       CopyStatus status = success ? SUCCESS : FAILURE;
+       GraphicsCopyStatus status = success ? SUCCESS : FAILURE;
        return std::make_pair(status, file_out);
 }
 
 
-std::pair<CopyStatus, FileName> const
+std::pair<GraphicsCopyStatus, FileName> const
 copyToDirIfNeeded(DocFileName const & file, string const & dir)
 {
        using support::rtrim;
@@ -605,21 +607,21 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
 
        // The master buffer. This is useful when there are multiple levels
        // of include files
-       Buffer const * m_buffer = buf.getMasterBuffer();
+       Buffer const * masterBuffer = buf.masterBuffer();
 
        // Return the output name if we are inside a comment or the file does
        // not exist.
        // We are not going to change the extension or using the name of the
        // temporary file, the code is already complicated enough.
        if (runparams.inComment || !params().filename.isFileReadable())
-               return params().filename.outputFilename(m_buffer->filePath());
+               return params().filename.outputFilename(masterBuffer->filePath());
 
        // We place all temporary files in the master buffer's temp dir.
        // This is possible because we use mangled file names.
        // This is necessary for DVI export.
-       string const temp_path = m_buffer->temppath();
+       string const temp_path = masterBuffer->temppath();
 
-       CopyStatus status;
+       GraphicsCopyStatus status;
        boost::tie(status, temp_file) =
                        copyToDirIfNeeded(params().filename, temp_path);
 
@@ -630,7 +632,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
        // "nice" means that the buffer is exported to LaTeX format but not
        // run through the LaTeX compiler.
        string output_file = runparams.nice ?
-               params().filename.outputFilename(m_buffer->filePath()) :
+               params().filename.outputFilename(masterBuffer->filePath()) :
                onlyFilename(temp_file.absFilename());
 
        if (runparams.nice && !isValidLaTeXFilename(output_file)) {
@@ -948,8 +950,8 @@ void InsetGraphics::validate(LaTeXFeatures & features) const
        features.require("graphicx");
 
        if (features.runparams().nice) {
-               Buffer const * m_buffer = features.buffer().getMasterBuffer();
-               string const rel_file = removeExtension(params().filename.relFilename(m_buffer->filePath()));
+               Buffer const * masterBuffer = features.buffer().masterBuffer();
+               string const rel_file = removeExtension(params().filename.relFilename(masterBuffer->filePath()));
                if (contains(rel_file, "."))
                        features.require("lyxdot");
        }