summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-10-07 10:17:25 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-10-07 10:21:38 (GMT)
commit8bcf844d95cdf9f69bbf02da49d8d3282eb40cfb (patch)
treed8abfe659f8550edd56b0456ab2d06b48805c103
parentfd89f9255d7965421a39a9089bb1d983264aff6f (diff)
downloadQt-8bcf844d95cdf9f69bbf02da49d8d3282eb40cfb.zip
Qt-8bcf844d95cdf9f69bbf02da49d8d3282eb40cfb.tar.gz
Qt-8bcf844d95cdf9f69bbf02da49d8d3282eb40cfb.tar.bz2
Get rid of some superfluous checks in QScriptString::operator==()
Reviewed-by: Olivier Goffart
-rw-r--r--src/script/api/qscriptstring.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp
index c2362da..2fb157f 100644
--- a/src/script/api/qscriptstring.cpp
+++ b/src/script/api/qscriptstring.cpp
@@ -150,14 +150,8 @@ bool QScriptString::isValid() const
bool QScriptString::operator==(const QScriptString &other) const
{
Q_D(const QScriptString);
- if (d == other.d_func())
- return true;
if (!d || !other.d_func())
return d == other.d_func();
- if (d->engine != other.d_func()->engine)
- return false;
- if (!d->engine)
- return true;
return d->identifier == other.d_func()->identifier;
}