Replace the text class shared ptr by good old index-into-global-list.

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

diff --git a/src/support/os.h b/src/support/os.h
index c42cfedbff89bda470a9862aebae92f13b577267..2d41dd76267a6d2f377ed44c55de3a01ab455453 100644 (file)
--- a/src/support/os.h
+++ b/src/support/os.h
@@ -14,9 +14,8 @@
 #ifndef OS_H
 #define OS_H
 
-#include "support/docstring.h"
-
-#include <string>
+#include "support/strfwd.h"
+#include <cstddef>
 
 
 namespace lyx {
@@ -45,7 +44,7 @@ std::string const python();
 
 /// Extract the path common to both @c p1 and @c p2. DBCS aware!
 /// \p p1, \p p2 and the return value are encoded in utf8.
-std::string::size_type common_path(std::string const & p1, std::string const & p2);
+std::size_t common_path(docstring const & p1, docstring const & p2);
 
 /// Converts a unix style path to host OS style.
 /// \p p and the return value are encoded in utf8.
@@ -72,10 +71,6 @@ std::string internal_path_list(std::string const & p);
  */
 std::string latex_path(std::string const & p);
 
-/// Is the path absolute?
-/// \p p is encoded in utf8.
-bool is_absolute_path(std::string const & p);
-
 /** Returns a string suitable to be passed to popen when
  *  reading a file.
  */
@@ -111,19 +106,6 @@ bool canAutoOpenFile(std::string const & ext, auto_open_mode const mode = VIEW);
  */
 bool autoOpenFile(std::string const & filename, auto_open_mode const mode = VIEW);
 
-/** General font utilities.
- *  FIXME: only MAC and WIN32 for now but it would be nice to convince
- *  fontconfig to do the same for linux.
- */
-
-/// Add fonts to the font subsystem, must be called before Application
-/// is initialized.
-void addFontResources();
-
-/// Restore original font resources, must be called after Application
-/// is destroyed.
-void restoreFontResources();
-
 } // namespace os
 } // namespace support
 } // namespace lyx