summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2010-02-25 15:30:48 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-02-25 15:32:34 (GMT)
commit745889c54b5c1e1df667ced9ba879607dfea6156 (patch)
tree5351155cccbca02355f75fadb2e59b2e0740f9b2
parent4b119820089b35aaba061936eded882e0ac96a97 (diff)
downloadQt-745889c54b5c1e1df667ced9ba879607dfea6156.zip
Qt-745889c54b5c1e1df667ced9ba879607dfea6156.tar.gz
Qt-745889c54b5c1e1df667ced9ba879607dfea6156.tar.bz2
Cleaning of the patch to QTBUG-3168
Removing trailing whitespace from qurl.cpp Removing a debug() output from the test. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
-rw-r--r--src/corelib/io/qurl.cpp4
-rw-r--r--tests/auto/qurl/tst_qurl.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 05d043e..ffe8d06 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -441,14 +441,14 @@ static bool QT_FASTCALL _scheme(const char **ptr, QUrlParseData *parseData)
{
bool first = true;
bool isSchemeValid = true;
-
+
parseData->scheme = *ptr;
for (;;) {
char ch = **ptr;
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) {
;
} else if ((ch >= '0' && ch <= '9') || ch == '+' || ch == '-' || ch == '.') {
- if (first)
+ if (first)
isSchemeValid = false;
} else {
break;
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index bc5a0af..83109b5 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -2516,7 +2516,6 @@ void tst_QUrl::invalidSchemeValidator()
// test that if scheme does not start with an ALPHA, QUrl::isValid() returns false
{
QUrl url("1http://qt.nokia.com", QUrl::StrictMode);
- qDebug() << url;
QCOMPARE(url.isValid(), false);
}
{