do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / GuiApplication.h

diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h
index 851ffbba4534fb8e313475ece2db3db6866f28bc..29b522b647743993c76d5acb36ef6e2b7403c1f1 100644 (file)
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -17,13 +17,13 @@
 #include "GuiFontLoader.h"
 #include "GuiClipboard.h"
 #include "GuiSelection.h"
+#include "Menus.h"
 
 #include "frontends/Application.h"
 
-#include "MenuBackend.h"
-
 #include <QObject>
 #include <QApplication>
+#include <QTimer>
 #include <QTranslator>
 
 #include <map>
@@ -61,11 +61,12 @@ public:
        virtual FuncStatus getStatus(FuncRequest const &);
        virtual bool dispatch(FuncRequest const &);
        virtual void resetGui();
+       void restoreGuiSession();
        virtual Clipboard & clipboard();
        virtual Selection & selection();
        virtual FontLoader & fontLoader() { return font_loader_; }
-       MenuBackend const & menuBackend() const { return menu_backend_; }
-       MenuBackend & menuBackend() { return menu_backend_; }
+       MenuBackend const & menuBackend() const { return menus_; }
+       MenuBackend & menuBackend() { return menus_; }
        virtual int exec();
        virtual void exit(int status);
        virtual bool event(QEvent * e);
@@ -76,6 +77,8 @@ public:
        void unregisterSocketCallback(int fd);
        //@}
 
+       Menus const & menus() const { return menus_; }
+       Menus & menus() { return menus_; }
        /// Methods inherited from \c QApplication class
        //@{
        bool notify(QObject * receiver, QEvent * event);
@@ -123,6 +126,8 @@ private Q_SLOTS:
        void execBatchCommands();
        ///
        void socketDataReceived(int fd);
+       /// events to be triggered by general_timer_ should go here
+       void handleRegularEvents();
 
 private:
        ///
@@ -140,7 +145,11 @@ private:
        ///
        std::map<int, SocketNotifier *> socket_notifiers_;
        ///
-       MenuBackend menu_backend_;
+       Menus menus_;
+       /// this timer is used for any regular events one wants to
+       /// perform. at present it is used to check if forked processes
+       /// are done.
+       QTimer general_timer_;
 
 #ifdef Q_WS_X11
 public: