From: Angus Leeming <leeming@lyx.org>
Date: Thu, 16 Dec 2004 16:04:52 +0000 (+0000)
Subject: Prevent invocation of std::string(0);
X-Git-Tag: 1.6.10~14728
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3dd565beae6fb7a01259379b1471e9974eee1c74;p=features.git

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 f36901ad94..d419ee2324 100644
--- 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 95937f7829..f35c89fa28 100644
--- 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);
 }