diff options
| author | Cristian Adam <cristian.adam@nokia.com> | 2012-05-08 09:11:31 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-16 07:04:42 +0200 |
| commit | d0f223b6ad20f628698c6a01b9fd8e0715d271d2 (patch) | |
| tree | 2a6a3c0899395fb8c0e8dad2f95a025ee7cd00a9 /src/plugins/geoservices/nokia | |
| parent | e057680b996d6854c9aee8f6504acc873f0e65ac (diff) | |
| download | qtlocation-d0f223b6ad20f628698c6a01b9fd8e0715d271d2.tar.gz | |
Removed spurious pointer check before deletion
In C++ it is perfectly valid to delete a null pointer.
http://www.parashift.com/c++-faq-lite/freestore-mgmt.html#faq-16.8
Change-Id: I60dc123b01e1ef015751143274579024e4c0becf
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'src/plugins/geoservices/nokia')
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeocodexmlparser.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp index 6b06fef0..a8929f70 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp @@ -60,14 +60,12 @@ QGeoCodeXmlParser::QGeoCodeXmlParser() QGeoCodeXmlParser::~QGeoCodeXmlParser() { - if (m_reader) - delete m_reader; + delete m_reader; } bool QGeoCodeXmlParser::parse(QIODevice *source) { - if (m_reader) - delete m_reader; + delete m_reader; m_reader = new QXmlStreamReader(source); if (!parseRootElement()) { diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp index 7c98ea79..4a67a0c9 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp @@ -70,14 +70,12 @@ QGeoRouteXmlParser::QGeoRouteXmlParser(const QGeoRouteRequest &request) QGeoRouteXmlParser::~QGeoRouteXmlParser() { - if (m_reader) - delete m_reader; + delete m_reader; } bool QGeoRouteXmlParser::parse(QIODevice *source) { - if (m_reader) - delete m_reader; + delete m_reader; m_reader = new QXmlStreamReader(source); if (!parseRootElement()) { |