.github/workflows/osx.yml

@@ -15,9 +15,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install dependencies
-        run: |
-          brew update
-          brew install qt5
+        run: brew install qt5
       - name: Create localization
         run: lrelease gpxsee.pro
       - name: Configure build
@@ -41,9 +39,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install dependencies
-        run: |
-           brew update
-           brew install qt6
+        run: brew install qt6
       - name: Create localization
         run: lrelease gpxsee.pro
       - name: Configure build

gpxsee.pro

@@ -26,6 +26,7 @@ INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
     src/GUI/crosshairitem.h \
     src/GUI/motioninfoitem.h \
+    src/GUI/navigationwidget.h \
     src/GUI/pluginparameters.h \
     src/common/garmin.h \
     src/common/coordinates.h \
@@ -261,6 +262,7 @@ HEADERS += src/common/config.h \
 SOURCES += src/main.cpp \
     src/GUI/crosshairitem.cpp \
     src/GUI/motioninfoitem.cpp \
+    src/GUI/navigationwidget.cpp \
     src/GUI/pluginparameters.cpp \
     src/GUI/settings.cpp \
     src/common/coordinates.cpp \
@@ -558,9 +560,6 @@ unix:!macx:!android {
 }
 
 android {
-    HEADERS += src/GUI/navigationwidget.h
-    SOURCES += src/GUI/navigationwidget.cpp
-
     defineReplace(versionCode) {
         segments = $$split(1, ".")
         for (segment, segments): \

src/data/geojsonparser.cpp

@@ -45,7 +45,7 @@ static void setAreaProperties(Area &area, const QJsonValue &properties)
 		if (o["fill-opacity"].isDouble())
 			fillColor.setAlphaF(o["fill-opacity"].toDouble());
 		else
-			fillColor.setAlphaF(0.6f);
+			fillColor.setAlphaF(0.6);
 	}
 
 	area.setStyle(PolygonStyle(fillColor, strokeColor, strokeWidth));

src/map/IMG/huffmantext.cpp

@@ -21,7 +21,7 @@ bool HuffmanText::decode(const SubFile *file, SubFile::Handle &hdl,
 	quint32 sym;
 
 	while (hs.readSymbol(sym)) {
-		for (int i = 0; i < (_table.symbolBits() >> 3); i++) {
+		for (quint32 i = 0; i < (_table.symbolBits() >> 3); i++) {
 			str.append((quint8)sym);
 			if (((quint8)sym == '\0'))
 				return true;

src/map/IMG/subfile.h

@@ -24,7 +24,7 @@ public:
 			if (!subFile)
 				return;
 
-			_data.resize(subFile->blockSize());
+			_data.resize(1U<<subFile->blockBits());
 			_file.setFileName(subFile->fileName());
 			_file.open(QIODevice::ReadOnly | QIODevice::Unbuffered);
 		}
@@ -144,10 +144,7 @@ public:
 	bool readVBitfield32(Handle &hdl, quint32 &bitfield) const;
 
 	const QString &fileName() const {return _path ? *_path : _img->fileName();}
-	int blockSize() const
-	{
-		return _path ? 1U<<BLOCK_BITS : 1U<<_img->blockBits();
-	}
+	unsigned blockBits() const {return _path ? BLOCK_BITS : _img->blockBits();}
 
 protected:
 	quint32 _gmpOffset;