diff --git a/src/core/composer/qgscomposermousehandles.cpp b/src/core/composer/qgscomposermousehandles.cpp index 529454d334b..5ee2d4e87d9 100644 --- a/src/core/composer/qgscomposermousehandles.cpp +++ b/src/core/composer/qgscomposermousehandles.cpp @@ -824,7 +824,7 @@ void QgsComposerMouseHandles::dragMouseMove( const QPointF& currentPosition, boo { //constrained (shift) moving should lock to horizontal/vertical movement //reset the smaller of the x/y movements - if ( abs( moveRectX ) <= abs( moveRectY ) ) + if ( qAbs( moveRectX ) <= qAbs( moveRectY ) ) { moveRectX = 0; } diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp index 8e4eac4e07d..ca6f83f6907 100644 --- a/src/core/symbology-ng/qgscptcityarchive.cpp +++ b/src/core/symbology-ng/qgscptcityarchive.cpp @@ -967,8 +967,7 @@ QMap< QString, QStringList > QgsCptCityDirectoryItem::rampsMap() QString curName, prevName, prevPath, curVariant, curSep, schemeName; QStringList listVariant; QStringList schemeNamesAll, schemeNames; - int num; - bool ok, prevAdd, curAdd; + bool prevAdd, curAdd; QDir dir( QgsCptCityArchive::defaultBaseDir() + "/" + mPath ); schemeNamesAll = dir.entryList( QStringList( "*.svg" ), QDir::Files, QDir::Name ); diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp index b921910c878..c69d8cdba45 100644 --- a/src/gui/raster/qgsrasterhistogramwidget.cpp +++ b/src/gui/raster/qgsrasterhistogramwidget.cpp @@ -1068,7 +1068,7 @@ QString findClosestTickVal( double target, const QwtScaleDiv * scale, int div = current += diff; if ( current > target ) { - closest = ( abs( target - current + diff ) < abs( target - current ) ) ? current - diff : current; + closest = ( qAbs( target - current + diff ) < qAbs( target - current ) ) ? current - diff : current; break; } } diff --git a/tests/qt_modeltest/modeltest.cpp b/tests/qt_modeltest/modeltest.cpp index d2877555065..42296b488a9 100644 --- a/tests/qt_modeltest/modeltest.cpp +++ b/tests/qt_modeltest/modeltest.cpp @@ -497,7 +497,7 @@ void ModelTest::data() */ void ModelTest::rowsAboutToBeInserted( const QModelIndex &parent, int start, int end ) { -// Q_UNUSED(end); + Q_UNUSED( end ); // qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString() // << "current count of parent=" << model->rowCount ( parent ); // << "display of last=" << model->data( model->index(start-1, 0, parent) ); // qDebug() << model->index(start-1, 0, parent) << model->data( model->index(start-1, 0, parent) );