Skip to content

Commit

Permalink
fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Dec 18, 2012
1 parent ffd6508 commit 6ebeb97
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 18 deletions.
10 changes: 1 addition & 9 deletions src/core/raster/qgsrasterinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,7 @@ class CORE_EXPORT QgsRasterInterface
/** Returns source data type for the band specified by number,
* source data type may be shorter than dataType
*/
virtual QGis::DataType srcDataType( int bandNo ) { if ( mInput ) return mInput->srcDataType( bandNo ); else return QGis::UnknownDataType; };

#if 0
{
Q_UNUSED( bandNo );
QgsDebugMsg( "Entered" );
return UnknownDataType;
}
#endif
virtual QGis::DataType srcDataType( int bandNo ) const { if ( mInput ) return mInput->srcDataType( bandNo ); else return QGis::UnknownDataType; };

/**
* Get the extent of the interface.
Expand Down
10 changes: 5 additions & 5 deletions src/core/symbology-ng/qgsstylev2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ QStringList QgsStyleV2::symbolsOfGroup( StyleEntity type, int groupid )
{
if ( !mCurrentDB )
{
QgsDebugMsg( "Cannot Open database for getting group symbols of groupid: " + groupid );
QgsDebugMsg( QString( "Cannot Open database for getting group symbols of groupid: %1" ).arg( groupid ) );
return QStringList();
}

Expand Down Expand Up @@ -546,7 +546,7 @@ QStringList QgsStyleV2::symbolsWithTag( StyleEntity type, int tagid )
{
if ( !mCurrentDB )
{
QgsDebugMsg( "Cannot open database to get symbols of tagid " + tagid );
QgsDebugMsg( QString( "Cannot open database to get symbols of tagid %1" ).arg( tagid ) );
return QStringList();
}

Expand Down Expand Up @@ -1111,7 +1111,7 @@ QStringList QgsStyleV2::symbolsOfSmartgroup( StyleEntity type, int id )
QString xmlstr = QString::fromUtf8(( const char * ) sqlite3_column_text( ppStmt, 0 ) );
if ( !doc.setContent( xmlstr ) )
{
QgsDebugMsg( "Cannot open smartgroup id: " + id );
QgsDebugMsg( QString( "Cannot open smartgroup id: %1" ).arg( id ) );
}
QDomElement smartEl = doc.documentElement();
QString op = smartEl.attribute( "operator" );
Expand Down Expand Up @@ -1226,7 +1226,7 @@ QgsSmartConditionMap QgsStyleV2::smartgroup( int id )
QString xmlstr = QString::fromUtf8(( const char * ) sqlite3_column_text( ppStmt, 0 ) );
if ( !doc.setContent( xmlstr ) )
{
QgsDebugMsg( "Cannot open smartgroup id: " + id );
QgsDebugMsg( QString( "Cannot open smartgroup id: %1" ).arg( id ) );
}

QDomElement smartEl = doc.documentElement();
Expand Down Expand Up @@ -1268,7 +1268,7 @@ QString QgsStyleV2::smartgroupOperator( int id )
QString xmlstr = QString::fromUtf8(( const char * ) sqlite3_column_text( ppStmt, 0 ) );
if ( !doc.setContent( xmlstr ) )
{
QgsDebugMsg( "Cannot open smartgroup id: " + id );
QgsDebugMsg( QString( "Cannot open smartgroup id: %1" ).arg( id ) );
}
QDomElement smartEl = doc.documentElement();
op = smartEl.attribute( "operator" );
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/grass/qgsgrassmodule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2246,12 +2246,12 @@ QgsGrassModuleOption::QgsGrassModuleOption( QgsGrassModule *module, QString key,
else
{
QgsDebugMsg( "\n\n\n\n**************************" );
QgsDebugMsg( "isOutput = " + isOutput() );
QgsDebugMsg( "mOutputType = " + mOutputType );
QgsDebugMsg( QString( "isOutput = %1" ).arg( isOutput() ) );
QgsDebugMsg( QString( "mOutputType = %1" ).arg( mOutputType ) );
if ( isOutput() && mOutputType == Raster )
mUsesRegion = true;
}
QgsDebugMsg( "mUsesRegion = " + mUsesRegion );
QgsDebugMsg( QString( "mUsesRegion = %1" ).arg( mUsesRegion ) );
}

void QgsGrassModuleOption::addLineEdit()
Expand Down
2 changes: 1 addition & 1 deletion src/providers/grass/qgsgrass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@ QString GRASS_LIB_EXPORT QgsGrass::getInfo( QString info, QString gisdbase, QStr
opt = "vect";
break;
default:
QgsDebugMsg( "unexpected type:" + type );
QgsDebugMsg( QString( "unexpected type:%1" ).arg( type ) );
return "";
}
arguments.append( opt + "=" + map + "@" + mapset );
Expand Down

0 comments on commit 6ebeb97

Please sign in to comment.