small cleanup, doxygen, formatting changes

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

diff --git a/src/support/lyxlib.h b/src/support/lyxlib.h
index a159ee30d07e111d9e7057fdd3a93fdbbff714e2..d178797b05cd6c6b59cadfc85c8b6501279a8d95 100644 (file)
--- a/src/support/lyxlib.h
+++ b/src/support/lyxlib.h
@@ -18,82 +18,51 @@
 // 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
+// Use a namespace if we can, a struct otherwise
 #ifdef CXX_WORKING_NAMESPACES
-///
+#define OPT_STATIC
 namespace lyx {
+#else
+#define OPT_STATIC static
+struct lyx {
+#endif 
        ///
-       char * getcwd(char * buffer, size_t size);
-       ///
-       int chdir(char const * name);
+       OPT_STATIC string const getcwd();
         ///
-        int chdir(string const & name);
-       /// Returns false it it fails
-       bool rename(char const * from, char const * to);
+        OPT_STATIC int chdir(string const & name);
         /// Returns false if it fails
-        bool rename(string const & from, string const & to);
+        OPT_STATIC bool rename(string const & from, string const & to);
        /// Returns false it it fails
-       bool copy(string const & from, string const & to);
+       OPT_STATIC bool copy(string const & from, string const & to);
        /// generates a checksum
-       unsigned long sum(char const * file);
-       /// generates a checksum
-       unsigned long sum(string const & file);
+       OPT_STATIC unsigned long sum(string const & file);
        /// returns a date string (not used currently)
-       char * date(); 
+       OPT_STATIC char * date(); 
        /// returns the name of the user (not used currently)
-       string const getUserName();
+       OPT_STATIC string const getUserName();
        ///
-       int kill(int pid, int sig);
+       OPT_STATIC int kill(int pid, int sig);
        ///
-       void abort();
+       OPT_STATIC void abort();
         ///
-        int mkdir(string const & pathname, mode_t mode);
+        OPT_STATIC int mkdir(string const & pathname, unsigned long int mode);
        ///
-       int putenv(char const * str);
+       OPT_STATIC int putenv(char const * str);
         ///
-        int unlink(string const & file);
+        OPT_STATIC int unlink(string const & file);
         ///
-        int rmdir(string const & file);
+        OPT_STATIC int rmdir(string const & file);
         ///
-        int atoi(string const & nstr);
+        OPT_STATIC int atoi(string const & nstr);
+       ///
+       OPT_STATIC string const tempName(string const & dir = string(),
+                                        string const & mask = string());
+#ifdef CXX_WORKING_NAMESPACES
 }
 #else
-///
-struct lyx {
-       ///
-       static char * getcwd(char * buffer, size_t size);
-       ///
-       static int chdir(char const * name);
-       ///
-       static int chdir(string const & name);
-       /// Returns false it it fails
-       static bool rename(char const * from, char const * to);
-        /// Returns false if it fails
-        static bool rename(string const & from, string const & to);
-       /// Returns false it it fails
-       static bool copy(string const & from, string const & to);
-       /// generates a checksum
-       static unsigned long sum(char const * file);
-       /// generates a checksum
-       static unsigned long sum(string const & file);
-       /// returns a date string (not used currently)
-       static char * date(); 
-       /// returns the name of the user (not used currently)
-       static string const getUserName();
-       ///
-       static int kill(int pid, int sig);
-       ///
-       static void abort();
-       ///
-       static int mkdir(string const & pathname, unsigned long int mode);
-       ///
-       static int putenv(char const * str);
-        ///
-        static int unlink(string const & file);
-        ///
-        static int rmdir(string const & file);
-        ///
-        static int atoi(string const & nstr);
 };
-#endif // CXX_WORKING_NAMESPACES
 #endif
+
+#undef OPT_STATIC
+       
+#endif /* LYX_LIB_H */