remove !NEW_INSETS cruft

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

diff --git a/src/support/lyxlib.h b/src/support/lyxlib.h
index b14fe84dd547a2e312d39ef3c861edd9eaeed0be..4df4e58557e05910a54054cc2845f57eaab82384 100644 (file)
--- a/src/support/lyxlib.h
+++ b/src/support/lyxlib.h
@@ -18,58 +18,40 @@
 // three/four times. Don't you think it better to use a macro definition
 // (an inlined member of some class)?
 
-// This should have been a namespace
-#ifdef CXX_WORKING_NAMESPACES
-///
+// Use a namespace if we can, a struct otherwise
 namespace lyx {
-       ///
-       char * getcwd(char * buffer, size_t size);
-       ///
-       int chdir(char const * name);
-       /// Returns false it it fails
-       bool rename(char const * from, char const * to);
-       /// Returns false it it fails
-       bool copy(char const * from, char const * to);
-       /// generates a checksum
-       unsigned long sum(char const * file);
-       /// returns a date string (not used currently)
-       char * date(); 
-       /// returns the name of the user (not used currently)
-       string getUserName();
-       ///
-       int kill(long int pid, int sig);
-       ///
-       void abort();
-       ///
-       int mkdir(char const * pathname, unsigned long int mode);
-       ///
-       int putenv(char const * str);
-}
-#else
+
+///
+string const getcwd();
+///
+int chdir(string const & name);
+/// Returns false if it fails
+bool rename(string const & from, string const & to);
+/// Returns false it it fails
+bool copy(string const & from, string const & to);
+/// generates a checksum
+unsigned long sum(string const & file);
+/// returns a date string (not used currently)
+char * date(); 
+/// returns the name of the user (not used currently)
+string const getUserName();
+///
+int kill(int pid, int sig);
+///
+void abort();
 ///
-struct lyx {
-       ///
-       static char * getcwd(char * buffer, size_t size);
-       ///
-       static int chdir(char const * name);
-       /// Returns false it it fails
-       static bool rename(char const * from, char const * to);
-       /// Returns false it it fails
-       static bool copy(char const * from, char const * to);
-       /// generates a checksum
-       static unsigned long sum(char const * file);
-       /// returns a date string (not used currently)
-       static char * date(); 
-       /// returns the name of the user (not used currently)
-       static string getUserName();
-       ///
-       static int kill(long int pid, int sig);
-       ///
-       static void abort();
-       ///
-       static int mkdir(char const * pathname, unsigned long int mode);
-       ///
-       static int putenv(char const * str);
-};
-#endif // CXX_WORKING_NAMESPACES
-#endif
+int mkdir(string const & pathname, unsigned long int mode);
+///
+int putenv(char const * str);
+///
+int unlink(string const & file);
+///
+int rmdir(string const & file);
+///
+int atoi(string const & nstr);
+///
+string const tempName(string const & dir = string(),
+                     string const & mask = string());
+
+} // namespace lyx
+#endif /* LYX_LIB_H */