Revert "Amend 3093789e for cmake build"

[features.git] / src / support / filetools.cpp

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 8d48c8e9bd8361aa80be5c55e44415433b32d606..2bcfbc650235d276417d24af8df76fb49793ad9b 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -21,11 +21,11 @@
 
 #include <config.h>
 
+#include "support/filetools.h"
+
 #include "LyX.h"
 #include "LyXRC.h"
 
-#include "support/filetools.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/environment.h"
@@ -42,7 +42,6 @@
 #include <QDir>
 
 #include "support/lassert.h"
-#include "support/regex.h"
 
 #include <fcntl.h>
 #ifdef HAVE_MAGIC_H
@@ -59,6 +58,7 @@
 
 #include <utility>
 #include <fstream>
+#include <regex>
 #include <sstream>
 #include <vector>
 
@@ -442,7 +442,7 @@ string const commandPrep(string const & command_in)
 }
 
 
-FileName const tempFileName(FileName tempdir, string const & mask, bool const dir)
+FileName const tempFileName(FileName const & tempdir, string const & mask, bool const dir)
 {
        return tempFileName(TempFile(tempdir, mask).name(), dir);
 }
@@ -1093,7 +1093,7 @@ cmd_ret const runCommand(string const & cmd)
 
        // (Claus Hentschel) Check if popen was successful ;-)
        if (!inf) {
-               lyxerr << "RunCommand:: could not start child process" << endl;
+               lyxerr << "RunCommand: could not start child process" << endl;
                return { false, string() };
        }
 
@@ -1125,7 +1125,7 @@ cmd_ret const runCommand(string const & cmd)
 #endif
 
        if (!valid)
-               perror("RunCommand:: could not terminate child process");
+               perror("RunCommand: could not terminate child process");
 
        return { valid, result };
 }