Minipage is no more (long live the box inset)

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

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index 988e606e0324f4719ba059d23049a100ab725ce5..a7688055a28faa24c3ffdda7de4f2199446a9494 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -11,15 +11,10 @@
 #ifndef DIALOGS_H
 #define DIALOGS_H
 
-
-#include "support/std_string.h"
-
 #include <boost/utility.hpp>
-#include <boost/scoped_ptr.hpp>
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/signal1.hpp>
 
-
 class Dialog;
 class InsetBase;
 class LyXView;
@@ -33,7 +28,7 @@ class Dialogs : boost::noncopyable
 public:
        ///
        Dialogs(LyXView &);
-       /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
+       ///
        ~Dialogs();
 
        /** Redraw all visible dialogs because, for example, the GUI colours
@@ -94,7 +89,7 @@ public:
            the dialog. Several of these dialogs do not need any data,
            so it defaults to string().
        */
-       void show(string const & name, string const & data = string());
+       void show(std::string const & name, std::string const & data = std::string());
 
        /** \param name == "bibtex", "citation" etc; an identifier used to
            launch a particular dialog.
@@ -107,46 +102,46 @@ public:
            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(string const & name, string const & data, InsetBase * inset);
+       void show(std::string const & name, std::string const & data, InsetBase * inset);
 
        /** \param name == "citation", "bibtex" etc; an identifier used
            to update the contents of a particular dialog with \param data .
            See the comments to 'show', above.
        */
-       void update(string const & name, string const & data);
+       void update(std::string const & name, std::string const & data);
 
        /// is the dialog currently visible?
-       bool visible(string const & name) const;
+       bool visible(std::string const & name) const;
 
        /** All Dialogs of the given \param name will be closed if they are
            connected to the given \param inset.
        */
-       static void hide(string const & name, InsetBase * inset);
+       static void hide(std::string const & name, InsetBase * inset);
        ///
-       void disconnect(string const & name);
+       void disconnect(std::string const & name);
        ///
-       InsetBase * getOpenInset(string const & name) const;
+       InsetBase * getOpenInset(std::string const & name) const;
 private:
        ///
-       void hideSlot(string const & name, InsetBase * inset);
+       void hideSlot(std::string const & name, InsetBase * inset);
        ///
        void redraw() const;
        ///
-       bool isValidName(string const & name) const;
+       bool isValidName(std::string const & name) const;
        ///
-       Dialog * find(string const & name);
+       Dialog * find_or_build(std::string const & name);
        ///
-       Dialog * build(string const & name);
+       Dialog * build(std::string const & name);
 
        ///
        LyXView & lyxview_;
        ///
-       std::map<string, InsetBase *> open_insets_;
+       std::map<std::string, InsetBase *> open_insets_;
 
        ///
        typedef boost::shared_ptr<Dialog> DialogPtr;
        ///
-       std::map<string, DialogPtr> dialogs_;
+       std::map<std::string, DialogPtr> dialogs_;
 
        /// the stuff below is slated to go...
        void init_pimpl();