X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.h;h=4fce15e67865b2e7e7ef1e53f890165f0f294f9a;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=5790b81b1cc68872a678ba2bb73704ec1576eaa7;hpb=ecd903be16470c5261714a49d8120509042228bd;p=lyx.git

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 5790b81b1c..4fce15e678 100644
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -23,6 +23,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
+namespace lyx {
 
 class BufferView;
 class FuncRequest;
@@ -53,7 +54,7 @@ public:
 	void initKeySequences(kb_keymap * kb);
 
 	/// return the status bar state string
-	std::string const viewStatusMessage();
+	docstring const viewStatusMessage();
 
 	///
 	void processKeySym(LyXKeySymPtr key, key_modifier::state state);
@@ -67,13 +68,18 @@ public:
 	/// True if lyxfunc reports an error
 	bool errorStat() const { return errorstat; }
 	/// Buffer to store result messages
-	void setMessage(lyx::docstring const & m) const;
+	void setMessage(docstring const & m) const;
 	/// Buffer to store result messages
-	void setErrorMessage(lyx::docstring const &) const;
+	void setErrorMessage(docstring const &) const;
 	/// Buffer to store result messages
-	lyx::docstring const getMessage() const { return dispatch_buffer; }
+	docstring const getMessage() const { return dispatch_buffer; }
 	/// Handle a accented char key sequence
 	void handleKeyFunc(kb_action action);
+	/// goto a bookmark
+	/// openFile: whether or not open a file if the file is not opened
+	/// switchToBuffer: whether or not switch to buffer if the buffer is 
+	///		not the current buffer
+	void gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer);
 
 private:
 	///
@@ -82,8 +88,8 @@ private:
 	///
 	LyXView * lyx_view_;
 
-	/// the last character added to the key sequence, in ISO encoded form
-	lyx::char_type encoded_last_key;
+	/// the last character added to the key sequence, in UCS4 encoded form
+	char_type encoded_last_key;
 
 	///
 	boost::scoped_ptr<kb_sequence> keyseq;
@@ -98,10 +104,10 @@ private:
 	/** Buffer to store messages and result data. Is there a
 	    good reason to have this one as static in Dispatch? (Ale)
 	*/
-	mutable lyx::docstring dispatch_buffer;
+	mutable docstring dispatch_buffer;
 
 	/// send a post-dispatch status message
-	void sendDispatchMessage(lyx::docstring const & msg,
+	void sendDispatchMessage(docstring const & msg,
 		FuncRequest const & ev);
 
 	// I think the following should be moved to BufferView. (Asger)
@@ -114,19 +120,20 @@ private:
 	///
 	void closeBuffer();
 	///
+	void reloadBuffer();
+	///
 	bool ensureBufferClean(BufferView * bv);
 };
 
 /// Implementation is in lyx_main.C
 extern LyXFunc & theLyXFunc();
 
-namespace lyx {
-
 /// Implementation is in lyx_main.C
 extern FuncStatus getStatus(FuncRequest const & action);
 
 /// Implementation is in lyx_main.C
 extern void dispatch(FuncRequest const & action);
-}
+
+} // namespace lyx
 
 #endif