InsetParamsDialog: fix Restore button enabling/disabling.

[lyx.git] / src / tex2lyx / tex2lyx.cpp

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index b6e8aee5559d00b3e7c8251a7c331a59430ab6fe..a3fb9b49df91674c318f0fe16c5bd70792ec1827 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -42,6 +42,18 @@ using namespace lyx::support::os;
 
 namespace lyx {
 
+namespace frontend {
+namespace Alert {
+       void warning(docstring const & title, docstring const & message,
+                                bool const &)
+       {
+               LYXERR0(title);
+               LYXERR0(message);
+       }
+}
+}
+
+
 // Dummy translation support
 Messages messages_;
 Messages const & getMessages(std::string const &)
@@ -472,7 +484,7 @@ bool tex2lyx(FileName const & infilename, ostream & os, string const & encoding)
                return false;
        }
        string const oldParentFilePath = parentFilePath;
-       parentFilePath = onlyPath(infilename.absFilename());
+       parentFilePath = onlyPath(infilename.absFileName());
        tex2lyx(is, os, encoding);
        parentFilePath = oldParentFilePath;
        return true;
@@ -541,13 +553,13 @@ int main(int argc, char * argv[])
        // Now every known option is parsed. Look for input and output
        // file name (the latter is optional).
        string infilename = internal_path(os::utf8_argv(1));
-       infilename = makeAbsPath(infilename).absFilename();
+       infilename = makeAbsPath(infilename).absFileName();
 
        string outfilename;
        if (argc > 2) {
                outfilename = internal_path(os::utf8_argv(2));
                if (outfilename != "-")
-                       outfilename = makeAbsPath(outfilename).absFilename();
+                       outfilename = makeAbsPath(outfilename).absFileName();
        } else
                outfilename = changeExtension(infilename, ".lyx");