Followup 1fda77c: Don't reference private headers in public ones

Author: m-kuhn

src/analysis/vector/qgszonalstatistics.cpp

@@ -23,6 +23,8 @@
 #include "qmath.h"
 #include "gdal.h"
 #include "cpl_string.h"
+#include "qgslogger.h"
+
 #include <QProgressDialog>
 #include <QFile>
 

src/app/qgsdiagramproperties.cpp

@@ -35,6 +35,7 @@
 #include "qgsstyle.h"
 #include "qgsmapcanvas.h"
 #include "qgsexpressionbuilderdialog.h"
+#include "qgslogger.h"
 
 #include <QList>
 #include <QMessageBox>

src/app/qgslabelingwidget.cpp

@@ -96,8 +96,6 @@ void QgsLabelingWidget::adaptToLayer()
   if ( !mLayer )
     return;
 
-  QgsDebugMsg( QString( "Setting up for layer %1" ).arg( mLayer->name() ) );
-
   mLabelModeComboBox->setCurrentIndex( -1 );
 
   // pick the right mode of the layer

src/app/qgsrulebasedlabelingwidget.cpp

@@ -22,6 +22,7 @@
 #include "qgsrulebasedlabeling.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectorlayerlabeling.h"
+#include "qgslogger.h"
 
 #include <QClipboard>
 #include <QMessageBox>
@@ -153,10 +154,8 @@ void QgsRuleBasedLabelingWidget::editRule( const QModelIndex& index )
 void QgsRuleBasedLabelingWidget::removeRule()
 {
   QItemSelection sel = viewRules->selectionModel()->selection();
-  QgsDebugMsg( QString( "REMOVE RULES!!! ranges: %1" ).arg( sel.count() ) );
   Q_FOREACH ( const QItemSelectionRange& range, sel )
   {
-    QgsDebugMsg( QString( "RANGE: r %1 - %2" ).arg( range.top() ).arg( range.bottom() ) );
     if ( range.isValid() )
       mModel->removeRows( range.top(), range.bottom() - range.top() + 1, range.parent() );
   }
@@ -167,7 +166,6 @@ void QgsRuleBasedLabelingWidget::removeRule()
 void QgsRuleBasedLabelingWidget::copy()
 {
   QModelIndexList indexlist = viewRules->selectionModel()->selectedRows();
-  QgsDebugMsg( QString( "%1" ).arg( indexlist.count() ) );
 
   if ( indexlist.isEmpty() )
     return;

src/core/composer/qgscomposerpicture.cpp

@@ -28,6 +28,8 @@
 #include "qgsnetworkcontentfetcher.h"
 #include "qgssymbollayerutils.h"
 #include "qgssvgcache.h"
+#include "qgslogger.h"
+
 #include <QDomDocument>
 #include <QDomElement>
 #include <QFileInfo>

src/core/dxf/qgsdxfexport.cpp

@@ -39,6 +39,7 @@
 #include "qgsmaplayerregistry.h"
 #include "qgsunittypes.h"
 #include "qgstextlabelfeature.h"
+#include "qgslogger.h"
 
 #include "qgswkbtypes.h"
 #include "qgspointv2.h"

src/core/qgscoordinatetransform.cpp

@@ -50,6 +50,22 @@ QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSyst
   d = new QgsCoordinateTransformPrivate( source, destination );
 }
 
+QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateTransform& o )
+{
+  d = o.d;
+}
+
+QgsCoordinateTransform& QgsCoordinateTransform::operator=( const QgsCoordinateTransform & o )
+{
+  d = o.d;
+  return *this;
+}
+
+QgsCoordinateTransform::~QgsCoordinateTransform()
+{
+
+}
+
 void QgsCoordinateTransform::setSourceCrs( const QgsCoordinateReferenceSystem& crs )
 {
   d.detach();

src/core/qgscoordinatetransform.h

@@ -19,7 +19,6 @@
 
 #include <QExplicitlySharedDataPointer>
 #include "qgscoordinatereferencesystem.h"
-#include "qgscoordinatetransform_p.h"
 
 class QgsCoordinateTransformPrivate;
 class QgsPoint;
@@ -62,6 +61,18 @@ class CORE_EXPORT QgsCoordinateTransform
     QgsCoordinateTransform( const QgsCoordinateReferenceSystem& source,
                             const QgsCoordinateReferenceSystem& destination );
 
+    /**
+     * Copy constructor
+     */
+    QgsCoordinateTransform( const QgsCoordinateTransform& o );
+
+    /**
+     * Assignment operator
+     */
+    QgsCoordinateTransform& operator=( const QgsCoordinateTransform& o );
+
+    ~QgsCoordinateTransform();
+
     /*!
      * Returns true if the coordinate transform is valid, ie both the source and destination
      * CRS have been set and are valid.

src/core/qgsofflineediting.cpp

@@ -31,6 +31,7 @@
 #include "qgsvectorlayerjoinbuffer.h"
 #include "qgsslconnect.h"
 #include "qgsfeatureiterator.h"
+#include "qgslogger.h"
 
 #include <QDir>
 #include <QDomDocument>

src/core/qgspointlocator.cpp

@@ -20,6 +20,7 @@
 #include "qgsvectorlayer.h"
 #include "qgswkbptr.h"
 #include "qgis.h"
+#include "qgslogger.h"
 
 #include <SpatialIndex.h>