diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGBillboardNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGBillboardNode.cpp index 13fb981b6..f5a27efba 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGBillboardNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGBillboardNode.cpp @@ -77,7 +77,6 @@ OSGBillboardNode::OSGBillboardNode(QObject *parent) : Inherited(parent), h(new H OSGBillboardNode::~OSGBillboardNode() { - qDebug() << "OSGBillboardNode::~OSGBillboardNode"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGCamera.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGCamera.cpp index 54ce4db5c..ccc83c1ff 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGCamera.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGCamera.cpp @@ -196,7 +196,6 @@ OSGCamera::OSGCamera(QObject *parent) : Inherited(parent), h(new Hidden(this)) OSGCamera::~OSGCamera() { - qDebug() << "OSGCamera::~OSGCamera"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGFileNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGFileNode.cpp index 646b95830..196f9fe0b 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGFileNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGFileNode.cpp @@ -151,7 +151,6 @@ OSGFileNode::OSGFileNode(QObject *parent) : Inherited(parent), h(new Hidden(this OSGFileNode::~OSGFileNode() { - qDebug() << "OSGFileNode::~OSGFileNode"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp index afc7d3c67..f32e0ba56 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp @@ -160,7 +160,6 @@ OSGGeoTransformNode::OSGGeoTransformNode(QObject *parent) : Inherited(parent), h OSGGeoTransformNode::~OSGGeoTransformNode() { - qDebug() << "OSGGeoTransformNode::~OSGGeoTransformNode"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp index 5d764fb64..95e1afb30 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp @@ -196,7 +196,6 @@ OSGGroup::OSGGroup(QObject *parent) : Inherited(parent), h(new Hidden(this)) OSGGroup::~OSGGroup() { - qDebug() << "OSGGroup::~OSGGroup"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp index 49b498f13..ab138d979 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGImageNode.cpp @@ -93,7 +93,6 @@ OSGImageNode::OSGImageNode(QObject *parent) : Inherited(parent), h(new Hidden(th OSGImageNode::~OSGImageNode() { - qDebug() << "OSGImageNode::~OSGImageNode"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGShapeNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGShapeNode.cpp index ce1405038..b8ddb9158 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGShapeNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGShapeNode.cpp @@ -82,7 +82,6 @@ OSGShapeNode::OSGShapeNode(QObject *parent) : Inherited(parent), h(new Hidden(th OSGShapeNode::~OSGShapeNode() { - qDebug() << "OSGShapeNode::~OSGShapeNode"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.cpp index 9d72e1f27..e14ac7541 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.cpp @@ -230,7 +230,6 @@ OSGSkyNode::OSGSkyNode(QObject *parent) : Inherited(parent), h(new Hidden(this)) OSGSkyNode::~OSGSkyNode() { - qDebug() << "OSGSkyNode::~OSGSkyNode"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTransformNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTransformNode.cpp index ec642845d..0b28bb3d2 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTransformNode.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGTransformNode.cpp @@ -96,7 +96,6 @@ OSGTransformNode::OSGTransformNode(QObject *parent) : Inherited(parent), h(new H OSGTransformNode::~OSGTransformNode() { - qDebug() << "OSGTransformNode::~OSGTransformNode"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp index eaa451b55..de46be9ea 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp @@ -614,7 +614,6 @@ OSGViewport::OSGViewport(QQuickItem *parent) : Inherited(parent), h(new Hidden(t OSGViewport::~OSGViewport() { - // qDebug() << "OSGViewport::~OSGViewport"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGCameraManipulator.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGCameraManipulator.cpp index 22e97ec1a..36410ac8c 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGCameraManipulator.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGCameraManipulator.cpp @@ -110,7 +110,6 @@ OSGCameraManipulator::OSGCameraManipulator(QObject *parent) : QObject(parent), h OSGCameraManipulator::~OSGCameraManipulator() { - qDebug() << "OSGCameraManipulator::~OSGCameraManipulator"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGEarthManipulator.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGEarthManipulator.cpp index 18ab7ab24..4da67960d 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGEarthManipulator.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGEarthManipulator.cpp @@ -62,7 +62,6 @@ OSGEarthManipulator::OSGEarthManipulator(QObject *parent) : Inherited(parent), h OSGEarthManipulator::~OSGEarthManipulator() { - qDebug() << "OSGEarthManipulator::~OSGEarthManipulator"; delete h; } } // namespace osgQtQuick diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGGeoTransformManipulator.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGGeoTransformManipulator.cpp index fa18737a9..6fc05d18c 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGGeoTransformManipulator.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGGeoTransformManipulator.cpp @@ -208,7 +208,6 @@ OSGGeoTransformManipulator::OSGGeoTransformManipulator(QObject *parent) : Inheri OSGGeoTransformManipulator::~OSGGeoTransformManipulator() { - qDebug() << "OSGGeoTransformManipulator::~OSGGeoTransformManipulator"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGNodeTrackerManipulator.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGNodeTrackerManipulator.cpp index e7b1f006e..230c7b027 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGNodeTrackerManipulator.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGNodeTrackerManipulator.cpp @@ -127,7 +127,6 @@ OSGNodeTrackerManipulator::OSGNodeTrackerManipulator(QObject *parent) : Inherite OSGNodeTrackerManipulator::~OSGNodeTrackerManipulator() { - qDebug() << "OSGNodeTrackerManipulator::~OSGNodeTrackerManipulator"; delete h; } diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGTrackballManipulator.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGTrackballManipulator.cpp index ceef860ad..f79d533c5 100644 --- a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGTrackballManipulator.cpp +++ b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGTrackballManipulator.cpp @@ -62,7 +62,6 @@ OSGTrackballManipulator::OSGTrackballManipulator(QObject *parent) : Inherited(pa OSGTrackballManipulator::~OSGTrackballManipulator() { - qDebug() << "OSGTrackballManipulator::~OSGTrackballManipulator"; delete h; } } // namespace osgQtQuick diff --git a/ground/gcs/src/libs/osgearth/utils/qtwindowingsystem.cpp b/ground/gcs/src/libs/osgearth/utils/qtwindowingsystem.cpp index dc7c14820..470368069 100644 --- a/ground/gcs/src/libs/osgearth/utils/qtwindowingsystem.cpp +++ b/ground/gcs/src/libs/osgearth/utils/qtwindowingsystem.cpp @@ -103,14 +103,14 @@ GraphicsWindowQt::GraphicsWindowQt(osg::GraphicsContext::Traits *traits) : _glContext(NULL), _surface(NULL) { - qDebug() << "GraphicsWindowQt::GraphicsWindowQt"; + // qDebug() << "GraphicsWindowQt::GraphicsWindowQt"; _traits = traits; init(); } GraphicsWindowQt::~GraphicsWindowQt() { - qDebug() << "GraphicsWindowQt::~GraphicsWindowQt"; + // qDebug() << "GraphicsWindowQt::~GraphicsWindowQt"; close(); } @@ -217,7 +217,7 @@ bool GraphicsWindowQt::realizeImplementation() QOpenGLContext *currentContext = QOpenGLContext::currentContext(); if (!currentContext) { - qDebug() << "GraphicsWindowQt::realizeImplementation - creating owned context"; + // qDebug() << "GraphicsWindowQt::realizeImplementation - creating owned context"; _owned = true; _glContext = new QOpenGLContext(); _glContext->create(); @@ -228,7 +228,7 @@ bool GraphicsWindowQt::realizeImplementation() osgQtQuick::formatInfo(_surface->format()); #endif } else { - qDebug() << "GraphicsWindowQt::realizeImplementation - using current context"; + // qDebug() << "GraphicsWindowQt::realizeImplementation - using current context"; _glContext = currentContext; } @@ -318,7 +318,7 @@ bool GraphicsWindowQt::releaseContextImplementation() return false; } if (_owned && _glContext) { - qDebug() << "GraphicsWindowQt::releaseContextImplementation"; + // qDebug() << "GraphicsWindowQt::releaseContextImplementation"; _glContext->doneCurrent(); } return true; @@ -326,14 +326,14 @@ bool GraphicsWindowQt::releaseContextImplementation() void GraphicsWindowQt::closeImplementation() { - qDebug() << "GraphicsWindowQt::closeImplementation"; + // qDebug() << "GraphicsWindowQt::closeImplementation"; _closing = true; _initialized = false; _valid = false; _realized = false; if (_owned) { if (_glContext) { - qDebug() << "GraphicsWindowQt::closeImplementation - deleting owned context"; + // qDebug() << "GraphicsWindowQt::closeImplementation - deleting owned context"; delete _glContext; } if (_surface) { diff --git a/ground/gcs/src/libs/utils/quickwidgetproxy.cpp b/ground/gcs/src/libs/utils/quickwidgetproxy.cpp index fe5a615e6..1f93c4e3c 100644 --- a/ground/gcs/src/libs/utils/quickwidgetproxy.cpp +++ b/ground/gcs/src/libs/utils/quickwidgetproxy.cpp @@ -127,16 +127,16 @@ void QuickWidgetProxy::onStatusChanged(QQuickWidget::Status status) { switch (status) { case QQuickWidget::Null: - qDebug() << "QuickWidgetProxy - status Null"; + qWarning() << "QuickWidgetProxy - status Null"; break; case QQuickWidget::Ready: - qDebug() << "QuickWidgetProxy - status Ready"; + // qDebug() << "QuickWidgetProxy - status Ready"; break; case QQuickWidget::Loading: - qDebug() << "QuickWidgetProxy - status Loading"; + // qDebug() << "QuickWidgetProxy - status Loading"; break; case QQuickWidget::Error: - qDebug() << "QuickWidgetProxy - status Error"; + qWarning() << "QuickWidgetProxy - status Error"; foreach(const QQmlError &error, errors()) { qWarning() << error.description(); } @@ -148,16 +148,16 @@ void QuickWidgetProxy::onStatusChanged(QQuickView::Status status) { switch (status) { case QQuickView::Null: - qDebug() << "QuickWidgetProxy - status Null"; + qWarning() << "QuickWidgetProxy - status Null"; break; case QQuickView::Ready: - qDebug() << "QuickWidgetProxy - status Ready"; + // qDebug() << "QuickWidgetProxy - status Ready"; break; case QQuickView::Loading: - qDebug() << "QuickWidgetProxy - status Loading"; + // qDebug() << "QuickWidgetProxy - status Loading"; break; case QQuickView::Error: - qDebug() << "QuickWidgetProxy - status Error"; + qWarning() << "QuickWidgetProxy - status Error"; foreach(const QQmlError &error, errors()) { qWarning() << error.description(); }