sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused variables, also avoid some unnecessary string creation

Browse Source 
when not using debug builds
This commit is contained in:
Nyall Dawson 2016-05-09 17:28:37 +10:00
parent bf76049d33
commit d255bfb256
54 changed files with 86 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/gps/qgsgpsinformationwidget.cpp
View File

@ -584,9 +584,7 @@ void QgsGPSInformationWidget::displayGPSInformation( const QgsGPSInformation& in
QColor bg( Qt::white ); // moved several items outside of the following if block to minimize loop time
bg.setAlpha( 200 );
QColor myColor;
QBrush symbolBrush( Qt::black );
QBrush textBgBrush( bg );
QSize markerSize( 9, 9 );
// Add a marker to the polar plot
if ( currentInfo.id > 0 ) // don't show satellite if id=0 (no satellite indication)
{
@ -607,6 +605,9 @@ void QgsGPSInformationWidget::displayGPSInformation( const QgsGPSInformation& in
myColor = Qt::black; //strong signal
}
#ifdef WITH_QWTPOLAR
QBrush symbolBrush( Qt::black );
QSize markerSize( 9, 9 );
QBrush textBgBrush( bg );
#if (QWT_POLAR_VERSION<0x010000)
mypMarker->setSymbol( QwtSymbol( QwtSymbol::Ellipse,
symbolBrush, QPen( myColor ), markerSize ) );

2
src/app/main.cpp
View File

@ -936,7 +936,7 @@ int main( int argc, char *argv[] )
QString i18nPath = QgsApplication::i18nPath();
QString myUserLocale = mySettings.value( "locale/userLocale", "" ).toString();
bool myLocaleOverrideFlag = mySettings.value( "locale/overrideFlag", false ).toBool();
QString myLocale;
//
// Priority of translation is:
// - command line

24
src/app/qgisapp.cpp
View File

@ -10477,8 +10477,6 @@ void QgisApp::refreshActionFeatureAction()
// this is a slot for action from GUI to add raster layer
void QgisApp::addRasterLayer()
{
QString fileFilters;
QStringList selectedFiles;
QString e;//only for parameter correctness
QString title = tr( "Open a GDAL Supported Raster Data Source" );
@ -10856,6 +10854,7 @@ void QgisApp::showBookmarks()
void QgisApp::oldProjectVersionWarning( const QString& oldVersion )
{
Q_UNUSED( oldVersion );
QSettings settings;
if ( settings.value( "/qgis/warnOldProjectVersion", QVariant( true ) ).toBool() )
@ -10864,24 +10863,6 @@ void QgisApp::oldProjectVersionWarning( const QString& oldVersion )
" When saving this project file, QGIS will update it to the latest version, "
"possibly rendering it useless for older versions of QGIS." );
QString text = tr( "<p>This project file was saved by an older version of QGIS."
" When saving this project file, QGIS will update it to the latest version, "
"possibly rendering it useless for older versions of QGIS."
"<p>Even though QGIS developers try to maintain backwards "
"compatibility, some of the information from the old project "
"file might be lost."
" To improve the quality of QGIS, we appreciate "
"if you file a bug report at %3."
" Be sure to include the old project file, and state the version of "
"QGIS you used to discover the error."
"<p>To remove this warning when opening an older project file, "
"uncheck the box '%5' in the %4 menu."
"<p>Version of the project file: %1<br>Current version of QGIS: %2" )
.arg( oldVersion,
QGis::QGIS_VERSION,
"<a href=\"https://hub.qgis.org/projects/quantum-gis\">https://hub.qgis.org/projects/quantum-gis</a> ",
tr( "<tt>Settings:Options:General</tt>", "Menu path to setting options" ),
tr( "Warn me when opening a project file saved with an older version of QGIS" ) );
QString title = tr( "Project file is older" );
#ifdef ANDROID
@ -11225,8 +11206,7 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors
timer->stop();
}
QString requesturl = reply->request().url().toString();
QgsDebugMsg( QString( "SSL errors occurred accessing URL:\n%1" ).arg( requesturl ) );
QgsDebugMsg( QString( "SSL errors occurred accessing URL:\n%1" ).arg( reply->request().url().toString() ) );
QString hostport( QString( "%1:%2" )
.arg( reply->url().host() )

1
src/app/qgsbrowserdockwidget.cpp
View File

@ -122,7 +122,6 @@ void QgsBrowserLayerProperties::setItem( QgsDataItem* item )
QgsMapLayer::LayerType type = layerItem->mapLayerType();
QString layerMetadata = tr( "Error" );
QgsCoordinateReferenceSystem layerCrs;
QString notice;
// temporarily override /Projections/defaultBehaviour to avoid dialog prompt
QSettings settings;

2
src/app/qgshandlebadlayers.cpp
View File

@ -368,8 +368,6 @@ void QgsHandleBadLayers::apply()
int idx = mLayerList->item( i, 0 )->data( Qt::UserRole ).toInt();
QDomNode &node = const_cast<QDomNode &>( mLayers[ idx ] );
QString type = mLayerList->item( i, 1 )->text();
QString provider = mLayerList->item( i, 2 )->text();
QTableWidgetItem *item = mLayerList->item( i, 4 );
QString datasource = item->text();

1
src/app/qgslabeldialog.cpp
View File

@ -279,6 +279,7 @@ void QgsLabelDialog::changeFont()
qreal fontSize = mFont.pointSizeF();
bool resultFlag;
QFont newFont = QgisGui::getFont( resultFlag, mFont );
Q_UNUSED( newFont );
if ( !resultFlag )
return;

2
src/app/qgsoptions.cpp
View File

@ -634,7 +634,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
initContrastEnhancement( cboxContrastEnhancementAlgorithmMultiBandSingleByte, "multiBandSingleByte", "NoEnhancement" );
initContrastEnhancement( cboxContrastEnhancementAlgorithmMultiBandMultiByte, "multiBandMultiByte", "StretchToMinimumMaximum" );
QString cumulativeCutText = tr( "Cumulative pixel count cut" );
cboxContrastEnhancementLimits->addItem( tr( "Cumulative pixel count cut" ), "CumulativeCut" );
cboxContrastEnhancementLimits->addItem( tr( "Minimum / maximum" ), "MinMax" );
cboxContrastEnhancementLimits->addItem( tr( "Mean +/- standard deviation" ), "StdDev" );
@ -807,7 +806,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
//set elements in digitizing tab
mLineWidthSpinBox->setValue( mSettings->value( "/qgis/digitizing/line_width", 1 ).toInt() );
QColor digitizingColor;
myRed = mSettings->value( "/qgis/digitizing/line_color_red", 255 ).toInt();
myGreen = mSettings->value( "/qgis/digitizing/line_color_green", 0 ).toInt();
myBlue = mSettings->value( "/qgis/digitizing/line_color_blue", 0 ).toInt();

1
src/app/qgsvectorlayerproperties.cpp
View File

@ -901,7 +901,6 @@ void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )
QSettings myQSettings; // where we keep last used filter in persistent state
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", QDir::homePath() ).toString();
QString format, extension;
if ( styleType == DB )
{
QString infoWindowTitle = QObject::tr( "Save style to DB (%1)" ).arg( mLayer->providerType() );

4
src/core/composer/qgscomposerlabel.cpp
View File

@ -395,8 +395,6 @@ QFont QgsComposerLabel::font() const
bool QgsComposerLabel::writeXML( QDomElement& elem, QDomDocument & doc ) const
{
QString alignment;
if ( elem.isNull() )
{
return false;
@ -429,8 +427,6 @@ bool QgsComposerLabel::writeXML( QDomElement& elem, QDomDocument & doc ) const
bool QgsComposerLabel::readXML( const QDomElement& itemElem, const QDomDocument& doc )
{
QString alignment;
if ( itemElem.isNull() )
{
return false;

1
src/core/composer/qgslegendmodel.cpp
View File

@ -784,7 +784,6 @@ bool QgsLegendModel::removeRows( int row, int count, const QModelIndex & parent
QMimeData* QgsLegendModel::mimeData( const QModelIndexList &indexes ) const
{
QMimeData* mimeData = new QMimeData();
QByteArray encodedData;
QDomDocument xmlDoc;
QDomElement xmlRootElement = xmlDoc.createElement( "LegendModelDragData" );
xmlDoc.appendChild( xmlRootElement );

1
src/core/qgsdataitem.cpp
View File

@ -1442,7 +1442,6 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, const QString& fileP
QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString();
int zipFileCount = 0;
QStringList zipFileList;
QFileInfo fileInfo( filePath );
QString vsiPrefix = QgsZipItem::vsiPrefix( filePath );
QgsZipItem * zipItem = nullptr;
bool populated = false;

1
src/core/qgsdiagramrendererv2.cpp
View File

@ -371,7 +371,6 @@ void QgsDiagramSettings::writeXML( QDomElement& rendererElem, QDomDocument& doc,
categoryElem.setAttribute( "minimumSize", QString::number( minimumSize ) );
categoryElem.setAttribute( "angleOffset", QString::number( angleOffset ) );
QString colors;
int nCats = qMin( categoryColors.size(), categoryAttributes.size() );
for ( int i = 0; i < nCats; ++i )
{

3
src/core/qgserror.cpp
View File

@ -51,7 +51,10 @@ QString QgsError::message( QgsErrorMessage::Format theFormat ) const
{
QString str;
#ifdef QGISDEBUG
QString srcUrl;
#endif
#if defined(QGISDEBUG) && defined(QGS_GIT_REMOTE_URL)
// TODO: verify if we are not ahead to origin (remote hash does not exist)
// and there are no local not commited changes

11
src/core/qgsfontutils.cpp
View File

@ -239,12 +239,11 @@ bool QgsFontUtils::loadStandardTestFonts( const QStringList& loadstyles )
{
continue;
}
QString familyStyle = QString( "%1 %2" ).arg( fontFamily, fontstyle );
if ( fontFamilyHasStyle( fontFamily, fontstyle ) )
{
fontsLoaded = ( fontsLoaded || false );
QgsDebugMsg( QString( "Test font '%1' already available" ).arg( familyStyle ) );
QgsDebugMsg( QString( "Test font '%1 %2' already available" ).arg( fontFamily, fontstyle ) );
}
else
{
@ -259,8 +258,8 @@ bool QgsFontUtils::loadStandardTestFonts( const QStringList& loadstyles )
int fontID = QFontDatabase::addApplicationFont( fontPath );
loaded = ( fontID != -1 );
fontsLoaded = ( fontsLoaded || loaded );
QgsDebugMsg( QString( "Test font '%1' %2 from filesystem [%3]" )
.arg( familyStyle, loaded ? "loaded" : "FAILED to load", fontPath ) );
QgsDebugMsg( QString( "Test font '%1 %2' %3 from filesystem [%4]" )
.arg( fontFamily, fontstyle, loaded ? "loaded" : "FAILED to load", fontPath ) );
QFontDatabase db;
QgsDebugMsg( QString( "font families in %1: %2" ).arg( fontID ).arg( db.applicationFontFamilies( fontID ).join( "," ) ) );
}
@ -273,8 +272,8 @@ bool QgsFontUtils::loadStandardTestFonts( const QStringList& loadstyles )
loaded = ( fontID != -1 );
fontsLoaded = ( fontsLoaded || loaded );
}
QgsDebugMsg( QString( "Test font '%1' %2 from testdata.qrc" )
.arg( familyStyle, loaded ? "loaded" : "FAILED to load" ) );
QgsDebugMsg( QString( "Test font '%1' %3 from testdata.qrc" )
.arg( fontFamily, fontstyle, loaded ? "loaded" : "FAILED to load" ) );
}
}
}

3
src/core/qgsmaprenderercustompainterjob.cpp
View File

@ -71,10 +71,11 @@ void QgsMapRendererCustomPainterJob::start()
mPainter->setRenderHint( QPainter::Antialiasing, mSettings.testFlag( QgsMapSettings::Antialiasing ) );
#ifndef QT_NO_DEBUG
QPaintDevice* thePaintDevice = mPainter->device();
QString errMsg = QString( "pre-set DPI not equal to painter's DPI (%1 vs %2)" ).arg( thePaintDevice->logicalDpiX() ).arg( mSettings.outputDpi() );
Q_ASSERT_X( thePaintDevice->logicalDpiX() == mSettings.outputDpi(), "Job::startRender()", errMsg.toAscii().data() );
#endif
delete mLabelingEngine;
mLabelingEngine = nullptr;

6
src/core/qgsogcutils.cpp
View File

@ -914,12 +914,6 @@ QgsRectangle QgsOgcUtils::rectangleFromGMLBox( const QDomNode& boxNode )
bool QgsOgcUtils::readGMLPositions( QgsPolyline &coords, const QDomElement &elem )
{
//tupel and coord separator are the same
QString coordSeparator = " ";
QString tupelSeparator = " ";
//"decimal" has to be "."
coords.clear();
QStringList pos = elem.text().split( ' ', QString::SkipEmptyParts );

4
src/core/qgspallabeling.cpp
View File

@ -3015,7 +3015,9 @@ bool QgsPalLayerSettings::dataDefinedValEval( DataDefinedValueType valType,
{
if ( dataDefinedEvaluate( p, exprVal, &context, originalValue ) )
{
QString dbgStr = QString( "exprVal %1:" ).arg( mDataDefinedNames.value( p ).first ) + "%1";
#ifdef QGISDEBUG
QString dbgStr = QString( "exprVal %1:" ).arg( mDataDefinedNames.value( p ).first ) + "%1"; // clazy:exclude=unused-non-trivial-variable
#endif
switch ( valType )
{

1
src/core/qgsproject.cpp
View File

@ -1134,7 +1134,6 @@ bool QgsProject::write()
if ( ml )
{
QString externalProjectFile = layerIsEmbedded( ml->id() );
QHash< QString, QPair< QString, bool> >::const_iterator emIt = mEmbeddedLayers.constFind( ml->id() );
if ( emIt == mEmbeddedLayers.constEnd() )
{

4
src/core/qgsvectorlayer.cpp
View File

@ -882,9 +882,7 @@ QgsRectangle QgsVectorLayer::extent()
QgsRectangle mbr = mDataProvider->extent();
// show the extent
QString s = mbr.toString();
QgsDebugMsg( "Extent of layer: " + s );
QgsDebugMsg( "Extent of layer: " + mbr.toString() );
// store the extent
setExtent( mbr );

9
src/core/raster/qgsrasterlayer.cpp
View File

@ -679,8 +679,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider )
QgsRectangle mbr = mDataProvider->extent();
// show the extent
QString s = mbr.toString();
QgsDebugMsgLevel( "Extent of layer: " + s, 4 );
QgsDebugMsgLevel( "Extent of layer: " + mbr.toString(), 4 );
// store the extent
setExtent( mbr );
@ -693,15 +692,11 @@ void QgsRasterLayer::setDataProvider( QString const & provider )
// Setup source CRS
setCrs( QgsCoordinateReferenceSystem( mDataProvider->crs() ) );
QString mySourceWkt = crs().toWkt();
QgsDebugMsgLevel( "using wkt:\n" + mySourceWkt, 4 );
QgsDebugMsgLevel( "using wkt:\n" + crs().toWkt(), 4 );
//defaults - Needs to be set after the Contrast list has been build
//Try to read the default contrast enhancement from the config file
QSettings myQSettings;
//decide what type of layer this is...
//TODO Change this to look at the color interp and palette interp to decide which type of layer it is
QgsDebugMsgLevel( "bandCount = " + QString::number( mDataProvider->bandCount() ), 4 );

2
src/core/symbology-ng/qgscptcityarchive.cpp
View File

@ -967,7 +967,7 @@ QMap< QString, QStringList > QgsCptCityDirectoryItem::rampsMap()
if ( ! mRampsMap.isEmpty() )
return mRampsMap;
QString curName, prevName, prevPath, curVariant, curSep, schemeName;
QString curName, prevName, curVariant, curSep, schemeName;
QStringList listVariant;
QStringList schemeNamesAll, schemeNames;
bool prevAdd, curAdd;

1
src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
View File

@ -208,7 +208,6 @@ QgsSingleSymbolRendererV2* QgsSingleSymbolRendererV2::clone() const
void QgsSingleSymbolRendererV2::toSld( QDomDocument& doc, QDomElement &element ) const
{
QgsStringMap props;
QString errorMsg;
if ( mRotation.data() )
props[ "angle" ] = mRotation->expression();
if ( mSizeScale.data() )

1
src/core/symbology-ng/qgsstylev2.cpp
View File

@ -1311,7 +1311,6 @@ QgsSmartConditionMap QgsStyleV2::smartgroup( int id )
}
QDomElement smartEl = doc.documentElement();
QString op = smartEl.attribute( "operator" );
QDomNodeList conditionNodes = smartEl.childNodes();
for ( int i = 0; i < conditionNodes.count(); i++ )

1
src/core/symbology-ng/qgssvgcache.cpp
View File

@ -756,7 +756,6 @@ void QgsSvgCache::containsElemParams( const QDomElement& elem, bool& hasFillPara
{
continue;
}
QString key = keyValueSplit.at( 0 );
QString value = keyValueSplit.at( 1 );
valueSplit = value.split( ' ' );
if ( !hasFillParam && value.startsWith( "param(fill)" ) )

3
src/gui/qgsbrowsertreeview.cpp
View File

@ -107,8 +107,7 @@ void QgsBrowserTreeView::expandTree( const QModelIndex & index )
if ( !model() )
return;
QString itemPath = model()->data( index, QgsBrowserModel::PathRole ).toString();
QgsDebugMsg( "itemPath = " + itemPath );
QgsDebugMsg( "itemPath = " + model()->data( index, QgsBrowserModel::PathRole ).toString() );
expand( index );
QModelIndex parentIndex = model()->parent( index );

2
src/gui/qgscomposerruler.cpp
View File

@ -361,8 +361,10 @@ int QgsComposerRuler::optimumNumberDivisions( double rulerScale, int scaleMultip
void QgsComposerRuler::setSceneTransform( const QTransform& transform )
{
#if 0
QString debug = QString::number( transform.dx() ) + ',' + QString::number( transform.dy() ) + ','
+ QString::number( transform.m11() ) + ',' + QString::number( transform.m22() );
#endif
mTransform = transform;
update();
}

4
src/gui/qgsmapcanvas.cpp
View File

@ -1180,10 +1180,6 @@ void QgsMapCanvas::keyPressEvent( QKeyEvent * e )
return;
}
QPainter paint;
QPen pen( Qt::gray );
QgsPoint ll, ur;
if ( ! mCanvasProperties->mouseButtonDown )
{
// Don't want to interfer with mouse events

2
src/gui/raster/qgsrasterhistogramwidget.cpp
View File

@ -688,7 +688,7 @@ void QgsRasterHistogramWidget::on_mSaveAsImageButton_clicked()
QPair< QString, QString> myFileNameAndFilter = QgisGui::getSaveAsImageName( this, tr( "Choose a file name to save the map image as" ) );
QFileInfo myInfo( myFileNameAndFilter.first );
if ( QFileInfo( myFileNameAndFilter.first ).baseName() != "" )
if ( myInfo.baseName() != "" )
{
histoSaveAsImage( myFileNameAndFilter.first );
}

3
src/gui/symbology-ng/qgsstylev2managerdialog.cpp
View File

@ -1096,8 +1096,7 @@ void QgsStyleV2ManagerDialog::removeGroup()
void QgsStyleV2ManagerDialog::groupRenamed( QStandardItem * item )
{
QString data = item->data( Qt::UserRole + 1 ).toString();
QgsDebugMsg( "Symbol group edited: data=" + data + " text=" + item->text() );
QgsDebugMsg( "Symbol group edited: data=" + item->data( Qt::UserRole + 1 ).toString() + " text=" + item->text() );
int id = item->data( Qt::UserRole + 1 ).toInt();
QString name = item->text();
if ( item->parent()->data( Qt::UserRole + 1 ) == "smartgroups" )

2
src/gui/symbology-ng/qgssymbolslistwidget.cpp
View File

@ -182,8 +182,6 @@ void QgsSymbolsListWidget::populateSymbolView()
void QgsSymbolsListWidget::populateSymbols( const QStringList& names )
{
QSize previewSize = viewSymbols->iconSize();
QPixmap p( previewSize );
QPainter painter;
QStandardItemModel* model = qobject_cast<QStandardItemModel*>( viewSymbols->model() );
if ( !model )

1
src/helpviewer/main.cpp
View File

@ -35,7 +35,6 @@ int main( int argc, char ** argv )
QCoreApplication::setOrganizationDomain( "qgis.org" );
QCoreApplication::setApplicationName( "QGIS2" );
QString context = QString::null;
QString myTranslationCode = "";
if ( argc == 2 )

3
src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
View File

@ -197,8 +197,9 @@ void eVisImageDisplayWidget::displayImage()
*/
void eVisImageDisplayWidget::displayUrlImage( const QString& url )
{
QUrl myUrl( url );
Q_UNUSED( url );
#if QT_VERSION < 0x050000
QUrl myUrl( url );
mHttpConnection->setHost( myUrl.host() );
mCurrentHttpImageRequestId = mHttpConnection->get( myUrl.path().replace( '\\', '/' ), mHttpBuffer );
#endif

13
src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp
View File

@ -157,7 +157,6 @@ void QgsOracleSelectGeoraster::connectToServer()
QSettings settings;
QString key = "/Oracle/connections/" + cmbConnections->currentText();
QString username = settings.value( key + "/username" ).toString();
QString password = settings.value( key + "/password" ).toString();
QString savepass = settings.value( key + "/savepass" ).toString();
QString database = settings.value( key + "/database" ).toString();
QString subdtset = settings.value( key + "/subdtset" ).toString();
@ -165,12 +164,12 @@ void QgsOracleSelectGeoraster::connectToServer()
if ( savepass == "false" )
{
makeConnection = false;
QString password = QInputDialog::getText( this,
tr( "Password for %1/<password>@%2" ).arg( username, database ),
tr( "Please enter your password:" ),
QLineEdit::Password,
QString::null,
&makeConnection );
( void )QInputDialog::getText( this,
tr( "Password for %1/<password>@%2" ).arg( username, database ),
tr( "Please enter your password:" ),
QLineEdit::Password,
QString::null,
&makeConnection );
}
if ( makeConnection )
{

1
src/plugins/roadgraph/roadgraphplugin.cpp
View File

@ -199,7 +199,6 @@ QgisInterface* RoadGraphPlugin::iface()
const QgsGraphDirector* RoadGraphPlugin::director() const
{
QString layerId;
QgsVectorLayer *layer = nullptr;
QMap< QString, QgsMapLayer* > mapLayers = QgsMapLayerRegistry::instance()->mapLayers();
QMap< QString, QgsMapLayer* >::const_iterator it;

1
src/plugins/spatialquery/qgsspatialquerydialog.cpp
View File

@ -536,7 +536,6 @@ void QgsSpatialQueryDialog::populateCbTargetLayer()
QMapIterator <QString, QgsMapLayer*> item( layers );
QgsMapLayer * mapLayer = nullptr;
QgsVectorLayer * lyr = nullptr;
QString layerId;
while ( item.hasNext() )
{
item.next();

8
src/providers/db2/qgsdb2dataitems.cpp
View File

@ -170,9 +170,8 @@ QVector<QgsDataItem*> QgsDb2ConnectionItem::createChildren()
QSqlDatabase db = QgsDb2Provider::getDatabase( connInfo, errorMsg );
if ( errorMsg.isEmpty() )
{
QString connectionName = db.connectionName();
//children.append( new QgsFavouritesItem(this, "connection successful", mPath + "/success"));
QgsDebugMsg( "DB open successful for connection " + connectionName );
QgsDebugMsg( "DB open successful for connection " + db.connectionName() );
}
else
{
@ -180,7 +179,7 @@ QVector<QgsDataItem*> QgsDb2ConnectionItem::createChildren()
QgsDebugMsg( "DB not open " + errorMsg );
return children;
}
QString connectionName = db.connectionName();
QgsDb2GeometryColumns db2GC = QgsDb2GeometryColumns( db );
int sqlcode = db2GC.open();
@ -295,10 +294,9 @@ void QgsDb2ConnectionItem::refreshConnection()
{
QString errMsg;
QSqlDatabase db = QgsDb2Provider::getDatabase( mConnInfo, errMsg );
Q_UNUSED( db );
if ( errMsg.isEmpty() )
{
QString connectionName = db.connectionName();
QgsDebugMsg( "successful get db2 connection on refresh" );
}
else

1
src/providers/db2/qgsdb2expressioncompiler.cpp
View File

@ -240,7 +240,6 @@ QString QgsDb2ExpressionCompiler::quotedValue( const QVariant& value, bool& ok )
return value.toBool() ? "(1=1)" : "(1=0)";
default:
QString result = QgsSqlExpressionCompiler::quotedValue( value, ok );
return QgsSqlExpressionCompiler::quotedValue( value, ok );
}
}

3
src/providers/db2/qgsdb2featureiterator.cpp
View File

@ -400,8 +400,7 @@ bool QgsDb2FeatureIterator::rewind()
QgsDebugMsg( "Execute mStatement: " + mStatement );
if ( !mQuery->exec( mStatement ) )
{
QString msg = mQuery->lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( mQuery->lastError().text() );
close();
return false;
}

29
src/providers/db2/qgsdb2provider.cpp
View File

@ -278,7 +278,7 @@ void QgsDb2Provider::loadFields()
{
mAttributeFields.clear();
//mDefaultValues.clear();
QString table = QString( "%1.%2" ).arg( mSchemaName ).arg( mTableName );
QString table = QString( "%1.%2" ).arg( mSchemaName, mTableName );
// Use the Qt functionality to get the fields and their definitions.
QSqlRecord r = mDatabase.record( table );
@ -544,8 +544,7 @@ void QgsDb2Provider::updateStatistics()
if ( !query.exec( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( !query.isActive() )
@ -600,8 +599,7 @@ void QgsDb2Provider::updateStatistics()
if ( !query.exec( statement ) || !query.isActive() )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( query.next() )
@ -779,8 +777,7 @@ bool QgsDb2Provider::deleteFeatures( const QgsFeatureIds & id )
QgsDebugMsg( statement );
if ( !query.exec( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
@ -851,8 +848,7 @@ bool QgsDb2Provider::changeAttributeValues( const QgsChangedAttributesMap &attr_
// use prepared statement to prevent from sql injection
if ( !query.prepare( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
QgsDebugMsg( statement );
@ -910,8 +906,7 @@ bool QgsDb2Provider::changeAttributeValues( const QgsChangedAttributesMap &attr_
if ( !query.exec() )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
}
@ -1244,8 +1239,7 @@ bool QgsDb2Provider::changeGeometryValues( const QgsGeometryMap &geometry_map )
QgsDebugMsg( statement );
if ( !query.prepare( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
@ -1255,8 +1249,7 @@ bool QgsDb2Provider::changeGeometryValues( const QgsGeometryMap &geometry_map )
if ( !query.exec() )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
}
@ -1310,8 +1303,7 @@ QgsVectorLayerImport::ImportError QgsDb2Provider::createEmptyLayer(
if ( !query.exec( statement ) || !query.isActive() )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( query.next() )
@ -1325,8 +1317,6 @@ QgsVectorLayerImport::ImportError QgsDb2Provider::createEmptyLayer(
}
}
QString dbName = dsUri.database();
QString schemaName = dsUri.schema().toUpper();
QString tableName = dsUri.table().toUpper();
QString fullName;
@ -1433,7 +1423,6 @@ QgsVectorLayerImport::ImportError QgsDb2Provider::createEmptyLayer(
int offset = 0;
// get the list of fields
QList<QgsField> flist;
QgsDebugMsg( "PrimaryKey: '" + primaryKey + "'" );
for ( int i = 0; i < fieldCount; ++i )
{

7
src/providers/db2/qgsdb2sourceselect.cpp
View File

@ -499,7 +499,6 @@ void QgsDb2SourceSelect::on_btnConnect_clicked()
return;
}
QString connectionName = db.connectionName();
QgsDb2GeometryColumns db2GC = QgsDb2GeometryColumns( db );
int sqlcode = db2GC.open();
if ( 0 != sqlcode )
@ -716,8 +715,7 @@ void QgsDb2GeomColumnTypeThread::run()
QSqlDatabase db = QSqlDatabase::database( mConnectionName );
if ( !QgsDb2Provider::openDatabase( db ) )
{
QString msg = db.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( db.lastError().text() );
continue;
}
@ -725,8 +723,7 @@ void QgsDb2GeomColumnTypeThread::run()
q.setForwardOnly( true );
if ( !q.exec( query ) )
{
QString msg = q.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( q.lastError().text() );
}
QString type;

6
src/providers/mssql/qgsmssqlfeatureiterator.cpp
View File

@ -44,8 +44,7 @@ QgsMssqlFeatureIterator::QgsMssqlFeatureIterator( QgsMssqlFeatureSource* source,
if ( !mDatabase.open() )
{
QgsDebugMsg( "Failed to open database" );
QString msg = mDatabase.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( mDatabase.lastError().text() );
return;
}
@ -399,8 +398,7 @@ bool QgsMssqlFeatureIterator::rewind()
if ( !result )
{
QString msg = mQuery->lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( mQuery->lastError().text() );
delete mQuery;
mQuery = nullptr;
if ( mDatabase.isOpen() )

53
src/providers/mssql/qgsmssqlprovider.cpp
View File

@ -353,8 +353,7 @@ void QgsMssqlProvider::loadMetadata()
query.setForwardOnly( true );
if ( !query.exec( QString( "select f_geometry_column, coord_dimension, srid, geometry_type from geometry_columns where f_table_schema = '%1' and f_table_name = '%2'" ).arg( mSchemaName, mTableName ) ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( query.isActive() && query.next() )
{
@ -373,8 +372,7 @@ void QgsMssqlProvider::loadFields()
query.setForwardOnly( true );
if ( !query.exec( QString( "exec sp_columns @table_name = N'%1', @table_owner = '%2'" ).arg( mTableName, mSchemaName ) ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text( ) );
return;
}
if ( query.isActive() )
@ -447,8 +445,7 @@ void QgsMssqlProvider::loadFields()
query.setForwardOnly( true );
if ( !query.exec( QString( "exec sp_pkeys @table_name = N'%1', @table_owner = '%2' " ).arg( mTableName, mSchemaName ) ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( query.isActive() && query.next() )
{
@ -462,8 +459,7 @@ void QgsMssqlProvider::loadFields()
if ( !query.exec( QString( "select count(distinct [%1]), count([%1]) from [%2].[%3]" )
.arg( pk, mSchemaName, mTableName ) ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( query.isActive() && query.next() && query.value( 0 ).toInt() == query.value( 1 ).toInt() )
{
@ -512,8 +508,7 @@ QVariant QgsMssqlProvider::minimumValue( int index )
if ( !query.exec( sql ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( query.isActive() && query.next() )
@ -544,8 +539,7 @@ QVariant QgsMssqlProvider::maximumValue( int index )
if ( !query.exec( sql ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( query.isActive() && query.next() )
@ -585,8 +579,7 @@ void QgsMssqlProvider::uniqueValues( int index, QList<QVariant> &uniqueValues, i
if ( !query.exec( sql ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( query.isActive() )
@ -666,8 +659,7 @@ void QgsMssqlProvider::UpdateStatistics( bool estimate )
if ( !query.exec( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
}
if ( !query.isActive() )
@ -851,8 +843,6 @@ bool QgsMssqlProvider::addFeatures( QgsFeatureList & flist )
QgsDebugMsg( msg );
if ( !mSkipFailures )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
pushError( msg );
return false;
}
@ -1016,8 +1006,7 @@ bool QgsMssqlProvider::addAttributes( const QList<QgsField> &attributes )
query.setForwardOnly( true );
if ( !query.exec( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
@ -1051,8 +1040,7 @@ bool QgsMssqlProvider::deleteAttributes( const QgsAttributeIds &attributes )
if ( !query.exec( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
@ -1119,8 +1107,7 @@ bool QgsMssqlProvider::changeAttributeValues( const QgsChangedAttributesMap &att
// use prepared statement to prevent from sql injection
if ( !query.prepare( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
@ -1181,8 +1168,7 @@ bool QgsMssqlProvider::changeAttributeValues( const QgsChangedAttributesMap &att
if ( !query.exec() )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
}
@ -1239,8 +1225,7 @@ bool QgsMssqlProvider::changeGeometryValues( const QgsGeometryMap &geometry_map
if ( !query.prepare( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
@ -1258,8 +1243,7 @@ bool QgsMssqlProvider::changeGeometryValues( const QgsGeometryMap &geometry_map
if ( !query.exec() )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
}
@ -1293,8 +1277,7 @@ bool QgsMssqlProvider::deleteFeatures( const QgsFeatureIds & id )
if ( !query.exec( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
@ -1351,8 +1334,7 @@ bool QgsMssqlProvider::createSpatialIndex()
if ( !query.exec( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}
@ -1380,8 +1362,7 @@ bool QgsMssqlProvider::createAttributeIndex( int field )
if ( !query.exec( statement ) )
{
QString msg = query.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( query.lastError().text() );
return false;
}

6
src/providers/mssql/qgsmssqlsourceselect.cpp
View File

@ -789,8 +789,7 @@ void QgsMssqlGeomColumnTypeThread::run()
QSqlDatabase db = QSqlDatabase::database( mConnectionName );
if ( !QgsMssqlProvider::OpenDatabase( db ) )
{
QString msg = db.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( db.lastError().text() );
continue;
}
@ -798,8 +797,7 @@ void QgsMssqlGeomColumnTypeThread::run()
q.setForwardOnly( true );
if ( !q.exec( query ) )
{
QString msg = q.lastError().text();
QgsDebugMsg( msg );
QgsDebugMsg( q.lastError().text() );
}
QString type;

3
src/providers/ogr/qgsogrdataitems.cpp
View File

@ -372,8 +372,7 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
return nullptr;
}
QString driverName = OGR_Dr_GetName( hDriver );
QgsDebugMsgLevel( "OGR Driver : " + driverName, 2 );
QgsDebugMsgLevel( "OGR Driver : " + OGR_Dr_GetName( hDriver ), 2 );
int numLayers = OGR_DS_GetLayerCount( hDataSource );

1
src/providers/spatialite/qgsspatialiteprovider.cpp
View File

@ -3501,7 +3501,6 @@ void QgsSpatiaLiteProvider::uniqueValues( int index, QList < QVariant > &uniqueV
{
sqlite3_stmt *stmt = nullptr;
QString sql;
QString txt;
uniqueValues.clear();

2
src/providers/spatialite/qgsspatialitetablemodel.cpp
View File

@ -53,8 +53,6 @@ void QgsSpatiaLiteTableModel::addTableEntry( const QString& type, const QString&
}
//path to icon for specified type
QString typeName;
QGis::WkbType wkbType = qgisTypeFromDbType( type );
QIcon iconFile = iconForType( wkbType );

2
src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
View File

@ -337,7 +337,7 @@ int vtableCreateConnect( sqlite3* sql, void* aux, int argc, const char* const* a
}
QScopedPointer<VTable> newVtab;
QString vname( argv[2] );
int r;
if ( argc == 4 )
{

6
src/providers/wcs/qgswcsprovider.cpp
View File

@ -1910,7 +1910,7 @@ void QgsWcsDownloadHandler::cacheReplyFinished()
void QgsWcsDownloadHandler::cacheReplyProgress( qint64 bytesReceived, qint64 bytesTotal )
{
QString msg = tr( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) );
QgsDebugMsgLevel( msg, 3 );
//emit statusChanged( msg );
Q_UNUSED( bytesReceived );
Q_UNUSED( bytesTotal );
QgsDebugMsgLevel( tr( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ), 3 );
}

3
src/providers/wfs/qgswfsrequest.cpp
View File

@ -183,8 +183,7 @@ void QgsWFSRequest::abort()
void QgsWFSRequest::replyProgress( qint64 bytesReceived, qint64 bytesTotal )
{
QString msg = tr( "%1 of %2 bytes downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) );
QgsDebugMsg( msg );
QgsDebugMsg( tr( "%1 of %2 bytes downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
if ( bytesReceived != 0 )
mGotNonEmptyResponse = true;

4
src/providers/wms/qgswmscapabilities.cpp
View File

@ -1370,8 +1370,10 @@ void QgsWmsCapabilities::parseWMTSContents( QDomElement const &e )
!e0.isNull();
e0 = e0.nextSiblingElement( "Layer" ) )
{
QString id = e0.firstChildElement( "ows:Identifier" ).text();
#ifdef QGISDEBUG
QString id = e0.firstChildElement( "ows:Identifier" ).text(); // clazy:exclude=unused-non-trivial-variable
QgsDebugMsg( QString( "Layer %1" ).arg( id ) );
#endif
QgsWmtsTileLayer l;
l.tileMode = WMTS;

5
src/providers/wms/qgswmsprovider.cpp
View File

@ -3301,8 +3301,9 @@ void QgsWmsImageDownloadHandler::cacheReplyFinished()
void QgsWmsImageDownloadHandler::cacheReplyProgress( qint64 bytesReceived, qint64 bytesTotal )
{
QString msg = tr( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) );
QgsDebugMsg( msg );
Q_UNUSED( bytesReceived );
Q_UNUSED( bytesTotal );
QgsDebugMsg( tr( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
}

2
src/server/qgssldconfigparser.cpp
View File

@ -466,7 +466,6 @@ QDomDocument QgsSLDConfigParser::getStyles( QStringList& layerList ) const
for ( int i = 0; i < layerList.size(); i++ )
{
QString layerName;
QString typeName;
layerName = layerList.at( i );
QDomElement userLayerElement = findUserLayerElement( layerName );
if ( userLayerElement.isNull() )
@ -1003,7 +1002,6 @@ bool QgsSLDConfigParser::labelSettingsFromUserStyle( const QDomElement& userStyl
int polyColorRed = 0;
int polyColorGreen = 0;
int polyColorBlue = 0;
QString elemText;
QString fontfamily = QString( "Helvetica" );
QString fontstyle = QString( "Normal" );
int fontsize = 14;

1
src/server/qgswfsserver.cpp
View File

@ -1692,7 +1692,6 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
const QgsFields& fields = provider->fields();
QMap<QString, int> fieldMap = provider->fieldNameMap();
QMap<QString, int>::const_iterator fieldMapIt;
QString fieldName;
// Loop through the insert elements
QDomNodeList inNodeList = typeNameElem.elementsByTagNameNS( WFS_NAMESPACE, "Insert" );

1
src/server/qgswmsconfigparser.cpp
View File

@ -314,7 +314,6 @@ QStringList QgsWMSConfigParser::addHighlightLayers( const QMap<QString, QString>
}
//create renderer from sld
QString sld = symbolSplit[i];
QDomDocument sldDoc;
if ( !sldDoc.setContent( symbolSplit[i], true ) )
{