From b271b9f0f62a81998411dd3e00d673562211c1ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Mon, 21 Apr 2008 06:36:06 +0000 Subject: [PATCH] compile fix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24406 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiDocument.cpp | 2 +- src/frontends/qt4/GuiExternal.cpp | 2 +- src/frontends/qt4/GuiGraphics.cpp | 4 ++-- src/frontends/qt4/GuiInclude.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index bfedf55bf0..0ce3284cf5 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -1230,7 +1230,7 @@ void GuiDocument::browseLayout() if (!file.endsWith(".layout")) return; - FileName layoutFile = makeAbsPath(fromqstr(file), + FileName layoutFile = support::makeAbsPath(fromqstr(file), fromqstr(bufferFilepath())); // load the layout file diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp index 6a77567b2b..1e0ebfc899 100644 --- a/src/frontends/qt4/GuiExternal.cpp +++ b/src/frontends/qt4/GuiExternal.cpp @@ -298,7 +298,7 @@ void GuiExternal::getbbClicked() if (filename.empty()) return; - FileName const abs_file(makeAbsPath(filename, fromqstr(bufferFilepath()))); + FileName const abs_file(support::makeAbsPath(filename, fromqstr(bufferFilepath()))); // try to get it from the file, if possible string bb = readBB_from_PSFile(abs_file); diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp index 069ee24f06..6a17db67d4 100644 --- a/src/frontends/qt4/GuiGraphics.cpp +++ b/src/frontends/qt4/GuiGraphics.cpp @@ -758,7 +758,7 @@ QString GuiGraphics::browse(QString const & in_name) const string GuiGraphics::readBoundingBox(string const & file) { - FileName const abs_file = makeAbsPath(file, fromqstr(bufferFilepath())); + FileName const abs_file = support::makeAbsPath(file, fromqstr(bufferFilepath())); // try to get it from the file, if possible. Zipped files are // unzipped in the readBB_from_PSFile-Function @@ -787,7 +787,7 @@ string GuiGraphics::readBoundingBox(string const & file) bool GuiGraphics::isFileNameValid(string const & fname) const { // It may be that the filename is relative. - return makeAbsPath(fname, fromqstr(bufferFilepath())).isReadableFile(); + return support::makeAbsPath(fname, fromqstr(bufferFilepath())).isReadableFile(); } diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp index 5633059109..0dd8ac11e9 100644 --- a/src/frontends/qt4/GuiInclude.cpp +++ b/src/frontends/qt4/GuiInclude.cpp @@ -334,7 +334,7 @@ void GuiInclude::edit(string const & file) else // tex file or other text file in verbatim mode formats.edit(buffer(), - makeAbsPath(file, support::onlyPath(buffer().absFileName())), + support::makeAbsPath(file, support::onlyPath(buffer().absFileName())), "text"); } -- 2.39.2