Skip to content

Commit 2e2e55b

Browse files
author
rblazek
committed
dont redefine actions
git-svn-id: http://svn.osgeo.org/qgis/trunk@5174 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 21fee7e commit 2e2e55b

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/plugins/grass/qgsgrassedit.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -213,72 +213,72 @@ void QgsGrassEdit::init()
213213

214214
QToolBar *tb = addToolBar(tr("Edit tools"));
215215

216-
QAction *mNewPointAction = new QAction(
216+
mNewPointAction = new QAction(
217217
QIcon(myIconPath+"grass_new_point.png"), tr("New point"), this);
218218
mNewPointAction->setShortcut ( QKeySequence(Qt::Key_F1) );
219219
tb->addAction ( mNewPointAction );
220220
connect ( mNewPointAction, SIGNAL(triggered()), this, SLOT(newPoint()) );
221221

222-
QAction *mNewLineAction = new QAction(
222+
mNewLineAction = new QAction(
223223
QIcon(myIconPath+"grass_new_line.png"), tr("New line"), this);
224224
mNewLineAction->setShortcut ( QKeySequence(Qt::Key_F2) );
225225
tb->addAction ( mNewLineAction );
226226
connect ( mNewLineAction, SIGNAL(triggered()), this, SLOT(newLine()) );
227227

228-
QAction *mNewBoundaryAction = new QAction(
228+
mNewBoundaryAction = new QAction(
229229
QIcon(myIconPath+"grass_new_boundary.png"), tr("New boundary"), this);
230230
mNewBoundaryAction->setShortcut ( QKeySequence(Qt::Key_F3) );
231231
tb->addAction ( mNewBoundaryAction );
232232
connect ( mNewBoundaryAction, SIGNAL(triggered()), this, SLOT(newBoundary()) );
233233

234-
QAction *mNewCentroidAction = new QAction(
234+
mNewCentroidAction = new QAction(
235235
QIcon(myIconPath+"grass_new_centroid.png"), tr("New centroid"), this);
236236
mNewCentroidAction->setShortcut ( QKeySequence(Qt::Key_F4) );
237237
tb->addAction ( mNewCentroidAction );
238238
connect ( mNewCentroidAction, SIGNAL(triggered()), this, SLOT(newCentroid()) );
239239

240-
QAction *mMoveVertexAction = new QAction(
240+
mMoveVertexAction = new QAction(
241241
QIcon(myIconPath+"grass_move_vertex.png"), tr("Move vertex"), this);
242242
mMoveVertexAction->setShortcut ( QKeySequence(Qt::Key_F5) );
243243
tb->addAction ( mMoveVertexAction );
244244
connect ( mMoveVertexAction, SIGNAL(triggered()), this, SLOT(moveVertex()) );
245245

246-
QAction *mAddVertexAction = new QAction(
246+
mAddVertexAction = new QAction(
247247
QIcon(myIconPath+"grass_add_vertex.png"), tr("Add vertex"), this);
248248
mAddVertexAction->setShortcut ( QKeySequence(Qt::Key_F6) );
249249
tb->addAction ( mAddVertexAction );
250250
connect ( mAddVertexAction, SIGNAL(triggered()), this, SLOT(addVertex()) );
251251

252-
QAction *mDeleteVertexAction = new QAction(
252+
mDeleteVertexAction = new QAction(
253253
QIcon(myIconPath+"grass_delete_vertex.png"), tr("Delete vertex"), this);
254254
mDeleteVertexAction->setShortcut ( QKeySequence(Qt::Key_F7) );
255255
tb->addAction ( mDeleteVertexAction );
256256
connect ( mDeleteVertexAction, SIGNAL(triggered()), this, SLOT(deleteVertex()) );
257257

258-
QAction *mMoveLineAction = new QAction(
258+
mMoveLineAction = new QAction(
259259
QIcon(myIconPath+"grass_move_line.png"), tr("Move line"), this);
260260
mMoveLineAction->setShortcut ( QKeySequence(Qt::Key_F9) );
261261
tb->addAction ( mMoveLineAction );
262262
connect ( mMoveLineAction, SIGNAL(triggered()), this, SLOT(moveLine()) );
263263

264-
QAction *mSplitLineAction = new QAction(
264+
mSplitLineAction = new QAction(
265265
QIcon(myIconPath+"grass_split_line.png"), tr("Split line"), this);
266266
mSplitLineAction->setShortcut ( QKeySequence(Qt::Key_F10) );
267267
tb->addAction ( mSplitLineAction );
268268
connect ( mSplitLineAction, SIGNAL(triggered()), this, SLOT(splitLine()) );
269269

270-
QAction *mDeleteLineAction = new QAction(
270+
mDeleteLineAction = new QAction(
271271
QIcon(myIconPath+"grass_delete_line.png"), tr("Delete line"), this);
272272
mDeleteLineAction->setShortcut ( QKeySequence(Qt::Key_F11) );
273273
tb->addAction ( mDeleteLineAction );
274274
connect ( mDeleteLineAction, SIGNAL(triggered()), this, SLOT(deleteLine()) );
275275

276-
QAction *mEditAttributesAction = new QAction(
276+
mEditAttributesAction = new QAction(
277277
QIcon(myIconPath+"grass_edit_attributes.png"), tr("Edit attributes"), this);
278278
tb->addAction ( mEditAttributesAction );
279279
connect ( mEditAttributesAction, SIGNAL(triggered()), this, SLOT(editAttributes()) );
280280

281-
QAction *mCloseEditAction = new QAction(
281+
mCloseEditAction = new QAction(
282282
QIcon(myIconPath+"grass_close_edit.png"), tr("Close"), this);
283283
tb->addAction ( mCloseEditAction );
284284
connect ( mCloseEditAction, SIGNAL(triggered()), this, SLOT(closeEdit()) );

src/plugins/grass/qgsgrassedit.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ public slots:
402402
// Actions
403403
QAction *mNewPointAction;
404404
QAction *mNewLineAction;
405-
QAction *mNewBoundarytAction;
405+
QAction *mNewBoundaryAction;
406406
QAction *mNewCentroidAction;
407407
QAction *mMoveVertexAction;
408408
QAction *mAddVertexAction;

0 commit comments

Comments
 (0)