Fix bug 2195: Slowness in rendering inside insets, especially on the Mac

[lyx.git] / src / lyx_cb.h

diff --git a/src/lyx_cb.h b/src/lyx_cb.h
index 8bd7bc0060e17212f6c19fc061bef3fd88d82cd5..fa191c4fc2a96a865f2f04a71d951d78962b1a2e 100644 (file)
--- a/src/lyx_cb.h
+++ b/src/lyx_cb.h
@@ -12,7 +12,7 @@
 #ifndef LYX_CB_H
 #define LYX_CB_H
 
-#include "support/std_string.h"
+#include <string>
 
 class Buffer;
 class BufferView;
@@ -23,19 +23,17 @@ extern bool quitting;
 ///
 bool MenuWrite(Buffer * buffer);
 /// write the given file, or ask if no name given
-bool WriteAs(Buffer * buffer, string const & filename = string());
+bool WriteAs(Buffer * buffer, std::string const & filename = std::string());
 ///
-void QuitLyX();
+void QuitLyX(bool noask);
 ///
 void AutoSave(BufferView * bv);
 ///
-void NewFile(BufferView * bv, string const & filename);
+void NewFile(BufferView * bv, std::string const & filename);
 ///
-void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph);
+void InsertAsciiFile(BufferView * bv, std::string const & f, bool asParagraph);
 ///
-string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph);
-///
-string const getPossibleLabel(BufferView const & bv);
+std::string getContentsOfAsciiFile(BufferView * bv, std::string const & f, bool asParagraph);
 ///
 void Reconfigure(BufferView * bv);
 #endif