Skip to content
Permalink
Browse files

Fix inadequate usage of nullptr

  • Loading branch information
m-kuhn committed Jul 22, 2016
1 parent 578962f commit 4d9f3ff806d123d71395a055e7deb5096d17d86c
Showing with 104 additions and 104 deletions.
  1. +2 −2 src/app/composer/qgsattributeselectiondialog.h
  2. +1 −1 src/app/composer/qgscomposerimageexportoptionsdialog.h
  3. +1 −1 src/app/composer/qgscomposermanager.h
  4. +1 −1 src/app/composer/qgscomposertablebackgroundcolorsdialog.h
  5. +1 −1 src/app/gps/qgsgpsinformationwidget.h
  6. +1 −1 src/app/ogr/qgsopenvectorlayerdialog.h
  7. +2 −2 src/app/ogr/qgsvectorlayersaveasdialog.h
  8. +2 −2 src/app/qgisapp.cpp
  9. +1 −1 src/app/qgsannotationwidget.h
  10. +1 −1 src/app/qgsattributetabledialog.cpp
  11. +1 −1 src/app/qgsattributetabledialog.h
  12. +1 −1 src/app/qgscustomprojectiondialog.h
  13. +1 −1 src/app/qgsdisplayangle.h
  14. +2 −2 src/app/qgsdxfexportdialog.cpp
  15. +1 −1 src/app/qgsdxfexportdialog.h
  16. +1 −1 src/app/qgsformannotationdialog.h
  17. +1 −1 src/app/qgshtmlannotationdialog.h
  18. +1 −1 src/app/qgsidentifyresultsdialog.h
  19. +1 −1 src/app/qgsjoindialog.h
  20. +1 −1 src/app/qgslabelpropertydialog.h
  21. +1 −1 src/app/qgsmeasuredialog.h
  22. +1 −1 src/app/qgsmergeattributesdialog.h
  23. +1 −1 src/app/qgsoptions.cpp
  24. +1 −1 src/app/qgsprojectlayergroupdialog.h
  25. +1 −1 src/app/qgsrastercalcdialog.h
  26. +1 −1 src/app/qgsselectbyformdialog.h
  27. +1 −1 src/app/qgssnappingdialog.h
  28. +1 −1 src/app/qgsstatisticalsummarydockwidget.cpp
  29. +1 −1 src/app/qgssvgannotationdialog.h
  30. +1 −1 src/app/qgstextannotationdialog.h
  31. +1 −1 src/browser/qgsbrowser.h
  32. +1 −1 src/core/qgis.h
  33. +1 −1 src/core/qgsdiagramrendererv2.cpp
  34. +1 −1 src/core/qgslabelingenginev2.cpp
  35. +1 −1 src/core/qgspaintenginehack.cpp
  36. +3 −3 src/core/qgsvectorlayer.cpp
  37. +2 −2 src/gui/editorwidgets/qgsphotowidgetfactory.cpp
  38. +2 −2 src/gui/editorwidgets/qgswebviewwidgetfactory.cpp
  39. +1 −1 src/gui/effects/qgseffectstackpropertieswidget.h
  40. +1 −1 src/gui/layertree/qgslayertreemapcanvasbridge.cpp
  41. +1 −1 src/gui/qgisgui.h
  42. +1 −1 src/gui/qgsadvanceddigitizingdockwidget.cpp
  43. +1 −1 src/gui/qgscolorbutton.cpp
  44. +1 −1 src/gui/qgscolorbutton.h
  45. +1 −1 src/gui/qgscolorbuttonv2.cpp
  46. +2 −2 src/gui/qgscolordialog.cpp
  47. +1 −1 src/gui/qgscolordialog.h
  48. +1 −1 src/gui/qgscomposerview.h
  49. +1 −1 src/gui/qgsdatumtransformdialog.h
  50. +1 −1 src/gui/qgsmaplayermodel.cpp
  51. +1 −1 src/gui/qgsoptionsdialogbase.h
  52. +3 −3 src/gui/qgsprojectionselector.cpp
  53. +1 −1 src/gui/qgsprojectionselector.h
  54. +1 −1 src/gui/qgsrasterlayersaveasdialog.h
  55. +1 −1 src/gui/qgssublayersdialog.h
  56. +1 −1 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
  57. +1 −1 src/gui/symbology-ng/qgsdashspacedialog.h
  58. +2 −2 src/gui/symbology-ng/qgssizescalewidget.cpp
  59. +1 −1 src/helpviewer/qgshelpviewer.h
  60. +1 −1 src/plugins/coordinate_capture/coordinatecapturegui.h
  61. +1 −1 src/plugins/dxf2shp_converter/dxf2shpconvertergui.h
  62. +1 −1 src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h
  63. +1 −1 src/plugins/evis/eventbrowser/evisimagedisplaywidget.h
  64. +1 −1 src/plugins/evis/idtool/eviseventidtool.cpp
  65. +2 −2 src/plugins/georeferencer/qgsgeorefplugingui.h
  66. +1 −1 src/plugins/offline_editing/offline_editing_plugin_gui.h
  67. +1 −1 src/plugins/offline_editing/offline_editing_progress_dialog.h
  68. +1 −1 src/plugins/oracle_raster/qgsselectgeoraster_ui.h
  69. +1 −1 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.h
  70. +1 −1 src/plugins/roadgraph/exportdlg.h
  71. +1 −1 src/plugins/roadgraph/settingsdlg.h
  72. +1 −1 src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
  73. +1 −1 src/providers/gdal/qgsgdalprovider.cpp
  74. +1 −1 src/providers/gdal/qgsgdalprovider.h
  75. +1 −1 src/providers/mssql/qgsmssqldataitems.cpp
  76. +1 −1 src/providers/ows/qgsowsprovider.cpp
  77. +1 −1 src/providers/ows/qgsowsprovider.h
  78. +1 −1 src/providers/postgres/qgspostgresdataitems.cpp
  79. +2 −2 src/providers/spatialite/qgsspatialitedataitems.cpp
  80. +2 −2 src/providers/wcs/qgswcsdataitems.cpp
  81. +1 −1 src/providers/wcs/qgswcsprovider.cpp
  82. +1 −1 src/providers/wcs/qgswcsprovider.h
  83. +1 −1 src/providers/wfs/qgswfsdataitems.cpp
  84. +1 −1 src/providers/wms/qgstilescalewidget.h
  85. +1 −1 src/providers/wms/qgswmsdataitems.cpp
  86. +1 −1 src/providers/wms/qgswmsprovider.cpp
  87. +1 −1 src/providers/wms/qgswmsprovider.h
  88. +1 −1 src/providers/wms/qgswmtsdimensions.h
  89. +1 −1 src/python/qgspythonutilsimpl.cpp
@@ -114,10 +114,10 @@ class QgsAttributeSelectionDialog: public QDialog, private Ui::QgsAttributeSelec
{
Q_OBJECT
public:
QgsAttributeSelectionDialog( QgsComposerAttributeTableV2* table, QgsVectorLayer* vLayer, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsAttributeSelectionDialog( QgsComposerAttributeTableV2* table, QgsVectorLayer* vLayer, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );

//todo - remove for QGIS 3.0
QgsAttributeSelectionDialog( QgsComposerAttributeTable* table, QgsVectorLayer* vLayer, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsAttributeSelectionDialog( QgsComposerAttributeTable* table, QgsVectorLayer* vLayer, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );


~QgsAttributeSelectionDialog();
@@ -35,7 +35,7 @@ class QgsComposerImageExportOptionsDialog: public QDialog, private Ui::QgsCompos
* @param parent parent widget
* @param flags window flags
*/
QgsComposerImageExportOptionsDialog( QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr );
QgsComposerImageExportOptionsDialog( QWidget* parent = nullptr, Qt::WindowFlags flags = 0 );

~QgsComposerImageExportOptionsDialog();

@@ -49,7 +49,7 @@ class QgsComposerManager: public QDialog, private Ui::QgsComposerManagerBase
{
Q_OBJECT
public:
QgsComposerManager( QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsComposerManager( QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsComposerManager();

void addTemplates( const QMap<QString, QString>& templates );
@@ -38,7 +38,7 @@ class QgsComposerTableBackgroundColorsDialog: public QDialog, private Ui::QgsCom
* @param parent parent widget
* @param flags window flags
*/
QgsComposerTableBackgroundColorsDialog( QgsComposerTableV2* table, QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr );
QgsComposerTableBackgroundColorsDialog( QgsComposerTableV2* table, QWidget* parent = nullptr, Qt::WindowFlags flags = 0 );

~QgsComposerTableBackgroundColorsDialog();

@@ -44,7 +44,7 @@ class QgsGPSInformationWidget: public QWidget, private Ui::QgsGPSInformationWidg
{
Q_OBJECT
public:
QgsGPSInformationWidget( QgsMapCanvas * thepCanvas, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsGPSInformationWidget( QgsMapCanvas * thepCanvas, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsGPSInformationWidget();

private slots:
@@ -32,7 +32,7 @@ class QgsOpenVectorLayerDialog : public QDialog, private Ui::QgsOpenVectorLayerD
Q_OBJECT

public:
QgsOpenVectorLayerDialog( QWidget* parent = nullptr, Qt::WindowFlags fl = nullptr );
QgsOpenVectorLayerDialog( QWidget* parent = nullptr, Qt::WindowFlags fl = 0 );
~QgsOpenVectorLayerDialog();
//! Opens a dialog to select a file datasource*/
QStringList openFile();
@@ -41,8 +41,8 @@ class APP_EXPORT QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVec
AllOptions = ~0
};

QgsVectorLayerSaveAsDialog( long srsid, QWidget* parent = nullptr, Qt::WindowFlags fl = nullptr );
QgsVectorLayerSaveAsDialog( QgsVectorLayer *layer, int options = AllOptions, QWidget* parent = nullptr, Qt::WindowFlags fl = nullptr );
QgsVectorLayerSaveAsDialog( long srsid, QWidget* parent = nullptr, Qt::WindowFlags fl = 0 );
QgsVectorLayerSaveAsDialog( QgsVectorLayer *layer, int options = AllOptions, QWidget* parent = nullptr, Qt::WindowFlags fl = 0 );
~QgsVectorLayerSaveAsDialog();

QString format() const;
@@ -1094,7 +1094,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
} // QgisApp ctor

QgisApp::QgisApp()
: QMainWindow( nullptr, nullptr )
: QMainWindow( nullptr, 0 )
, mProfiler( nullptr )
, mStyleSheetBuilder( nullptr )
, mActionPluginSeparator1( nullptr )
@@ -5955,7 +5955,7 @@ void QgisApp::saveAsRasterFile()
fileWriter.setMaxTileHeight( d.maximumTileSizeY() );
}

QProgressDialog pd( nullptr, tr( "Abort..." ), 0, 0 );
QProgressDialog pd( QString(), tr( "Abort..." ), 0, 0 );
// Show the dialo immediately because cloning pipe can take some time (WCS)
pd.setLabelText( tr( "Reading raster" ) );
pd.setWindowTitle( tr( "Saving raster" ) );
@@ -29,7 +29,7 @@ class APP_EXPORT QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationW
{
Q_OBJECT
public:
QgsAnnotationWidget( QgsAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsAnnotationWidget( QgsAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsAnnotationWidget();

void apply();
@@ -510,7 +510,7 @@ void QgsAttributeTableDialog::replaceSearchWidget( QWidget* oldw, QWidget* neww
{
mFilterLayout->removeWidget( oldw );
oldw->setVisible( false );
mFilterLayout->addWidget( neww, 0, 0, nullptr );
mFilterLayout->addWidget( neww, 0, 0, 0 );
neww->setVisible( true );
}

@@ -230,7 +230,7 @@ class QgsAttributeTableDock : public QgsDockWidget
Q_OBJECT

public:
QgsAttributeTableDock( const QString & title, QWidget * parent = nullptr, Qt::WindowFlags flags = nullptr );
QgsAttributeTableDock( const QString & title, QWidget * parent = nullptr, Qt::WindowFlags flags = 0 );

virtual void closeEvent( QCloseEvent * ev ) override;
};
@@ -33,7 +33,7 @@ class APP_EXPORT QgsCustomProjectionDialog : public QDialog, private Ui::QgsCust
{
Q_OBJECT
public:
QgsCustomProjectionDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = nullptr );
QgsCustomProjectionDialog( QWidget *parent = nullptr, Qt::WindowFlags fl = 0 );
~QgsCustomProjectionDialog();

public slots:
@@ -26,7 +26,7 @@ class APP_EXPORT QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBas
Q_OBJECT

public:
QgsDisplayAngle( QgsMapToolMeasureAngle * tool = nullptr, Qt::WindowFlags f = nullptr );
QgsDisplayAngle( QgsMapToolMeasureAngle * tool = nullptr, Qt::WindowFlags f = 0 );
~QgsDisplayAngle();
/** Sets the measured angle value (in radians). The value is going to
be converted to degrees / gon automatically if necessary*/
@@ -427,8 +427,8 @@ QgsDxfExportDialog::QgsDxfExportDialog( QWidget *parent, Qt::WindowFlags f )
mTreeView->setEditTriggers( QAbstractItemView::AllEditTriggers );
mTreeView->setItemDelegate( mFieldSelectorDelegate );

QgsLayerTreeModel *model = new QgsVectorLayerAndAttributeModel( mLayerTreeGroup, this );
model->setFlags( nullptr );
QgsLayerTreeModel* model = new QgsVectorLayerAndAttributeModel( mLayerTreeGroup, this );
model->setFlags( 0 );
mTreeView->setModel( model );
mTreeView->resizeColumnToContents( 0 );
mTreeView->header()->show();
@@ -77,7 +77,7 @@ class QgsDxfExportDialog : public QDialog, private Ui::QgsDxfExportDialogBase
{
Q_OBJECT
public:
QgsDxfExportDialog( QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsDxfExportDialog( QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsDxfExportDialog();

QList< QPair<QgsVectorLayer *, int> > layers() const;
@@ -24,7 +24,7 @@ class APP_EXPORT QgsFormAnnotationDialog: public QDialog, private Ui::QgsFormAnn
{
Q_OBJECT
public:
QgsFormAnnotationDialog( QgsFormAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsFormAnnotationDialog( QgsFormAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsFormAnnotationDialog();

private:
@@ -24,7 +24,7 @@ class APP_EXPORT QgsHtmlAnnotationDialog: public QDialog, private Ui::QgsFormAnn
{
Q_OBJECT
public:
QgsHtmlAnnotationDialog( QgsHtmlAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsHtmlAnnotationDialog( QgsHtmlAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsHtmlAnnotationDialog();

private:
@@ -117,7 +117,7 @@ class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdenti

//! Constructor - takes it own copy of the QgsAttributeAction so
// that it is independent of whoever created it.
QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr );
QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidget *parent = nullptr, Qt::WindowFlags f = 0 );

~QgsIdentifyResultsDialog();

@@ -27,7 +27,7 @@ class APP_EXPORT QgsJoinDialog: public QDialog, private Ui::QgsJoinDialogBase
{
Q_OBJECT
public:
QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer*> alreadyJoinedLayers, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer*> alreadyJoinedLayers, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsJoinDialog();

/** Configure the dialog for an existing join */
@@ -29,7 +29,7 @@ class APP_EXPORT QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPro
{
Q_OBJECT
public:
QgsLabelPropertyDialog( const QString& layerId, const QString& providerId, int featureId, const QFont& labelFont, const QString& labelText, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsLabelPropertyDialog( const QString& layerId, const QString& providerId, int featureId, const QFont& labelFont, const QString& labelText, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsLabelPropertyDialog();

/** Returns properties changed by the user*/
@@ -33,7 +33,7 @@ class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
public:

//! Constructor
QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f = nullptr );
QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f = 0 );

//! Save position
void saveWindowLocation();
@@ -42,7 +42,7 @@ class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeA
};


QgsMergeAttributesDialog( const QgsFeatureList& features, QgsVectorLayer* vl, QgsMapCanvas* canvas, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsMergeAttributesDialog( const QgsFeatureList& features, QgsVectorLayer* vl, QgsMapCanvas* canvas, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsMergeAttributesDialog();

QgsAttributes mergedAttributes() const;
@@ -1571,7 +1571,7 @@ void QgsOptions::editGdalDriver( const QString& driverName )
if ( driverName.isEmpty() )
return;

QgsDialog dlg( this, nullptr, QDialogButtonBox::Ok | QDialogButtonBox::Cancel );
QgsDialog dlg( this, 0, QDialogButtonBox::Ok | QDialogButtonBox::Cancel );
QVBoxLayout *layout = dlg.layout();
QString title = tr( "Create Options - %1 Driver" ).arg( driverName );
if ( driverName == "_pyramids" )
@@ -28,7 +28,7 @@ class APP_EXPORT QgsProjectLayerGroupDialog: public QDialog, private Ui::QgsProj
Q_OBJECT
public:
/** Constructor. If a project file is given, the groups/layers are displayed directly and the file selection hidden*/
QgsProjectLayerGroupDialog( QWidget * parent = nullptr, const QString& projectFile = QString(), Qt::WindowFlags f = nullptr );
QgsProjectLayerGroupDialog( QWidget * parent = nullptr, const QString& projectFile = QString(), Qt::WindowFlags f = 0 );
~QgsProjectLayerGroupDialog();

QStringList selectedGroups() const;
@@ -26,7 +26,7 @@ class APP_EXPORT QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcD
{
Q_OBJECT
public:
QgsRasterCalcDialog( QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsRasterCalcDialog( QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsRasterCalcDialog();

QString formulaString() const;
@@ -43,7 +43,7 @@ class APP_EXPORT QgsSelectByFormDialog : public QDialog
*/
QgsSelectByFormDialog( QgsVectorLayer* layer,
const QgsAttributeEditorContext& context = QgsAttributeEditorContext(),
QWidget* parent = nullptr, Qt::WindowFlags fl = nullptr );
QWidget* parent = nullptr, Qt::WindowFlags fl = 0 );

~QgsSelectByFormDialog();

@@ -107,7 +107,7 @@ class QgsSnappingDock : public QgsDockWidget
Q_OBJECT

public:
QgsSnappingDock( const QString & title, QWidget * parent = nullptr, Qt::WindowFlags flags = nullptr );
QgsSnappingDock( const QString & title, QWidget * parent = nullptr, Qt::WindowFlags flags = 0 );

virtual void closeEvent( QCloseEvent *e ) override;

@@ -183,7 +183,7 @@ void QgsStatisticalSummaryDockWidget::updateNumericStatistics( bool selectedOnly
}

QList< QgsStatisticalSummary::Statistic > statsToDisplay;
QgsStatisticalSummary::Statistics statsToCalc = nullptr;
QgsStatisticalSummary::Statistics statsToCalc = 0;
Q_FOREACH ( QgsStatisticalSummary::Statistic stat, mDisplayStats )
{
if ( mStatsActions.value( stat )->isChecked() )
@@ -27,7 +27,7 @@ class APP_EXPORT QgsSvgAnnotationDialog: public QDialog, private Ui::QgsFormAnno
{
Q_OBJECT
public:
QgsSvgAnnotationDialog( QgsSvgAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsSvgAnnotationDialog( QgsSvgAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsSvgAnnotationDialog();

private slots:
@@ -27,7 +27,7 @@ class APP_EXPORT QgsTextAnnotationDialog: public QDialog, private Ui::QgsTextAnn
{
Q_OBJECT
public:
QgsTextAnnotationDialog( QgsTextAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
QgsTextAnnotationDialog( QgsTextAnnotationItem* item, QWidget * parent = nullptr, Qt::WindowFlags f = 0 );
~QgsTextAnnotationDialog();

private:
@@ -30,7 +30,7 @@ class QgsBrowser : public QMainWindow, private Ui::QgsBrowserBase
{
Q_OBJECT
public:
QgsBrowser( QWidget *parent = nullptr, const Qt::WindowFlags& flags = nullptr );
QgsBrowser( QWidget *parent = nullptr, const Qt::WindowFlags& flags = 0 );
~QgsBrowser();

// Expand to given path
@@ -528,7 +528,7 @@ typedef unsigned long long qgssize;
#endif

#if defined(__clang__)
#define FALLTHROUGH [[clang::fallthrough]]
#define FALLTHROUGH //[[clang::fallthrough]]
#else
#define FALLTHROUGH
#endif
@@ -738,7 +738,7 @@ QList< QgsLayerTreeModelLegendNode* > QgsLinearlyInterpolatedDiagramRenderer::le
Q_FOREACH ( double v, QgsSymbolLayerV2Utils::prettyBreaks( mInterpolationSettings.lowerValue, mInterpolationSettings.upperValue, 4 ) )
{
double size = mDiagram->legendSize( v, mSettings, mInterpolationSettings );
QgsLegendSymbolItemV2 si( mSizeLegendSymbol.data(), QString::number( v ), nullptr );
QgsLegendSymbolItemV2 si( mSizeLegendSymbol.data(), QString::number( v ), QString() );
QgsMarkerSymbolV2 * s = static_cast<QgsMarkerSymbolV2 *>( si.symbol() );
s->setSize( size );
s->setSizeUnit( mSettings.sizeType );
@@ -350,7 +350,7 @@ void QgsLabelingEngineV2::readSettingsFromProject()
mCandLine = prj->readNumEntry( "PAL", "/CandidatesLine", 8, &saved );
mCandPolygon = prj->readNumEntry( "PAL", "/CandidatesPolygon", 8, &saved );

mFlags = nullptr;
mFlags = 0;
if ( prj->readBoolEntry( "PAL", "/ShowingCandidates", false, &saved ) ) mFlags |= DrawCandidates;
if ( prj->readBoolEntry( "PAL", "/DrawRectOnly", false, &saved ) ) mFlags |= DrawLabelRectOnly;
if ( prj->readBoolEntry( "PAL", "/ShowingShadowRects", false, &saved ) ) mFlags |= DrawShadowRects;
@@ -20,7 +20,7 @@
// Hack to workaround Qt #5114 by disabling PatternTransform
void QgsPaintEngineHack::fixFlags()
{
gccaps = nullptr;
gccaps = 0;
gccaps |= ( QPaintEngine::PrimitiveTransform
// | QPaintEngine::PatternTransform
| QPaintEngine::PixmapTransform
@@ -199,7 +199,7 @@ QString QgsVectorLayer::storageType() const
{
return mDataProvider->storageType();
}
return nullptr;
return QString();
}


@@ -209,7 +209,7 @@ QString QgsVectorLayer::capabilitiesString() const
{
return mDataProvider->capabilitiesString();
}
return nullptr;
return QString();
}

QString QgsVectorLayer::dataComment() const
@@ -992,7 +992,7 @@ QString QgsVectorLayer::subsetString() const
if ( !mValid || !mDataProvider )
{
QgsDebugMsg( "invoked with invalid layer or null mDataProvider" );
return nullptr;
return QString();
}
return mDataProvider->subsetString();
}
@@ -41,8 +41,8 @@ QgsEditorWidgetConfig QgsPhotoWidgetFactory::readConfig( const QDomElement& conf

QgsEditorWidgetConfig cfg;

cfg.insert( "Height", configElement.attribute( "Height", nullptr ).toInt() );
cfg.insert( "Width", configElement.attribute( "Width", nullptr ).toInt() );
cfg.insert( "Height", configElement.attribute( "Height", 0 ).toInt() );
cfg.insert( "Width", configElement.attribute( "Width", 0 ).toInt() );

return cfg;
}
@@ -41,8 +41,8 @@ QgsEditorWidgetConfig QgsWebViewWidgetFactory::readConfig( const QDomElement& co

QgsEditorWidgetConfig cfg;

cfg.insert( "Height", configElement.attribute( "Height", nullptr ).toInt() );
cfg.insert( "Width", configElement.attribute( "Width", nullptr ).toInt() );
cfg.insert( "Height", configElement.attribute( "Height", 0 ).toInt() );
cfg.insert( "Width", configElement.attribute( "Width", 0 ).toInt() );

return cfg;
}
@@ -155,7 +155,7 @@ class GUI_EXPORT QgsEffectStackPropertiesDialog: public QgsDialog
* @param parent parent widget
* @param f window flags
*/
QgsEffectStackPropertiesDialog( QgsEffectStack* stack, QWidget* parent = nullptr, const Qt::WindowFlags& f = nullptr );
QgsEffectStackPropertiesDialog( QgsEffectStack* stack, QWidget* parent = nullptr, const Qt::WindowFlags& f = 0 );
~QgsEffectStackPropertiesDialog();

/** Returns effect stack attached to the dialog
@@ -223,7 +223,7 @@ void QgsLayerTreeMapCanvasBridge::readProject( const QDomDocument& doc )
itemElem = itemElem.nextSiblingElement( "item" );
}

setHasCustomLayerOrder( customOrderElem.attribute( "enabled", nullptr ).toInt() );
setHasCustomLayerOrder( customOrderElem.attribute( "enabled", QString() ).toInt() );
setCustomLayerOrder( order );
}
}

0 comments on commit 4d9f3ff

Please sign in to comment.
You can’t perform that action at this time.