X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FDialogs.cpp;h=35d4e013d72574b089c637e4a79b656ccaa5f44d;hb=cf5a9defdd186fe5bc2b5cc7977e7b091949236f;hp=afd4665c8414d6553e94365657fc971c47919ffe;hpb=9a17e559f289845db02bc114fad5190280548e4e;p=lyx.git diff --git a/src/frontends/Dialogs.cpp b/src/frontends/Dialogs.cpp index afd4665c84..35d4e013d7 100644 --- a/src/frontends/Dialogs.cpp +++ b/src/frontends/Dialogs.cpp @@ -14,7 +14,7 @@ #include "Dialogs.h" -#include "lyx_cb.h" +#include "callback.h" #include "controllers/Dialog.h" @@ -51,15 +51,15 @@ private: namespace { -BugfixSignal > hideSignal; +BugfixSignal > hideSignal; } -void Dialogs::hide(string const & name, InsetBase* inset) +void Dialogs::hide(string const & name, Inset* inset) { // Don't send the signal if we are quitting, because on MSVC it is - // destructed before the cut stack in CutAndPaste.C, and this method + // destructed before the cut stack in CutAndPaste.cpp, and this method // is called from some inset destructor if the cut stack is not empty // on exit. if (!quitting) @@ -106,7 +106,7 @@ void Dialogs::show(string const & name, string const & data) } -void Dialogs::show(string const & name, string const & data, InsetBase * inset) +void Dialogs::show(string const & name, string const & data, Inset * inset) { if (in_show_) { return; @@ -145,7 +145,7 @@ void Dialogs::update(string const & name, string const & data) } -void Dialogs::hideSlot(string const & name, InsetBase * inset) +void Dialogs::hideSlot(string const & name, Inset * inset) { std::map::const_iterator it = dialogs_.find(name); @@ -172,12 +172,12 @@ void Dialogs::disconnect(string const & name) } -InsetBase * Dialogs::getOpenInset(string const & name) const +Inset * Dialogs::getOpenInset(string const & name) const { if (!isValidName(name)) return 0; - std::map::const_iterator it = + std::map::const_iterator it = open_insets_.find(name); return it == open_insets_.end() ? 0 : it->second; }