summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2009-06-18 13:36:05 (GMT)
committerhjk <qtc-committer@nokia.com>2009-06-18 14:29:25 (GMT)
commitd7005487b789e2bc5a1400148b4f317142a381ac (patch)
tree6c9ac9d8f5398b51780c0ef50f958c35a37dfd1f
parent45c1b4f3d48dd8f7c33b259b6f73cf628798a23d (diff)
downloadQt-d7005487b789e2bc5a1400148b4f317142a381ac.zip
Qt-d7005487b789e2bc5a1400148b4f317142a381ac.tar.gz
Qt-d7005487b789e2bc5a1400148b4f317142a381ac.tar.bz2
Use enum Qt::Uninitialized instead of struct QString::Uninitialized
There is no BC issue as the changed constructor was introduced recently and there is no released version of Qt using it. Reviewed-by: mariusSO
-rw-r--r--src/corelib/tools/qstring.cpp2
-rw-r--r--src/corelib/tools/qstring.h3
-rw-r--r--src/corelib/tools/qstringbuilder.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 3b70f44..083253f 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -1019,7 +1019,7 @@ QString::QString(int size, QChar ch)
\internal
*/
-QString::QString(int size, Uninitialized)
+QString::QString(int size, enum Qt::Uninitialized)
{
d = (Data*) qMalloc(sizeof(Data)+size*sizeof(QChar));
d->ref = 1;
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index 4b2ceb7..67716b8 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -579,8 +579,7 @@ public:
bool isSimpleText() const { if (!d->clean) updateProperties(); return d->simpletext; }
bool isRightToLeft() const { if (!d->clean) updateProperties(); return d->righttoleft; }
- struct Uninitialized {};
- QString(int size, Uninitialized);
+ QString(int size, enum Qt::Uninitialized);
private:
#if defined(QT_NO_CAST_FROM_ASCII) && !defined(Q_NO_DECLARED_NOT_DEFINED)
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 19f14b4..852c072 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -80,7 +80,7 @@ public:
operator QString() const
{
QString s(QConcatenable< QStringBuilder<A, B> >::size(*this),
- QString::Uninitialized());
+ Qt::Uninitialized);
QChar *d = s.data();
QConcatenable< QStringBuilder<A, B> >::appendTo(*this, d);