Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix indentation in src/app/qgisapp.cpp
The indentation error was added in
d732d84
but went unnoticed in the Travis builds after merge in master.

However my working branch rebased on top of master detected the issue whereas
I never modified this file...
https://travis-ci.org/rouault/Quantum-GIS/jobs/119308048

There must be some shortcoming or subtelty in the working of scripts/verify-indentation.sh
  • Loading branch information
rouault committed Mar 29, 2016
1 parent f7c28f6 commit 8c3155f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Expand Up @@ -7746,7 +7746,7 @@ void QgisApp::removeLayer()
}

bool promptConfirmation = QSettings().value( "qgis/askToDeleteLayers", true ).toBool();
bool shiftHeld = QApplication::queryKeyboardModifiers().testFlag(Qt::ShiftModifier);
bool shiftHeld = QApplication::queryKeyboardModifiers().testFlag( Qt::ShiftModifier );
//display a warning
if ( !shiftHeld && promptConfirmation && QMessageBox::warning( this, tr( "Remove layers and groups" ), tr( "Remove %n legend entries?", "number of legend items to remove", selectedNodes.count() ), QMessageBox::Ok | QMessageBox::Cancel ) == QMessageBox::Cancel )
{
Expand Down

0 comments on commit 8c3155f

Please sign in to comment.