summaryrefslogtreecommitdiffstats
path: root/tests/auto/qurl
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-03-18 21:39:03 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-21 13:48:45 (GMT)
commit3b545a4008fed0250d61ce1bb54af1a47fd8df92 (patch)
treee271ed61fbaf06fd744636ebb4eb6d20c105a376 /tests/auto/qurl
parente3c5ca076ee15975dd2d8973b871ec0115c614fc (diff)
downloadQt-3b545a4008fed0250d61ce1bb54af1a47fd8df92.zip
Qt-3b545a4008fed0250d61ce1bb54af1a47fd8df92.tar.gz
Qt-3b545a4008fed0250d61ce1bb54af1a47fd8df92.tar.bz2
Change qt_nameprep to do in-line nameprepping
This will allow to do less allocations in qt_ACE_do.
Diffstat (limited to 'tests/auto/qurl')
-rw-r--r--tests/auto/qurl/tst_qurl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index fcced37..94abbb3 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -3061,7 +3061,8 @@ void tst_QUrl::nameprep_testsuite_data()
#ifdef QT_BUILD_INTERNAL
QT_BEGIN_NAMESPACE
-extern QString qt_nameprep(const QString &source);
+extern void qt_nameprep(QString *source, int from);
+extern bool qt_check_std3rules(const QStringRef &);
QT_END_NAMESPACE
#endif
@@ -3086,7 +3087,8 @@ void tst_QUrl::nameprep_testsuite()
"Investigate further", Continue);
QEXPECT_FAIL("Larger test (expanding)",
"Investigate further", Continue);
- QCOMPARE(qt_nameprep(in), out);
+ qt_nameprep(&in, 0);
+ QCOMPARE(in, out);
#endif
}
@@ -3210,11 +3212,9 @@ void tst_QUrl::std3violations()
{
QFETCH(QString, source);
- extern QString qt_nameprep(const QString &);
- extern bool qt_check_std3rules(const QStringRef &);
-
{
- QString prepped = qt_nameprep(source);
+ QString prepped = source;
+ qt_nameprep(&prepped, 0);
QVERIFY(!qt_check_std3rules(QStringRef(&prepped)));
}