Dialog::name() is not really needed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20146 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/controllers/Dialog.cpp b/src/frontends/controllers/Dialog.cpp
index a6e4ebaf9e987eb208cf1565e8ec7fb85623dc4b..1c836378240a84f412598ffe7726045b9b840542 100644 (file)
--- a/src/frontends/controllers/Dialog.cpp
+++ b/src/frontends/controllers/Dialog.cpp
@@ -85,7 +85,7 @@ void Dialog::hide()
 
        controller().clearParams();
        hideView();
-       kernel().disconnect(name());
+       kernel().disconnect(name_);
 }
 
 
@@ -101,7 +101,7 @@ void Dialog::apply()
        controller().dispatchParams();
 
        if (controller().disconnectOnApply() && !is_closing_) {
-               kernel().disconnect(name());
+               kernel().disconnect(name_);
                controller().initialiseParams(string());
                updateView();
        }
@@ -134,7 +134,7 @@ Dialog::Controller::Controller(Dialog & parent)
 
 bool Dialog::Controller::canApply() const
 {
-       FuncRequest const fr(getLfun(), dialog().name());
+       FuncRequest const fr(getLfun(), dialog().name_);
        FuncStatus const fs(getStatus(fr));
        return fs.enabled();
 }

diff --git a/src/frontends/controllers/Dialog.h b/src/frontends/controllers/Dialog.h
index 1dac6f5c134d6b9677063da0050074371992bfe7..2d508bce648f0ae7ae593d36b250ce7e6d79a204 100644 (file)
--- a/src/frontends/controllers/Dialog.h
+++ b/src/frontends/controllers/Dialog.h
@@ -36,11 +36,6 @@ public:
        Dialog(LyXView & lv, std::string const & name);
        virtual ~Dialog();
 
-       /** The Dialog's name is the means by which a dialog identifies
-        *  itself to the kernel.
-        */
-       std::string const & name() const { return name_; }
-
        /** \name Container Access
         *  These methods are publicly accessible because they are invoked
         *  by the parent container acting on commands from the LyX kernel.
@@ -162,6 +157,9 @@ protected:
 
        bool is_closing_;
        Kernel kernel_;
+       /** The Dialog's name is the means by which a dialog identifies
+        *  itself to the kernel.
+        */
        std::string name_;
        boost::scoped_ptr<Controller> controller_ptr_;