diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-11-07 22:16:30 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-11-07 22:26:33 -0800 |
commit | 440423ff6476119e090798ae2d59dc59d5253a0a (patch) | |
tree | 5a8c32678056583e0cc7cd06682bc123d0584e33 /profile-widget | |
parent | bfe24526d35c47c1229a0711882d4e789fb46731 (diff) | |
parent | 829f7a2ee264b4e25e8ea926a98199f8049a23d6 (diff) | |
download | subsurface-440423ff6476119e090798ae2d59dc59d5253a0a.tar.gz |
Merge branch 'warnings' of github.com:neolit123/subsurface
Diffstat (limited to 'profile-widget')
-rw-r--r-- | profile-widget/profilewidget2.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 177ceab75..ca9eead95 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -1291,7 +1291,7 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event) action->setData(event->globalPos()); if (same_string(current_dc->model, "manually added dive")) - QAction *editProfileAction = m.addAction(tr("Edit the profile"), this, SIGNAL(editCurrentDive())); + m.addAction(tr("Edit the profile"), this, SIGNAL(editCurrentDive())); if (DiveEventItem *item = dynamic_cast<DiveEventItem *>(sceneItem)) { action = new QAction(&m); @@ -1621,7 +1621,6 @@ void ProfileWidget2::repositionDiveHandlers() { DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance(); // Re-position the user generated dive handlers - struct gasmix mix, lastmix; for (int i = 0; i < plannerModel->rowCount(); i++) { struct divedatapoint datapoint = plannerModel->at(i); if (datapoint.time == 0) // those are the magic entries for tanks |