Skip to content

Commit 17db101

Browse files
committed
Fix Coverity uninitialized variable warnings
1 parent ffaffad commit 17db101

File tree

7 files changed

+23
-9
lines changed

7 files changed

+23
-9
lines changed

src/core/qgsattributeeditorelement.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,10 @@ class CORE_EXPORT QgsAttributeEditorRelation : public QgsAttributeEditorElement
313313
QgsAttributeEditorRelation( const QString& name, const QgsRelation& relation, QgsAttributeEditorElement* parent )
314314
: QgsAttributeEditorElement( AeTypeRelation, name, parent )
315315
, mRelationId( relation.id() )
316-
, mRelation( relation ) {}
316+
, mRelation( relation )
317+
, mShowLinkButton( true )
318+
, mShowUnlinkButton( true )
319+
{}
317320

318321
//! Destructor
319322
virtual ~QgsAttributeEditorRelation() {}

src/gui/qgsunitselectionwidget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ QgsMapUnitScale QgsMapUnitScaleWidget::mapUnitScale() const
125125

126126
QgsUnitSelectionWidget::QgsUnitSelectionWidget( QWidget *parent )
127127
: QWidget( parent )
128+
, mCanvas( nullptr )
128129
{
129130
mMapUnitIdx = -1;
130131

src/plugins/grass/qgsgrassregion.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ QgsGrassRegion::QgsGrassRegion( QgisInterface *iface,
200200
, mRegionEdit( 0 )
201201
{
202202
QgsDebugMsg( "QgsGrassRegion()" );
203+
QgsGrass::initRegion( &mWindow );
203204

204205
setupUi( this );
205206
setAttribute( Qt::WA_DeleteOnClose );

src/providers/grass/qgsgrass.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,14 +1686,14 @@ bool QgsGrass::writeRegion( const QString& gisbase,
16861686
const QString& location, const QString& mapset,
16871687
const struct Cell_head *window )
16881688
{
1689-
QgsDebugMsg( QString( "n = %1 s = %2" ).arg( window->north ).arg( window->south ) );
1690-
QgsDebugMsg( QString( "e = %1 w = %2" ).arg( window->east ).arg( window->west ) );
1691-
16921689
if ( !window )
16931690
{
16941691
return false;
16951692
}
16961693

1694+
QgsDebugMsg( QString( "n = %1 s = %2" ).arg( window->north ).arg( window->south ) );
1695+
QgsDebugMsg( QString( "e = %1 w = %2" ).arg( window->east ).arg( window->west ) );
1696+
16971697
QgsGrass::setMapset( gisbase, location, mapset );
16981698

16991699
if ( G_put_window( window ) == -1 )

src/providers/oracle/ocispatial/wkbptr.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ enum SDO_GTYPE_TT
5252
class QOCISpatialGeometry : public QSharedData
5353
{
5454
public:
55+
QOCISpatialGeometry()
56+
: isNull( true )
57+
, gtype( -1 )
58+
, srid( -1 )
59+
, x( 0.0 )
60+
, y( 0.0 )
61+
, z( 0.0 )
62+
{}
63+
5564
bool isNull;
5665
int gtype;
5766
int srid;

src/providers/wms/qgswmsprovider.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,7 @@ void QgsWmsProvider::setupXyzCapabilities( const QString &uri )
12181218
tm.tileWidth = tm.tileHeight = 256;
12191219
tm.matrixWidth = tm.matrixHeight = 1 << zoom;
12201220
tm.tres = xspan / ( tm.tileWidth * tm.matrixWidth );
1221+
tm.scaleDenom = 0.0;
12211222

12221223
mCaps.mTileMatrixSets[tms.identifier].tileMatrices[tm.tres] = tm;
12231224
}
@@ -3518,6 +3519,7 @@ QGISEXTERN bool isProvider()
35183519

35193520
QgsWmsImageDownloadHandler::QgsWmsImageDownloadHandler( const QString& providerUri, const QUrl& url, const QgsWmsAuthorization& auth, QImage* image, QgsRasterBlockFeedback* feedback )
35203521
: mProviderUri( providerUri )
3522+
, mCacheReply( nullptr )
35213523
, mCachedImage( image )
35223524
, mEventLoop( new QEventLoop )
35233525
, mFeedback( feedback )

src/server/qgsserverlogger.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ QgsServerLogger* QgsServerLogger::instance()
3434
return mInstance;
3535
}
3636

37-
QgsServerLogger::QgsServerLogger(): mLogFile( nullptr )
37+
QgsServerLogger::QgsServerLogger()
38+
: mLogFile( nullptr )
39+
, mLogLevel( 3 )
3840
{
3941
//logfile
4042
QString filePath = getenv( "QGIS_SERVER_LOG_FILE" );
@@ -53,10 +55,6 @@ QgsServerLogger::QgsServerLogger(): mLogFile( nullptr )
5355
{
5456
mLogLevel = atoi( logLevelChar );
5557
}
56-
else
57-
{
58-
mLogLevel = 3;
59-
}
6058

6159
connect( QgsMessageLog::instance(), SIGNAL( messageReceived( QString, QString, QgsMessageLog::MessageLevel ) ), this,
6260
SLOT( logMessage( QString, QString, QgsMessageLog::MessageLevel ) ) );

0 commit comments

Comments
 (0)