X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphicsParams.cpp;h=f4cd119f6e34ffd762e24c1bf3b8ce52d8a2ced4;hb=a25569ebb3e739779ff458b287e403c3bf79777a;hp=ad796d7638ff0f3794bb27ec6ba11f9bdd7d3200;hpb=4a1be58591ea5a7431d9426abb27d8b946c634cb;p=lyx.git

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index ad796d7638..f4cd119f6e 100644
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voß
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,17 +13,17 @@
 
 #include "InsetGraphicsParams.h"
 
+#include "Buffer.h"
 #include "LyX.h" // for use_gui
 #include "Lexer.h"
 #include "LyXRC.h"
-#include "Buffer.h"
 
+#include "graphics/epstools.h"
 #include "graphics/GraphicsParams.h"
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
-#include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 #include "support/Translator.h"
@@ -141,7 +141,7 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
 {
 	// Do not write the default values
 	if (!filename.empty())
-		os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n';
+		os << "\tfilename " << filename.outputFileName(buffer.filePath()) << '\n';
 	if (lyxscale != 100)
 		os << "\tlyxscale " << lyxscale << '\n';
 	if (!display)
@@ -262,12 +262,11 @@ graphics::Params InsetGraphicsParams::as_grfxParams() const
 		pars.bb = bb;
 
 		// Get the original Bounding Box from the file
-		string const tmp = readBB_from_PSFile(filename);
+		string const tmp = graphics::readBB_from_PSFile(filename);
 		LYXERR(Debug::GRAPHICS, "BB_from_File: " << tmp);
 		if (!tmp.empty()) {
-			// FIXME: why not convert to unsigned int? (Lgb)
-			unsigned int const bb_orig_xl = convert<int>(token(tmp, ' ', 0));
-			unsigned int const bb_orig_yb = convert<int>(token(tmp, ' ', 1));
+			unsigned int const bb_orig_xl = convert<unsigned int>(token(tmp, ' ', 0));
+			unsigned int const bb_orig_yb = convert<unsigned int>(token(tmp, ' ', 1));
 
 			// new pars.bb values must be >= zero
 			if (pars.bb.xl > bb_orig_xl)