summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2021-02-14 20:59:02 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2021-02-17 07:26:55 -0800
commit5b3cb5898fead63750ea860417d1853710832d34 (patch)
treef9dbcd03ddcac45b9f6017b416c764504cf50d07 /core
parent80c92acc339237502d1d7f1eeb5d5a8801d6f908 (diff)
downloadsubsurface-5b3cb5898fead63750ea860417d1853710832d34.tar.gz
desktop: fold ApplicationState into MainWindow
The application state is a desktop-only thing. The mobile UI also has its application state, but that is something completely different. The last remaining user of the application state was to flag whether the planner is active. Since this has all been unglobalized, the ApplicationState structure can be moved from core to the desktop UI. And there it can be made local to the MainWindow class. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
-rw-r--r--core/CMakeLists.txt2
-rw-r--r--core/applicationstate.cpp14
-rw-r--r--core/applicationstate.h26
-rw-r--r--core/qthelper.cpp1
4 files changed, 0 insertions, 43 deletions
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 0d400931d..c2103ab71 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -37,8 +37,6 @@ endif()
# compile the core library part in C, part in C++
set(SUBSURFACE_CORE_LIB_SRCS
- applicationstate.cpp
- applicationstate.h
checkcloudconnection.cpp
checkcloudconnection.h
cloudstorage.cpp
diff --git a/core/applicationstate.cpp b/core/applicationstate.cpp
deleted file mode 100644
index 05701cd32..000000000
--- a/core/applicationstate.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include "applicationstate.h"
-
-static ApplicationState appState = (ApplicationState)-1; // Set to an invalid value
-
-ApplicationState getAppState()
-{
- return appState;
-}
-
-void setAppState(ApplicationState state)
-{
- appState = state;
-}
diff --git a/core/applicationstate.h b/core/applicationstate.h
deleted file mode 100644
index c3a8f360d..000000000
--- a/core/applicationstate.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#ifndef APPLICATIONSTATE_H
-#define APPLICATIONSTATE_H
-
-// By using an enum class, the enum entries don't polute the global namespace.
-// Moreover, they are strongly typed. This means that they are not auto-converted
-// to integer types if e.g. used as array-indices.
-enum class ApplicationState {
- Default,
- EditDive,
- PlanDive,
- EditPlannedDive,
- EditDiveSite,
- FilterDive,
- Statistics,
- MapMaximized,
- ProfileMaximized,
- ListMaximized,
- InfoMaximized,
- Count
-};
-
-ApplicationState getAppState();
-void setAppState(ApplicationState state);
-
-#endif
diff --git a/core/qthelper.cpp b/core/qthelper.cpp
index d0a6e36db..702ee965d 100644
--- a/core/qthelper.cpp
+++ b/core/qthelper.cpp
@@ -13,7 +13,6 @@
#include "planner.h"
#include "subsurface-time.h"
#include "gettextfromc.h"
-#include "applicationstate.h"
#include "metadata.h"
#include "exif.h"
#include "file.h"