From 70d5b8fe06322d67101418f82c851f685bd27b84 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Tue, 9 Feb 2010 17:25:44 +0000 Subject: [PATCH] Application: get rid of 2 virtual interface. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33394 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/Application.h | 5 ----- src/frontends/qt4/GuiApplication.cpp | 2 +- src/frontends/qt4/GuiApplication.h | 6 ++++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/frontends/Application.h b/src/frontends/Application.h index 5e1a12cdca..d5f48ae609 100644 --- a/src/frontends/Application.h +++ b/src/frontends/Application.h @@ -185,14 +185,9 @@ public: /// virtual FuncStatus getStatus(FuncRequest const & cmd) const = 0; - /// - virtual void resetGui() = 0; - /// Load files and restore GUI Session. virtual void restoreGuiSession() = 0; - /// - virtual void hideDialogs(std::string const & name, Inset * inset) const = 0; /// virtual Buffer const * updateInset(Inset const * inset) const = 0; diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index 9b205ad09b..981d345aa1 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -2454,7 +2454,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev) void hideDialogs(std::string const & name, Inset * inset) { if (theApp()) - theApp()->hideDialogs(name, inset); + frontend::guiApp->hideDialogs(name, inset); } diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h index 5355f9bd85..b170430f4a 100644 --- a/src/frontends/qt4/GuiApplication.h +++ b/src/frontends/qt4/GuiApplication.h @@ -61,7 +61,6 @@ public: void dispatch(FuncRequest const &, DispatchResult & dr); FuncStatus getStatus(FuncRequest const & cmd) const; void dispatchDelayed(FuncRequest const &); - void resetGui(); void restoreGuiSession(); Clipboard & clipboard(); Selection & selection(); @@ -75,10 +74,13 @@ public: void unregisterSocketCallback(int fd); bool searchMenu(FuncRequest const & func, docstring_list & names) const; docstring iconName(FuncRequest const & f, bool unknown); - void hideDialogs(std::string const & name, Inset * inset) const; Buffer const * updateInset(Inset const * inset) const; void handleKeyFunc(FuncCode action); //@} + /// + void hideDialogs(std::string const & name, Inset * inset) const; + /// + void resetGui(); Toolbars const & toolbars() const; Toolbars & toolbars(); -- 2.39.2