[qmapshack] 01/04: Imported Upstream version 1.5.1

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qmapshack.

commit e2d3f65212749bbca06be07553bbe29a50d6ba33
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Nov 22 18:48:04 2015 +0100

    Imported Upstream version 1.5.1
---
 CMakeLists.txt                    | 2 +-
 CMakeLists.txt.user               | 2 +-
 changelog.txt                     | 3 +++
 src/mouse/CMouseEditArea.cpp      | 2 +-
 src/mouse/CMouseEditRte.cpp       | 2 +-
 src/mouse/CMouseEditTrk.cpp       | 2 +-
 src/mouse/line/IMouseEditLine.cpp | 4 ++--
 src/mouse/line/IMouseEditLine.h   | 3 ++-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 244dede..7eeb853 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(APPLICATION_NAME qmapshack)
 
 set(APPLICATION_VERSION_MAJOR "1")
 set(APPLICATION_VERSION_MINOR "5")
-set(APPLICATION_VERSION_PATCH "0")
+set(APPLICATION_VERSION_PATCH "1")
 
 add_definitions(-DVER_MAJOR=${APPLICATION_VERSION_MAJOR} -DVER_MINOR=${APPLICATION_VERSION_MINOR} -DVER_STEP=${APPLICATION_VERSION_PATCH} -DAPPLICATION_NAME=${PROJECT_NAME})
 
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
index a295790..8778814 100644
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.5.1, 2015-11-22T15:55:40. -->
+<!-- Written by QtCreator 3.5.1, 2015-11-22T17:55:20. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/changelog.txt b/changelog.txt
index fd2b3ae..4d7a0bc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+V 1.5.1
+Line edit: Fix broken abort button
+
 V 1.5.0
 * Add track filter to remove track points with invalid position
 * Add options to "cut track" function (keep only first or second, keep both)
diff --git a/src/mouse/CMouseEditArea.cpp b/src/mouse/CMouseEditArea.cpp
index 78eff14..751bd6e 100644
--- a/src/mouse/CMouseEditArea.cpp
+++ b/src/mouse/CMouseEditArea.cpp
@@ -64,7 +64,7 @@ IGisLine * CMouseEditArea::getGisLine()
 void CMouseEditArea::slotAbort()
 {
     canvas->reportStatus(key.item,"");
-    IMouseEditLine::slotAbort(false);
+    IMouseEditLine::slotAbortEx(false);
 }
 
 void CMouseEditArea::slotCopyToOrig()
diff --git a/src/mouse/CMouseEditRte.cpp b/src/mouse/CMouseEditRte.cpp
index a8cade9..aad4d3c 100644
--- a/src/mouse/CMouseEditRte.cpp
+++ b/src/mouse/CMouseEditRte.cpp
@@ -73,7 +73,7 @@ IGisLine * CMouseEditRte::getGisLine()
 void CMouseEditRte::slotAbort()
 {
     canvas->reportStatus(key.item,"");
-    IMouseEditLine::slotAbort(false);
+    IMouseEditLine::slotAbortEx(false);
 }
 
 void CMouseEditRte::slotCopyToOrig()
diff --git a/src/mouse/CMouseEditTrk.cpp b/src/mouse/CMouseEditTrk.cpp
index cdfb075..01aaac4 100644
--- a/src/mouse/CMouseEditTrk.cpp
+++ b/src/mouse/CMouseEditTrk.cpp
@@ -68,7 +68,7 @@ IGisLine * CMouseEditTrk::getGisLine()
 void CMouseEditTrk::slotAbort()
 {
     canvas->reportStatus(key.item,"");
-    IMouseEditLine::slotAbort(false);
+    IMouseEditLine::slotAbortEx(false);
 }
 
 void CMouseEditTrk::slotCopyToOrig()
diff --git a/src/mouse/line/IMouseEditLine.cpp b/src/mouse/line/IMouseEditLine.cpp
index 704483b..ebd7439 100644
--- a/src/mouse/line/IMouseEditLine.cpp
+++ b/src/mouse/line/IMouseEditLine.cpp
@@ -142,7 +142,7 @@ void IMouseEditLine::abortStep()
     {
         // if within operation nothing can be aborted, then abort the whole operation
         // this equals clicking the `abort` button
-        slotAbort(true);
+        slotAbortEx(true);
     }
 }
 
@@ -358,7 +358,7 @@ void IMouseEditLine::changeCursor()
     }
 }
 
-void IMouseEditLine::slotAbort(bool showMB)
+void IMouseEditLine::slotAbortEx(bool showMB)
 {
     // ask if the current operation should be aborted (only in case there are things to be saved)
     bool doAbort = ( idxHistory == 0 ) || !showMB;
diff --git a/src/mouse/line/IMouseEditLine.h b/src/mouse/line/IMouseEditLine.h
index fb808ae..4ca9c3b 100644
--- a/src/mouse/line/IMouseEditLine.h
+++ b/src/mouse/line/IMouseEditLine.h
@@ -103,7 +103,8 @@ protected slots:
     void slotVectorRouting();
 
 
-    void slotAbort(bool showMB);
+    virtual void slotAbort() = 0;
+    void slotAbortEx(bool showMB);
     virtual void slotCopyToOrig();
     virtual void slotCopyToNew() = 0;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git