Skip to content

Commit fd8722a

Browse files
wonder-skwonder-sk
committed
Add usual file headers and update indentation
1 parent bb7831f commit fd8722a

22 files changed

+1634
-1318
lines changed

‎src/app/qgisapp.cpp

100755100644
+41-41
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ void QgisApp::emitCustomSrsValidation( QgsCoordinateReferenceSystem &srs )
378378
emit customSrsValidation( srs );
379379
}
380380

381-
void QgisApp::layerTreeViewDoubleClicked(const QModelIndex& index)
381+
void QgisApp::layerTreeViewDoubleClicked( const QModelIndex& index )
382382
{
383383
Q_UNUSED( index );
384384

@@ -396,7 +396,7 @@ void QgisApp::layerTreeViewDoubleClicked(const QModelIndex& index)
396396
}
397397
}
398398

399-
void QgisApp::activeLayerChanged(QgsMapLayer* layer)
399+
void QgisApp::activeLayerChanged( QgsMapLayer* layer )
400400
{
401401
if ( mMapCanvas )
402402
mMapCanvas->setCurrentLayer( layer );
@@ -553,7 +553,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
553553
mMapCanvas->setFocus();
554554

555555
mLayerTreeView = new QgsLayerTreeView( this );
556-
mLayerTreeView->setObjectName("theLayerTreeView"); // "theLayerTreeView" used to find this canonical instance later
556+
mLayerTreeView->setObjectName( "theLayerTreeView" ); // "theLayerTreeView" used to find this canonical instance later
557557

558558
// create undo widget
559559
mUndoWidget = new QgsUndoWidget( NULL, mMapCanvas );
@@ -1952,15 +1952,15 @@ void QgisApp::setupConnections()
19521952
// connect legend signals
19531953
connect( mLayerTreeView, SIGNAL( currentLayerChanged( QgsMapLayer * ) ),
19541954
this, SLOT( activateDeactivateLayerRelatedActions( QgsMapLayer * ) ) );
1955-
connect( mLayerTreeView->selectionModel(), SIGNAL( selectionChanged(QItemSelection,QItemSelection) ),
1955+
connect( mLayerTreeView->selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ),
19561956
this, SLOT( legendLayerSelectionChanged() ) );
1957-
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( addedChildren(QgsLayerTreeNode*,int,int) ),
1957+
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( addedChildren( QgsLayerTreeNode*, int, int ) ),
19581958
this, SLOT( markDirty() ) );
1959-
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( removedChildren(QgsLayerTreeNode*,int,int) ),
1959+
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( removedChildren( QgsLayerTreeNode*, int, int ) ),
19601960
this, SLOT( markDirty() ) );
1961-
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( visibilityChanged(QgsLayerTreeNode*,Qt::CheckState) ),
1961+
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( visibilityChanged( QgsLayerTreeNode*, Qt::CheckState ) ),
19621962
this, SLOT( markDirty() ) );
1963-
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( customPropertyChanged(QgsLayerTreeNode*,QString) ),
1963+
connect( mLayerTreeView->layerTreeModel()->rootGroup(), SIGNAL( customPropertyChanged( QgsLayerTreeNode*, QString ) ),
19641964
this, SLOT( markDirty() ) );
19651965

19661966
// connect map layer registry
@@ -2214,24 +2214,24 @@ void QgisApp::initLayerTreeView()
22142214
mLayerTreeDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
22152215

22162216
QgsLayerTreeModel* model = new QgsLayerTreeModel( QgsProject::instance()->layerTreeRoot(), this );
2217-
model->setFlag(QgsLayerTreeModel::AllowVisibilityManagement);
2217+
model->setFlag( QgsLayerTreeModel::AllowVisibilityManagement );
22182218

22192219
mLayerTreeView->setModel( model );
2220-
mLayerTreeView->setMenuProvider( new QgsAppLayerTreeViewMenuProvider(mLayerTreeView, mMapCanvas) );
2220+
mLayerTreeView->setMenuProvider( new QgsAppLayerTreeViewMenuProvider( mLayerTreeView, mMapCanvas ) );
22212221

2222-
connect( mLayerTreeView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(layerTreeViewDoubleClicked(QModelIndex)) );
2223-
connect( mLayerTreeView, SIGNAL(currentLayerChanged(QgsMapLayer*)), this, SLOT(activeLayerChanged(QgsMapLayer*)) );
2224-
connect( mLayerTreeView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(layerTreeViewCurrentChanged(QModelIndex,QModelIndex)));
2222+
connect( mLayerTreeView, SIGNAL( doubleClicked( QModelIndex ) ), this, SLOT( layerTreeViewDoubleClicked( QModelIndex ) ) );
2223+
connect( mLayerTreeView, SIGNAL( currentLayerChanged( QgsMapLayer* ) ), this, SLOT( activeLayerChanged( QgsMapLayer* ) ) );
2224+
connect( mLayerTreeView->selectionModel(), SIGNAL( currentChanged( QModelIndex, QModelIndex ) ), this, SLOT( layerTreeViewCurrentChanged( QModelIndex, QModelIndex ) ) );
22252225

22262226
mLayerTreeDock->setWidget( mLayerTreeView );
22272227
addDockWidget( Qt::LeftDockWidgetArea, mLayerTreeDock );
22282228

22292229
mLayerTreeCanvasBridge = new QgsLayerTreeMapCanvasBridge( QgsProject::instance()->layerTreeRoot(), mMapCanvas, this );
2230-
connect( QgsProject::instance(), SIGNAL(writeProject(QDomDocument&)), mLayerTreeCanvasBridge, SLOT(writeProject(QDomDocument&)));
2231-
connect( QgsProject::instance(), SIGNAL(readProject(QDomDocument)), mLayerTreeCanvasBridge, SLOT(readProject(QDomDocument)));
2230+
connect( QgsProject::instance(), SIGNAL( writeProject( QDomDocument& ) ), mLayerTreeCanvasBridge, SLOT( writeProject( QDomDocument& ) ) );
2231+
connect( QgsProject::instance(), SIGNAL( readProject( QDomDocument ) ), mLayerTreeCanvasBridge, SLOT( readProject( QDomDocument ) ) );
22322232

2233-
mMapLayerOrder = new QgsCustomLayerOrderWidget(mLayerTreeCanvasBridge, this);
2234-
mMapLayerOrder->setObjectName("theMapLayerOrder");
2233+
mMapLayerOrder = new QgsCustomLayerOrderWidget( mLayerTreeCanvasBridge, this );
2234+
mMapLayerOrder->setObjectName( "theMapLayerOrder" );
22352235

22362236
mMapLayerOrder->setWhatsThis( tr( "Map layer list that displays all layers in drawing order." ) );
22372237
mLayerOrderDock = new QDockWidget( tr( "Layer order" ), this );
@@ -2244,27 +2244,27 @@ void QgisApp::initLayerTreeView()
22442244
}
22452245

22462246

2247-
void QgisApp::layerTreeViewCurrentChanged(const QModelIndex& current, const QModelIndex& previous)
2247+
void QgisApp::layerTreeViewCurrentChanged( const QModelIndex& current, const QModelIndex& previous )
22482248
{
2249-
Q_UNUSED(previous);
2249+
Q_UNUSED( previous );
22502250

22512251
// defaults
22522252
QgsLayerTreeGroup* parentGroup = mLayerTreeView->layerTreeModel()->rootGroup();
22532253
int index = 0;
22542254

2255-
if (current.isValid())
2255+
if ( current.isValid() )
22562256
{
2257-
if (QgsLayerTreeNode* currentNode = mLayerTreeView->currentNode())
2257+
if ( QgsLayerTreeNode* currentNode = mLayerTreeView->currentNode() )
22582258
{
22592259
QgsLayerTreeNode* parentNode = currentNode->parent();
2260-
if (QgsLayerTree::isGroup(parentNode))
2261-
parentGroup = QgsLayerTree::toGroup(parentNode);
2260+
if ( QgsLayerTree::isGroup( parentNode ) )
2261+
parentGroup = QgsLayerTree::toGroup( parentNode );
22622262
}
22632263

22642264
index = current.row();
22652265
}
22662266

2267-
QgsProject::instance()->layerTreeRegistryBridge()->setLayerInsertionPoint(parentGroup, index);
2267+
QgsProject::instance()->layerTreeRegistryBridge()->setLayerInsertionPoint( parentGroup, index );
22682268
}
22692269

22702270

@@ -4047,7 +4047,7 @@ void QgisApp::addAllToOverview()
40474047
if ( mLayerTreeView )
40484048
{
40494049
foreach ( QgsLayerTreeLayer* nodeL, mLayerTreeView->layerTreeModel()->rootGroup()->findLayers() )
4050-
nodeL->setCustomProperty("overview", 1);
4050+
nodeL->setCustomProperty( "overview", 1 );
40514051
}
40524052

40534053
markDirty();
@@ -4059,7 +4059,7 @@ void QgisApp::removeAllFromOverview()
40594059
if ( mLayerTreeView )
40604060
{
40614061
foreach ( QgsLayerTreeLayer* nodeL, mLayerTreeView->layerTreeModel()->rootGroup()->findLayers() )
4062-
nodeL->setCustomProperty("overview", 0);
4062+
nodeL->setCustomProperty( "overview", 0 );
40634063
}
40644064

40654065
markDirty();
@@ -6545,7 +6545,7 @@ void QgisApp::removeLayer()
65456545
return;
65466546
}
65476547

6548-
QList<QgsLayerTreeNode*> selectedNodes = mLayerTreeView->selectedNodes(true);
6548+
QList<QgsLayerTreeNode*> selectedNodes = mLayerTreeView->selectedNodes( true );
65496549

65506550
//validate selection
65516551
if ( selectedNodes.isEmpty() )
@@ -6563,11 +6563,11 @@ void QgisApp::removeLayer()
65636563
return;
65646564
}
65656565

6566-
foreach (QgsLayerTreeNode* node, selectedNodes)
6566+
foreach ( QgsLayerTreeNode* node, selectedNodes )
65676567
{
6568-
QgsLayerTreeGroup* parentGroup = qobject_cast<QgsLayerTreeGroup*>(node->parent());
6569-
if (parentGroup)
6570-
parentGroup->removeChildNode(node);
6568+
QgsLayerTreeGroup* parentGroup = qobject_cast<QgsLayerTreeGroup*>( node->parent() );
6569+
if ( parentGroup )
6570+
parentGroup->removeChildNode( node );
65716571
}
65726572

65736573
showStatusMessage( tr( "%n legend entries removed.", "number of removed legend entries", selectedNodes.count() ) );
@@ -6657,19 +6657,19 @@ void QgisApp::duplicateLayers( QList<QgsMapLayer *> lyrList )
66576657
// add layer to layer registry and legend
66586658
QList<QgsMapLayer *> myList;
66596659
myList << dupLayer;
6660-
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled(false);
6660+
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( false );
66616661
QgsMapLayerRegistry::instance()->addMapLayers( myList );
6662-
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled(true);
6662+
QgsProject::instance()->layerTreeRegistryBridge()->setEnabled( true );
66636663

6664-
QgsLayerTreeLayer* nodeSelectedLyr = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer(selectedLyr->id());
6665-
Q_ASSERT(nodeSelectedLyr);
6666-
Q_ASSERT(QgsLayerTree::isGroup(nodeSelectedLyr->parent()));
6667-
QgsLayerTreeGroup* parentGroup = QgsLayerTree::toGroup(nodeSelectedLyr->parent());
6664+
QgsLayerTreeLayer* nodeSelectedLyr = mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( selectedLyr->id() );
6665+
Q_ASSERT( nodeSelectedLyr );
6666+
Q_ASSERT( QgsLayerTree::isGroup( nodeSelectedLyr->parent() ) );
6667+
QgsLayerTreeGroup* parentGroup = QgsLayerTree::toGroup( nodeSelectedLyr->parent() );
66686668

6669-
QgsLayerTreeLayer* nodeDupLayer = parentGroup->insertLayer(parentGroup->children().indexOf(nodeSelectedLyr)+1, dupLayer);
6669+
QgsLayerTreeLayer* nodeDupLayer = parentGroup->insertLayer( parentGroup->children().indexOf( nodeSelectedLyr ) + 1, dupLayer );
66706670

66716671
// always set duplicated layers to not visible so layer can be configured before being turned on
6672-
nodeDupLayer->setVisible(Qt::Unchecked);
6672+
nodeDupLayer->setVisible( Qt::Unchecked );
66736673

66746674
// duplicate the layer style
66756675
copyStyle( selectedLyr );
@@ -6731,7 +6731,7 @@ void QgisApp::setLayerCRS()
67316731
else if ( QgsLayerTree::isLayer( node ) )
67326732
{
67336733
QgsLayerTreeLayer* nodeLayer = QgsLayerTree::toLayer( node );
6734-
if (nodeLayer->layer())
6734+
if ( nodeLayer->layer() )
67356735
nodeLayer->layer()->setCrs( crs );
67366736
}
67376737
}
@@ -7328,7 +7328,7 @@ bool QgisApp::setActiveLayer( QgsMapLayer *layer )
73287328
if ( !layer )
73297329
return false;
73307330

7331-
if ( !mLayerTreeView->layerTreeModel()->rootGroup()->findLayer(layer->id()) )
7331+
if ( !mLayerTreeView->layerTreeModel()->rootGroup()->findLayer( layer->id() ) )
73327332
return false;
73337333

73347334
mLayerTreeView->setCurrentLayer( layer );

‎src/core/layertree/qgslayertree.h

+21-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/***************************************************************************
2+
qgslayertree.h
3+
--------------------------------------
4+
Date : May 2014
5+
Copyright : (C) 2014 by Martin Dobias
6+
Email : wonder dot sk at gmail dot com
7+
***************************************************************************
8+
* *
9+
* This program is free software; you can redistribute it and/or modify *
10+
* it under the terms of the GNU General Public License as published by *
11+
* the Free Software Foundation; either version 2 of the License, or *
12+
* (at your option) any later version. *
13+
* *
14+
***************************************************************************/
15+
116
#ifndef QGSLAYERTREE_H
217
#define QGSLAYERTREE_H
318

@@ -7,22 +22,22 @@
722

823
namespace QgsLayerTree
924
{
10-
inline bool isGroup(QgsLayerTreeNode* node)
25+
inline bool isGroup( QgsLayerTreeNode* node )
1126
{
1227
return node && node->nodeType() == QgsLayerTreeNode::NodeGroup;
1328
}
14-
inline bool isLayer(QgsLayerTreeNode* node)
29+
inline bool isLayer( QgsLayerTreeNode* node )
1530
{
1631
return node && node->nodeType() == QgsLayerTreeNode::NodeLayer;
1732
}
1833

19-
inline QgsLayerTreeGroup* toGroup(QgsLayerTreeNode* node)
34+
inline QgsLayerTreeGroup* toGroup( QgsLayerTreeNode* node )
2035
{
21-
return static_cast<QgsLayerTreeGroup*>(node);
36+
return static_cast<QgsLayerTreeGroup*>( node );
2237
}
23-
inline QgsLayerTreeLayer* toLayer(QgsLayerTreeNode* node)
38+
inline QgsLayerTreeLayer* toLayer( QgsLayerTreeNode* node )
2439
{
25-
return static_cast<QgsLayerTreeLayer*>(node);
40+
return static_cast<QgsLayerTreeLayer*>( node );
2641
}
2742

2843
}

0 commit comments

Comments
 (0)