summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJesper Thomschütz <jesper@trolltech.com>2009-05-14 13:48:31 (GMT)
committerJesper Thomschütz <jesper@trolltech.com>2009-05-14 13:55:14 (GMT)
commit8e9b041f0081cd5af67c5c5f3cee0cf2b70ffe11 (patch)
treefeed93dc8771667dd2f9ef73fd18c53426e50f17 /src
parentf09304d46bac91f3e8329cb7147f8df44898d1e0 (diff)
downloadQt-8e9b041f0081cd5af67c5c5f3cee0cf2b70ffe11.zip
Qt-8e9b041f0081cd5af67c5c5f3cee0cf2b70ffe11.tar.gz
Qt-8e9b041f0081cd5af67c5c5f3cee0cf2b70ffe11.tar.bz2
Use isNull() for strings instead of comparing against QString().
foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network Reviewed-by: Samuel
Diffstat (limited to 'src')
-rw-r--r--src/corelib/concurrent/qfuturewatcher.cpp2
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp
index ea35e9e..39d7698 100644
--- a/src/corelib/concurrent/qfuturewatcher.cpp
+++ b/src/corelib/concurrent/qfuturewatcher.cpp
@@ -465,7 +465,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
break;
emit q->progressValueChanged(event->index1);
- if (event->text != QString()) // ###
+ if (!event->text.isNull()) // ###
q->progressTextChanged(event->text);
break;
case QFutureCallOutEvent::ProgressRange:
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index a23b2dd..f6ce4b3 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1696,7 +1696,7 @@ QString QCoreApplication::applicationDirPath()
}
QCoreApplicationPrivate *d = self->d_func();
- if (d->cachedApplicationDirPath == QString())
+ if (d->cachedApplicationDirPath.isNull())
d->cachedApplicationDirPath = QFileInfo(applicationFilePath()).path();
return d->cachedApplicationDirPath;
}
@@ -1724,7 +1724,7 @@ QString QCoreApplication::applicationFilePath()
}
QCoreApplicationPrivate *d = self->d_func();
- if (d->cachedApplicationFilePath != QString())
+ if (!d->cachedApplicationFilePath.isNull())
return d->cachedApplicationFilePath;
#if defined( Q_WS_WIN )