diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 16:32:26 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 06:10:20 +0200 |
commit | 1eac22a1b9dad7f843916afa9b7c820aa1c23777 (patch) | |
tree | 4a109a87d3bd7c560e6e40efd7ff15678a8dd0a0 /src/widgets/widgets | |
parent | 425b925b7e9dd818f2a58fd7bc77bfe8475e6483 (diff) |
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtWidgets]
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.
Task-number: QTBUG-21872
Change-Id: Ie8ac500f2f8ebe99b7525feaa7b39247e641a461
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qabstractspinbox.cpp | 14 | ||||
-rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qsplitter.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index 8bab6a9a1d..6c556dc870 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -2028,8 +2028,8 @@ int QAbstractSpinBoxPrivate::variantCompare(const QVariant &arg1, const QVariant switch (arg2.type()) { case QVariant::Date: Q_ASSERT_X(arg1.type() == QVariant::Date, "QAbstractSpinBoxPrivate::variantCompare", - qPrintable(QString::fromAscii("Internal error 1 (%1)"). - arg(QString::fromAscii(arg1.typeName())))); + qPrintable(QString::fromLatin1("Internal error 1 (%1)"). + arg(QString::fromLatin1(arg1.typeName())))); if (arg1.toDate() == arg2.toDate()) { return 0; } else if (arg1.toDate() < arg2.toDate()) { @@ -2039,8 +2039,8 @@ int QAbstractSpinBoxPrivate::variantCompare(const QVariant &arg1, const QVariant } case QVariant::Time: Q_ASSERT_X(arg1.type() == QVariant::Time, "QAbstractSpinBoxPrivate::variantCompare", - qPrintable(QString::fromAscii("Internal error 2 (%1)"). - arg(QString::fromAscii(arg1.typeName())))); + qPrintable(QString::fromLatin1("Internal error 2 (%1)"). + arg(QString::fromLatin1(arg1.typeName())))); if (arg1.toTime() == arg2.toTime()) { return 0; } else if (arg1.toTime() < arg2.toTime()) { @@ -2079,9 +2079,9 @@ int QAbstractSpinBoxPrivate::variantCompare(const QVariant &arg1, const QVariant return 0; default: Q_ASSERT_X(0, "QAbstractSpinBoxPrivate::variantCompare", - qPrintable(QString::fromAscii("Internal error 3 (%1 %2)"). - arg(QString::fromAscii(arg1.typeName())). - arg(QString::fromAscii(arg2.typeName())))); + qPrintable(QString::fromLatin1("Internal error 3 (%1 %2)"). + arg(QString::fromLatin1(arg1.typeName())). + arg(QString::fromLatin1(arg2.typeName())))); } return -2; } diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 5e808c1ab5..0cdb2d1176 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -2208,7 +2208,7 @@ void QDateTimeEditPrivate::_q_editorCursorPositionChanged(int oldpos, int newpos currentSectionIndex = s; Q_ASSERT_X(currentSectionIndex < sectionNodes.size(), "QDateTimeEditPrivate::_q_editorCursorPositionChanged()", - qPrintable(QString::fromAscii("Internal error (%1 %2)"). + qPrintable(QString::fromLatin1("Internal error (%1 %2)"). arg(currentSectionIndex). arg(sectionNodes.size()))); diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 44c450ca47..17e1c39cee 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -1702,7 +1702,7 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter) line.replace(QLatin1Char(' '), QString()); line = line.toUpper(); - splitter.restoreState(line.toAscii()); + splitter.restoreState(line.toLatin1()); return ts; } |