diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-04-10 12:28:36 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-04-29 14:32:27 +0000 |
| commit | 11d0b20757a66db0108e368499dca0a0856b7da5 (patch) | |
| tree | 270478b0eae88228dad89d745cfda5d67988025c | |
| parent | feba145824cfca0a8e36e6e3dd94abfc99c3ff4f (diff) | |
Remove QLOC_TRACE macros
Change-Id: I580d066f2e83425eb471180fa323e77f6e21ed59
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 6 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativegeomap_p.h | 12 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 6818679b..21a2a7af 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -182,7 +182,6 @@ QDeclarativeGeoMap::QDeclarativeGeoMap(QQuickItem *parent) m_componentCompleted(false), m_mappingManagerInitialized(false) { - QLOC_TRACE0; setAcceptHoverEvents(false); setAcceptedMouseButtons(Qt::LeftButton); setFlags(QQuickItem::ItemHasContents | QQuickItem::ItemClipsChildrenToShape); @@ -298,8 +297,6 @@ void QDeclarativeGeoMap::pluginReady() */ void QDeclarativeGeoMap::componentComplete() { - QLOC_TRACE0; - m_componentCompleted = true; populateMap(); QQuickItem::componentComplete(); @@ -926,7 +923,6 @@ bool QDeclarativeGeoMap::childMouseEventFilter(QQuickItem *item, QEvent *event) void QDeclarativeGeoMap::addMapItem(QDeclarativeGeoMapItemBase *item) { - QLOC_TRACE0; if (!item || item->quickMap()) return; m_updateMutex.lock(); @@ -970,7 +966,6 @@ QList<QObject *> QDeclarativeGeoMap::mapItems() */ void QDeclarativeGeoMap::removeMapItem(QDeclarativeGeoMapItemBase *ptr) { - QLOC_TRACE0; if (!ptr || !m_map) return; QPointer<QDeclarativeGeoMapItemBase> item(ptr); @@ -994,7 +989,6 @@ void QDeclarativeGeoMap::removeMapItem(QDeclarativeGeoMapItemBase *ptr) */ void QDeclarativeGeoMap::clearMapItems() { - QLOC_TRACE0; if (m_mapItems.isEmpty()) return; m_updateMutex.lock(); diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h index 16f8ba83..0089a23b 100644 --- a/src/imports/location/qdeclarativegeomap_p.h +++ b/src/imports/location/qdeclarativegeomap_p.h @@ -47,17 +47,7 @@ -//#define QT_DECLARATIVE_LOCATION_TRACE 1 - -#ifdef QT_DECLARATIVE_LOCATION_TRACE -#define QLOC_TRACE0 qDebug() << __FILE__ << __FUNCTION__; -#define QLOC_TRACE1(msg1) qDebug() << __FILE__ << __FUNCTION__ << msg1; -#define QLOC_TRACE2(msg1, msg2) qDebug() << __FILE__ << __FUNCTION__ << msg1 << msg2; -#else -#define QLOC_TRACE0 -#define QLOC_TRACE1(msg1) -#define QLOC_TRACE2(msg1, msg2) -#endif + QT_BEGIN_NAMESPACE |