Various fixes to make it compile on Windows

wonder-sk · wonder-sk · commit bf7dd522993e · 2013-12-06T09:22:26.000+07:00
diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -597,6 +597,9 @@ public:
   QList<QgsLabelPosition> labelsAtPosition( const QgsPoint& p ) const;
   //! return infos about labels within a given (map) rectangle
   QList<QgsLabelPosition> labelsWithinRect( const QgsRectangle& r ) const;
+
+private:
+  QgsLabelingResults( const QgsLabelingResults& );
 };
 
 
diff --git a/src/core/qgsfeaturerequest.h b/src/core/qgsfeaturerequest.h
@@ -152,7 +152,7 @@ class QgsAbstractFeatureIterator;
 /** base class that can be used for any class that is capable of returning features
  * @note added in 2.1
  */
-class QgsAbstractFeatureSource
+class CORE_EXPORT QgsAbstractFeatureSource
 {
 public:
   virtual ~QgsAbstractFeatureSource();
diff --git a/src/core/qgsmaplayerrenderer.h b/src/core/qgsmaplayerrenderer.h
@@ -23,7 +23,7 @@
  * 3. renderer job (in worker thread) calls QgsMapLayerRenderer::render()
  * 4. renderer job (again in GUI thread) will check errors() and report them
  */
-class QgsMapLayerRenderer
+class CORE_EXPORT QgsMapLayerRenderer
 {
 public:
   QgsMapLayerRenderer( const QString& layerID ) : mLayerID( layerID ) {}
diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp
@@ -131,7 +131,9 @@ void QgsMapRendererSequentialJob::internalFinished()
 
   mErrors = mInternalJob->errors();
 
-  delete mInternalJob;
+  // now we are in a slot called from mInternalJob - do not delete it immediately
+  // so the class is still valid when the execution returns to the class
+  mInternalJob->deleteLater();
   mInternalJob = 0;
 
   emit finished();
@@ -818,7 +820,7 @@ void QgsMapRendererParallelJob::renderLabelsStatic(QgsMapRendererParallelJob* se
 QImage QgsMapRendererParallelJob::composeImage()
 {
   QImage image( mSettings.outputSize(), QImage::Format_ARGB32_Premultiplied );
-  image.fill( mSettings.backgroundColor() );
+  image.fill( mSettings.backgroundColor().rgb() );
 
   QPainter painter(&image);
 
diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h
@@ -29,7 +29,7 @@ typedef QList<LayerRenderJob> LayerRenderJobs;
 
 
 /** abstract base class renderer jobs that asynchronously start map rendering */
-class QgsMapRendererJob : public QObject
+class CORE_EXPORT QgsMapRendererJob : public QObject
 {
   Q_OBJECT
 public:
@@ -101,7 +101,7 @@ class QgsMapRendererJob : public QObject
 /** Intermediate base class adding functionality that allows client to query the rendered image.
  *  The image can be queried even while the rendering is still in progress to get intermediate result
  */
-class QgsMapRendererQImageJob : public QgsMapRendererJob
+class CORE_EXPORT QgsMapRendererQImageJob : public QgsMapRendererJob
 {
 public:
   QgsMapRendererQImageJob( const QgsMapSettings& settings );
@@ -115,7 +115,7 @@ class QgsMapRendererCustomPainterJob;
 
 
 /** job implementation that renders everything sequentially in one thread */
-class QgsMapRendererSequentialJob : public QgsMapRendererQImageJob
+class CORE_EXPORT QgsMapRendererSequentialJob : public QgsMapRendererQImageJob
 {
   Q_OBJECT
 public:
@@ -148,7 +148,7 @@ public slots:
 
 
 /** job implementation that renders all layers in parallel */
-class QgsMapRendererParallelJob : public QgsMapRendererQImageJob
+class CORE_EXPORT QgsMapRendererParallelJob : public QgsMapRendererQImageJob
 {
   Q_OBJECT
 public:
@@ -200,7 +200,7 @@ protected slots:
 /** job implementation that renders everything sequentially using a custom painter.
  *  The returned image is always invalid (because there is none available).
  */
-class QgsMapRendererCustomPainterJob : public QgsMapRendererJob
+class CORE_EXPORT QgsMapRendererCustomPainterJob : public QgsMapRendererJob
 {
   Q_OBJECT
 public:
diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp
@@ -13,8 +13,11 @@
 #include "qgsxmlutils.h"
 
 
+Q_GUI_EXPORT extern int qt_defaultDpiX();
+
+
 QgsMapSettings::QgsMapSettings()
-  : mDpi( 96 ) // what to set?
+  : mDpi( qt_defaultDpiX() ) // DPI that will be used by default for QImage instances
   , mSize( QSize( 0, 0 ) )
   , mExtent()
   , mProjectionsEnabled( false )
diff --git a/src/core/qgsmapsettings.h b/src/core/qgsmapsettings.h
@@ -18,7 +18,7 @@ class QgsMapRendererJob;
 class QgsMapLayer;
 
 
-class QgsMapSettings
+class CORE_EXPORT QgsMapSettings
 {
 public:
   QgsMapSettings();
diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h
@@ -661,7 +661,7 @@ class CORE_EXPORT QgsLabelComponent
  * Class that stores computed placement from labeling engine.
  * @note added in 2.1
  */
-class QgsLabelingResults
+class CORE_EXPORT QgsLabelingResults
 {
 public:
   QgsLabelingResults();
@@ -672,7 +672,7 @@ class QgsLabelingResults
   //! return infos about labels within a given (map) rectangle
   QList<QgsLabelPosition> labelsWithinRect( const QgsRectangle& r ) const;
 
-protected:
+private:
   QgsLabelingResults( const QgsLabelingResults& ) {} // no copying allowed
 
   QgsLabelSearchTree* mLabelSearchTree;
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -636,7 +636,9 @@ void QgsMapCanvas::rendererJobFinished()
     mLabelingResults = mJob->takeLabelingResults();
   }
 
-  delete mJob;
+  // now we are in a slot called from mJob - do not delete it immediately
+  // so the class is still valid when the execution returns to the class
+  mJob->deleteLater();
   mJob = 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ class QgsAbstractFeatureIterator;`
`152`	`152`	`/** base class that can be used for any class that is capable of returning features`
`153`	`153`	`* @note added in 2.1`
`154`	`154`	`*/`
`155`		`-class QgsAbstractFeatureSource`
	`155`	`+class CORE_EXPORT QgsAbstractFeatureSource`
`156`	`156`	`{`
`157`	`157`	`public:`
`158`	`158`	`virtual ~QgsAbstractFeatureSource();`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* 3. renderer job (in worker thread) calls QgsMapLayerRenderer::render()`
`24`	`24`	`* 4. renderer job (again in GUI thread) will check errors() and report them`
`25`	`25`	`*/`
`26`		`-class QgsMapLayerRenderer`
	`26`	`+class CORE_EXPORT QgsMapLayerRenderer`
`27`	`27`	`{`
`28`	`28`	`public:`
`29`	`29`	`QgsMapLayerRenderer( const QString& layerID ) : mLayerID( layerID ) {}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class QgsMapRendererJob;`
`18`	`18`	`class QgsMapLayer;`
`19`	`19`
`20`	`20`
`21`		`-class QgsMapSettings`
	`21`	`+class CORE_EXPORT QgsMapSettings`
`22`	`22`	`{`
`23`	`23`	`public:`
`24`	`24`	`QgsMapSettings();`
Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,9 @@ void QgsMapCanvas::rendererJobFinished()`
`636`	`636`	`mLabelingResults = mJob->takeLabelingResults();`
`637`	`637`	`}`
`638`	`638`
`639`		`- delete mJob;`
	`639`	`+ // now we are in a slot called from mJob - do not delete it immediately`
	`640`	`+ // so the class is still valid when the execution returns to the class`
	`641`	`+ mJob->deleteLater();`
`640`	`642`	`mJob = 0;`
`641`	`643`	`}`
`642`	`644`