Prevent invocation of std::string(0);

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index f36901ad9432f81f4d0f51cadf8e5a3d681acc8a..d419ee23243846900664fd74752af353aed0318c 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-16  Angus Leeming  <leeming@lyx.org>
+
+       * qt_helpers.C (fromqstr): Don't use std::string(0) to construct
+       a string. Bad things will happen.
+
 2004-12-14  Angus Leeming  <leeming@lyx.org>
 
        * qgridview.h (class QGridView): remove invalid Q_EXPORT declaration

diff --git a/src/frontends/qt2/qt_helpers.C b/src/frontends/qt2/qt_helpers.C
index 95937f782954635afea16eac90e5010cafe15f55..f35c89fa2867bf6040363fbe0ae10998bbb00c8d 100644 (file)
--- a/src/frontends/qt2/qt_helpers.C
+++ b/src/frontends/qt2/qt_helpers.C
@@ -142,10 +142,9 @@ QString const qt_(string const & str)
 
 string const fromqstr(QString const & str)
 {
-       QTextCodec * codec = QTextCodec::codecForLocale();
-       QCString tmpstr = codec->fromUnicode(str);
-       char const * tmpcstr = tmpstr;
-       return tmpcstr;
+       QTextCodec const * const codec = QTextCodec::codecForLocale();
+       QCString const tmpstr = codec->fromUnicode(str);
+       return tmpstr.isEmpty() ? string() : string(tmpstr);
 }