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

qgis · Aug 20, 2016 · 1dd74e4 · 1dd74e4
1 parent 6214dc1
commit 1dd74e4
Show file tree

Hide file tree

Showing 28 changed files with 66 additions and 30 deletions.
diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/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>
 

diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -35,6 +35,7 @@
 #include "qgsstyle.h"
 #include "qgsmapcanvas.h"
 #include "qgsexpressionbuilderdialog.h"
+#include "qgslogger.h"
 
 #include <QList>
 #include <QMessageBox>

diff --git a/src/app/qgslabelingwidget.cpp b/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

diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/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;

diff --git a/src/core/composer/qgscomposerpicture.cpp b/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>

diff --git a/src/core/dxf/qgsdxfexport.cpp b/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"

diff --git a/src/core/qgscoordinatetransform.cpp b/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();

diff --git a/src/core/qgscoordinatetransform.h b/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.

diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -31,6 +31,7 @@
 #include "qgsvectorlayerjoinbuffer.h"
 #include "qgsslconnect.h"
 #include "qgsfeatureiterator.h"
+#include "qgslogger.h"
 
 #include <QDir>
 #include <QDomDocument>

diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
@@ -20,6 +20,7 @@
 #include "qgsvectorlayer.h"
 #include "qgswkbptr.h"
 #include "qgis.h"
+#include "qgslogger.h"
 
 #include <SpatialIndex.h>
 

diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
@@ -19,7 +19,7 @@
 #include "qgsmaplayerregistry.h"
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
-
+#include "qgslogger.h"
 
 QgsSnappingUtils::QgsSnappingUtils( QObject* parent )
     : QObject( parent )

diff --git a/src/core/qgsvectorlayerlabelprovider.cpp b/src/core/qgsvectorlayerlabelprovider.cpp
@@ -26,6 +26,7 @@
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 #include "qgsmultipolygon.h"
+#include "qgslogger.h"
 
 #include "feature.h"
 #include "labelposition.h"

diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -34,6 +34,7 @@
 #include "qgspainteffect.h"
 #include "qgsfeaturefilterprovider.h"
 #include "qgscsexception.h"
+#include "qgslogger.h"
 
 #include <QSettings>
 #include <QPicture>

diff --git a/src/gui/attributetable/qgsfeatureselectionmodel.cpp b/src/gui/attributetable/qgsfeatureselectionmodel.cpp
@@ -17,7 +17,7 @@
 #include "qgsifeatureselectionmanager.h"
 #include "qgsfeatureselectionmodel.h"
 #include "qgsvectorlayer.h"
-#include <qdebug.h>
+#include "qgslogger.h"
 
 QgsFeatureSelectionModel::QgsFeatureSelectionModel( QAbstractItemModel* model, QgsFeatureModel* featureModel, QgsIFeatureSelectionManager* featureSelectionManager, QObject* parent )
     : QItemSelectionModel( model, parent )

diff --git a/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
@@ -47,7 +47,6 @@ QWidget* QgsRangeWidgetWrapper::createWidget( QWidget* parent )
   }
   else
   {
-    QgsDebugMsg( QString( "%1" ).arg(( int )layer()->fields().at( fieldIdx() ).type() ) );
     switch ( layer()->fields().at( fieldIdx() ).type() )
     {
       case QVariant::Double:

diff --git a/src/gui/editorwidgets/qgsrelationreferencefactory.cpp b/src/gui/editorwidgets/qgsrelationreferencefactory.cpp
@@ -23,6 +23,7 @@
 #include "qgsrelationreferenceconfigdlg.h"
 #include "qgsrelationreferencesearchwidgetwrapper.h"
 #include "qgsrelationreferencewidget.h"
+#include "qgslogger.h"
 
 QgsRelationReferenceFactory::QgsRelationReferenceFactory( const QString& name, QgsMapCanvas* canvas, QgsMessageBar* messageBar )
     : QgsEditorWidgetFactory( name )

diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -29,6 +29,7 @@
 #include "qgsmessagebaritem.h"
 #include "qgseditorwidgetwrapper.h"
 #include "qgsrelationmanager.h"
+#include "qgslogger.h"
 
 #include <QDir>
 #include <QTextStream>

diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -229,7 +229,6 @@ void QgsFieldExpressionWidget::expressionEdited( const QString& expression )
 
 void QgsFieldExpressionWidget::expressionEditingFinished()
 {
-  QgsDebugMsg( "Editing finished" );
   const QString expression = mCombo->lineEdit()->text();
   mFieldProxyModel->sourceFieldModel()->setExpression( expression );
   QModelIndex idx = mFieldProxyModel->sourceFieldModel()->indexFromName( expression );

diff --git a/src/gui/qgsidentifymenu.cpp b/src/gui/qgsidentifymenu.cpp
@@ -23,6 +23,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsactionmenu.h"
 #include "qgsvectorlayer.h"
+#include "qgslogger.h"
 
 /// @cond PRIVATE
 CustomActionRegistry::CustomActionRegistry( QObject* parent )

diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -27,6 +27,7 @@
 #include "qgsvectorlayertools.h"
 #include "qgsproject.h"
 #include "qgstransactiongroup.h"
+#include "qgslogger.h"
 
 #include <QHBoxLayout>
 #include <QLabel>

diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp
@@ -22,6 +22,7 @@
 #include "qgssymbollayerutils.h"
 #include "qgsvectorcolorramp.h"
 #include "qgsstyle.h"
+#include "qgslogger.h"
 
 #include "qgssymbolselectordialog.h"
 #include "qgsexpressionbuilderdialog.h"

diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp
@@ -24,6 +24,7 @@
 
 #include "qgssymbolselectordialog.h"
 #include "qgsexpressionbuilderdialog.h"
+#include "qgslogger.h"
 
 #include "qgsludialog.h"
 

diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp
@@ -87,22 +87,18 @@ void QgsGeometryCheckerSetupTab::updateLayers()
   QgsMapLayer* currentLayer = isVisible() ? 0 : mIface->mapCanvas()->currentLayer();
   int currIdx = -1;
   int idx = 0;
-  Q_FOREACH ( QgsMapLayer* layer, QgsMapLayerRegistry::instance()->mapLayers() )
+  Q_FOREACH ( QgsVectorLayer* layer, QgsMapLayerRegistry::instance()->layers<QgsVectorLayer*>() )
   {
-    QgsDebugMsg( QString( "Adding layer, have %1 in list" ).arg( ui.comboBoxInputLayer->count() ) );
-    if ( qobject_cast<QgsVectorLayer*>( layer ) )
+    ui.comboBoxInputLayer->addItem( layer->name(), layer->id() );
+    if ( layer->name() == prevLayer )
     {
-      ui.comboBoxInputLayer->addItem( layer->name(), layer->id() );
-      if ( layer->name() == prevLayer )
-      {
-        currIdx = idx;
-      }
-      else if ( currIdx == -1 && layer == currentLayer )
-      {
-        currIdx = idx;
-      }
-      ++idx;
+      currIdx = idx;
+    }
+    else if ( currIdx == -1 && layer == currentLayer )
+    {
+      currIdx = idx;
     }
+    ++idx;
   }
   ui.comboBoxInputLayer->setCurrentIndex( qMax( 0, currIdx ) );
 }

diff --git a/src/plugins/offline_editing/offline_editing_plugin_gui.cpp b/src/plugins/offline_editing/offline_editing_plugin_gui.cpp
@@ -148,7 +148,6 @@ void QgsOfflineEditingPluginGui::on_buttonBox_accepted()
   {
     if ( nodeLayer->isVisible() )
     {
-      QgsDebugMsg( nodeLayer->layerId() );
       mSelectedLayerIds.append( nodeLayer->layerId() );
     }
   }

diff --git a/src/providers/virtual/qgsvirtuallayerprovider.cpp b/src/providers/virtual/qgsvirtuallayerprovider.cpp
@@ -24,12 +24,13 @@ extern "C"
 
 #include <stdexcept>
 
-#include <qgsvirtuallayerprovider.h>
-#include <qgsvirtuallayerdefinition.h>
-#include <qgsvirtuallayerfeatureiterator.h>
-#include <qgsvectorlayer.h>
-#include <qgsmaplayerregistry.h>
-#include <qgsdatasourceuri.h>
+#include "qgsvirtuallayerprovider.h"
+#include "qgsvirtuallayerdefinition.h"
+#include "qgsvirtuallayerfeatureiterator.h"
+#include "qgsvectorlayer.h"
+#include "qgsmaplayerregistry.h"
+#include "qgsdatasourceuri.h"
+#include "qgslogger.h"
 
 #include "qgsvirtuallayerprovider.h"
 #include "qgsvirtuallayersqlitemodule.h"

diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp
@@ -24,6 +24,7 @@
 #include "qgswfsprovider.h"
 #include "qgswfsshareddata.h"
 #include "qgswfsutils.h"
+#include "qgslogger.h"
 
 #include <QDir>
 #include <QProgressDialog>

diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp
@@ -27,6 +27,7 @@
 #include "qgsvectorfilewriter.h"
 #include "qgsproviderregistry.h"
 #include "qgsslconnect.h"
+#include "qgslogger.h"
 
 #include <cpl_vsi.h>
 #include <cpl_conv.h>

diff --git a/tests/src/core/testqgsgml.cpp b/tests/src/core/testqgsgml.cpp
@@ -21,6 +21,7 @@
 #include <qgsgeometry.h>
 #include <qgsgml.h>
 #include "qgsapplication.h"
+#include "qgslogger.h"
 
 /** \ingroup UnitTests
  * This is a unit test for GML parsing