Skip to content

Commit e0f4d06

Browse files
committed
indentation update
1 parent 1aae72c commit e0f4d06

24 files changed

+149
-147
lines changed

src/app/composer/qgscomposeritemwidget.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,12 @@ void QgsComposerItemWidget::on_mPositionButton_clicked()
189189
}
190190
}
191191

192-
void QgsComposerItemWidget::on_mItemIdLineEdit_textChanged(const QString &text)
192+
void QgsComposerItemWidget::on_mItemIdLineEdit_textChanged( const QString &text )
193193
{
194-
if ( mItem )
195-
{
196-
mItem->beginCommand( tr( "Item id changed" ), QgsComposerMergeCommand::ComposerLabelSetId );
197-
mItem->setId( text );
198-
mItem->endCommand();
199-
}
194+
if ( mItem )
195+
{
196+
mItem->beginCommand( tr( "Item id changed" ), QgsComposerMergeCommand::ComposerLabelSetId );
197+
mItem->setId( text );
198+
mItem->endCommand();
199+
}
200200
}

src/app/legend/qgslegend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ QgsLegendGroup* QgsLegend::addEmbeddedGroup( const QString& groupName, const QSt
713713
removeItem( cItem );
714714
}
715715

716-
if( cItem )
716+
if ( cItem )
717717
{
718718
group->insertChild( group->childCount(), cItem );
719719
}

src/app/legend/qgslegendlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ void QgsLegendLayer::rasterLayerSymbology( QgsRasterLayer* layer )
309309
SymbologyList itemList;
310310
QList< QPair< QString, QColor > > rasterItemList = layer->legendSymbologyItems();
311311
QList< QPair< QString, QColor > >::const_iterator itemIt = rasterItemList.constBegin();
312-
for(; itemIt != rasterItemList.constEnd(); ++itemIt )
312+
for ( ; itemIt != rasterItemList.constEnd(); ++itemIt )
313313
{
314314
QPixmap itemPixmap( treeWidget()->iconSize() );
315315
itemPixmap.fill( itemIt->second );

src/app/qgsembedlayerdialog.cpp

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
QgsEmbedLayerDialog::QgsEmbedLayerDialog( QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f )
1111
{
1212
setupUi( this );
13-
QObject::connect( mButtonBox, SIGNAL(rejected() ), this, SLOT(reject() ) );
13+
QObject::connect( mButtonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
1414
}
1515

1616
QgsEmbedLayerDialog::~QgsEmbedLayerDialog()
@@ -23,11 +23,11 @@ QList< QPair < QString, QString > > QgsEmbedLayerDialog::embeddedGroups() const
2323

2424
QList<QTreeWidgetItem*> items = mTreeWidget->selectedItems();
2525
QList<QTreeWidgetItem*>::iterator itemIt = items.begin();
26-
for(; itemIt != items.end(); ++itemIt )
26+
for ( ; itemIt != items.end(); ++itemIt )
2727
{
28-
if( (*itemIt)->data(0, Qt::UserRole).toString() == "group" )
28+
if (( *itemIt )->data( 0, Qt::UserRole ).toString() == "group" )
2929
{
30-
result.push_back( qMakePair( (*itemIt)->text( 0 ), mProjectPath ) );
30+
result.push_back( qMakePair(( *itemIt )->text( 0 ), mProjectPath ) );
3131
}
3232
}
3333

@@ -40,11 +40,11 @@ QList< QPair < QString, QString > > QgsEmbedLayerDialog::embeddedLayers() const
4040

4141
QList<QTreeWidgetItem*> items = mTreeWidget->selectedItems();
4242
QList<QTreeWidgetItem*>::iterator itemIt = items.begin();
43-
for(; itemIt != items.end(); ++itemIt )
43+
for ( ; itemIt != items.end(); ++itemIt )
4444
{
45-
if( (*itemIt)->data(0, Qt::UserRole).toString() == "layer" )
45+
if (( *itemIt )->data( 0, Qt::UserRole ).toString() == "layer" )
4646
{
47-
result.push_back( qMakePair( (*itemIt)->data(0, Qt::UserRole + 1).toString(), mProjectPath ) );
47+
result.push_back( qMakePair(( *itemIt )->data( 0, Qt::UserRole + 1 ).toString(), mProjectPath ) );
4848
}
4949
}
5050
return result;
@@ -56,8 +56,8 @@ void QgsEmbedLayerDialog::on_mBrowseFileToolButton_clicked()
5656
mProjectFileLineEdit->blockSignals( true );
5757

5858
QSettings s;
59-
QString projectFile = QFileDialog::getOpenFileName( 0, tr("Select project file"), s.value("/qgis/last_embedded_project_path").toString() ,tr("QGIS project files (*.qgs)") );
60-
if( !projectFile.isEmpty() )
59+
QString projectFile = QFileDialog::getOpenFileName( 0, tr( "Select project file" ), s.value( "/qgis/last_embedded_project_path" ).toString() , tr( "QGIS project files (*.qgs)" ) );
60+
if ( !projectFile.isEmpty() )
6161
{
6262
mProjectFileLineEdit->setText( projectFile );
6363
}
@@ -73,55 +73,55 @@ void QgsEmbedLayerDialog::on_mProjectFileLineEdit_editingFinished()
7373
void QgsEmbedLayerDialog::changeProjectFile()
7474
{
7575
QFile projectFile( mProjectFileLineEdit->text() );
76-
if( !projectFile.exists() )
76+
if ( !projectFile.exists() )
7777
{
7878
return;
7979
}
8080

81-
if( mProjectPath == mProjectFileLineEdit->text() )
81+
if ( mProjectPath == mProjectFileLineEdit->text() )
8282
{
8383
//already up to date
8484
return;
8585
}
8686

8787
//check we are not embedding from/to the same project
88-
if( mProjectFileLineEdit->text() == QgsProject::instance()->fileName() )
88+
if ( mProjectFileLineEdit->text() == QgsProject::instance()->fileName() )
8989
{
90-
QMessageBox::critical( 0, tr("Recursive embeding not possible"), tr("It is not possible to embed layers / groups from the current project") );
90+
QMessageBox::critical( 0, tr( "Recursive embeding not possible" ), tr( "It is not possible to embed layers / groups from the current project" ) );
9191
return;
9292
}
9393

9494
mTreeWidget->clear();
9595

9696
//parse project file and fill tree
97-
if( !projectFile.open( QIODevice::ReadOnly ) )
97+
if ( !projectFile.open( QIODevice::ReadOnly ) )
9898
{
9999
return;
100100
}
101101

102102
QDomDocument projectDom;
103-
if( !projectDom.setContent( &projectFile ) )
103+
if ( !projectDom.setContent( &projectFile ) )
104104
{
105105
return;
106106
}
107107

108-
QDomElement legendElem = projectDom.documentElement().firstChildElement("legend");
109-
if( legendElem.isNull() )
108+
QDomElement legendElem = projectDom.documentElement().firstChildElement( "legend" );
109+
if ( legendElem.isNull() )
110110
{
111111
return;
112112
}
113113

114114
QDomNodeList legendChildren = legendElem.childNodes();
115115
QDomElement currentChildElem;
116116

117-
for( int i = 0; i < legendChildren.size(); ++i )
117+
for ( int i = 0; i < legendChildren.size(); ++i )
118118
{
119119
currentChildElem = legendChildren.at( i ).toElement();
120-
if( currentChildElem.tagName() == "legendlayer" )
120+
if ( currentChildElem.tagName() == "legendlayer" )
121121
{
122122
addLegendLayerToTreeWidget( currentChildElem );
123123
}
124-
else if( currentChildElem.tagName() == "legendgroup" )
124+
else if ( currentChildElem.tagName() == "legendgroup" )
125125
{
126126
addLegendGroupToTreeWidget( currentChildElem );
127127
}
@@ -135,32 +135,32 @@ void QgsEmbedLayerDialog::addLegendGroupToTreeWidget( const QDomElement& groupEl
135135
QDomNodeList groupChildren = groupElem.childNodes();
136136
QDomElement currentChildElem;
137137

138-
if(groupElem.attribute("embedded") == "1" )
138+
if ( groupElem.attribute( "embedded" ) == "1" )
139139
{
140140
return;
141141
}
142142

143143
QTreeWidgetItem* groupItem = 0;
144-
if( !parent )
144+
if ( !parent )
145145
{
146146
groupItem = new QTreeWidgetItem( mTreeWidget );
147147
}
148148
else
149149
{
150150
groupItem = new QTreeWidgetItem( parent );
151151
}
152-
groupItem->setIcon( 0, QgisApp::getThemeIcon("mActionFolder.png") );
153-
groupItem->setText( 0, groupElem.attribute("name") );
152+
groupItem->setIcon( 0, QgisApp::getThemeIcon( "mActionFolder.png" ) );
153+
groupItem->setText( 0, groupElem.attribute( "name" ) );
154154
groupItem->setData( 0, Qt::UserRole, "group" );
155155

156-
for( int i = 0; i < groupChildren.size(); ++i )
156+
for ( int i = 0; i < groupChildren.size(); ++i )
157157
{
158158
currentChildElem = groupChildren.at( i ).toElement();
159-
if( currentChildElem.tagName() == "legendlayer" )
159+
if ( currentChildElem.tagName() == "legendlayer" )
160160
{
161161
addLegendLayerToTreeWidget( currentChildElem, groupItem );
162162
}
163-
else if( currentChildElem.tagName() == "legendgroup" )
163+
else if ( currentChildElem.tagName() == "legendgroup" )
164164
{
165165
addLegendGroupToTreeWidget( currentChildElem, groupItem );
166166
}
@@ -169,31 +169,31 @@ void QgsEmbedLayerDialog::addLegendGroupToTreeWidget( const QDomElement& groupEl
169169

170170
void QgsEmbedLayerDialog::addLegendLayerToTreeWidget( const QDomElement& layerElem, QTreeWidgetItem* parent )
171171
{
172-
if(layerElem.attribute("embedded") == "1" )
172+
if ( layerElem.attribute( "embedded" ) == "1" )
173173
{
174174
return;
175175
}
176176

177177
QTreeWidgetItem* item = 0;
178-
if( parent )
178+
if ( parent )
179179
{
180180
item = new QTreeWidgetItem( parent );
181181
}
182182
else
183183
{
184184
item = new QTreeWidgetItem( mTreeWidget );
185185
}
186-
item->setText( 0, layerElem.attribute("name") );
186+
item->setText( 0, layerElem.attribute( "name" ) );
187187
item->setData( 0, Qt::UserRole, "layer" );
188-
item->setData( 0, Qt::UserRole + 1, layerElem.firstChildElement("filegroup").firstChildElement("legendlayerfile").attribute("layerid") );
188+
item->setData( 0, Qt::UserRole + 1, layerElem.firstChildElement( "filegroup" ).firstChildElement( "legendlayerfile" ).attribute( "layerid" ) );
189189
}
190190

191191
void QgsEmbedLayerDialog::on_mTreeWidget_itemSelectionChanged()
192192
{
193193
mTreeWidget->blockSignals( true );
194194
QList<QTreeWidgetItem*> items = mTreeWidget->selectedItems();
195195
QList<QTreeWidgetItem*>::iterator itemIt = items.begin();
196-
for(; itemIt != items.end(); ++itemIt )
196+
for ( ; itemIt != items.end(); ++itemIt )
197197
{
198198
//deselect children recursively
199199
unselectChildren( *itemIt );
@@ -203,13 +203,13 @@ void QgsEmbedLayerDialog::on_mTreeWidget_itemSelectionChanged()
203203

204204
void QgsEmbedLayerDialog::unselectChildren( QTreeWidgetItem* item )
205205
{
206-
if( !item )
206+
if ( !item )
207207
{
208208
return;
209209
}
210210

211211
QTreeWidgetItem* currentChild = 0;
212-
for( int i = 0; i < item->childCount(); ++i )
212+
for ( int i = 0; i < item->childCount(); ++i )
213213
{
214214
currentChild = item->child( i );
215215
currentChild->setSelected( false );
@@ -221,9 +221,9 @@ void QgsEmbedLayerDialog::on_mButtonBox_accepted()
221221
{
222222
QSettings s;
223223
QFileInfo fi( mProjectPath );
224-
if( fi.exists() )
224+
if ( fi.exists() )
225225
{
226-
s.setValue("/qgis/last_embedded_project_path", fi.absolutePath() );
226+
s.setValue( "/qgis/last_embedded_project_path", fi.absolutePath() );
227227
}
228228
accept();
229229
}

src/app/qgsembedlayerdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class QDomElement;
88

99
class QgsEmbedLayerDialog: public QDialog, private Ui::QgsEmbedLayerDialogBase
1010
{
11-
Q_OBJECT
11+
Q_OBJECT
1212
public:
1313
QgsEmbedLayerDialog( QWidget * parent = 0, Qt::WindowFlags f = 0 );
1414
~QgsEmbedLayerDialog();

src/core/composer/qgscomposeritem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
330330
void rotationChanged( double newRotation );
331331
/**Used e.g. by the item widgets to update the gui elements*/
332332
void itemChanged();
333-
private:
333+
private:
334334
// Label id (unique within the same composition)
335335
QString mId;
336336
};

src/core/composer/qgscomposerlegenditem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class CORE_EXPORT QgsComposerRasterSymbolItem: public QgsComposerLegendItem
125125
QString layerID() const { return mLayerID; }
126126
ItemType itemType() const { return RasterSymbolItem; }
127127

128-
void setColor( const QColor& c ){ mColor = c; }
128+
void setColor( const QColor& c ) { mColor = c; }
129129
QColor color() const { return mColor; }
130130

131131
private:

src/core/composer/qgslegendmodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ int QgsLegendModel::addRasterLayerItems( QStandardItem* layerItem, QgsMapLayer*
238238

239239
QList< QPair< QString, QColor > > rasterItemList = rasterLayer->legendSymbologyItems();
240240
QList< QPair< QString, QColor > >::const_iterator itemIt = rasterItemList.constBegin();
241-
for(; itemIt != rasterItemList.constEnd(); ++itemIt )
241+
for ( ; itemIt != rasterItemList.constEnd(); ++itemIt )
242242
{
243243
QgsComposerRasterSymbolItem* currentSymbolItem = new QgsComposerRasterSymbolItem( itemIt->first );
244-
if( mHasTopLevelWindow )
244+
if ( mHasTopLevelWindow )
245245
{
246246
QPixmap itemPixmap( 20, 20 );
247247
itemPixmap.fill( itemIt->second );

src/core/qgsproject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ class CORE_EXPORT QgsProject : public QObject
283283
@return the layer or 0 in case of error
284284
@note: added in version 1.8*/
285285
//static QgsMapLayer* createEmbeddedLayer( const QString& layerId, const QString& projectFilePath );
286-
bool createEmbeddedLayer( const QString& layerId, const QString& projectFilePath, QList<QDomNode>& brokenNodes,
287-
QList< QPair< QgsVectorLayer*, QDomElement > >& vectorLayerList, bool saveFlag = true );
286+
bool createEmbeddedLayer( const QString& layerId, const QString& projectFilePath, QList<QDomNode>& brokenNodes,
287+
QList< QPair< QgsVectorLayer*, QDomElement > >& vectorLayerList, bool saveFlag = true );
288288

289289
protected:
290290

src/core/spatialindex/include/RTree.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,25 @@ namespace SpatialIndex
7878
extern ISpatialIndex* returnRTree( IStorageManager& in0, Tools::PropertySet& in1 );
7979
#endif//_MSC_VER
8080
extern ISpatialIndex* createNewRTree(
81-
IStorageManager& sm,
82-
double fillFactor,
83-
unsigned long indexCapacity,
84-
unsigned long leafCapacity,
85-
unsigned long dimension,
86-
RTreeVariant rv,
87-
long& indexIdentifier
88-
);
81+
IStorageManager& sm,
82+
double fillFactor,
83+
unsigned long indexCapacity,
84+
unsigned long leafCapacity,
85+
unsigned long dimension,
86+
RTreeVariant rv,
87+
long& indexIdentifier
88+
);
8989
extern ISpatialIndex* createAndBulkLoadNewRTree(
90-
BulkLoadMethod m,
91-
IDataStream& stream,
92-
IStorageManager& sm,
93-
double fillFactor,
94-
unsigned long indexCapacity,
95-
unsigned long leafCapacity,
96-
unsigned long dimension,
97-
RTreeVariant rv,
98-
long& indexIdentifier
99-
);
90+
BulkLoadMethod m,
91+
IDataStream& stream,
92+
IStorageManager& sm,
93+
double fillFactor,
94+
unsigned long indexCapacity,
95+
unsigned long leafCapacity,
96+
unsigned long dimension,
97+
RTreeVariant rv,
98+
long& indexIdentifier
99+
);
100100
extern ISpatialIndex* loadRTree( IStorageManager& in, long indexIdentifier );
101101
}
102102
}

src/core/spatialindex/include/SpatialIndex.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ namespace SpatialIndex
5757
//
5858
// Interfaces
5959
//
60-
interface IEntry : public Tools::IObject
60+
interface IEntry : public Tools::IObject
6161
{
6262
public:
6363
virtual long getIdentifier() const = 0;
6464
virtual void getShape( IShape** out ) const = 0;
6565
virtual ~IEntry() {}
6666
}; // IEntry
6767

68-
interface INode : public IEntry, public Tools::ISerializable
68+
interface INode : public IEntry, public Tools::ISerializable
6969
{
7070
public:
7171
virtual unsigned long getChildrenCount() const = 0;
@@ -77,14 +77,14 @@ interface INode : public IEntry, public Tools::ISerializable
7777
virtual ~INode() {}
7878
}; // INode
7979

80-
interface IData : public IEntry
80+
interface IData : public IEntry
8181
{
8282
public:
8383
virtual void getData( unsigned long& len, byte** data ) const = 0;
8484
virtual ~IData() {}
8585
}; // IData
8686

87-
interface IDataStream : public Tools::IObjectStream
87+
interface IDataStream : public Tools::IObjectStream
8888
{
8989
public:
9090
virtual IData* getNext() = 0;
@@ -168,7 +168,7 @@ interface IDataStream : public Tools::IObjectStream
168168
NewPage = -0x1
169169
};
170170

171-
interface IBuffer : public IStorageManager
171+
interface IBuffer : public IStorageManager
172172
{
173173
public:
174174
virtual unsigned long getHits() = 0;

0 commit comments

Comments
 (0)