Skip to content

Commit

Permalink
Indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 22, 2020
1 parent e82a2e4 commit ccfecae
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/gui/labeling/qgslabelengineconfigdialog.cpp
Expand Up @@ -28,7 +28,7 @@
#include <QMessageBox>
#include <QMenu>

QgsLabelEngineConfigWidget::QgsLabelEngineConfigWidget( QgsMapCanvas* canvas, QWidget *parent )
QgsLabelEngineConfigWidget::QgsLabelEngineConfigWidget( QgsMapCanvas *canvas, QWidget *parent )
: QgsPanelWidget( parent ), mCanvas( canvas )
{
setupUi( this );
Expand Down Expand Up @@ -149,7 +149,7 @@ void QgsLabelEngineConfigWidget::showHelp()
// QgsLabelEngineConfigDialog
//

QgsLabelEngineConfigDialog::QgsLabelEngineConfigDialog( QgsMapCanvas* canvas, QWidget *parent )
QgsLabelEngineConfigDialog::QgsLabelEngineConfigDialog( QgsMapCanvas *canvas, QWidget *parent )
: QDialog( parent )
{
mWidget = new QgsLabelEngineConfigWidget( canvas );
Expand Down
24 changes: 12 additions & 12 deletions src/gui/layout/qgslayoutscalebarwidget.cpp
Expand Up @@ -189,24 +189,24 @@ void QgsLayoutScaleBarWidget::lineSymbolChanged()

void QgsLayoutScaleBarWidget::fillSymbol1Changed()
{
if ( !mScalebar )
return;
if ( !mScalebar )
return;

mScalebar->layout()->undoStack()->beginCommand( mScalebar, tr( "Change Scalebar Fill Style" ), QgsLayoutItem::UndoShapeStyle );
mScalebar->setFillSymbol1( mFillSymbol1Button->clonedSymbol<QgsFillSymbol>() );
mScalebar->update();
mScalebar->layout()->undoStack()->endCommand();
mScalebar->layout()->undoStack()->beginCommand( mScalebar, tr( "Change Scalebar Fill Style" ), QgsLayoutItem::UndoShapeStyle );
mScalebar->setFillSymbol1( mFillSymbol1Button->clonedSymbol<QgsFillSymbol>() );
mScalebar->update();
mScalebar->layout()->undoStack()->endCommand();
}

void QgsLayoutScaleBarWidget::fillSymbol2Changed()
{
if ( !mScalebar )
return;
if ( !mScalebar )
return;

mScalebar->layout()->undoStack()->beginCommand( mScalebar, tr( "Change Scalebar Fill Style" ), QgsLayoutItem::UndoShapeStyle );
mScalebar->setFillSymbol2( mFillSymbol2Button->clonedSymbol<QgsFillSymbol>() );
mScalebar->update();
mScalebar->layout()->undoStack()->endCommand();
mScalebar->layout()->undoStack()->beginCommand( mScalebar, tr( "Change Scalebar Fill Style" ), QgsLayoutItem::UndoShapeStyle );
mScalebar->setFillSymbol2( mFillSymbol2Button->clonedSymbol<QgsFillSymbol>() );
mScalebar->update();
mScalebar->layout()->undoStack()->endCommand();
}

void QgsLayoutScaleBarWidget::setGuiElements()
Expand Down
4 changes: 2 additions & 2 deletions src/gui/vector/qgsvectorlayerloadstyledialog.cpp
Expand Up @@ -265,7 +265,7 @@ void QgsVectorLayerLoadStyleDialog::deleteStyleFromDB()
if ( !msgError.isNull() )
{
QgsDebugMsg( opInfo + " failed." );
QMessageBox::warning(this, opInfo, tr( "%1: fail. %2" ).arg( opInfo, msgError ) );
QMessageBox::warning( this, opInfo, tr( "%1: fail. %2" ).arg( opInfo, msgError ) );
}
else
{
Expand All @@ -282,7 +282,7 @@ void QgsVectorLayerLoadStyleDialog::deleteStyleFromDB()
int sectionLimit = mLayer->listStylesInDatabase( ids, names, descriptions, errorMsg );
if ( !errorMsg.isNull() )
{
QMessageBox::warning(this, tr( "Error occurred while retrieving styles from database" ), errorMsg );
QMessageBox::warning( this, tr( "Error occurred while retrieving styles from database" ), errorMsg );
}
else
{
Expand Down

0 comments on commit ccfecae

Please sign in to comment.