Skip to content

Commit 6ebeb97

Browse files
committed
fix warnings
1 parent ffd6508 commit 6ebeb97

File tree

4 files changed

+10
-18
lines changed

4 files changed

+10
-18
lines changed

src/core/raster/qgsrasterinterface.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,7 @@ class CORE_EXPORT QgsRasterInterface
9696
/** Returns source data type for the band specified by number,
9797
* source data type may be shorter than dataType
9898
*/
99-
virtual QGis::DataType srcDataType( int bandNo ) { if ( mInput ) return mInput->srcDataType( bandNo ); else return QGis::UnknownDataType; };
100-
101-
#if 0
102-
{
103-
Q_UNUSED( bandNo );
104-
QgsDebugMsg( "Entered" );
105-
return UnknownDataType;
106-
}
107-
#endif
99+
virtual QGis::DataType srcDataType( int bandNo ) const { if ( mInput ) return mInput->srcDataType( bandNo ); else return QGis::UnknownDataType; };
108100

109101
/**
110102
* Get the extent of the interface.

src/core/symbology-ng/qgsstylev2.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ QStringList QgsStyleV2::symbolsOfGroup( StyleEntity type, int groupid )
505505
{
506506
if ( !mCurrentDB )
507507
{
508-
QgsDebugMsg( "Cannot Open database for getting group symbols of groupid: " + groupid );
508+
QgsDebugMsg( QString( "Cannot Open database for getting group symbols of groupid: %1" ).arg( groupid ) );
509509
return QStringList();
510510
}
511511

@@ -546,7 +546,7 @@ QStringList QgsStyleV2::symbolsWithTag( StyleEntity type, int tagid )
546546
{
547547
if ( !mCurrentDB )
548548
{
549-
QgsDebugMsg( "Cannot open database to get symbols of tagid " + tagid );
549+
QgsDebugMsg( QString( "Cannot open database to get symbols of tagid %1" ).arg( tagid ) );
550550
return QStringList();
551551
}
552552

@@ -1111,7 +1111,7 @@ QStringList QgsStyleV2::symbolsOfSmartgroup( StyleEntity type, int id )
11111111
QString xmlstr = QString::fromUtf8(( const char * ) sqlite3_column_text( ppStmt, 0 ) );
11121112
if ( !doc.setContent( xmlstr ) )
11131113
{
1114-
QgsDebugMsg( "Cannot open smartgroup id: " + id );
1114+
QgsDebugMsg( QString( "Cannot open smartgroup id: %1" ).arg( id ) );
11151115
}
11161116
QDomElement smartEl = doc.documentElement();
11171117
QString op = smartEl.attribute( "operator" );
@@ -1226,7 +1226,7 @@ QgsSmartConditionMap QgsStyleV2::smartgroup( int id )
12261226
QString xmlstr = QString::fromUtf8(( const char * ) sqlite3_column_text( ppStmt, 0 ) );
12271227
if ( !doc.setContent( xmlstr ) )
12281228
{
1229-
QgsDebugMsg( "Cannot open smartgroup id: " + id );
1229+
QgsDebugMsg( QString( "Cannot open smartgroup id: %1" ).arg( id ) );
12301230
}
12311231

12321232
QDomElement smartEl = doc.documentElement();
@@ -1268,7 +1268,7 @@ QString QgsStyleV2::smartgroupOperator( int id )
12681268
QString xmlstr = QString::fromUtf8(( const char * ) sqlite3_column_text( ppStmt, 0 ) );
12691269
if ( !doc.setContent( xmlstr ) )
12701270
{
1271-
QgsDebugMsg( "Cannot open smartgroup id: " + id );
1271+
QgsDebugMsg( QString( "Cannot open smartgroup id: %1" ).arg( id ) );
12721272
}
12731273
QDomElement smartEl = doc.documentElement();
12741274
op = smartEl.attribute( "operator" );

src/plugins/grass/qgsgrassmodule.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,12 +2246,12 @@ QgsGrassModuleOption::QgsGrassModuleOption( QgsGrassModule *module, QString key,
22462246
else
22472247
{
22482248
QgsDebugMsg( "\n\n\n\n**************************" );
2249-
QgsDebugMsg( "isOutput = " + isOutput() );
2250-
QgsDebugMsg( "mOutputType = " + mOutputType );
2249+
QgsDebugMsg( QString( "isOutput = %1" ).arg( isOutput() ) );
2250+
QgsDebugMsg( QString( "mOutputType = %1" ).arg( mOutputType ) );
22512251
if ( isOutput() && mOutputType == Raster )
22522252
mUsesRegion = true;
22532253
}
2254-
QgsDebugMsg( "mUsesRegion = " + mUsesRegion );
2254+
QgsDebugMsg( QString( "mUsesRegion = %1" ).arg( mUsesRegion ) );
22552255
}
22562256

22572257
void QgsGrassModuleOption::addLineEdit()

src/providers/grass/qgsgrass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ QString GRASS_LIB_EXPORT QgsGrass::getInfo( QString info, QString gisdbase, QStr
12681268
opt = "vect";
12691269
break;
12701270
default:
1271-
QgsDebugMsg( "unexpected type:" + type );
1271+
QgsDebugMsg( QString( "unexpected type:%1" ).arg( type ) );
12721272
return "";
12731273
}
12741274
arguments.append( opt + "=" + map + "@" + mapset );

0 commit comments

Comments
 (0)