summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-04-13 15:41:47 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-15 10:30:04 +1200
commit4bb002d1370a9eb4ebe5a1210b969edc5cdba893 (patch)
tree77e4fc57551728292fbdbfaf2a135ee6a0af829d
parent88dc32fdfcb7cb63b0e47280d1f38395077df757 (diff)
downloadsubsurface-4bb002d1370a9eb4ebe5a1210b969edc5cdba893.tar.gz
Cleanup: Remove MainTab::getEditMode() function
The only caller of said function used to check whether MainTab is in edit mode. For this case there is already a function - use that instead. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r--desktop-widgets/mainwindow.cpp2
-rw-r--r--desktop-widgets/tab-widgets/maintab.cpp5
-rw-r--r--desktop-widgets/tab-widgets/maintab.h1
3 files changed, 1 insertions, 7 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index c509a7607..0760e747d 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -404,7 +404,7 @@ void MainWindow::enableDisableOtherDCsActions()
void MainWindow::setDefaultState()
{
setApplicationState("Default");
- if (mainTab->getEditMode() != MainTab::NONE)
+ if (mainTab->isEditing())
ui.bottomLeft->currentWidget()->setEnabled(false);
}
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index 7dda4c0e7..d1e47ddd9 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -704,11 +704,6 @@ void MainTab::reload()
mark_divelist_changed(true); \
} while (0)
-MainTab::EditMode MainTab::getEditMode() const
-{
- return editMode;
-}
-
void MainTab::refreshDisplayedDiveSite()
{
struct dive_site *ds = get_dive_site_for_dive(current_dive);
diff --git a/desktop-widgets/tab-widgets/maintab.h b/desktop-widgets/tab-widgets/maintab.h
index 9968472c9..8b08cdf68 100644
--- a/desktop-widgets/tab-widgets/maintab.h
+++ b/desktop-widgets/tab-widgets/maintab.h
@@ -97,7 +97,6 @@ slots:
void toggleTriggeredColumn();
void updateTextLabels(bool showUnits = true);
void escDetected(void);
- EditMode getEditMode() const;
private:
Ui::MainTab ui;
WeightModel *weightModel;