compile fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24406 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index bfedf55bf066530255519b8ccc5d17bf3d372c3e..0ce3284cf50e468641c2590205c63338138f65b6 100644 (file)
--- 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 6a77567b2bc3157daa6ce8524848d13d4156886a..1e0ebfc89941c507538308ed5dddb4e31edc09f4 100644 (file)
--- 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 069ee24f06a6402f5ea027cb8cd090813a7adb45..6a17db67d40a5ed04409fc84be27befbff5ceea4 100644 (file)
--- 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 5633059109d4354176b5a3a54939889bb3f77e44..0dd8ac11e91a59e2a09e2a02495d0752c00170c7 100644 (file)
--- 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");
 }