Fix bug 4413 (http://bugzilla.lyx.org/show_bug.cgi?id=4413)

The problem was that name_ was a const pointer and the pointer pointed to nothing after leaving the ctor.
Andre': <docstring> is included in every dialog anyway via GuiDialog.h -> InsetCommandParams.h -> docstring.h"; so this change won't affect compilation time.

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

diff --git a/src/frontends/qt4/Dialog.cpp b/src/frontends/qt4/Dialog.cpp
index 40b4f376321a75595b0810446833f9fa9132c305..f4f69928d2bb1ca427817e06ec604031a4e943e4 100644 (file)
--- a/src/frontends/qt4/Dialog.cpp
+++ b/src/frontends/qt4/Dialog.cpp
@@ -26,7 +26,7 @@ namespace frontend {
 
 
 Dialog::Dialog(GuiView & lv, std::string const & name)
-       : lyxview_(&lv), name_(name.c_str())
+       : lyxview_(&lv), name_(name)
 {}
 
 
@@ -34,7 +34,7 @@ Dialog::~Dialog()
 {}
 
 
-std::string Dialog::name() const
+std::string const & Dialog::name() const
 {
        return name_;
 }

diff --git a/src/frontends/qt4/Dialog.h b/src/frontends/qt4/Dialog.h
index 8f6cea63170d46a2c52d7d3c96c676f446ff528b..4506ea26a1be3734ed8e8043c2dbe1d0befc1890 100644 (file)
--- a/src/frontends/qt4/Dialog.h
+++ b/src/frontends/qt4/Dialog.h
@@ -14,7 +14,7 @@
 
 #include "lfuns.h"
 
-#include "support/strfwd.h"
+#include <string>
 
 namespace lyx {
 
@@ -107,8 +107,11 @@ public:
        virtual bool isVisibleView() const = 0;
        //@}
 
-       ///
-       std::string name() const;
+       /// Dialog identifier.
+       /// FIXME for Andre': Now that Dialog is entirely within qt4/
+       /// We can use QString instead in order to avoid <string> inclusion
+       /// or we can pimpl name_.
+       std::string const & name() const;
 
        //@{
        /** Enable the controller to initialise its data structures.
@@ -233,7 +236,7 @@ private:
        /** The Dialog's name is the means by which a dialog identifies
         *  itself to the LyXView.
         */
-       char const * const name_;
+       std::string name_;
        ///
        GuiView * lyxview_;