Replace LString.h with support/std_string.h,

[features.git] / src / support / tempname.C

diff --git a/src/support/tempname.C b/src/support/tempname.C
index 8a7785cc1adf7dc0e5fc70c22dcaac0464776cc2..cffa90f9e37c6b098789e84b0740a8279749074e 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -1,41 +1,47 @@
+/**
+ * \file tempname.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
 #include <cstdlib>
 #include <unistd.h>
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "support/lyxlib.h"
 #include "support/filetools.h"
+#include "support/tostr.h"
 #include "debug.h"
 #include "os.h"
 
 using std::endl;
 
-
 namespace {
 
 inline
-int make_tempfile(char * templ) 
+int make_tempfile(char * templ)
 {
-#ifdef HAVE_MKSTEMP
+#if defined(HAVE_MKSTEMP)
        return ::mkstemp(templ);
-#else
-#ifdef HAVE_MKTEMP
+#elif defined(HAVE_MKTEMP)
        // This probably just barely works...
        ::mktemp(templ);
        return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 #else
-#ifdef WITH_WARNINGS
-#warning FIX FIX FIX
-#endif
-#endif
+#error FIX FIX FIX
 #endif
 }
 
 } // namespace anon
 
 
-string const lyx::tempName(string const & dir, string const & mask)
+string const lyx::support::tempName(string const & dir, string const & mask)
 {
        string const tmpdir(dir.empty() ? os::getTmpDir() : dir);
        string tmpfl(AddName(tmpdir, mask));
@@ -46,7 +52,7 @@ string const lyx::tempName(string const & dir, string const & mask)
        char * tmpl = new char[tmpfl.length() + 1]; // + 1 for '\0'
        tmpfl.copy(tmpl, string::npos);
        tmpl[tmpfl.length()] = '\0'; // terminator
-       
+
        int const tmpf = make_tempfile(tmpl);
        if (tmpf != -1) {
                string const t(tmpl);