Index: qgis/src/app/qgsmeasuredialog.h =================================================================== --- qgis/src/app/qgsmeasuredialog.h (revision 9120) +++ qgis/src/app/qgsmeasuredialog.h (working copy) @@ -26,7 +26,7 @@ class QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase { - Q_OBJECT; + Q_OBJECT public: Index: qgis/src/app/qgsmaptoolsplitfeatures.h =================================================================== --- qgis/src/app/qgsmaptoolsplitfeatures.h (revision 9120) +++ qgis/src/app/qgsmaptoolsplitfeatures.h (working copy) @@ -22,7 +22,7 @@ /**A map tool that draws a line and splits the features cut by the line*/ class QgsMapToolSplitFeatures: public QgsMapToolCapture { - Q_OBJECT; + Q_OBJECT public: QgsMapToolSplitFeatures(QgsMapCanvas* canvas); virtual ~QgsMapToolSplitFeatures(); Index: qgis/src/app/qgisapp.h =================================================================== --- qgis/src/app/qgisapp.h (revision 9120) +++ qgis/src/app/qgisapp.h (working copy) @@ -68,7 +68,7 @@ */ class QgisApp : public QMainWindow { - Q_OBJECT; + Q_OBJECT public: //! Constructor QgisApp(QSplashScreen *splash, QWidget * parent = 0, Qt::WFlags fl = Qt::Window); Index: qgis/src/app/legend/qgslegendlayerfile.h =================================================================== --- qgis/src/app/legend/qgslegendlayerfile.h (revision 9120) +++ qgis/src/app/legend/qgslegendlayerfile.h (working copy) @@ -32,7 +32,7 @@ */ class QgsLegendLayerFile : public QgsLegendItem { - Q_OBJECT; + Q_OBJECT public: QgsLegendLayerFile(QTreeWidgetItem * theLegendItem, QString theString, QgsMapLayer* theLayer); Index: qgis/src/app/legend/qgslegend.h =================================================================== --- qgis/src/app/legend/qgslegend.h (revision 9120) +++ qgis/src/app/legend/qgslegend.h (working copy) @@ -82,7 +82,7 @@ class QgsLegend : public QTreeWidget { - Q_OBJECT; + Q_OBJECT private: // Moved here to match access of declaration later in file. // Previous location raised a warning in msvc as the forward Index: qgis/src/app/qgsidentifyresults.h =================================================================== --- qgis/src/app/qgsidentifyresults.h (revision 9120) +++ qgis/src/app/qgsidentifyresults.h (working copy) @@ -36,7 +36,7 @@ class QgsIdentifyResults: public QDialog, private Ui::QgsIdentifyResultsBase { - Q_OBJECT; + Q_OBJECT public: //! Constructor - takes it own copy of the QgsAttributeAction so Index: qgis/src/app/qgsattributetable.cpp =================================================================== --- qgis/src/app/qgsattributetable.cpp (revision 9120) +++ qgis/src/app/qgsattributetable.cpp (working copy) @@ -33,7 +33,7 @@ QgsAttributeTableItemDelegate::QgsAttributeTableItemDelegate(QgsAttributeTable *table, QObject *parent) - : mTable(table), QItemDelegate(parent) + : QItemDelegate(parent), mTable(table) { } @@ -429,8 +429,6 @@ void QgsAttributeTable::fillTable(QgsVectorLayer *layer) { - int row = 0; - const QgsFieldMap &fields = layer->pendingFields(); // set up the column headers Index: qgis/src/app/qgsvectorlayerproperties.h =================================================================== --- qgis/src/app/qgsvectorlayerproperties.h (revision 9120) +++ qgis/src/app/qgsvectorlayerproperties.h (working copy) @@ -35,7 +35,7 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPropertiesBase { - Q_OBJECT; + Q_OBJECT public: QgsVectorLayerProperties(QgsVectorLayer *lyr = 0,QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags); ~QgsVectorLayerProperties(); Index: qgis/src/app/qgsmaptooledit.cpp =================================================================== --- qgis/src/app/qgsmaptooledit.cpp (revision 9120) +++ qgis/src/app/qgsmaptooledit.cpp (working copy) @@ -35,7 +35,6 @@ int QgsMapToolEdit::insertSegmentVerticesForSnap(const QList& snapResults, QgsVectorLayer* editedLayer) { - int returnval = 0; QgsPoint layerPoint; if(!editedLayer || !editedLayer->isEditable()) Index: qgis/src/app/qgssearchquerybuilder.cpp =================================================================== --- qgis/src/app/qgssearchquerybuilder.cpp (revision 9120) +++ qgis/src/app/qgssearchquerybuilder.cpp (working copy) @@ -119,8 +119,9 @@ mModelValues->blockSignals(true); lstValues->setUpdatesEnabled(false); + const int limitval = static_cast(limit); while (provider->getNextFeature(feat) && - (limit == 0 || mModelValues->rowCount() != limit)) + (limitval == 0 || mModelValues->rowCount() != limitval)) { const QgsAttributeMap& attributes = feat.attributeMap(); value = attributes[fieldIndex].toString(); Index: qgis/src/app/qgsrasterlayerproperties.cpp =================================================================== --- qgis/src/app/qgsrasterlayerproperties.cpp (revision 9120) +++ qgis/src/app/qgsrasterlayerproperties.cpp (working copy) @@ -52,9 +52,9 @@ QgsRasterLayerProperties::QgsRasterLayerProperties(QgsMapLayer *lyr, QWidget *parent, Qt::WFlags fl) : QDialog(parent, fl), - mRasterLayer( dynamic_cast(lyr)), // Constant that signals property not used. - TRSTRING_NOT_SET( tr("Not Set")) + TRSTRING_NOT_SET( tr("Not Set")), + mRasterLayer( dynamic_cast(lyr)) { ignoreSpinBoxEvent = false; //Short circuit signal loop between min max field and stdDev spin box mGrayActualMinimumMaximum = false; Index: qgis/src/app/qgsdbsourceselect.h =================================================================== --- qgis/src/app/qgsdbsourceselect.h (revision 9120) +++ qgis/src/app/qgsdbsourceselect.h (working copy) @@ -103,7 +103,7 @@ dbssType=0, dbssDetail, dbssSql, - dbssColumns, + dbssColumns }; typedef std::pair geomPair; Index: qgis/src/app/qgsattributetable.h =================================================================== --- qgis/src/app/qgsattributetable.h (revision 9120) +++ qgis/src/app/qgsattributetable.h (working copy) @@ -57,7 +57,7 @@ enum { AttributeIndex = Qt::UserRole, AttributeName = Qt::UserRole+1, - AttributeType = Qt::UserRole+2, + AttributeType = Qt::UserRole+2 }; void setReadOnly(bool b); Index: qgis/src/app/qgsdbtablemodel.h =================================================================== --- qgis/src/app/qgsdbtablemodel.h (revision 9120) +++ qgis/src/app/qgsdbtablemodel.h (working copy) @@ -24,7 +24,7 @@ The tables have the following columns: Type, Schema, Tablename, Geometry Column, Sql*/ class QgsDbTableModel: public QStandardItemModel { - Q_OBJECT; + Q_OBJECT public: QgsDbTableModel(); ~QgsDbTableModel(); Index: qgis/src/app/qgsattributedialog.cpp =================================================================== --- qgis/src/app/qgsattributedialog.cpp (revision 9120) +++ qgis/src/app/qgsattributedialog.cpp (working copy) @@ -38,8 +38,8 @@ QgsAttributeDialog::QgsAttributeDialog(QgsVectorLayer *vl, QgsFeature *thepFeature) : QDialog(), mSettingsPath("/Windows/AttributeDialog/"), - mpFeature(thepFeature), - mLayer(vl) + mLayer(vl), + mpFeature(thepFeature) { setupUi(this); if (mpFeature==NULL || vl->getDataProvider()==NULL ) Index: qgis/src/app/qgsmaptoolvertexedit.h =================================================================== --- qgis/src/app/qgsmaptoolvertexedit.h (revision 9120) +++ qgis/src/app/qgsmaptoolvertexedit.h (working copy) @@ -26,7 +26,7 @@ QgsMapToolDeleteVertex*/ class QgsMapToolVertexEdit: public QgsMapToolEdit { - Q_OBJECT; + Q_OBJECT public: Index: qgis/src/app/qgspastetransformations.h =================================================================== --- qgis/src/app/qgspastetransformations.h (revision 9120) +++ qgis/src/app/qgspastetransformations.h (working copy) @@ -27,7 +27,7 @@ */ class QgsPasteTransformations : public QDialog, private Ui::QgsPasteTransformationsBase { - Q_OBJECT; + Q_OBJECT public: //! Constructor QgsPasteTransformations(); Index: qgis/src/app/qgsoptions.h =================================================================== --- qgis/src/app/qgsoptions.h (revision 9120) +++ qgis/src/app/qgsoptions.h (working copy) @@ -29,7 +29,7 @@ */ class QgsOptions :public QDialog, private Ui::QgsOptionsBase { - Q_OBJECT; + Q_OBJECT public: /** * Constructor Index: qgis/src/app/qgslabeldialog.h =================================================================== --- qgis/src/app/qgslabeldialog.h (revision 9120) +++ qgis/src/app/qgslabeldialog.h (working copy) @@ -26,7 +26,7 @@ /** QgsLabelDialog is the dialog for label. */ class QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase { - Q_OBJECT; + Q_OBJECT public: QgsLabelDialog( QgsLabel *label, QWidget * parent = 0 ); Index: qgis/src/app/qgisappinterface.h =================================================================== --- qgis/src/app/qgisappinterface.h (revision 9120) +++ qgis/src/app/qgisappinterface.h (working copy) @@ -32,7 +32,7 @@ */ class QgisAppInterface : public QgisInterface { - Q_OBJECT; + Q_OBJECT public: /** Index: qgis/src/app/qgsattributeactiondialog.h =================================================================== --- qgis/src/app/qgsattributeactiondialog.h (revision 9120) +++ qgis/src/app/qgsattributeactiondialog.h (working copy) @@ -32,7 +32,7 @@ class QgsAttributeActionDialog: public QWidget, private Ui::QgsAttributeActionDialogBase { - Q_OBJECT; + Q_OBJECT public: QgsAttributeActionDialog(QgsAttributeAction* actions, Index: qgis/src/app/qgsattributedialog.h =================================================================== --- qgis/src/app/qgsattributedialog.h (revision 9120) +++ qgis/src/app/qgsattributedialog.h (working copy) @@ -31,7 +31,7 @@ class QgsAttributeDialog: public QDialog, private Ui::QgsAttributeDialogBase { - Q_OBJECT; + Q_OBJECT public: QgsAttributeDialog(QgsVectorLayer *vl, QgsFeature * thepFeature); Index: qgis/src/app/qgisapp.cpp =================================================================== --- qgis/src/app/qgisapp.cpp (revision 9120) +++ qgis/src/app/qgisapp.cpp (working copy) @@ -314,7 +314,8 @@ QgisApp::QgisApp(QSplashScreen *splash, QWidget * parent, Qt::WFlags fl) : QMainWindow(parent,fl), mSplash(splash), - mPythonUtils(NULL), mPythonConsole(NULL) + mPythonConsole(NULL), + mPythonUtils(NULL) { if(smInstance) { QMessageBox::critical( @@ -2451,7 +2452,7 @@ break; } -}; // findLayer_ +} // findLayer_ Index: qgis/src/app/qgsmeasuretool.h =================================================================== --- qgis/src/app/qgsmeasuretool.h (revision 9120) +++ qgis/src/app/qgsmeasuretool.h (working copy) @@ -29,7 +29,7 @@ class QgsMeasureTool : public QgsMapTool { - Q_OBJECT; + Q_OBJECT public: Index: qgis/src/app/qgsabout.cpp =================================================================== --- qgis/src/app/qgsabout.cpp (revision 9120) +++ qgis/src/app/qgsabout.cpp (working copy) @@ -215,8 +215,7 @@ #ifdef QGISDEBUG printf ("Loading mug: %s\n", myString.toLocal8Bit().constData()); #endif - QPixmap *pixmap = new QPixmap(myString); - //pixAuthorMug->setPixmap(*pixmap); + /* Uncomment this block to use preloaded images pixAuthorMug->setPixmap(mugs[myString]); */ Index: qgis/src/app/qgsmaptoolidentify.h =================================================================== --- qgis/src/app/qgsmaptoolidentify.h (revision 9120) +++ qgis/src/app/qgsmaptoolidentify.h (working copy) @@ -39,7 +39,7 @@ */ class QgsMapToolIdentify : public QgsMapTool { - Q_OBJECT; + Q_OBJECT public: QgsMapToolIdentify(QgsMapCanvas* canvas); Index: qgis/src/plugins/spit/qgsspit.h =================================================================== --- qgis/src/plugins/spit/qgsspit.h (revision 9120) +++ qgis/src/plugins/spit/qgsspit.h (working copy) @@ -37,7 +37,7 @@ class QgsSpit : public QDialog, private Ui::QgsSpitBase { - Q_OBJECT; + Q_OBJECT public: QgsSpit( QWidget *parent = 0, Qt::WFlags fl = 0 ); ~QgsSpit(); @@ -124,7 +124,7 @@ class ShapefileTableDelegate : public QItemDelegate { - Q_OBJECT; + Q_OBJECT public: ShapefileTableDelegate(QObject *parent, QStringList& schema_list) : Index: qgis/src/plugins/quick_print/quickprintgui.cpp =================================================================== --- qgis/src/plugins/quick_print/quickprintgui.cpp (revision 9120) +++ qgis/src/plugins/quick_print/quickprintgui.cpp (working copy) @@ -28,8 +28,8 @@ //standard includes QuickPrintGui::QuickPrintGui( QgsMapCanvas * thepMapCanvas, - QWidget* parent, Qt::WFlags fl ) -: mpMapCanvas ( thepMapCanvas ), QDialog ( parent, fl ) + QWidget* parent, Qt::WFlags fl ) : + QDialog ( parent, fl ), mpMapCanvas ( thepMapCanvas ) { setupUi(this); grpOuput->hide(); //until properly implemented Index: qgis/src/plugins/quick_print/quickprintplugin.h =================================================================== --- qgis/src/plugins/quick_print/quickprintplugin.h (revision 9120) +++ qgis/src/plugins/quick_print/quickprintplugin.h (working copy) @@ -57,7 +57,7 @@ */ class QuickPrintPlugin:public QObject, public QgisPlugin { - Q_OBJECT; + Q_OBJECT public: ////////////////////////////////////////////////////////////////////// Index: qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp =================================================================== --- qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp (revision 9120) +++ qgis/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp (working copy) @@ -125,6 +125,7 @@ void dxf2shpConverterGui::on_buttonBox_helpRequested() { + // FIXME - mloskot: Ticket #1235 QString s = "Fields description:\n" "* Input DXF file: path to the DXF file to be converted\n" "* Output Shp file: desired filename of the ShapeFile to be created\n" Index: qgis/src/plugins/dxf2shp_converter/dxf2shpconverter.h =================================================================== --- qgis/src/plugins/dxf2shp_converter/dxf2shpconverter.h (revision 9120) +++ qgis/src/plugins/dxf2shp_converter/dxf2shpconverter.h (working copy) @@ -34,7 +34,7 @@ */ class dxf2shpConverter: public QObject, public QgisPlugin { - Q_OBJECT; + Q_OBJECT public: ////////////////////////////////////////////////////////////////////// Index: qgis/src/plugins/dxf2shp_converter/builder.cpp =================================================================== --- qgis/src/plugins/dxf2shp_converter/builder.cpp (revision 9120) +++ qgis/src/plugins/dxf2shp_converter/builder.cpp (working copy) @@ -400,6 +400,7 @@ return; } + // FIXME - Ticket #1236 logfile << "(Add Circle (%6.3f, %6.3f, %6.3f) %6.3f\n", data.cx, data.cy, data.cz, data.radius; if (ignoringBlock) Index: qgis/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.cpp =================================================================== --- qgis/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.cpp (revision 9120) +++ qgis/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.cpp (working copy) @@ -58,7 +58,7 @@ */ void DL_WriterA::dxfReal(int gc, double value) const { char str[256]; - sprintf(str, "%.16lf", value); + sprintf(str, "%.16f", value); // fix for german locale: strReplace(str, ',', '.'); Index: qgis/src/plugins/copyright_label/plugingui.h =================================================================== --- qgis/src/plugins/copyright_label/plugingui.h (revision 9120) +++ qgis/src/plugins/copyright_label/plugingui.h (working copy) @@ -21,7 +21,7 @@ */ class QgsCopyrightLabelPluginGui : public QDialog, private Ui::QgsCopyrightLabelPluginGuiBase { -Q_OBJECT; +Q_OBJECT public: QgsCopyrightLabelPluginGui( QWidget* parent = 0, Qt::WFlags fl = 0 ); ~QgsCopyrightLabelPluginGui(); Index: qgis/src/plugins/coordinate_capture/coordinatecapturemaptool.h =================================================================== --- qgis/src/plugins/coordinate_capture/coordinatecapturemaptool.h (revision 9120) +++ qgis/src/plugins/coordinate_capture/coordinatecapturemaptool.h (working copy) @@ -30,7 +30,7 @@ */ class CoordinateCaptureMapTool : public QgsMapTool { - Q_OBJECT; + Q_OBJECT public: CoordinateCaptureMapTool(QgsMapCanvas* thepCanvas); Index: qgis/src/plugins/coordinate_capture/coordinatecapture.h =================================================================== --- qgis/src/plugins/coordinate_capture/coordinatecapture.h (revision 9120) +++ qgis/src/plugins/coordinate_capture/coordinatecapture.h (working copy) @@ -61,7 +61,7 @@ */ class CoordinateCapture:public QObject, public QgisPlugin { - Q_OBJECT; + Q_OBJECT public: ////////////////////////////////////////////////////////////////////// Index: qgis/src/plugins/scale_bar/plugingui.h =================================================================== --- qgis/src/plugins/scale_bar/plugingui.h (revision 9120) +++ qgis/src/plugins/scale_bar/plugingui.h (working copy) @@ -20,7 +20,7 @@ */ class QgsScaleBarPluginGui : public QDialog, private Ui::QgsScaleBarPluginGuiBase { -Q_OBJECT; +Q_OBJECT public: QgsScaleBarPluginGui( QWidget* parent = 0, Qt::WFlags fl = 0 ); ~QgsScaleBarPluginGui(); Index: qgis/src/gui/qgsquickprint.cpp =================================================================== --- qgis/src/gui/qgsquickprint.cpp (revision 9120) +++ qgis/src/gui/qgsquickprint.cpp (working copy) @@ -132,8 +132,7 @@ // the screen resolution is which we store and then // reset the resolution of the printer after that... QPrinter myPrinter ( QPrinter::ScreenResolution ); - int myScreenResolutionDpi = myPrinter.resolution(); //try to get programmatically - // + // Try to force the printer resolution to 300dpi // to get past platform specific defaults in printer // resolution... @@ -410,7 +409,6 @@ if ( mypVectorLayer ) { QString myLayerName = mypVectorLayer->name(); - int myLayerNameWidth = myLegendFontMetrics.width(myLayerName); QIcon myIcon; QPixmap myPixmap ( QSize ( myIconWidth, myIconWidth ) ); //square //based on code from qgslegendlayer.cpp - see that file for more info @@ -445,7 +443,6 @@ } myLegendXPos += myIconWidth + myLegendSpacer; myPrintPainter.setPen( Qt::black ); - int myMaximumLabelWidth = myLegendDimensionX - myLegendXPos; QStringList myWrappedLayerNameList = wordWrap(myLayerName, myLegendFontMetrics, myLegendDimensionX - myIconWidth); @@ -547,9 +544,7 @@ } myLabel = myLabel.trimmed(); myLegendXPos += myIconWidth + myLegendSpacer; - int myLabelWidth = myLegendFontMetrics.width(myLabel); myPrintPainter.setPen( Qt::black ); - // QStringList myWrappedLayerNameList = wordWrap(myLabel, myLegendFontMetrics, Index: qgis/src/gui/qgsdetaileditemdelegate.h =================================================================== --- qgis/src/gui/qgsdetaileditemdelegate.h (revision 9120) +++ qgis/src/gui/qgsdetaileditemdelegate.h (working copy) @@ -30,7 +30,7 @@ class GUI_EXPORT QgsDetailedItemDelegate : public QAbstractItemDelegate { - Q_OBJECT; + Q_OBJECT public: QgsDetailedItemDelegate(QObject * parent = 0); ~QgsDetailedItemDelegate(); Index: qgis/src/gui/qgsmapoverviewcanvas.h =================================================================== --- qgis/src/gui/qgsmapoverviewcanvas.h (revision 9120) +++ qgis/src/gui/qgsmapoverviewcanvas.h (working copy) @@ -34,7 +34,7 @@ class GUI_EXPORT QgsMapOverviewCanvas : public QWidget { - Q_OBJECT; + Q_OBJECT public: QgsMapOverviewCanvas(QWidget * parent = 0, QgsMapCanvas* mapCanvas = NULL); Index: qgis/src/gui/qgsdetaileditemdelegate.cpp =================================================================== --- qgis/src/gui/qgsdetaileditemdelegate.cpp (revision 9120) +++ qgis/src/gui/qgsdetaileditemdelegate.cpp (working copy) @@ -54,7 +54,6 @@ { QgsDetailedItemData myData = qVariantValue(theIndex.data(Qt::UserRole)); - bool myCheckState = theIndex.model()->data(theIndex, Qt::CheckStateRole).toBool(); if (myData.isRenderedAsWidget()) { paintAsWidget(thepPainter,theOption,myData); Index: qgis/src/gui/qgsquickprint.h =================================================================== --- qgis/src/gui/qgsquickprint.h (revision 9120) +++ qgis/src/gui/qgsquickprint.h (working copy) @@ -36,7 +36,7 @@ */ class GUI_EXPORT QgsQuickPrint:public QObject { - Q_OBJECT; + Q_OBJECT public: QgsQuickPrint(); Index: qgis/src/gui/qgsdetaileditemwidget.h =================================================================== --- qgis/src/gui/qgsdetaileditemwidget.h (revision 9120) +++ qgis/src/gui/qgsdetaileditemwidget.h (working copy) @@ -24,7 +24,7 @@ class QgsDetailedItemWidget : public QWidget, private Ui::QgsDetailedItemWidgetBase { - Q_OBJECT; + Q_OBJECT public: QgsDetailedItemWidget(QWidget * parent = 0); ~QgsDetailedItemWidget(); Index: qgis/src/gui/qgsmapcanvas.h =================================================================== --- qgis/src/gui/qgsmapcanvas.h (revision 9120) +++ qgis/src/gui/qgsmapcanvas.h (working copy) @@ -91,7 +91,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView { - Q_OBJECT; + Q_OBJECT public: Index: qgis/src/gui/qgisinterface.h =================================================================== --- qgis/src/gui/qgisinterface.h (revision 9120) +++ qgis/src/gui/qgisinterface.h (working copy) @@ -48,7 +48,7 @@ class GUI_EXPORT QgisInterface : public QObject { - Q_OBJECT; + Q_OBJECT public: Index: qgis/src/gui/qgsgenericprojectionselector.h =================================================================== --- qgis/src/gui/qgsgenericprojectionselector.h (revision 9120) +++ qgis/src/gui/qgsgenericprojectionselector.h (working copy) @@ -30,7 +30,7 @@ class GUI_EXPORT QgsGenericProjectionSelector : public QDialog, private Ui::QgsGenericProjectionSelectorBase { - Q_OBJECT; + Q_OBJECT public: /** * Constructor Index: qgis/src/core/qgsfeature.cpp =================================================================== --- qgis/src/core/qgsfeature.cpp (revision 9120) +++ qgis/src/core/qgsfeature.cpp (working copy) @@ -36,11 +36,11 @@ QgsFeature::QgsFeature( QgsFeature const & rhs ) : mFid( rhs.mFid ), mAttributes( rhs.mAttributes ), + mGeometry( 0 ), + mOwnsGeometry( false ), mValid( rhs.mValid ), mDirty( rhs.mDirty ), - mTypeName( rhs.mTypeName ), - mGeometry( 0 ), - mOwnsGeometry( false ) + mTypeName( rhs.mTypeName ) { // copy embedded geometry Index: qgis/src/core/qgsvectorlayer.cpp =================================================================== --- qgis/src/core/qgsvectorlayer.cpp (revision 9120) +++ qgis/src/core/qgsvectorlayer.cpp (working copy) @@ -95,10 +95,10 @@ mProviderKey(providerKey), mEditable(false), mModified(false), + mMaxUpdatedIndex(-1), mRenderer(0), mLabel(0), mLabelOn(false), - mMaxUpdatedIndex(-1), mFetching(false) { mActions = new QgsAttributeAction; @@ -703,7 +703,8 @@ /* Scale factor of the marker image*/ /* We set this to the symbolScale, and if it is NOT changed, */ /* we don't have to do another scaling here */ - double markerScaleFactor = renderContext.rasterScaleFactor(); + // XXX - mloskot: unused + // double markerScaleFactor = renderContext.rasterScaleFactor(); if(mEditable) { @@ -738,6 +739,8 @@ emit drawingProgress(featureCount, totalFeatures); qApp->processEvents(); } +#else + UNREFERENCED_PARAMETER(totalFeatures); #endif //Q_WS_MAC if (mEditable) @@ -1645,7 +1648,6 @@ int QgsVectorLayer::splitFeatures(const QList& splitLine, bool topologicalEditing) { - QgsGeometry* newGeometry = 0; QgsFeatureList newFeatures; //store all the newly created features double xMin, yMin, xMax, yMax; QgsRect bBox; //bounding box of the split line @@ -1870,6 +1872,8 @@ } break; } + default: + break; } return returnVal; } Index: qgis/src/core/qgsvectorfilewriter.cpp =================================================================== --- qgis/src/core/qgsvectorfilewriter.cpp (revision 9120) +++ qgis/src/core/qgsvectorfilewriter.cpp (working copy) @@ -30,6 +30,7 @@ #include #include +#include // size_t #include #include @@ -340,7 +341,7 @@ bool ok = TRUE; const char* suffixes[] = { ".shp", ".shx", ".dbf", ".prj", ".qix" }; - for (int i = 0; i < sizeof(suffixes) / sizeof(char*); i++) + for (std::size_t i = 0; i < sizeof(suffixes) / sizeof(char*); i++) { QString file = myFileBase + suffixes[i]; QFileInfo myInfo(file); Index: qgis/src/core/raster/qgsrasterlayer.cpp =================================================================== --- qgis/src/core/raster/qgsrasterlayer.cpp (revision 9120) +++ qgis/src/core/raster/qgsrasterlayer.cpp (working copy) @@ -305,16 +305,15 @@ QString const & baseName, bool loadDefaultStyleFlag) : QgsMapLayer(RASTER, baseName, path), + // Constant that signals property not used. + QSTRING_NOT_SET("Not Set"), + TRSTRING_NOT_SET(tr("Not Set")), mRasterXDim( std::numeric_limits::max() ), mRasterYDim( std::numeric_limits::max() ), mDebugOverlayFlag(false), mInvertPixelsFlag(false), mStandardDeviations(0), - mDataProvider(0), - // Constant that signals property not used. - QSTRING_NOT_SET("Not Set"), - TRSTRING_NOT_SET(tr("Not Set")) - + mDataProvider(0) { mUserDefinedRGBMinMaxFlag = false; //defaults needed to bypass stretch @@ -2420,6 +2419,7 @@ // a certain range -- in this case twenty times the smallest value that // doubles can take for the current system. (Yes, 20 was arbitrary.) double myPrecision = std::numeric_limits::epsilon() * 20; + UNREFERENCED_PARAMETER(myPrecision); //ifdefs below to remove compiler warning about unused vars #ifdef QGISDEBUG @@ -5155,6 +5155,8 @@ case USER_DEFINED: return QString("USER_DEFINED"); break; + default: + break; } return QString("UNDEFINED_SHADING_ALGORITHM"); Index: qgis/src/core/raster/qgscontrastenhancement.cpp =================================================================== --- qgis/src/core/raster/qgscontrastenhancement.cpp (revision 9120) +++ qgis/src/core/raster/qgscontrastenhancement.cpp (working copy) @@ -102,6 +102,9 @@ case QGS_CFloat64: return std::numeric_limits::max(); break; + default: + // XXX - mloskot: QGS_Unknown and QGS_TypeCount not handled? + break; } return std::numeric_limits::max(); @@ -146,6 +149,9 @@ case QGS_CFloat64: return std::numeric_limits::max() * -1.0; break; + default: + // XXX - mloskot: QGS_Unknown and QGS_TypeCount not handled? + break; } return std::numeric_limits::max() * -1.0; Index: qgis/src/core/qgsgeometry.cpp =================================================================== --- qgis/src/core/qgsgeometry.cpp (revision 9120) +++ qgis/src/core/qgsgeometry.cpp (working copy) @@ -1109,7 +1109,7 @@ for (unsigned int i=0, j=0; i(i)) { GEOSCoordSeq_setX(*new_sequence, j, x); GEOSCoordSeq_setY(*new_sequence, j, y); @@ -4608,7 +4608,6 @@ //ratio intersect geometry / geometry. This should be close to 1 //if the polygon belongs to the input geometry - double areaRatio = 0.0; for(int i=0; i 0.99 && areaRatio < 1.01) testedGeometries << GEOSGeom_clone(polygon); Index: qgis/src/core/qgsmaprenderer.cpp =================================================================== --- qgis/src/core/qgsmaprenderer.cpp (revision 9120) +++ qgis/src/core/qgsmaprenderer.cpp (working copy) @@ -499,8 +499,7 @@ QgsCoordinateTransform tr(layer->srs(), *mDestCRS); #ifdef QGISDEBUG - // QgsLogger::debug("Getting extent of canvas in layers CS. Canvas is ", extent, __FILE__,\ - // __FUNCTION__, __LINE__); + // QgsLogger::debug("Getting extent of canvas in layers CS. Canvas is ", extent, __FILE__, __FUNCTION__, __LINE__); #endif // Split the extent into two if the source CRS is // geographic and the extent crosses the split in Index: qgis/src/core/qgsvectorlayer.h =================================================================== --- qgis/src/core/qgsvectorlayer.h (revision 9120) +++ qgis/src/core/qgsvectorlayer.h (working copy) @@ -65,7 +65,7 @@ UniqueValuesEditable, ValueMap, Classification, - Range, + Range }; struct RangeData { Index: qgis/src/core/qgsprojectfiletransform.h =================================================================== --- qgis/src/core/qgsprojectfiletransform.h (revision 9120) +++ qgis/src/core/qgsprojectfiletransform.h (working copy) @@ -66,7 +66,7 @@ void (QgsProjectFileTransform::* transformFunc)(); } transform; - static transform transformers[];; + static transform transformers[]; QDomDocument mDom; QgsProjectVersion mCurrentVersion; Index: qgis/src/core/qgsprojectversion.cpp =================================================================== --- qgis/src/core/qgsprojectversion.cpp (revision 9120) +++ qgis/src/core/qgsprojectversion.cpp (working copy) @@ -51,7 +51,7 @@ return ((mMajor == other.mMajor) && (mMinor == other.mMinor) && (mSub == other.mSub)); -}; +} /*! Boolean >= operator */ @@ -60,7 +60,7 @@ return ( (mMajor >= other.mMajor) || ((mMajor == other.mMajor) && (mMinor >= other.mMinor)) || ((mMajor == other.mMajor) && (mMinor == other.mMinor) && (mSub >= other.mSub))); -}; +} /*! Boolean > operator */ @@ -69,7 +69,7 @@ return ( (mMajor > other.mMajor) || ((mMajor == other.mMajor) && (mMinor > other.mMinor)) || ((mMajor == other.mMajor) && (mMinor == other.mMinor) && (mSub > other.mSub))); -}; +} QString QgsProjectVersion::text() { Index: qgis/src/core/spatialindex/tools/Tools.cc =================================================================== --- qgis/src/core/spatialindex/tools/Tools.cc (revision 9120) +++ qgis/src/core/spatialindex/tools/Tools.cc (working copy) @@ -20,6 +20,7 @@ // mhadji@gmail.com #include +#include #include #include #include @@ -118,7 +119,7 @@ m_propertySet.clear(); unsigned long numberOfProperties; - memcpy(&numberOfProperties, ptr, sizeof(unsigned long)); + std::memcpy(&numberOfProperties, ptr, sizeof(unsigned long)); ptr += sizeof(unsigned long); Variant v; @@ -127,86 +128,86 @@ { std::string s(reinterpret_cast(ptr)); ptr += s.size() + 1; - memcpy(&(v.m_varType), ptr, sizeof(VariantType)); + std::memcpy(&(v.m_varType), ptr, sizeof(VariantType)); ptr += sizeof(VariantType); switch (v.m_varType) { case VT_LONG: long l; - memcpy(&l, ptr, sizeof(long)); + std::memcpy(&l, ptr, sizeof(long)); ptr += sizeof(long); v.m_val.lVal = l; break; case VT_LONGLONG: long long ll; - memcpy(&ll, ptr, sizeof(long long)); + std::memcpy(&ll, ptr, sizeof(long long)); ptr += sizeof(long long); v.m_val.llVal = ll; break; case VT_BYTE: byte b; - memcpy(&b, ptr, sizeof(byte)); + std::memcpy(&b, ptr, sizeof(byte)); ptr += sizeof(byte); v.m_val.bVal = b; break; case VT_SHORT: short s; - memcpy(&s, ptr, sizeof(short)); + std::memcpy(&s, ptr, sizeof(short)); ptr += sizeof(short); v.m_val.iVal = s; break; case VT_FLOAT: float f; - memcpy(&f, ptr, sizeof(float)); + std::memcpy(&f, ptr, sizeof(float)); ptr += sizeof(float); v.m_val.fltVal = f; break; case VT_DOUBLE: double d; - memcpy(&d, ptr, sizeof(double)); + std::memcpy(&d, ptr, sizeof(double)); ptr += sizeof(double); v.m_val.dblVal = d; break; case VT_CHAR: char c; - memcpy(&c, ptr, sizeof(char)); + std::memcpy(&c, ptr, sizeof(char)); ptr += sizeof(char); v.m_val.cVal = c; break; case VT_USHORT: unsigned short us; - memcpy(&us, ptr, sizeof(unsigned short)); + std::memcpy(&us, ptr, sizeof(unsigned short)); ptr += sizeof(unsigned short); v.m_val.uiVal = us; break; case VT_ULONG: unsigned long ul; - memcpy(&ul, ptr, sizeof(unsigned long)); + std::memcpy(&ul, ptr, sizeof(unsigned long)); ptr += sizeof(unsigned long); v.m_val.ulVal = ul; break; case VT_ULONGLONG: unsigned long long ull; - memcpy(&ull, ptr, sizeof(unsigned long long)); + std::memcpy(&ull, ptr, sizeof(unsigned long long)); ptr += sizeof(unsigned long long); v.m_val.ullVal = ull; break; case VT_INT: int i; - memcpy(&i, ptr, sizeof(int)); + std::memcpy(&i, ptr, sizeof(int)); ptr += sizeof(int); v.m_val.intVal = i; break; case VT_UINT: unsigned int ui; - memcpy(&ui, ptr, sizeof(unsigned int)); + std::memcpy(&ui, ptr, sizeof(unsigned int)); ptr += sizeof(unsigned int); v.m_val.uintVal = ui; break; case VT_BOOL: byte bl; - memcpy(&bl, ptr, sizeof(byte)); + std::memcpy(&bl, ptr, sizeof(byte)); ptr += sizeof(byte); v.m_val.blVal = bl!=0; break; @@ -286,7 +287,7 @@ byte* ptr = *data; unsigned long numberOfProperties = m_propertySet.size(); - memcpy(ptr, &numberOfProperties, sizeof(unsigned long)); + std::memcpy(ptr, &numberOfProperties, sizeof(unsigned long)); ptr += sizeof(unsigned long); std::map::iterator it; @@ -294,68 +295,68 @@ for (it = m_propertySet.begin(); it != m_propertySet.end(); it++) { unsigned long strSize = (*it).first.size(); - memcpy(ptr, (*it).first.c_str(), strSize); + std::memcpy(ptr, (*it).first.c_str(), strSize); ptr += strSize; *ptr = 0; ptr++; - memcpy(ptr, &((*it).second.m_varType), sizeof(VariantType)); + std::memcpy(ptr, &((*it).second.m_varType), sizeof(VariantType)); ptr += sizeof(VariantType); switch ((*it).second.m_varType) { case VT_LONG: - memcpy(ptr, &((*it).second.m_val.lVal), sizeof(long)); + std::memcpy(ptr, &((*it).second.m_val.lVal), sizeof(long)); ptr += sizeof(long); break; case VT_LONGLONG: - memcpy(ptr, &((*it).second.m_val.llVal), sizeof(long long)); + std::memcpy(ptr, &((*it).second.m_val.llVal), sizeof(long long)); ptr += sizeof(long long); break; case VT_BYTE: - memcpy(ptr, &((*it).second.m_val.bVal), sizeof(byte)); + std::memcpy(ptr, &((*it).second.m_val.bVal), sizeof(byte)); ptr += sizeof(byte); break; case VT_SHORT: - memcpy(ptr, &((*it).second.m_val.iVal), sizeof(short)); + std::memcpy(ptr, &((*it).second.m_val.iVal), sizeof(short)); ptr += sizeof(short); break; case VT_FLOAT: - memcpy(ptr, &((*it).second.m_val.fltVal), sizeof(float)); + std::memcpy(ptr, &((*it).second.m_val.fltVal), sizeof(float)); ptr += sizeof(float); break; case VT_DOUBLE: - memcpy(ptr, &((*it).second.m_val.dblVal), sizeof(double)); + std::memcpy(ptr, &((*it).second.m_val.dblVal), sizeof(double)); ptr += sizeof(double); break; case VT_CHAR: - memcpy(ptr, &((*it).second.m_val.cVal), sizeof(char)); + std::memcpy(ptr, &((*it).second.m_val.cVal), sizeof(char)); ptr += sizeof(char); break; case VT_USHORT: - memcpy(ptr, &((*it).second.m_val.uiVal), sizeof(unsigned short)); + std::memcpy(ptr, &((*it).second.m_val.uiVal), sizeof(unsigned short)); ptr += sizeof(unsigned short); break; case VT_ULONG: - memcpy(ptr, &((*it).second.m_val.ulVal), sizeof(unsigned long)); + std::memcpy(ptr, &((*it).second.m_val.ulVal), sizeof(unsigned long)); ptr += sizeof(unsigned long); break; case VT_ULONGLONG: - memcpy(ptr, &((*it).second.m_val.ullVal), sizeof(unsigned long long)); + std::memcpy(ptr, &((*it).second.m_val.ullVal), sizeof(unsigned long long)); ptr += sizeof(unsigned long long); break; case VT_INT: - memcpy(ptr, &((*it).second.m_val.intVal), sizeof(int)); + std::memcpy(ptr, &((*it).second.m_val.intVal), sizeof(int)); ptr += sizeof(int); break; case VT_UINT: - memcpy(ptr, &((*it).second.m_val.uintVal), sizeof(unsigned int)); + std::memcpy(ptr, &((*it).second.m_val.uintVal), sizeof(unsigned int)); ptr += sizeof(unsigned int); break; case VT_BOOL: byte bl; bl = (*it).second.m_val.blVal; - memcpy(ptr, &bl, sizeof(byte)); + std::memcpy(ptr, &bl, sizeof(byte)); ptr += sizeof(byte); break; default: @@ -582,18 +583,20 @@ if (lin == 0) { *out = 0; lout = 0; return; } byte *data = 0, *pdata = 0, *pin; -#ifdef _MSC_VER - // MSVC doesn't like non-const array initialisers + + // NOTE- mloskot: + // VLA was used to use here but removed. + // ISO C++ does not defined Variable-Length Arrays and C99 features are + // not part of ISO C++. So, using VLA in C++ source file and compiling + // with C++ compiler is not portable. + // For RAII, std::vector should be used instead of dynamic arrays. byte* cv = new byte[blockSize]; byte* pv = new byte[blockSize]; -#else - byte cv[blockSize], pv[blockSize]; -#endif//_MSC_VER byte rl; unsigned long bufferLength = 2 * lin; pin = in; - memcpy(cv, pin, blockSize); + std::memcpy(cv, pin, blockSize); pv[0] = ~cv[0]; // force next character to be different. assert(pv[0] != cv[0]); data = new byte[bufferLength]; @@ -601,7 +604,7 @@ while (pin < in + lin) { - memcpy(cv, pin, blockSize); + std::memcpy(cv, pin, blockSize); pin += blockSize; assert(pin <= in + lin); @@ -619,14 +622,12 @@ catch(...) { delete[] data; -#ifdef _MSC_VER delete[] cv; delete[] pv; -#endif//_MSC_VER throw; } - memcpy(tmp, data, bufferLength); + std::memcpy(tmp, data, bufferLength); pdata = tmp + (pdata - data); byte* tmp2 = data; data = tmp; @@ -634,12 +635,12 @@ bufferLength *= 2; } - memcpy(pdata, cv, blockSize); + std::memcpy(pdata, cv, blockSize); pdata += blockSize; if (memcmp(cv, pv, blockSize) == 0 && pin < in + lin) { - memcpy(&rl, pin, sizeof(byte)); + std::memcpy(&rl, pin, sizeof(byte)); pin += sizeof(byte); assert(pin <= in + lin); if ( @@ -657,14 +658,12 @@ catch(...) { delete[] data; -#ifdef _MSC_VER delete[] cv; delete[] pv; -#endif//_MSC_VER throw; } - memcpy(tmp, data, bufferLength); + std::memcpy(tmp, data, bufferLength); pdata = tmp + (pdata - data); byte* tmp2 = data; data = tmp; @@ -674,15 +673,15 @@ while (rl > 0) { - memcpy(pdata, cv, blockSize); + std::memcpy(pdata, cv, blockSize); pdata += blockSize; rl--; } - memcpy(cv, pin, blockSize); + std::memcpy(cv, pin, blockSize); pv[0] = ~cv[0]; assert(pv[0] != cv[0]); } - else memcpy(pv, cv, blockSize); + else std::memcpy(pv, cv, blockSize); } lout = pdata - data; @@ -694,19 +693,15 @@ catch(...) { delete[] data; -#ifdef _MSC_VER delete[] cv; delete[] pv; -#endif//_MSC_VER throw; } - memcpy(*out, data, lout); + std::memcpy(*out, data, lout); delete[] data; -#ifdef _MSC_VER delete[] cv; delete[] pv; -#endif//_MSC_VER } #if HAVE_GETTIMEOFDAY Index: qgis/src/core/spatialindex/geometry/LineSegment.cc =================================================================== --- qgis/src/core/spatialindex/geometry/LineSegment.cc (revision 9120) +++ qgis/src/core/spatialindex/geometry/LineSegment.cc (working copy) @@ -172,12 +172,7 @@ void Tools::Geometry::LineSegment::getCenter(Point& out) const { -#ifdef _MSC_VER - // MSVC doesn't like non-const array initialisers double* coords = new double[m_dimension]; -#else - double coords[m_dimension]; -#endif//_MSC_VER for (unsigned long cDim = 0; cDim < m_dimension; cDim++) { @@ -188,9 +183,7 @@ out = Point(coords, m_dimension); -#ifdef _MSC_VER delete[] coords; -#endif//_MSC_VER } unsigned long Tools::Geometry::LineSegment::getDimension() const @@ -200,14 +193,8 @@ void Tools::Geometry::LineSegment::getMBR(Region& out) const { -#ifdef _MSC_VER - // MSVC doesn't like non-const array initialisers double* low = new double[m_dimension]; double* high = new double[m_dimension]; -#else - double low[m_dimension]; - double high[m_dimension]; -#endif//_MSC_VER for (unsigned long cDim = 0; cDim < m_dimension; cDim++) { @@ -217,10 +204,8 @@ out = Region(low, high, m_dimension); -#ifdef _MSC_VER delete[] low; delete[] high; -#endif//_MSC_VER } double Tools::Geometry::LineSegment::getArea() const Index: qgis/src/core/qgis.h =================================================================== --- qgis/src/core/qgis.h (revision 9120) +++ qgis/src/core/qgis.h (working copy) @@ -146,4 +146,8 @@ #endif #endif +#ifndef UNREFERENCED_PARAMETER +# define UNREFERENCED_PARAMETER(param) ((void)param) #endif + +#endif Index: qgis/src/core/qgsprojectfiletransform.cpp =================================================================== --- qgis/src/core/qgsprojectfiletransform.cpp (revision 9120) +++ qgis/src/core/qgsprojectfiletransform.cpp (working copy) @@ -23,6 +23,7 @@ #include #include #include //to find out screen resolution +#include typedef QgsProjectVersion PFV; @@ -42,7 +43,7 @@ if ( ! mDom.isNull() ) { - for (int i = 0; i < sizeof(transformers)/sizeof(transform); i++) + for (std::size_t i = 0; i < sizeof(transformers)/sizeof(transform); i++) { if ( transformers[i].from == mCurrentVersion) { @@ -54,7 +55,7 @@ } } return returnValue; -}; +} void QgsProjectFileTransform::dump() { @@ -176,7 +177,7 @@ } return; -}; +} void QgsProjectFileTransform::transform091to0100() { @@ -235,7 +236,7 @@ } return; -}; +} void QgsProjectFileTransform::transform0100to0110() { Index: qgis/src/core/symbology/qgsmarkercatalogue.cpp =================================================================== --- qgis/src/core/symbology/qgsmarkercatalogue.cpp (revision 9120) +++ qgis/src/core/symbology/qgsmarkercatalogue.cpp (working copy) @@ -264,8 +264,6 @@ } else if (name == "star") { - int oneThird = 2*r/3; - int twoThird = 4*r/3; int oneSixth = 2*r/6; QPolygon pa(10); Index: qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h =================================================================== --- qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h (revision 9120) +++ qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h (working copy) @@ -42,7 +42,7 @@ */ class QgsDelimitedTextProvider : public QgsVectorDataProvider { - Q_OBJECT; + Q_OBJECT public: Index: qgis/src/providers/postgres/qgspostgresprovider.h =================================================================== --- qgis/src/providers/postgres/qgspostgresprovider.h (revision 9120) +++ qgis/src/providers/postgres/qgspostgresprovider.h (working copy) @@ -49,7 +49,7 @@ */ class QgsPostgresProvider : public QgsVectorDataProvider { - Q_OBJECT; + Q_OBJECT public: /** Index: qgis/src/providers/postgres/qgspostgresprovider.cpp =================================================================== --- qgis/src/providers/postgres/qgspostgresprovider.cpp (revision 9120) +++ qgis/src/providers/postgres/qgspostgresprovider.cpp (working copy) @@ -55,10 +55,10 @@ QgsPostgresProvider::QgsPostgresProvider(QString const & uri) : QgsVectorDataProvider(uri), + mFetching(false), geomType(QGis::WKBUnknown), mFeatureQueueSize(200), - gotPostgisVersion(false), - mFetching(false) + gotPostgisVersion(false) { // assume this is a valid layer until we determine otherwise valid = true; Index: qgis/src/providers/ogr/qgsogrprovider.cpp =================================================================== --- qgis/src/providers/ogr/qgsogrprovider.cpp (revision 9120) +++ qgis/src/providers/ogr/qgsogrprovider.cpp (working copy) @@ -471,7 +471,6 @@ bool returnValue = true; OGRFeatureDefnH fdef=OGR_L_GetLayerDefn(ogrLayer); OGRFeatureH feature= OGR_F_Create(fdef); - QGis::WKBTYPE ftype = f.geometry()->wkbType(); unsigned char* wkb = f.geometry()->wkbBuffer(); if( f.geometry()->wkbSize() > 0 ) @@ -1263,18 +1262,18 @@ uniqueValues.clear(); - OGRLayerH l = OGR_DS_ExecuteSQL(ogrDataSource, sql.toAscii(), NULL, "SQL"); - if(l==0) + OGRLayerH lyr = OGR_DS_ExecuteSQL(ogrDataSource, sql.toAscii(), NULL, "SQL"); + if( 0 == lyr ) return; OGRFeatureH f; - while( f=OGR_L_GetNextFeature(l) ) + while( 0 != (f = OGR_L_GetNextFeature(lyr)) ) { uniqueValues.append( mEncoding->toUnicode(OGR_F_GetFieldAsString(f, 0)) ); OGR_F_Destroy(f); } - OGR_DS_ReleaseResultSet(ogrDataSource, l); + OGR_DS_ReleaseResultSet(ogrDataSource, lyr); } Index: qgis/src/providers/memory/memoryprovider.cpp =================================================================== --- qgis/src/providers/memory/memoryprovider.cpp (revision 9120) +++ qgis/src/providers/memory/memoryprovider.cpp (working copy) @@ -28,8 +28,8 @@ QgsMemoryProvider::QgsMemoryProvider(QString uri) : QgsVectorDataProvider(uri), - mSpatialIndex(NULL), - mSelectRectGeom(NULL) + mSelectRectGeom(NULL), + mSpatialIndex(NULL) { if (uri == "Point") mWkbType = QGis::WKBPoint;