summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-02-16 17:21:55 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-02-16 18:10:38 (GMT)
commite6b629f3ebc1d530218f01a735275e56bf474a18 (patch)
treefd1c40fbb935239d23886d5c688f46b61219e238 /src/corelib/tools/qstring.h
parent684e86adea5e89d6220560e82f1823f99920bb40 (diff)
downloadQt-e6b629f3ebc1d530218f01a735275e56bf474a18.zip
Qt-e6b629f3ebc1d530218f01a735275e56bf474a18.tar.gz
Qt-e6b629f3ebc1d530218f01a735275e56bf474a18.tar.bz2
add QString(const QChar *) c'tor
to complement the QString(const QChar *, int) one, which unfortunately clamps sizes below zero to zero instead of computing the length itself instead. Reviewed-by: denis Reviewed-by: joao
Diffstat (limited to 'src/corelib/tools/qstring.h')
-rw-r--r--src/corelib/tools/qstring.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index 702a21a..8de3c7d 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -91,7 +91,8 @@ class Q_CORE_EXPORT QString
{
public:
inline QString();
- QString(const QChar *unicode, int size);
+ QString(const QChar *unicode, int size); // Qt5: don't cap size < 0
+ explicit QString(const QChar *unicode); // Qt5: merge with the above
QString(QChar c);
QString(int size, QChar c);
inline QString(const QLatin1String &latin1);