Move Color::color enum to ColorCode.h

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

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index 323deee995ccad3ad703a37f8c88db883325afee..9a57462982ee9a7d67140eef6a0b0f0bbcee9d93 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -14,16 +14,18 @@
 #define DIALOGS_H
 
 #include <boost/signal.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <map>
 
 namespace lyx {
 
 class Inset;
-class LyXView;
 
-namespace frontend { class Dialog; }
+namespace frontend {
+
+class Dialog;
+class LyXView;
 
 /** Container of all dialogs.
  */
@@ -50,30 +52,25 @@ public:
        void hideBufferDependent() const;
        /** Update visible, buffer-dependent dialogs
            If the bool is true then a buffer change has occurred
-           else its still the same buffer.
+           else it is still the same buffer.
         */
-       void updateBufferDependent(bool) const ;
-
-       /** \param name == "about" etc; an identifier used to
-           launch a particular dialog.
-           \param data is a string encoding of the data used to populate
-           the dialog. Several of these dialogs do not need any data,
-           so it defaults to string().
-       */
-       void show(std::string const & name, std::string const & data = std::string());
+       void updateBufferDependent(bool) const;
 
        /** \param name == "bibtex", "citation" etc; an identifier used to
            launch a particular dialog.
            \param data is a string representation of the Inset contents.
            It is often little more than the output from Inset::write.
            It is passed to, and parsed by, the frontend dialog.
-           \param inset is _not_ passed to the frontend dialog.
+           Several of these dialogs do not need any data,
+           so it defaults to string().
+           \param inset ownership is _not_ passed to the frontend dialog.
            It is stored internally and used by the kernel to ascertain
            what to do with the FuncRequest dispatched from the frontend
            dialog on 'Apply'; should it be used to create a new inset at
            the current cursor position or modify an existing, 'open' inset?
        */
-       void show(std::string const & name, std::string const & data, Inset * inset);
+       void show(std::string const & name,
+               std::string const & data = std::string(), Inset * inset = 0);
 
        /** \param name == "citation", "bibtex" etc; an identifier used
            to update the contents of a particular dialog with \param data.
@@ -87,24 +84,22 @@ public:
        /** All Dialogs of the given \param name will be closed if they are
            connected to the given \param inset.
        */
-       static void hide(std::string const & name, Inset * inset);
+       void hide(std::string const & name, Inset * inset);
        ///
        void disconnect(std::string const & name);
        ///
        Inset * getOpenInset(std::string const & name) const;
 private:
-       ///
-       void hideSlot(std::string const & name, Inset * inset);
        ///
        void redraw() const;
        ///
        bool isValidName(std::string const & name) const;
        ///
-       frontend::Dialog * find_or_build(std::string const & name);
+       Dialog * find_or_build(std::string const & name);
        ///
-       typedef boost::shared_ptr<frontend::Dialog> DialogPtr;
+       typedef boost::shared_ptr<Dialog> DialogPtr;
        ///
-       DialogPtr build(std::string const & name);
+       Dialog * build(std::string const & name);
 
        ///
        LyXView & lyxview_;
@@ -114,10 +109,15 @@ private:
        ///
        std::map<std::string, DialogPtr> dialogs_;
 
-       /// flag against a race condition due to multiclicks in Qt frontend, see bug #1119
+       /// flag against a race condition due to multiclicks in Qt frontend,
+       /// see bug #1119
        bool in_show_;
+
+       ///
+       boost::signals::connection connection_;
 };
 
+} // namespace frontend
 } // namespace lyx
 
 #endif