... and sanitize the simplified code...

[lyx.git] / src / bufferview_funcs.h

diff --git a/src/bufferview_funcs.h b/src/bufferview_funcs.h
index e829c53dcd5cacaf51cacefb85f62d31fbafb95a..c8665daa71412c4bdc9eb946889038e04571c5f7 100644 (file)
--- a/src/bufferview_funcs.h
+++ b/src/bufferview_funcs.h
@@ -4,72 +4,34 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef BUFFERVIEW_FUNCS_H
 #define BUFFERVIEW_FUNCS_H
 
-#include "LString.h"
+#include <string>
 
-class BufferView;
 class LyXFont;
-class LyXText;
 
-/** Set \param data using \param font and \param toggle.
- *  If successful, returns true.
- */
-bool font2string(LyXFont const & font, bool toggle, string & data);
-/** Set \param font and \param toggle using \param data.
- *  If successful, returns true.
- */
-bool string2font(string const & data, LyXFont & font, bool & toggle);
-/** Returns the current freefont, encoded as a string to be passed to the
+
+namespace bv_funcs {
+
+/// Set \param data using \param font and \param toggle. Return success.
+bool font2string(LyXFont const & font, bool toggle, std::string & data);
+
+/// Set \param font and \param toggle using \param data. Return success.
+bool string2font(std::string const & data, LyXFont & font, bool & toggle);
+
+/** Returns the current freefont, encoded as a std::string to be passed to the
  *  frontends.
  */
-string const freefont2string();
-/** Set the freefont using the contents of \param data dispatched from
- *  the frontends and apply it at the current cursor location.
- */
-void update_and_apply_freefont(BufferView * bv, string const & data);
-/** Apply the contents of freefont at the current cursor location.
- */
-void apply_freefont(BufferView * bv);
+std::string const freefont2string();
 
+} // namespace bv_funcs
 
-///
-extern void emph(BufferView *);
-///
-extern void bold(BufferView *);
-///
-extern void noun(BufferView *);
-///
-extern void lang(BufferView *, string const &);
-///
-extern void number(BufferView *);
-///
-extern void tex(BufferView *);
-///
-extern void changeDepth(BufferView *, LyXText *, int);
-///
-extern void code(BufferView *);
-///
-extern void sans(BufferView *);
-///
-extern void roman(BufferView *);
-///
-extern void styleReset(BufferView *);
-///
-extern void underline(BufferView *);
-///
-extern void fontSize(BufferView *, string const &);
-/// Returns the current font and depth as a message.
-extern string const currentState(BufferView *);
-///
-extern void toggleAndShow(BufferView *, LyXFont const &,
-                         bool toggleall = true);
 #endif