Skip to content

Commit

Permalink
indentation update
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Dec 4, 2015
1 parent f210fc7 commit 60ad688
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/lidar/fusion/ClipData.py
Expand Up @@ -71,7 +71,7 @@ def processAlgorithm(self, progress):
commands.append('/shape:' + unicode(self.getParameterValue(self.SHAPE)))
dtm = self.getParameterValue(self.DTM)
if dtm:
commands.append('/dtm:'+unicode(dtm))
commands.append('/dtm:' + unicode(dtm))
height = self.getParameterValue(self.HEIGHT)
if height:
commands.append('/height')
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsconfigureshortcutsdialog.cpp
Expand Up @@ -100,7 +100,7 @@ void QgsConfigureShortcutsDialog::populateActions()
void QgsConfigureShortcutsDialog::saveShortcuts()
{
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save shortcuts" ), QDir::homePath(),
tr( "XML file" ) + " (*.xml);;" + tr( "All files" ) + " (*)" );
tr( "XML file" ) + " (*.xml);;" + tr( "All files" ) + " (*)" );

if ( fileName.isEmpty() )
return;
Expand Down Expand Up @@ -153,7 +153,7 @@ void QgsConfigureShortcutsDialog::saveShortcuts()
void QgsConfigureShortcutsDialog::loadShortcuts()
{
QString fileName = QFileDialog::getOpenFileName( this, tr( "Load shortcuts" ), QDir::homePath(),
tr( "XML file" ) + " (*.xml);;" + tr( "All files" ) + " (*)" );
tr( "XML file" ) + " (*.xml);;" + tr( "All files" ) + " (*)" );

if ( fileName.isEmpty() )
{
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgresprovider.cpp
Expand Up @@ -1280,7 +1280,7 @@ bool QgsPostgresProvider::determinePrimaryKey()

mPrimaryKeyType = ( mPrimaryKeyAttrs.size() == 1 && isInt ) ? pktInt : pktFidMap;

if ( ( mightBeNull || isParentTable ) && !mUseEstimatedMetadata && !uniqueData( primaryKey ) )
if (( mightBeNull || isParentTable ) && !mUseEstimatedMetadata && !uniqueData( primaryKey ) )
{
QgsMessageLog::logMessage( tr( "Ignoring key candidate because of NULL values or inheritance" ), tr( "PostGIS" ) );
mPrimaryKeyType = pktUnknown;
Expand Down

0 comments on commit 60ad688

Please sign in to comment.