Skip to content

Commit

Permalink
Fix code style with astyle.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
alisovenko committed Dec 26, 2016
1 parent a037f79 commit adba280
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion python/gui/qgsmaptoolcapture.sip
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
void deleteTempRubberBand();

/**
* Return defalut Z value
* Return defalut Z value
*/
double getDefaultZValue();

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsmaptoolcapture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas* canvas, QgsAdvancedDigitizin
#ifdef Q_OS_WIN
, mSkipNextContextMenuEvent( 0 )
#endif
, mDefaultZValue(Qgis::DEFAULT_Z_COORDINATE)
, mDefaultZValue( Qgis::DEFAULT_Z_COORDINATE )
{
mCaptureMode = mode;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsmaptoolcapture.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
void deleteTempRubberBand();

/**
* Return defalut Z value
* Return defalut Z value
*/
double getDefaultZValue() {return mDefaultZValue;};

Expand Down
8 changes: 4 additions & 4 deletions src/gui/qgsnewmemorylayerdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ QgsVectorLayer *QgsNewMemoryLayerDialog::runAndCreateLayer( QWidget *parent )

QgsWkbTypes::Type geometrytype = dialog.selectedType();

QString geomType = QgsWkbTypes::displayString(geometrytype);
if ( geomType.isNull())
QString geomType = QgsWkbTypes::displayString( geometrytype );
if ( geomType.isNull() )
geomType = "none";

QString layerProperties = QStringLiteral( "%1?" ).arg( geomType );
Expand Down Expand Up @@ -109,8 +109,8 @@ QgsWkbTypes::Type QgsNewMemoryLayerDialog::selectedType() const
wkbType = QgsWkbTypes::MultiPolygon;
}

if (mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown && wkbType != QgsWkbTypes::NoGeometry)
wkbType = QgsWkbTypes::to25D(wkbType);
if ( mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown && wkbType != QgsWkbTypes::NoGeometry )
wkbType = QgsWkbTypes::to25D( wkbType );

return wkbType;
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgsnewvectorlayerdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ QgsWkbTypes::Type QgsNewVectorLayerDialog::selectedType() const
wkbType = QgsWkbTypes::Polygon;
}

if (mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown)
wkbType = QgsWkbTypes::to25D(wkbType);
if ( mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown )
wkbType = QgsWkbTypes::to25D( wkbType );

return wkbType;
}
Expand Down

0 comments on commit adba280

Please sign in to comment.