Skip to content

Commit 36fc62c

Browse files
3nids3nids
committed
also rename file and class
1 parent 0a2d3ba commit 36fc62c

7 files changed

Lines changed: 66 additions & 66 deletions

File tree

‎src/app/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ SET(QGIS_APP_SRCS
120120
decorations/qgsdecorationgrid.cpp
121121
decorations/qgsdecorationgriddialog.cpp
122122

123-
vertextool/qgsselectedfeature.cpp
123+
vertextool/qgslockedfeature.cpp
124124
vertextool/qgsvertexentry.cpp
125125
vertextool/qgsvertexeditor.cpp
126126
vertextool/qgsvertextool.cpp
@@ -372,7 +372,7 @@ SET (QGIS_APP_MOC_HDRS
372372
decorations/qgsdecorationgrid.h
373373
decorations/qgsdecorationgriddialog.h
374374

375-
vertextool/qgsselectedfeature.h
375+
vertextool/qgslockedfeature.h
376376
vertextool/qgsvertexeditor.h
377377
vertextool/qgsvertextool.h
378378

src/app/vertextool/qgsselectedfeature.cpp renamed to src/app/vertextool/qgslockedfeature.cpp

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsselectedfeature.cpp - selected feature of vertextool
2+
qgslockedfeature.cpp - locked feature of vertextool
33
---------------------
44
begin : April 2009
55
copyright : (C) 2009 by Richard Kostecky
@@ -13,7 +13,7 @@
1313
* *
1414
***************************************************************************/
1515

16-
#include "vertextool/qgsselectedfeature.h"
16+
#include "vertextool/qgslockedfeature.h"
1717
#include "vertextool/qgsvertexentry.h"
1818

1919
#include "qgsfeatureiterator.h"
@@ -32,16 +32,16 @@
3232
#include "qgsmapcanvas.h"
3333

3434

35-
QgsSelectedFeature::QgsSelectedFeature( QgsFeatureId featureId,
36-
QgsVectorLayer *vlayer,
37-
QgsMapCanvas *canvas )
35+
QgsLockedFeature::QgsLockedFeature( QgsFeatureId featureId,
36+
QgsVectorLayer *vlayer,
37+
QgsMapCanvas *canvas )
3838
: mFeatureId( featureId )
3939
, mChangingGeometry( false )
4040
{
4141
setSelectedFeature( featureId, vlayer, canvas );
4242
}
4343

44-
QgsSelectedFeature::~QgsSelectedFeature()
44+
QgsLockedFeature::~QgsLockedFeature()
4545
{
4646
deleteVertexMap();
4747

@@ -61,13 +61,13 @@ QgsSelectedFeature::~QgsSelectedFeature()
6161
delete mGeometry;
6262
}
6363

64-
void QgsSelectedFeature::currentLayerChanged( QgsMapLayer *layer )
64+
void QgsLockedFeature::currentLayerChanged( QgsMapLayer *layer )
6565
{
6666
if ( layer == mLayer )
6767
deleteLater();
6868
}
6969

70-
void QgsSelectedFeature::updateGeometry( const QgsGeometry *geom )
70+
void QgsLockedFeature::updateGeometry( const QgsGeometry *geom )
7171
{
7272
delete mGeometry;
7373

@@ -86,7 +86,7 @@ void QgsSelectedFeature::updateGeometry( const QgsGeometry *geom )
8686
}
8787
}
8888

89-
void QgsSelectedFeature::setSelectedFeature( QgsFeatureId featureId, QgsVectorLayer *layer, QgsMapCanvas *canvas )
89+
void QgsLockedFeature::setSelectedFeature( QgsFeatureId featureId, QgsVectorLayer *layer, QgsMapCanvas *canvas )
9090
{
9191
mFeatureId = featureId;
9292
mLayer = layer;
@@ -96,58 +96,58 @@ void QgsSelectedFeature::setSelectedFeature( QgsFeatureId featureId, QgsVectorLa
9696
mGeometry = nullptr;
9797

9898
// signal changing of current layer
99-
connect( QgisApp::instance()->layerTreeView(), &QgsLayerTreeView::currentLayerChanged, this, &QgsSelectedFeature::currentLayerChanged );
99+
connect( QgisApp::instance()->layerTreeView(), &QgsLayerTreeView::currentLayerChanged, this, &QgsLockedFeature::currentLayerChanged );
100100

101101
// feature was deleted
102-
connect( mLayer, &QgsVectorLayer::featureDeleted, this, &QgsSelectedFeature::featureDeleted );
102+
connect( mLayer, &QgsVectorLayer::featureDeleted, this, &QgsLockedFeature::featureDeleted );
103103

104104
// rolling back
105-
connect( mLayer, &QgsVectorLayer::beforeRollBack, this, &QgsSelectedFeature::beforeRollBack );
105+
connect( mLayer, &QgsVectorLayer::beforeRollBack, this, &QgsLockedFeature::beforeRollBack );
106106

107107
// projection or extents changed
108-
connect( canvas, &QgsMapCanvas::destinationCrsChanged, this, &QgsSelectedFeature::updateVertexMarkersPosition );
109-
connect( canvas, &QgsMapCanvas::extentsChanged, this, &QgsSelectedFeature::updateVertexMarkersPosition );
108+
connect( canvas, &QgsMapCanvas::destinationCrsChanged, this, &QgsLockedFeature::updateVertexMarkersPosition );
109+
connect( canvas, &QgsMapCanvas::extentsChanged, this, &QgsLockedFeature::updateVertexMarkersPosition );
110110

111111
// geometry was changed
112-
connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsSelectedFeature::geometryChanged );
112+
connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsLockedFeature::geometryChanged );
113113

114114
replaceVertexMap();
115115
}
116116

117-
void QgsSelectedFeature::beforeRollBack()
117+
void QgsLockedFeature::beforeRollBack()
118118
{
119-
disconnect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsSelectedFeature::geometryChanged );
119+
disconnect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsLockedFeature::geometryChanged );
120120
deleteVertexMap();
121121
}
122122

123-
void QgsSelectedFeature::beginGeometryChange()
123+
void QgsLockedFeature::beginGeometryChange()
124124
{
125125
Q_ASSERT( !mChangingGeometry );
126126
mChangingGeometry = true;
127127

128-
disconnect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsSelectedFeature::geometryChanged );
128+
disconnect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsLockedFeature::geometryChanged );
129129
}
130130

131-
void QgsSelectedFeature::endGeometryChange()
131+
void QgsLockedFeature::endGeometryChange()
132132
{
133133
Q_ASSERT( mChangingGeometry );
134134
mChangingGeometry = false;
135135

136-
connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsSelectedFeature::geometryChanged );
136+
connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsLockedFeature::geometryChanged );
137137
}
138138

139-
void QgsSelectedFeature::canvasLayersChanged()
139+
void QgsLockedFeature::canvasLayersChanged()
140140
{
141141
currentLayerChanged( mCanvas->currentLayer() );
142142
}
143143

144-
void QgsSelectedFeature::featureDeleted( QgsFeatureId fid )
144+
void QgsLockedFeature::featureDeleted( QgsFeatureId fid )
145145
{
146146
if ( fid == mFeatureId )
147147
deleteLater();
148148
}
149149

150-
void QgsSelectedFeature::geometryChanged( QgsFeatureId fid, const QgsGeometry &geom )
150+
void QgsLockedFeature::geometryChanged( QgsFeatureId fid, const QgsGeometry &geom )
151151
{
152152
QgsDebugCall;
153153

@@ -159,7 +159,7 @@ void QgsSelectedFeature::geometryChanged( QgsFeatureId fid, const QgsGeometry &g
159159
replaceVertexMap();
160160
}
161161

162-
void QgsSelectedFeature::validateGeometry( QgsGeometry *g )
162+
void QgsLockedFeature::validateGeometry( QgsGeometry *g )
163163
{
164164
QgsSettings settings;
165165
if ( settings.value( QStringLiteral( "qgis/digitizing/validate_geometries" ), 1 ).toInt() == 0 )
@@ -190,15 +190,15 @@ void QgsSelectedFeature::validateGeometry( QgsGeometry *g )
190190
if ( settings.value( QStringLiteral( "qgis/digitizing/validate_geometries" ), 1 ).toInt() == 2 )
191191
method = QgsGeometry::ValidatorGeos;
192192
mValidator = new QgsGeometryValidator( *g, nullptr, method );
193-
connect( mValidator, &QgsGeometryValidator::errorFound, this, &QgsSelectedFeature::addError );
194-
connect( mValidator, &QThread::finished, this, &QgsSelectedFeature::validationFinished );
193+
connect( mValidator, &QgsGeometryValidator::errorFound, this, &QgsLockedFeature::addError );
194+
connect( mValidator, &QThread::finished, this, &QgsLockedFeature::validationFinished );
195195
mValidator->start();
196196

197197
QgsStatusBar *sb = QgisApp::instance()->statusBarIface();
198198
sb->showMessage( tr( "Validation started." ) );
199199
}
200200

201-
void QgsSelectedFeature::addError( QgsGeometry::Error e )
201+
void QgsLockedFeature::addError( QgsGeometry::Error e )
202202
{
203203
mGeomErrors << e;
204204
if ( !mTip.isEmpty() )
@@ -223,13 +223,13 @@ void QgsSelectedFeature::addError( QgsGeometry::Error e )
223223
sb->setToolTip( mTip );
224224
}
225225

226-
void QgsSelectedFeature::validationFinished()
226+
void QgsLockedFeature::validationFinished()
227227
{
228228
QgsStatusBar *sb = QgisApp::instance()->statusBarIface();
229229
sb->showMessage( tr( "Validation finished (%n error(s) found).", "number of geometry errors", mGeomErrorMarkers.size() ) );
230230
}
231231

232-
void QgsSelectedFeature::replaceVertexMap()
232+
void QgsLockedFeature::replaceVertexMap()
233233
{
234234
// delete old map
235235
deleteVertexMap();
@@ -243,7 +243,7 @@ void QgsSelectedFeature::replaceVertexMap()
243243
emit vertexMapChanged();
244244
}
245245

246-
void QgsSelectedFeature::deleteVertexMap()
246+
void QgsLockedFeature::deleteVertexMap()
247247
{
248248
Q_FOREACH ( QgsVertexEntry *entry, mVertexMap )
249249
{
@@ -253,18 +253,18 @@ void QgsSelectedFeature::deleteVertexMap()
253253
mVertexMap.clear();
254254
}
255255

256-
bool QgsSelectedFeature::isSelected( int vertexNr )
256+
bool QgsLockedFeature::isSelected( int vertexNr )
257257
{
258258
return mVertexMap.at( vertexNr )->isSelected();
259259
}
260260

261-
QgsGeometry *QgsSelectedFeature::geometry()
261+
QgsGeometry *QgsLockedFeature::geometry()
262262
{
263263
Q_ASSERT( mGeometry );
264264
return mGeometry;
265265
}
266266

267-
void QgsSelectedFeature::createVertexMap()
267+
void QgsLockedFeature::createVertexMap()
268268
{
269269

270270
if ( !mGeometry )
@@ -292,7 +292,7 @@ void QgsSelectedFeature::createVertexMap()
292292
}
293293
}
294294

295-
void QgsSelectedFeature::selectVertex( int vertexNr )
295+
void QgsLockedFeature::selectVertex( int vertexNr )
296296
{
297297
if ( vertexNr < 0 || vertexNr >= mVertexMap.size() )
298298
return;
@@ -303,7 +303,7 @@ void QgsSelectedFeature::selectVertex( int vertexNr )
303303
emit selectionChanged();
304304
}
305305

306-
void QgsSelectedFeature::deselectVertex( int vertexNr )
306+
void QgsLockedFeature::deselectVertex( int vertexNr )
307307
{
308308
if ( vertexNr < 0 || vertexNr >= mVertexMap.size() )
309309
return;
@@ -314,7 +314,7 @@ void QgsSelectedFeature::deselectVertex( int vertexNr )
314314
emit selectionChanged();
315315
}
316316

317-
void QgsSelectedFeature::deselectAllVertices()
317+
void QgsLockedFeature::deselectAllVertices()
318318
{
319319
for ( int i = 0; i < mVertexMap.size(); i++ )
320320
{
@@ -323,7 +323,7 @@ void QgsSelectedFeature::deselectAllVertices()
323323
emit selectionChanged();
324324
}
325325

326-
void QgsSelectedFeature::invertVertexSelection( int vertexNr )
326+
void QgsLockedFeature::invertVertexSelection( int vertexNr )
327327
{
328328
if ( vertexNr < 0 || vertexNr >= mVertexMap.size() )
329329
return;
@@ -336,7 +336,7 @@ void QgsSelectedFeature::invertVertexSelection( int vertexNr )
336336
emit selectionChanged();
337337
}
338338

339-
void QgsSelectedFeature::invertVertexSelection( const QVector<int> &vertexIndices )
339+
void QgsLockedFeature::invertVertexSelection( const QVector<int> &vertexIndices )
340340
{
341341
Q_FOREACH ( int index, vertexIndices )
342342
{
@@ -349,25 +349,25 @@ void QgsSelectedFeature::invertVertexSelection( const QVector<int> &vertexIndice
349349
emit selectionChanged();
350350
}
351351

352-
void QgsSelectedFeature::updateVertexMarkersPosition()
352+
void QgsLockedFeature::updateVertexMarkersPosition()
353353
{
354354
Q_FOREACH ( QgsVertexEntry *vertexEntry, mVertexMap )
355355
{
356356
vertexEntry->placeMarker();
357357
}
358358
}
359359

360-
QgsFeatureId QgsSelectedFeature::featureId()
360+
QgsFeatureId QgsLockedFeature::featureId()
361361
{
362362
return mFeatureId;
363363
}
364364

365-
QList<QgsVertexEntry *> &QgsSelectedFeature::vertexMap()
365+
QList<QgsVertexEntry *> &QgsLockedFeature::vertexMap()
366366
{
367367
return mVertexMap;
368368
}
369369

370-
QgsVectorLayer *QgsSelectedFeature::layer()
370+
QgsVectorLayer *QgsLockedFeature::layer()
371371
{
372372
return mLayer;
373373
}

src/app/vertextool/qgsselectedfeature.h renamed to src/app/vertextool/qgslockedfeature.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsselectedfeature.h - selected feature of vertextool
2+
qgslockedfeature.h - selected feature of vertextool
33
---------------------
44
begin : April 2009
55
copyright : (C) 2009 by Richard Kostecky
@@ -13,8 +13,8 @@
1313
* *
1414
***************************************************************************/
1515

16-
#ifndef QGSSELECTEDFEATURE_H
17-
#define QGSSELECTEDFEATURE_H
16+
#ifndef QGSLOCKEDFEATURE_H
17+
#define QGSLOCKEDFEATURE_H
1818

1919
#include "qgsgeometry.h"
2020
#include "qgsfeatureid.h"
@@ -38,13 +38,13 @@ static const double ZERO_TOLERANCE = 0.000000001;
3838
/**
3939
* Class that keeps the selected feature
4040
*/
41-
class QgsSelectedFeature: public QObject
41+
class QgsLockedFeature: public QObject
4242
{
4343
Q_OBJECT
4444

4545
public:
46-
QgsSelectedFeature( QgsFeatureId id, QgsVectorLayer *layer, QgsMapCanvas *canvas );
47-
~QgsSelectedFeature() override;
46+
QgsLockedFeature( QgsFeatureId id, QgsVectorLayer *layer, QgsMapCanvas *canvas );
47+
~QgsLockedFeature() override;
4848

4949
/**
5050
* Setting selected feature

‎src/app/vertextool/qgsvertexeditor.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "qgsvertexeditor.h"
2020
#include "qgsmapcanvas.h"
2121
#include "qgsmessagelog.h"
22-
#include "qgsselectedfeature.h"
22+
#include "qgslockedfeature.h"
2323
#include "qgsvertexentry.h"
2424
#include "qgsvectorlayer.h"
2525
#include "qgsgeometryutils.h"
@@ -47,7 +47,7 @@ QgsVertexEditorModel::QgsVertexEditorModel( QgsMapCanvas *canvas, QObject *paren
4747
mWidgetFont = parentWidget->font();
4848
}
4949

50-
void QgsVertexEditorModel::setFeature( QgsSelectedFeature *selectedFeature )
50+
void QgsVertexEditorModel::setFeature( QgsLockedFeature *selectedFeature )
5151
{
5252
beginResetModel();
5353

@@ -332,7 +332,7 @@ QgsVertexEditor::QgsVertexEditor( QgsMapCanvas *canvas )
332332
setWidget( content );
333333
}
334334

335-
void QgsVertexEditor::updateEditor( QgsSelectedFeature *selectedFeature )
335+
void QgsVertexEditor::updateEditor( QgsLockedFeature *selectedFeature )
336336
{
337337

338338
mSelectedFeature = selectedFeature;
@@ -344,7 +344,7 @@ void QgsVertexEditor::updateEditor( QgsSelectedFeature *selectedFeature )
344344
mHintLabel->setVisible( false );
345345
mTableView->setVisible( true );
346346

347-
connect( mSelectedFeature, &QgsSelectedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
347+
connect( mSelectedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
348348
}
349349
else
350350
{

0 commit comments

Comments
 (0)