Skip to content

Commit 33682f2

Browse files
committed
fix warnings
1 parent dcef083 commit 33682f2

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

src/core/raster/qgsrasterlayer.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -919,12 +919,12 @@ bool QgsRasterLayer::hasStatistics( int theBandNo )
919919
}
920920
#endif
921921

922+
#if 0
922923
/**
923924
* @param thePoint the QgsPoint for which to obtain pixel values
924925
* @param theResults QMap to hold the pixel values at thePoint for each layer in the raster file
925926
* @return False if WMS layer and true otherwise
926927
*/
927-
#if 0
928928
bool QgsRasterLayer::identify( const QgsPoint& thePoint, QMap<QString, QString>& theResults )
929929
{
930930
theResults.clear();
@@ -1019,10 +1019,6 @@ QString QgsRasterLayer::identifyAsHtml( const QgsPoint& thePoint )
10191019
}
10201020
#endif
10211021

1022-
/**
1023-
* @note Note implemented yet
1024-
* @return Always returns false
1025-
*/
10261022
bool QgsRasterLayer::isEditable() const
10271023
{
10281024
return false;

src/core/symbology-ng/qgscptcityarchive.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,8 +860,10 @@ QgsCptCityDirectoryItem::QgsCptCityDirectoryItem( QgsCptCityDataItem* parent,
860860
mType = Directory;
861861
mValid = QDir( QgsCptCityArchive::defaultBaseDir() ).exists();
862862
if ( ! mValid )
863+
{
863864
QgsDebugMsg( "created invalid dir item, path = " + QgsCptCityArchive::defaultBaseDir()
864865
+ QDir::separator() + mPath );
866+
}
865867

866868
// parse DESC.xml to get mInfo
867869
mInfo = "";

src/core/symbology-ng/qgsstylev2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ bool QgsStyleV2::detagSymbol( StyleEntity type, QString symbol, QStringList tags
881881
sqlite3_stmt *ppStmt;
882882
int nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
883883

884-
int symbolid;
884+
int symbolid = 0;
885885
if ( nErr == SQLITE_OK && sqlite3_step( ppStmt ) == SQLITE_ROW )
886886
{
887887
symbolid = sqlite3_column_int( ppStmt, 0 );

src/gui/qgserrordialog.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ class GUI_EXPORT QgsErrorDialog: public QDialog, private Ui::QgsErrorDialogBase
3232

3333
/** Show dialog with error
3434
* @param theError error
35+
* @param theTitle title
36+
* @param parent parent object
37+
* @param fl widget flags
3538
*/
3639
static void show( const QgsError & theError, const QString & theTitle, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
3740

src/mapserver/qgsfilter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ QgsFilter* QgsFilter::createFilterFromXml( const QDomElement& filterElem, QgsVec
9696
// if the filter is spatial
9797
if ( filterName == "BBOX" || filterName == "CONTAINS" || filterName == "CROSSES" || filterName == "DISJOINT" || filterName == "EQUALS" || filterName == "INTERSECTS" || filterName == "OVERLAPS" || filterName == "TOUCHES" || filterName == "WITHIN" )
9898
{
99-
QgsGeometry* geom;
99+
QgsGeometry *geom = 0;
100100

101101
QDomNodeList bNodes = filterElem.elementsByTagName( "Box" );
102102
if ( bNodes.size() > 0 )

src/mapserver/qgswmsserver.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,6 +1445,7 @@ void QgsWMSServer::drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p,
14451445
double layerTitleSpace, double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight, double fontOversamplingFactor,
14461446
double dpi ) const
14471447
{
1448+
Q_UNUSED( layerSpace );
14481449
if ( !item )
14491450
{
14501451
return;

src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2476,7 +2476,7 @@ bool QgsPostgresProvider::changeGeometryValues( QgsGeometryMap & geometry_map )
24762476
QgsDebugMsg( "iterating over feature id " + FID_TO_STRING( iter.key() ) );
24772477

24782478
// Save the id of the current topogeometry
2479-
long old_tg_id;
2479+
long old_tg_id = -1;
24802480
if ( mSpatialColType == sctTopoGeometry )
24812481
{
24822482
QStringList params;

0 commit comments

Comments
 (0)