Skip to content
Permalink
Browse files

indentation and spelling fixes

  • Loading branch information
jef-n committed Jun 26, 2015
1 parent 318137a commit 7b31f12405694c710d77c5b9b532f951af865504
Showing with 11 additions and 11 deletions.
  1. +10 −10 src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
  2. +1 −1 src/providers/grass/qgsgrassprovidermodule.cpp
@@ -411,15 +411,15 @@ void QgsSymbolV2SelectorDialog::addLayer()
QgsSymbolV2* parentSymbol = item->symbol();

// save data-defined values at marker level
QgsDataDefined ddSize = parentSymbol->type() == QgsSymbolV2::Marker
? static_cast<QgsMarkerSymbolV2 *>(parentSymbol)->dataDefinedSize()
: QgsDataDefined();
QgsDataDefined ddSize = parentSymbol->type() == QgsSymbolV2::Marker
? static_cast<QgsMarkerSymbolV2 *>( parentSymbol )->dataDefinedSize()
: QgsDataDefined();
QgsDataDefined ddAngle = parentSymbol->type() == QgsSymbolV2::Marker
? static_cast<QgsMarkerSymbolV2 *>(parentSymbol)->dataDefinedAngle()
: QgsDataDefined();
? static_cast<QgsMarkerSymbolV2 *>( parentSymbol )->dataDefinedAngle()
: QgsDataDefined();
QgsDataDefined ddWidth = parentSymbol->type() == QgsSymbolV2::Line
? static_cast<QgsLineSymbolV2 *>(parentSymbol)->dataDefinedWidth()
: QgsDataDefined() ;
? static_cast<QgsLineSymbolV2 *>( parentSymbol )->dataDefinedWidth()
: QgsDataDefined() ;

QgsSymbolLayerV2* newLayer = QgsSymbolLayerV2Registry::instance()->defaultSymbolLayer( parentSymbol->type() );
if ( insertIdx == -1 )
@@ -429,11 +429,11 @@ void QgsSymbolV2SelectorDialog::addLayer()

// restore data-defined values at marker level
if ( ddSize != QgsDataDefined() )
static_cast<QgsMarkerSymbolV2 *>(parentSymbol)->setDataDefinedSize(ddSize);
static_cast<QgsMarkerSymbolV2 *>( parentSymbol )->setDataDefinedSize( ddSize );
if ( ddAngle != QgsDataDefined() )
static_cast<QgsMarkerSymbolV2 *>(parentSymbol)->setDataDefinedAngle(ddAngle);
static_cast<QgsMarkerSymbolV2 *>( parentSymbol )->setDataDefinedAngle( ddAngle );
if ( ddWidth != QgsDataDefined() )
static_cast<QgsLineSymbolV2 *>(parentSymbol)->setDataDefinedWidth(ddWidth);
static_cast<QgsLineSymbolV2 *>( parentSymbol )->setDataDefinedWidth( ddWidth );

SymbolLayerItem *newLayerItem = new SymbolLayerItem( newLayer );
item->insertRow( insertIdx == -1 ? 0 : insertIdx, newLayerItem );
@@ -116,7 +116,7 @@ void QgsGrassMapsetItem::setState( State state )
{
QgsDebugMsg( "Entered" );
QgsDirectoryItem::setState( state );
// TODO: verify and reenable, it seems to be causing strange icon switching during import, sometimes
// TODO: verify and re-enable, it seems to be causing strange icon switching during import, sometimes
#if 0
if ( state == Populated )
{

0 comments on commit 7b31f12

Please sign in to comment.
You can’t perform that action at this time.