--- src/app/composer/qgscomposer.cpp.str 2009-01-27 01:19:44.000000000 -0500 +++ src/app/composer/qgscomposer.cpp 2009-01-27 01:19:52.000000000 -0500 @@ -550,7 +550,7 @@ } myOutputFileNameQString = myQFileDialog->selectedFiles().last(); - qWarning( myOutputFileNameQString.toLocal8Bit().data() ); + qWarning( "%s", myOutputFileNameQString.toLocal8Bit().data() ); QString myFilterString = myQFileDialog->selectedFilter(); QgsDebugMsg( QString( "Selected filter: %1" ).arg( myFilterString ) ); QgsDebugMsg( QString( "Image type: %1" ).arg( myFilterMap[myFilterString] ) ); --- src/app/qgsdbsourceselect.cpp.str 2009-01-27 01:20:13.000000000 -0500 +++ src/app/qgsdbsourceselect.cpp 2009-01-27 01:20:57.000000000 -0500 @@ -441,7 +441,7 @@ else { qDebug( "Unable to get list of spatially enabled tables from the database" ); - qDebug( PQerrorMessage( pd ) ); + qDebug( "%s",PQerrorMessage( pd ) ); } // BEGIN CHANGES ECOS if ( cmbConnections->count() > 0 ) @@ -509,7 +509,7 @@ QString schemaName = mTableModel.itemFromIndex( mProxyModel.mapToSource( schemaSibling ) )->text(); QString tableName = mTableModel.itemFromIndex( mProxyModel.mapToSource( tableSibling ) )->text(); QString tableString = "\"" + schemaName + "\".\"" + tableName + "\""; - qWarning( tableString.toUtf8() ); + qWarning( "%s", tableString.toUtf8().data() ); QString currentSql; QModelIndex sqlSibling = index.sibling( index.row(), 4 ); --- src/core/composer/qgscomposition.cpp.str 2009-01-27 01:06:44.000000000 -0500 +++ src/core/composer/qgscomposition.cpp 2009-01-27 01:07:54.000000000 -0500 @@ -197,7 +197,7 @@ return; } mItemZList.push_back( item ); - qWarning( QString::number( mItemZList.size() ).toLocal8Bit().data() ); + qWarning("%s", QString::number( mItemZList.size() ).toLocal8Bit().data() ); item->setZValue( mItemZList.size() ); } @@ -330,7 +330,7 @@ currentItem = *it; if ( currentItem ) { - qWarning( QString::number( counter ).toLocal8Bit().data() ); + qWarning("%s", QString::number( counter ).toLocal8Bit().data() ); currentItem->setZValue( counter ); } ++counter; @@ -344,7 +344,7 @@ QLinkedList::iterator before_it = mItemZList.begin(); for ( ; before_it != mItemZList.end(); ++before_it ) { - qWarning( QString::number(( *before_it )->zValue() ).toLocal8Bit().data() ); + qWarning("%s", QString::number(( *before_it )->zValue() ).toLocal8Bit().data() ); } QMutableLinkedListIterator it( mItemZList ); @@ -398,6 +398,6 @@ QLinkedList::iterator after_it = mItemZList.begin(); for ( ; after_it != mItemZList.end(); ++after_it ) { - qWarning( QString::number(( *after_it )->zValue() ).toLocal8Bit().data() ); + qWarning("%s", QString::number(( *after_it )->zValue() ).toLocal8Bit().data() ); } } --- src/core/qgslogger.cpp.str 2009-01-27 01:03:37.000000000 -0500 +++ src/core/qgslogger.cpp 2009-01-27 01:04:30.000000000 -0500 @@ -35,7 +35,7 @@ { if ( file == NULL ) { - qDebug( msg.toLocal8Bit().data() ); + qDebug( "%s", msg.toLocal8Bit().data() ); } else if ( function == NULL ) { @@ -132,17 +132,17 @@ void QgsLogger::warning( const QString& msg ) { - qWarning( msg.toLocal8Bit().data() ); + qWarning("%s", msg.toLocal8Bit().data() ); } void QgsLogger::critical( const QString& msg ) { - qCritical( msg.toLocal8Bit().data() ); + qCritical("%s", msg.toLocal8Bit().data() ); } void QgsLogger::fatal( const QString& msg ) { - qFatal( msg.toLocal8Bit().data() ); + qFatal("%s", msg.toLocal8Bit().data() ); } int QgsLogger::debugLevel() --- src/core/qgsproject.cpp.str 2009-01-27 01:04:57.000000000 -0500 +++ src/core/qgsproject.cpp 2009-01-27 01:05:08.000000000 -0500 @@ -770,7 +770,7 @@ errorMsg + QObject::tr( " at line " ) + QString::number( line ) + QObject::tr( " column " ) + QString::number( column ); - qDebug( errorString.toUtf8().constData() ); + qDebug("%s", errorString.toUtf8().constData() ); imp_->file.close(); --- src/core/symbology/qgssymbologyutils.cpp.str 2009-01-27 01:08:23.000000000 -0500 +++ src/core/symbology/qgssymbologyutils.cpp 2009-01-27 01:10:47.000000000 -0500 @@ -873,7 +873,7 @@ } else //return a null string { - qWarning( "Brush style \"" + brushString.toUtf8() + "\" not found in qString2BrushStyle" ); + qWarning("Brush style \"%s,\" not found in qString2BrushStyle", brushString.toUtf8().data()); return Qt::NoBrush; } } --- src/gui/qgsprojectionselector.cpp.str 2009-01-27 01:12:19.000000000 -0500 +++ src/gui/qgsprojectionselector.cpp 2009-01-27 01:12:32.000000000 -0500 @@ -803,7 +803,7 @@ myFileInfo.setFile( myDatabaseFileName ); if ( !myFileInfo.exists( ) ) //its not critical if this happens { - qDebug( myDatabaseFileName.toUtf8() ); + qDebug( "%s", myDatabaseFileName.toUtf8().data() ); qDebug( "User db does not exist" ); return ; } --- src/gui/qgsquickprint.cpp.str 2009-01-27 01:13:12.000000000 -0500 +++ src/gui/qgsquickprint.cpp 2009-01-27 01:14:25.000000000 -0500 @@ -83,12 +83,12 @@ void QgsQuickPrint::setLogo1( QString theFileName ) { mLogo1File = theFileName; - qDebug( "Logo1 set to: " + mLogo1File.toLocal8Bit() ); + qDebug( "Logo1 set to: %s", mLogo1File.toLocal8Bit().data() ); } void QgsQuickPrint::setLogo2( QString theFileName ) { mLogo2File = theFileName; - qDebug( "Logo2 set to: " + mLogo2File.toLocal8Bit() ); + qDebug( "Logo2 set to: %s", mLogo2File.toLocal8Bit().data() ); } void QgsQuickPrint::setOutputPdf( QString theFileName ) { @@ -140,7 +140,7 @@ int myPrintResolutionDpi = 300; myPrinter.setResolution( myPrintResolutionDpi ); myPrinter.setOutputFormat( QPrinter::PdfFormat ); - qDebug( "Printing to page size" + pageSizeToString( mPageSize ).toLocal8Bit() ); + qDebug( "Printing to page size %s", pageSizeToString( mPageSize ).toLocal8Bit().data() ); myPrinter.setPageSize( mPageSize ); myPrinter.setOutputFileName( mOutputFileName ); myPrinter.setOrientation( QPrinter::Landscape ); @@ -589,7 +589,7 @@ int myLogoYDim = ( myDrawableHeight / 100 ) * myLogoHeightPercent; QPixmap myLogo1; qDebug( "Logo1:" ); - qDebug( mLogo1File.toLocal8Bit() ); + qDebug( "%s", mLogo1File.toLocal8Bit().data() ); myLogo1.fill( Qt::white ); myLogo1.load( mLogo1File ); myLogo1 = myLogo1.scaled( myLogoXDim, myLogoYDim, Qt::KeepAspectRatio ); --- src/plugins/quick_print/quickprintgui.cpp.str 2009-01-27 01:17:12.000000000 -0500 +++ src/plugins/quick_print/quickprintgui.cpp 2009-01-27 01:17:30.000000000 -0500 @@ -146,7 +146,7 @@ myQuickPrint.setOutputPdf( myOutputFileName ); QString myPageSizeString = cboPageSize->itemData( cboPageSize->currentIndex() ).toString(); myQuickPrint.setPageSize( QgsQuickPrint::stringToPageSize( myPageSizeString ) ); - qDebug( "Page size : " + myPageSizeString.toLocal8Bit() ); + qDebug( "Page size : %s", myPageSizeString.toLocal8Bit().data() ); myQuickPrint.printMap(); } else --- src/plugins/wfs/qgswfssourceselect.cpp.str 2009-01-27 01:15:05.000000000 -0500 +++ src/plugins/wfs/qgswfssourceselect.cpp 2009-01-27 01:17:02.000000000 -0500 @@ -214,7 +214,7 @@ //print out result for a test QString resultString( result ); - qWarning( resultString.toUtf8() ); + qWarning( "%s", resultString.toUtf8().data() ); return 0; } @@ -269,7 +269,7 @@ QSettings settings; QString key = "/Qgis/connections-wfs/" + cmbConnections->currentText() + "/url"; mUri = settings.value( key ).toString(); - qWarning( "url is: " + mUri.toUtf8() ); + qWarning( "url is: %s", mUri.toUtf8().data() ); //make a GetCapabilities request std::list typenames; @@ -349,7 +349,7 @@ { uri.append( "?" ); } - qWarning( uri.toUtf8() + "SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=" + typeName.toUtf8() ); + qWarning( "%sSERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=%s", uri.toUtf8().data(), typeName.toUtf8().data() ); //get CRS QString crsString; @@ -385,7 +385,7 @@ if ( currentTreeItem ) { QString currentTypename = currentTreeItem->text( 1 ); - qWarning( "the current typename is: " + currentTypename.toUtf8() ); + qWarning( "the current typename is: %s", currentTypename.toUtf8().data() ); std::map >::const_iterator crsIterator = mAvailableCRS.find( currentTypename ); if ( crsIterator != mAvailableCRS.end() ) --- src/providers/wfs/qgswfsdata.cpp.str 2009-01-27 01:12:00.000000000 -0500 +++ src/providers/wfs/qgswfsdata.cpp 2009-01-27 01:12:10.000000000 -0500 @@ -57,7 +57,7 @@ { mTypeName = it->section( "=", 1, 1 ); qWarning( "mTypeName is:" ); - qWarning( mTypeName.toLocal8Bit().data() ); + qWarning( "%s", mTypeName.toLocal8Bit().data() ); } } --- src/providers/wfs/qgswfsprovider.cpp.str 2009-01-27 01:12:48.000000000 -0500 +++ src/providers/wfs/qgswfsprovider.cpp 2009-01-27 01:13:03.000000000 -0500 @@ -297,9 +297,9 @@ } qWarning( "feature count after request is:" ); - qWarning( QString::number( mFeatures.size() ).toLocal8Bit().data() ); + qWarning( "%s", QString::number( mFeatures.size() ).toLocal8Bit().data() ); qWarning( "mExtent after request is:" ); - qWarning( mExtent.toString().toLocal8Bit().data() ); + qWarning( "%s", mExtent.toString().toLocal8Bit().data() ); for ( QList::iterator it = mFeatures.begin(); it != mFeatures.end(); ++it ) {