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 /tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp | |
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 'tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 1c06197d11..7696ab2dea 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -561,37 +561,37 @@ void tst_QPushButton::sizeHint_data() { QTest::addColumn<QString>("stylename"); #if !defined(QT_NO_STYLE_MOTIF) - QTest::newRow("motif") << QString::fromAscii("motif"); + QTest::newRow("motif") << QString::fromLatin1("motif"); #endif #if !defined(QT_NO_STYLE_CDE) - QTest::newRow("cde") << QString::fromAscii("cde"); + QTest::newRow("cde") << QString::fromLatin1("cde"); #endif #if !defined(QT_NO_STYLE_WINDOWS) - QTest::newRow("windows") << QString::fromAscii("windows"); + QTest::newRow("windows") << QString::fromLatin1("windows"); #endif #if !defined(QT_NO_STYLE_CLEANLOOKS) - QTest::newRow("cleanlooks") << QString::fromAscii("cleanlooks"); + QTest::newRow("cleanlooks") << QString::fromLatin1("cleanlooks"); #endif #if !defined(QT_NO_STYLE_GTK) - QTest::newRow("gtk") << QString::fromAscii("gtk"); + QTest::newRow("gtk") << QString::fromLatin1("gtk"); #endif #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) - QTest::newRow("mac") << QString::fromAscii("mac"); + QTest::newRow("mac") << QString::fromLatin1("mac"); #endif #if !defined(QT_NO_STYLE_PLASTIQUE) - QTest::newRow("plastique") << QString::fromAscii("plastique"); + QTest::newRow("plastique") << QString::fromLatin1("plastique"); #endif #if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSXP) - QTest::newRow("windowsxp") << QString::fromAscii("windowsxp"); + QTest::newRow("windowsxp") << QString::fromLatin1("windowsxp"); #endif #if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSVISTA) - QTest::newRow("windowsvista") << QString::fromAscii("windowsvista"); + QTest::newRow("windowsvista") << QString::fromLatin1("windowsvista"); #endif #if defined(Q_OS_WINCE) && !defined(QT_NO_STYLE_WINDOWSCE) - QTest::newRow("windowsce") << QString::fromAscii("windowsce"); + QTest::newRow("windowsce") << QString::fromLatin1("windowsce"); #endif #if defined(Q_OS_WINCE_WM) && !defined(QT_NO_STYLE_WINDOWSCE) - QTest::newRow("windowsmobile") << QString::fromAscii("windowsmobile"); + QTest::newRow("windowsmobile") << QString::fromLatin1("windowsmobile"); #endif } |