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

indentation update

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-12-04 22:52:31 +01:00
parent f210fc7ee8
commit 60ad6887c2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/processing/algs/lidar/fusion/ClipData.py
View File

@ -71,7 +71,7 @@ class ClipData(FusionAlgorithm):
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')

4
src/app/qgsconfigureshortcutsdialog.cpp
View File

@ -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;
@ -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() )
{

2
src/providers/postgres/qgspostgresprovider.cpp
View File

@ -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;