get rid of broken_header.h and some unneeded tests

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

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index d5aa8af54deaabb496bf08015d6a2ca629cef6c4..22ab1784d6abde2f3954bb2933437a0cc0ad69f2 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -3,7 +3,9 @@
  * \file Dialogs.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
+ *
  * \author Allan Rae
+ * \author Angus Leeming
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,17 +13,23 @@
 #ifndef DIALOGS_H
 #define DIALOGS_H
 
+#include <boost/signal.hpp>
 #include <boost/utility.hpp>
-#include <boost/signals/signal0.hpp>
 
-class Dialog;
+#include <map>
+
 class InsetBase;
 class LyXView;
 
+namespace lyx {
+namespace frontend {
+class Dialog;
+} // namespace frontend
+} // namespace lyx
+
 /** Container of all dialogs.
  */
-class Dialogs : boost::noncopyable
-{
+class Dialogs : boost::noncopyable {
 public:
        ///
        Dialogs(LyXView &);
@@ -32,7 +40,7 @@ public:
         *  Note that static boost signals break some compilers, so we return a
         *  reference to some hidden magic ;-)
         */
-       static boost::signal0<void> & redrawGUI();
+       static boost::signal<void()> & redrawGUI();
 
        /// Toggle tooltips on/off in all dialogs.
        static void toggleTooltips();
@@ -96,9 +104,9 @@ private:
        ///
        bool isValidName(std::string const & name) const;
        ///
-       Dialog * find_or_build(std::string const & name);
+       lyx::frontend::Dialog * find_or_build(std::string const & name);
        ///
-       typedef boost::shared_ptr<Dialog> DialogPtr;
+       typedef boost::shared_ptr<lyx::frontend::Dialog> DialogPtr;
        ///
        DialogPtr build(std::string const & name);