From dbdea2d846e9fdbf8724e49b74b723da7ff994ff Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 9 Aug 2016 03:15:26 +0200 Subject: [PATCH] Fix handling of base index properties in CAirport/ICoordinateWithRelativePosition --- src/blackmisc/aviation/airport.cpp | 1 - src/blackmisc/geo/coordinategeodetic.cpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/blackmisc/aviation/airport.cpp b/src/blackmisc/aviation/airport.cpp index 16352e30b..9d41dd747 100644 --- a/src/blackmisc/aviation/airport.cpp +++ b/src/blackmisc/aviation/airport.cpp @@ -23,7 +23,6 @@ namespace BlackMisc { namespace Aviation { - CAirport::CAirport() { } diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index 81df4a7c0..eba2c600c 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -281,6 +281,7 @@ namespace BlackMisc void ICoordinateWithRelativePosition::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant) { + if (ICoordinateGeodetic::canHandleIndex(index)) { return; } if (!index.isMyself()) { ColumnIndex i = index.frontCasted(); @@ -326,6 +327,7 @@ namespace BlackMisc bool ICoordinateWithRelativePosition::canHandleIndex(const CPropertyIndex &index) { + if (ICoordinateGeodetic::canHandleIndex(index)) { return true; } int i = index.frontCasted(); return (i >= static_cast(IndexRelativeDistance)) && (i <= static_cast(IndexRelativeBearing)); }