From e8496b869ee517bb7703ad31e32849e59581ec2c Mon Sep 17 00:00:00 2001
From: Stefan Kebekus <stefan.kebekus@math.uni-freiburg>
Date: Thu, 2 Apr 2020 07:39:08 +0200
Subject: [PATCH] Fixes one issue found by Johannes Zellner. Thanks!

---
 CMakeLists.txt       | 4 ++--
 src/GlobalSettings.h | 4 ++--
 src/qml/main.qml     | 9 ---------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 914f4a467..2f7a6e16b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,9 @@ option(BUILD_DOC "Build documentation" OFF)
 # Project data
 #
 
-project(enroute VERSION 1.6.0)
+project(enroute VERSION 1.6.1)
 set(APP_ID de.akaflieg_freiburg.enroute)
-set(PROJECT_DATE 2020-03-31)
+set(PROJECT_DATE 2020-04-02)
 math(EXPR PROJECT_VERSION_CODE 10000*${PROJECT_VERSION_MAJOR}+100*${PROJECT_VERSION_MINOR}+${PROJECT_VERSION_PATCH})
 add_compile_definitions(PROJECT_VERSION="${PROJECT_VERSION}")
 
diff --git a/src/GlobalSettings.h b/src/GlobalSettings.h
index 8ed7926f1..cf16fdb05 100644
--- a/src/GlobalSettings.h
+++ b/src/GlobalSettings.h
@@ -77,7 +77,7 @@ class GlobalSettings : public QObject
      *
      * @param accepted Property acceptedTerms
      */
-    void setAcceptedTerms(int accepted);
+    void setAcceptedTerms(int terms);
 
     /*! \brief Find out if "What's new" should be shown
      *
@@ -104,7 +104,7 @@ class GlobalSettings : public QObject
      *
      * @param hUA Property hideUpperAirspaces
      */
-    void setHideUpperAirspaces(bool hUA);
+    void setHideUpperAirspaces(bool hide);
 
     /*! \brief Hide airspaces with lower bound FL100 or above */
     Q_PROPERTY(bool keepScreenOn READ keepScreenOn WRITE setKeepScreenOn NOTIFY keepScreenOnChanged)
diff --git a/src/qml/main.qml b/src/qml/main.qml
index a07f5b97d..1a96b8de1 100644
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -381,15 +381,6 @@ ApplicationWindow {
         onDetected: MobileAdaptor.vibrateBrief()
     }
 
-    Connections {
-        target: view
-        onActiveChanged: {
-            if (Qt.platform.os === "android" && view.active) {
-                share.checkPendingIntents()
-            }
-        }
-    }
-
     // enroute closed unexpectedly if...
     // * the "route" page is open
     // * the route menu is opened