one small private fix in mathed, put noncopyable and tie into boost namespace

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

diff --git a/src/support/lyxlib.h b/src/support/lyxlib.h
index 4c9d9a1b754d8c2292b1c86a8692cd05d496ec39..d178797b05cd6c6b59cadfc85c8b6501279a8d95 100644 (file)
--- a/src/support/lyxlib.h
+++ b/src/support/lyxlib.h
@@ -4,8 +4,8 @@
  * 
  *           LyX, The Document Processor
  *        
- *           Copyright (C) 1995 Matthias Ettrich
- *           Copyright (C) 1995-1999 The LyX Team.
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -18,40 +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 {
-       ///
-       char * getcwd(char * buffer, size_t size);
-       ///
-       int chdir(char const * name);
-       /// generates an checksum
-       unsigned long sum(char const * file);
-       /// returns a date string
-       char * date(); 
-       ///
-       string getUserName();
-       ///
-       int kill(int pid, int sig);
-       ///
-       void abort();
-}
 #else
+#define OPT_STATIC static
 struct lyx {
+#endif 
        ///
-       static char * getcwd(char * buffer, size_t size);
+       OPT_STATIC string const getcwd();
+        ///
+        OPT_STATIC int chdir(string const & name);
+        /// Returns false if it fails
+        OPT_STATIC bool rename(string const & from, string const & to);
+       /// Returns false it it fails
+       OPT_STATIC bool copy(string const & from, string const & to);
+       /// generates a checksum
+       OPT_STATIC unsigned long sum(string const & file);
+       /// returns a date string (not used currently)
+       OPT_STATIC char * date(); 
+       /// returns the name of the user (not used currently)
+       OPT_STATIC string const getUserName();
        ///
-       static int chdir(char const * name);
-       /// generates an checksum
-       static unsigned long sum(char const * file);
-       /// returns a date string
-       static char * date(); 
+       OPT_STATIC int kill(int pid, int sig);
        ///
-       static string getUserName();
+       OPT_STATIC void abort();
+        ///
+        OPT_STATIC int mkdir(string const & pathname, unsigned long int mode);
        ///
-       static int kill(int pid, int sig);
+       OPT_STATIC int putenv(char const * str);
+        ///
+        OPT_STATIC int unlink(string const & file);
+        ///
+        OPT_STATIC int rmdir(string const & file);
+        ///
+        OPT_STATIC int atoi(string const & nstr);
        ///
-       static void abort();
+       OPT_STATIC string const tempName(string const & dir = string(),
+                                        string const & mask = string());
+#ifdef CXX_WORKING_NAMESPACES
+}
+#else
 };
-#endif // CXX_WORKING_NAMESPACES
 #endif
+
+#undef OPT_STATIC
+       
+#endif /* LYX_LIB_H */