* lyxfunctional.h: delete compare_memfun and helper classes

[lyx.git] / src / support / lyxlib.h

diff --git a/src/support/lyxlib.h b/src/support/lyxlib.h
index e1c76ed649cec8cc22946726efc9ea862bb60d66..0695269c9037069c23e730261769561df144e1ee 100644 (file)
--- a/src/support/lyxlib.h
+++ b/src/support/lyxlib.h
@@ -9,46 +9,48 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYX_LIB_H
 #define LYX_LIB_H
 
-#include "LString.h"
+#include <string>
+
 
 namespace lyx {
+namespace support {
 
 /// get the current working directory
-string const getcwd();
+std::string const getcwd();
 /// change to a directory, 0 is returned on success.
-int chdir(string const & name);
+int chdir(std::string const & name);
 /**
- * rename a file, returns false if it fails. 
+ * rename a file, returns false if it fails.
  * It can handle renames across partitions.
  */
-bool rename(string const & from, string const & to);
+bool rename(std::string const & from, std::string const & to);
 /// copy a file, returns false it it fails
-bool copy(string const & from, string const & to);
+bool copy(std::string const & from, std::string const & to);
 /// generates a checksum of a file
-unsigned long sum(string const & file);
+unsigned long sum(std::string const & file);
 /// FIXME: some point to this hmm ?
 int kill(int pid, int sig);
 /// FIXME: same here
 void abort();
 /// create the given directory with the given mode
-int mkdir(string const & pathname, unsigned long int mode);
-/// put a C string into the environment
-int putenv(char const * str);
+int mkdir(std::string const & pathname, unsigned long int mode);
+/// put variable=value as a C std::string into the environment
+bool putenv(std::string const & varname, std::string const & value);
 /// unlink the given file
-int unlink(string const & file);
+int unlink(std::string const & file);
 /// remove the given directory
-int rmdir(string const & file);
+int rmdir(std::string const & file);
 /// convert the given string to an integer
-int atoi(string const & nstr);
+int atoi(std::string const & nstr);
 /// (securely) create a temporary file in the given dir with the given prefix
-string const tempName(string const & dir = string(),
-                     string const & mask = string());
+std::string const tempName(std::string const & dir = std::string(),
+                     std::string const & mask = std::string());
 
 
 /**
@@ -64,6 +66,7 @@ inline bool float_equal(float var, float number, float error)
        return (number - error <= var && var <= number + error);
 }
 
+} // namespace support
 } // namespace lyx
- 
+
 #endif /* LYX_LIB_H */