X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxvc.h;h=6ce52cbb23dd7d8c04b0041f5c74d6c703c23d3f;hb=b9aa557b359463dfb0a2132b665570c8d1e5d605;hp=e2cc2281384b011fc3a35ccd25ad3a17889e05f3;hpb=f6aaac088c411f6d03bab73695b14a5441ea85b1;p=lyx.git

diff --git a/src/lyxvc.h b/src/lyxvc.h
index e2cc228138..6ce52cbb23 100644
--- a/src/lyxvc.h
+++ b/src/lyxvc.h
@@ -1,13 +1,25 @@
 // -*- C++ -*-
+/**
+ * \file lyxvc.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LYX_VC_H
 #define LYX_VC_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include <boost/scoped_ptr.hpp>
+
+#include <string>
+
 
-#include "LString.h"
+namespace lyx {
+
+namespace support { class FileName; }
 
 class VCS;
 class Buffer;
@@ -19,7 +31,7 @@ class Buffer;
     The support in LyX is based loosely upon the version control in GNU Emacs,
     but is not as extensive as that one. See examples/VC.lyx for a simple
     tutorial and manual for the use of the version control system in LyX.
-    
+
     LyXVC use this algorithm when it searches for VC files:
     for RCS it searches for <filename>,v and RCS/<filename>,v similar
     should be done for CVS. By doing this there doesn't need to be any
@@ -39,8 +51,8 @@ public:
 	  the appropiate actions is taken. Returns true if the file is under
 	  control by a VCS.
 	  */
-	bool file_found_hook(string const & fn);
-	
+	bool file_found_hook(support::FileName const & fn);
+
 	/** This function should be run when a file is requested for loading,
 	  but it does not exist. This function will then check for a VC master
 	  file with the same name (see above function). If this exists the
@@ -48,7 +60,7 @@ public:
 	  viewing/editing. Returns true if the file is under control by a VCS
 	  and the user wants to view/edit it.
 	  */
-	static bool file_not_found_hook(string const & fn);
+	static bool file_not_found_hook(support::FileName const & fn);
 
 	///
 	void buffer(Buffer *);
@@ -73,26 +85,31 @@ public:
 	 * It is the caller's responsibility to unlink the
 	 * file after use.
 	 */
-	const string getLogFile() const;
+	const std::string getLogFile() const;
 
-	/// 
+	///
 	void toggleReadOnly();
-	
+
 	/// Is the document under administration by RCS?
 	bool inUse();
 
 	/// Returns the version number.
-	string const & version() const;
+	//std::string const & version() const;
+	/// Returns the version number.
+	std::string const versionString() const;
 
 	/// Returns the userid of the person who has locked the doc.
-	string const & locker() const;
+	std::string const & locker() const;
 
 private:
 	///
 	Buffer * owner_;
-	
+
 	///
-	VCS * vcs;
+	boost::scoped_ptr<VCS> vcs;
 };
 
+
+} // namespace lyx
+
 #endif