fix math fonts with LyX/Mac

[lyx.git] / src / frontends / Dialogs.C

diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index ff7825c5b7180c13f60d077f351be9f5ea3a0002..0c222c045e5f72aa8972d83a18a3c8efc9eaae6e 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -5,7 +5,7 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
  * Common to all frontends' Dialogs
  */
@@ -13,11 +13,17 @@
 #include <config.h>
 
 #include "Dialogs.h"
+
 #include "controllers/Dialog.h"
-#include <boost/signals/signal2.hpp>
+
+#include <boost/signal.hpp>
 #include <boost/bind.hpp>
 
 
+using std::string;
+using lyx::frontend::Dialog;
+
+
 // Note that static boost signals break some compilers, so this wrapper
 // initialises the signal dynamically when it is first invoked.
 template<typename Signal>
@@ -38,16 +44,16 @@ private:
 };
 
 
-boost::signal0<void> & Dialogs::redrawGUI()
+boost::signal<void()> & Dialogs::redrawGUI()
 {
-       static BugfixSignal<boost::signal0<void> > thesignal;
+       static BugfixSignal<boost::signal<void()> > thesignal;
        return thesignal();
 }
 
 
 namespace {
 
-BugfixSignal<boost::signal2<void, string const &, InsetBase*> > hideSignal;
+BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
 
 }
 
@@ -63,17 +69,10 @@ Dialogs::Dialogs(LyXView & lyxview)
 {
        // Connect signals
        redrawGUI().connect(boost::bind(&Dialogs::redraw, this));
-       hideSignal().connect(boost::bind(&Dialogs::hideSlot, this, _1, _2));
-
-       // All this is slated to go
-       init_pimpl();
-       // reduce the number of connections needed in
-       // dialogs by a simple connection here.
-       hideAllSignal.connect(hideBufferDependentSignal);
 }
 
 
-Dialog * Dialogs::find(string const & name)
+Dialog * Dialogs::find_or_build(string const & name)
 {
        if (!isValidName(name))
                return 0;
@@ -81,18 +80,17 @@ Dialog * Dialogs::find(string const & name)
        std::map<string, DialogPtr>::iterator it =
                dialogs_.find(name);
 
-       if (it == dialogs_.end()) {
-               dialogs_[name] = DialogPtr(build(name));
-               return dialogs_[name].get();
-       }
+       if (it != dialogs_.end())
+               return it->second.get();
 
-       return it->second.get();
+       dialogs_[name] = build(name);
+       return dialogs_[name].get();
 }
 
 
 void Dialogs::show(string const & name, string const & data)
 {
-       Dialog * dialog = find(name);
+       Dialog * dialog = find_or_build(name);
        if (!dialog)
                return;
 
@@ -103,7 +101,7 @@ void Dialogs::show(string const & name, string const & data)
 
 void Dialogs::show(string const & name, string const & data, InsetBase * inset)
 {
-       Dialog * dialog = find(name);
+       Dialog * dialog = find_or_build(name);
        if (!dialog)
                return;
 
@@ -125,10 +123,12 @@ bool Dialogs::visible(string const & name) const
 
 void Dialogs::update(string const & name, string const & data)
 {
-       Dialog * dialog = find(name);
-       if (!dialog)
+       std::map<string, DialogPtr>::const_iterator it =
+               dialogs_.find(name);
+       if (it == dialogs_.end())
                return;
 
+       Dialog * const dialog = it->second.get();
        if (dialog->isVisible())
                dialog->update(data);
 }
@@ -136,13 +136,15 @@ void Dialogs::update(string const & name, string const & data)
 
 void Dialogs::hideSlot(string const & name, InsetBase * inset)
 {
-       Dialog * dialog = find(name);
-       if (!dialog)
+       std::map<string, DialogPtr>::const_iterator it =
+               dialogs_.find(name);
+       if (it == dialogs_.end())
                return;
 
        if (inset && inset != getOpenInset(name))
                return;
 
+       Dialog * const dialog = it->second.get();
        if (dialog->isVisible())
                dialog->hide();
        open_insets_[name] = 0;
@@ -177,7 +179,6 @@ void Dialogs::hideAll() const
        for(; it != end; ++it) {
                it->second->hide();
        }
-       hideAllSignal();
 }
 
 
@@ -191,7 +192,6 @@ void Dialogs::hideBufferDependent() const
                if (dialog->controller().isBufferDependent())
                        dialog->hide();
        }
-       hideBufferDependentSignal();
 }
 
 
@@ -211,7 +211,6 @@ void Dialogs::updateBufferDependent(bool switched) const
                        dialog->RestoreButton();
                }
        }
-       updateBufferDependentSignal(switched);
 }