Replace LString.h with support/std_string.h,

[features.git] / src / support / os.h

diff --git a/src/support/os.h b/src/support/os.h
index 7abe2d0a4d18ac1307b4e6dbdd1ba949892d5424..b1bf8799c053b75b1a76dd88fe0a880b37eaac3f 100644 (file)
--- a/src/support/os.h
+++ b/src/support/os.h
@@ -1,66 +1,62 @@
-// os.h copyright "Ruurd A. Reitsma" <R.A.Reitsma@wbmt.tudelft.nl>
+// -*- C++ -*-
+/**
+ * \file os.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Ruurd A. Reitsma
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef OS_H
 #define OS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "LString.h"
-
-/// Do we need a base class for this?
-class os {
-public:
-       //
-       enum shell_type {
-               UNIX,   // Do we have to distinguish sh and csh?
-               CMD_EXE
-       };
-
-       // 
-       static void init(int * argc, char ** argv[]);
-
-       // 
-       static string binpath() {return binpath_;};
-
-       // 
-       static string binname() {return binname_;};
-
-       // system_tempdir actually doesn't belong here.
-       // I put it here only to avoid a global variable.
-       static void setTmpDir(string p) {tmpdir_ = p;};
+#include "support/std_string.h"
 
-       // 
-       static string getTmpDir() {return tmpdir_;};
-
-       // 
-       static string current_root();
-
-       // 
-       static os::shell_type shell() {return _shell;};
-
-       // DBCS aware!
-       static string::size_type common_path(string const &p1, string const &p2);
-
-       // no-op on UNIX, '\\'->'/' on OS/2 and Win32, ':'->'/' on MacOS, etc.
-       static string slashify_path(string p);
-       static string external_path(string p);
-       static void warn(string mesg);
-private:
-       static string binpath_;
-       static string binname_;
-       static string tmpdir_;
-       static os::shell_type _shell;
-       static unsigned long cp_;       // Used only on OS/2 to determine file system encoding.
-
-       // Never initialize static variables in the header!
-       // Anyway I bet this class will never be constructed.
-       os() {};
-
-       // Ignore warning!
-       ~os() {};
+/// wrap OS specific stuff
+namespace lyx {
+namespace support {
+namespace os {
 
+//
+enum shell_type {
+       UNIX,   // Do we have to distinguish sh and csh?
+       CMD_EXE
 };
 
+// do some work just once
+void init(int * argc, char ** argv[]);
+// returns path of LyX binary
+string binpath();
+// returns name of LyX binary
+string binname();
+//
+void setTmpDir(string const & p);
+//
+string getTmpDir();
+//
+string current_root();
+//
+shell_type shell();
+// DBCS aware!
+string::size_type common_path(string const & p1, string const & p2);
+// no-op on UNIX, '\\'->'/' on OS/2 and Win32, ':'->'/' on MacOS, etc.
+string slashify_path(string const & p);
+// converts a host OS path to unix style
+string external_path(string const & p);
+// converts a unix path to host OS style
+string internal_path(string const & p);
+// is path absolute?
+bool is_absolute_path(string const & p);
+// returns a string suitable to be passed to popen when
+// same for popen().
+       char const * popen_read_mode();
+//
+void warn(string const & mesg);
+
+} // namespace os
+} // namespace support
+} // namespace lyx
+
 #endif