Application: get rid of 2 virtual interface.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33394 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2010-02-09 17:25:44 +00:00
parent d77a22e2f9
commit 70d5b8fe06
3 changed files with 5 additions and 8 deletions

View File

@ -185,14 +185,9 @@ public:
/// ///
virtual FuncStatus getStatus(FuncRequest const & cmd) const = 0; virtual FuncStatus getStatus(FuncRequest const & cmd) const = 0;
///
virtual void resetGui() = 0;
/// Load files and restore GUI Session. /// Load files and restore GUI Session.
virtual void restoreGuiSession() = 0; virtual void restoreGuiSession() = 0;
///
virtual void hideDialogs(std::string const & name, Inset * inset) const = 0;
/// ///
virtual Buffer const * updateInset(Inset const * inset) const = 0; virtual Buffer const * updateInset(Inset const * inset) const = 0;

View File

@ -2454,7 +2454,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
void hideDialogs(std::string const & name, Inset * inset) void hideDialogs(std::string const & name, Inset * inset)
{ {
if (theApp()) if (theApp())
theApp()->hideDialogs(name, inset); frontend::guiApp->hideDialogs(name, inset);
} }

View File

@ -61,7 +61,6 @@ public:
void dispatch(FuncRequest const &, DispatchResult & dr); void dispatch(FuncRequest const &, DispatchResult & dr);
FuncStatus getStatus(FuncRequest const & cmd) const; FuncStatus getStatus(FuncRequest const & cmd) const;
void dispatchDelayed(FuncRequest const &); void dispatchDelayed(FuncRequest const &);
void resetGui();
void restoreGuiSession(); void restoreGuiSession();
Clipboard & clipboard(); Clipboard & clipboard();
Selection & selection(); Selection & selection();
@ -75,10 +74,13 @@ public:
void unregisterSocketCallback(int fd); void unregisterSocketCallback(int fd);
bool searchMenu(FuncRequest const & func, docstring_list & names) const; bool searchMenu(FuncRequest const & func, docstring_list & names) const;
docstring iconName(FuncRequest const & f, bool unknown); docstring iconName(FuncRequest const & f, bool unknown);
void hideDialogs(std::string const & name, Inset * inset) const;
Buffer const * updateInset(Inset const * inset) const; Buffer const * updateInset(Inset const * inset) const;
void handleKeyFunc(FuncCode action); void handleKeyFunc(FuncCode action);
//@} //@}
///
void hideDialogs(std::string const & name, Inset * inset) const;
///
void resetGui();
Toolbars const & toolbars() const; Toolbars const & toolbars() const;
Toolbars & toolbars(); Toolbars & toolbars();