Revert qprocess code. Revisions reverted: 22026, 22030, 22044, 22048,

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

diff --git a/src/support/lyxlib.h b/src/support/lyxlib.h
index e1c76ed649cec8cc22946726efc9ea862bb60d66..b7952d2868d966a34fd4270350908a72488e9c92 100644 (file)
--- a/src/support/lyxlib.h
+++ b/src/support/lyxlib.h
@@ -9,46 +9,47 @@
  *
  * \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 "support/FileName.h"
+
+#include <string>
+
 
 namespace lyx {
+namespace support {
 
 /// get the current working directory
-string const getcwd();
-/// change to a directory, 0 is returned on success.
-int chdir(string const & name);
+FileName const getcwd();
+/// Change file permissions
+bool chmod(FileName const & file, unsigned long int mode);
 /**
- * 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(FileName const & from, FileName const & to);
 /// copy a file, returns false it it fails
-bool copy(string const & from, string const & to);
-/// generates a checksum of a file
-unsigned long sum(string const & file);
+bool copy(FileName const & from, FileName const & to,
+         unsigned long int mode = (unsigned long int)-1);
 /// 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);
-/// unlink the given file
-int unlink(string const & file);
-/// remove the given directory
-int rmdir(string const & file);
-/// convert the given string to an integer
-int atoi(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());
+/// \ret return 0 if the directory is successfully created
+int mkdir(FileName const & pathname, unsigned long int mode);
+/// create the given directory with the given mode, create all
+/// intermediate directories if necessary
+/// \ret return 0 if the directory is successfully created
+int makedir(char * pathname, unsigned long int mode=0755);
+/// (securely) create a temporary file in the given dir with the given mask
+/// \p mask must be in filesystem encoding
+FileName const tempName(FileName const & dir = FileName(),
+                     std::string const & mask = std::string());
 
 
 /**
@@ -59,11 +60,12 @@ string const tempName(string const & dir = string(),
  *
  * This will check if 'var' is approx. equal to 'number' with error of 1/1000
  */
-inline bool float_equal(float var, float number, float error)
+inline bool float_equal(double var, double number, double error)
 {
        return (number - error <= var && var <= number + error);
 }
 
+} // namespace support
 } // namespace lyx
- 
+
 #endif /* LYX_LIB_H */