compile fix

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

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 6f9d8d07e680251ac284571604555faef54b5589..103003be7acb02005445d859da3f06054aa2cdee 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -186,8 +186,7 @@ QString browseRelFile(QString const & filename, QString const & refpath,
        QString const & label1, QString const & dir1,
        QString const & label2, QString const & dir2)
 {
-       QString const fname = toqstr(makeAbsPath(
-               fromqstr(filename), fromqstr(refpath)).absFilename());
+       QString const fname = makeAbsPath(filename, refpath);
 
 
        QString const outname =

diff --git a/src/frontends/qt4/GuiPrint.cpp b/src/frontends/qt4/GuiPrint.cpp
index ff5254e54e2989417523c9a34a124429b7c3c566..14339be16bce656c6155a04d6af06c649084760d 100644 (file)
--- a/src/frontends/qt4/GuiPrint.cpp
+++ b/src/frontends/qt4/GuiPrint.cpp
@@ -175,7 +175,7 @@ bool GuiPrint::initialiseParams(string const &)
 {
        /// get global printer parameters
        params_ = PrinterParams();
-       params_.file_name = changeExtension(buffer().absFileName(),
+       params_.file_name = support::changeExtension(buffer().absFileName(),
                                        lyxrc.print_file_extension);
 
        setButtonsValid(true); // so that the user can press Ok

diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp
index f29403e67b1bdb4b6121da4dc1a28b5990f85105..c7770453d67d6f0899e008d7707ed9255e01e459 100644 (file)
--- a/src/frontends/qt4/GuiRef.cpp
+++ b/src/frontends/qt4/GuiRef.cpp
@@ -340,7 +340,8 @@ void GuiRef::updateRefs()
 {
        refs_.clear();
        string const name = theBufferList().getFileNames()[bufferCO->currentIndex()];
-       Buffer const * buf = theBufferList().getBuffer(makeAbsPath(name).absFilename());
+       Buffer const * buf = theBufferList().getBuffer(
+               support::makeAbsPath(name).absFilename());
        buf->getLabelList(refs_);
        sortCB->setEnabled(!refs_.empty());
        refsLW->setEnabled(!refs_.empty());

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index bf3a906a824a47b0bad0148e9bee8a058e2a4185..c10c5924a90cc2128e144682b2d78e956543e851 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1331,7 +1331,7 @@ void GuiView::importDocument(string const & argument)
                return;
 
        // get absolute path of file
-       FileName const fullname(makeAbsPath(filename));
+       FileName const fullname(support::makeAbsPath(filename));
 
        FileName const lyxfile(support::changeExtension(fullname.absFilename(), ".lyx"));
 
@@ -1493,7 +1493,7 @@ bool GuiView::renameBuffer(Buffer & b, docstring const & newname)
 
        if (!newname.empty()) {
                // FIXME UNICODE
-               fname = makeAbsPath(to_utf8(newname), oldname.onlyPath().absFilename());
+               fname = support::makeAbsPath(to_utf8(newname), oldname.onlyPath().absFilename());
        } else {
                // Switch to this Buffer.
                setBuffer(&b);

diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h
index ed082e1e33bb4c7d73121310deb460e20a552ad1..5774b65699d477325e5d33b7b686b2863e30b5f5 100644 (file)
--- a/src/frontends/qt4/qt_helpers.h
+++ b/src/frontends/qt4/qt_helpers.h
@@ -126,6 +126,7 @@ QString addExtension(QString const & name, QString const & extension);
 /// Return the extension of the file (not including the .)
 QString getExtension(QString const & name);
 QString makeAbsPath(QString const & relpath, QString const & base);
+QString changeExtension(QString const & oldname, QString const & ext);
 
 } // namespace lyx