fix compiler warnings in pedantic mode: remove trailing comma after last enum member

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index f4b7a62241f5a7bb4e56b9fb3648a31462b8f18e..c9674eba37ad29ecd55d063536dcdec0a6ad288b 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -16,6 +16,8 @@
 
 #include "support/strfwd.h"
 
+#include <vector>
+
 namespace lyx {
 
 class BufferList;
@@ -34,7 +36,22 @@ class ServerSocket;
 class Session;
 class SpellChecker;
 
+enum RunMode {
+       NEW_INSTANCE,
+       USE_REMOTE,
+       PREFERRED
+};
+
+enum OverwriteFiles {
+       NO_FILES,
+       MAIN_FILE,
+       ALL_FILES,
+       UNSPECIFIED
+};
+
 extern bool use_gui;
+extern RunMode run_mode;
+extern OverwriteFiles force_overwrite;
 
 namespace frontend {
 class Application;
@@ -118,13 +135,14 @@ private:
        friend FuncStatus getStatus(FuncRequest const & action);
        friend void dispatch(FuncRequest const & action);
        friend void dispatch(FuncRequest const & action, DispatchResult & dr);
+       friend std::vector<std::string> & theFilesToLoad();
        friend BufferList & theBufferList();
        friend Server & theServer();
        friend ServerSocket & theServerSocket();
        friend Converters & theConverters();
        friend Converters & theSystemConverters();
-       friend Messages & getMessages(std::string const & language);
-       friend Messages & getGuiMessages();
+       friend Messages const & getMessages(std::string const & language);
+       friend Messages const & getGuiMessages();
        friend KeyMap & theTopLevelKeymap();
        friend Movers & theMovers();
        friend Mover const & getMover(std::string  const & fmt);
@@ -160,6 +178,9 @@ FuncStatus getStatus(FuncRequest const & action);
 ///
 void dispatch(FuncRequest const & action);
 
+///
+void dispatch(FuncRequest const & action, DispatchResult & dr);
+
 } // namespace lyx
 
 #endif // LYX_H