Upgrade to KDECompilerSettings 5.85

CMakeLists.txt

 # SPDX-FileCopyrightText: 2018 Volker Krause <vkrause@kde.org>
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "21")
@@ -12,10 +12,10 @@ project(KOSMIndoorMap VERSION ${RELEASE_SERVICE_VERSION})
 
 option(BUILD_STANDALONE_APP "Build and install the stand-alone test/demo app." OFF)
 
-find_package(ECM 5.59 REQUIRED NO_MODULE)
+find_package(ECM 5.85 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddTests)
 include(ECMGenerateHeaders)
 include(ECMQtDeclareLoggingCategory)
@@ -25,10 +25,6 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(GenerateExportHeader)
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
 ecm_setup_version(PROJECT VARIABLE_PREFIX KOSMINDOORMAP
     VERSION_HEADER kosmindoormap_version.h
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KOSMIndoorMapConfigVersion.cmake"
@@ -75,7 +71,6 @@ endif()
 
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
 add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400)
-add_definitions(-DQT_NO_FOREACH)
 
 add_subdirectory(src)
 if (BUILD_TESTING)

src/map-publictransport-integration/locationqueryoverlayproxymodel.cpp

@@ -48,7 +48,7 @@ void LocationQueryOverlayProxyModel::setMapData(const MapData &data)
 
     initialize();
     endResetModel();
-    emit mapDataChanged();
+    Q_EMIT mapDataChanged();
 }
 
 QObject* LocationQueryOverlayProxyModel::sourceModel() const
@@ -96,7 +96,7 @@ void LocationQueryOverlayProxyModel::setSourceModel(QObject *sourceModel)
         for (int i = first.row(); i <= last.row(); ++i) {
             m_nodes[i] = nodeForRow(i);
         }
-        emit dataChanged(index(first.row(), 0), index(last.row(), 0));
+        Q_EMIT dataChanged(index(first.row(), 0), index(last.row(), 0));
     });
 }
 

src/map-publictransport-integration/realtimeequipmentmodel.cpp

@@ -35,7 +35,7 @@ void RealtimeEquipmentModel::setRealtimeModel(QObject *model)
     }
 
     m_realtimeModel = qobject_cast<QAbstractItemModel*>(model);
-    emit realtimeModelChanged();
+    Q_EMIT realtimeModelChanged();
 
     if (m_realtimeModel) {
         connect(m_realtimeModel, &QAbstractItemModel::modelReset, this, &RealtimeEquipmentModel::updateRealtimeState);
@@ -178,7 +178,7 @@ void RealtimeEquipmentModel::updateRealtimeState()
         }
     }
 
-    emit update();
+    Q_EMIT update();
 }
 void RealtimeEquipmentModel::resolveEquipmentPair(int eqRow1, int eqRow2, int rtRow1, int rtRow2)
 {

src/map-quick/floorlevelchangemodel.cpp

@@ -65,9 +65,9 @@ void FloorLevelChangeModel::setCurrentFloorLevel(int level)
     }
     m_currentFloorLevel = level;
     if (!m_levels.empty()) {
-        emit dataChanged(index(0, 0), index(rowCount() - 1, 0));
+        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0));
     }
-    emit contentChanged();
+    Q_EMIT contentChanged();
 }
 
 FloorLevelModel* FloorLevelChangeModel::floorLevelModel() const
@@ -82,7 +82,7 @@ void FloorLevelChangeModel::setFloorLevelModel(FloorLevelModel *floorLevelModel)
     }
 
     m_floorLevelModel = floorLevelModel;
-    emit contentChanged();
+    Q_EMIT contentChanged();
 }
 
 OSMElement FloorLevelChangeModel::element() const
@@ -125,7 +125,7 @@ void FloorLevelChangeModel::setElement(const OSMElement &element)
     }
 
     endResetModel();
-    emit contentChanged();
+    Q_EMIT contentChanged();
 }
 
 bool FloorLevelChangeModel::isLevelChangeElement(OSM::Element element) const

src/map-quick/mapitem.cpp

@@ -104,7 +104,7 @@ void MapItem::setStylesheetName(const QString &styleSheet)
 
         if (cssParser.hasError()) {
             m_errorMessage = cssParser.errorMessage();
-            emit errorChanged();
+            Q_EMIT errorChanged();
             return;
         }
     }
@@ -112,7 +112,7 @@ void MapItem::setStylesheetName(const QString &styleSheet)
     m_style.compile(m_data.dataSet());
     m_controller.setStyleSheet(&m_style);
 
-    emit styleSheetChanged();
+    Q_EMIT styleSheetChanged();
     update();
 }
 
@@ -149,7 +149,7 @@ void MapItem::loaderDone()
         m_view->setLevel(0);
         m_floorLevelModel->setMapData(&m_data);
         m_view->floorLevelChanged();
-        emit mapDataChanged();
+        Q_EMIT mapDataChanged();
     }
 
     Q_EMIT errorChanged();
@@ -179,8 +179,8 @@ void MapItem::clear()
     m_sg.clear();
     m_data = MapData();
     m_controller.setMapData(m_data);
-    emit mapDataChanged();
-    emit errorChanged();
+    Q_EMIT mapDataChanged();
+    Q_EMIT errorChanged();
     update();
 }
 
@@ -224,7 +224,7 @@ void MapItem::setOverlaySources(const QVariant &overlays)
     }
 
     m_controller.setOverlaySources(std::move(sources));
-    emit overlaySourcesChanged();
+    Q_EMIT overlaySourcesChanged();
     update();
 }
 
@@ -265,7 +265,7 @@ void MapItem::setRegion(const QString &region)
     }
 
     m_data.setRegionCode(region);
-    emit regionChanged();
+    Q_EMIT regionChanged();
 }
 
 QString MapItem::timeZoneId() const
@@ -281,5 +281,5 @@ void MapItem::setTimeZoneId(const QString &tz)
     }
 
     m_data.setTimeZone(QTimeZone(tzId));
-    emit timeZoneChanged();
+    Q_EMIT timeZoneChanged();
 }

src/map-quick/osmelementinformationmodel.cpp

@@ -54,7 +54,7 @@ void OSMElementInformationModel::setElement(const OSMElement &element)
         reload();
     }
     endResetModel();
-    emit elementChanged();
+    Q_EMIT elementChanged();
 }
 
 void OSMElementInformationModel::clear()
@@ -66,7 +66,7 @@ void OSMElementInformationModel::clear()
     m_infos.clear();
     m_element = {};
     endResetModel();
-    emit elementChanged();
+    Q_EMIT elementChanged();
 }
 
 QString OSMElementInformationModel::name() const

src/map/CMakeLists.txt

@@ -70,7 +70,7 @@ add_library(KOSMIndoorMap
 
 generate_export_header(KOSMIndoorMap BASE_NAME KOSMIndoorMap)
 set_target_properties(KOSMIndoorMap PROPERTIES
-    VERSION ${KOSMINDOORMAP_VERSION_STRING}
+    VERSION ${KOSMINDOORMAP_VERSION}
     SOVERSION ${KOSMINDOORMAP_SOVERSION}
     EXPORT_NAME KOSMIndoorMap
 )

src/map/content/equipmentmodel.cpp

@@ -77,7 +77,7 @@ void EquipmentModel::setMapData(const MapData &data)
         qDebug() << "  E" << eq.sourceElements.size() << eq.levels << eq.type;
     }
 
-    emit update();
+    Q_EMIT update();
 }
 
 void EquipmentModel::forEach(int floorLevel, const std::function<void (OSM::Element, int)> &func) const

src/map/content/gatemodel.cpp

@@ -39,7 +39,7 @@ void GateModel::setMapData(const MapData &data)
         populateModel();
     }
     endResetModel();
-    emit mapDataChanged();
+    Q_EMIT mapDataChanged();
     matchGates();
 }
 
@@ -170,12 +170,12 @@ void GateModel::matchGates()
     m_departureGateRow = matchGate(m_departureGate);
     setGateTag(m_departureGateRow, m_tagKeys.mxDeparture, true);
 
-    emit gateIndexChanged();
+    Q_EMIT gateIndexChanged();
     if (m_arrivalGateRow >= 0) {
-        emit dataChanged(index(m_arrivalGateRow, 0), index(m_arrivalGateRow, 0));
+        Q_EMIT dataChanged(index(m_arrivalGateRow, 0), index(m_arrivalGateRow, 0));
     }
     if (m_departureGateRow >= 0) {
-        emit dataChanged(index(m_departureGateRow, 0), index(m_departureGateRow, 0));
+        Q_EMIT dataChanged(index(m_departureGateRow, 0), index(m_departureGateRow, 0));
     }
 }
 

src/map/content/platformmodel.cpp

@@ -49,7 +49,7 @@ void PlatformModel::setMapData(const MapData &data)
         createLabels();
     }
     endResetModel();
-    emit mapDataChanged();
+    Q_EMIT mapDataChanged();
     matchPlatforms();
 }
 
@@ -178,12 +178,12 @@ void PlatformModel::matchPlatforms()
     setPlatformTag(m_departurePlatformRow, m_tagKeys.departure, false);
     m_departurePlatformRow = matchPlatform(m_departurePlatform);
     setPlatformTag(m_departurePlatformRow, m_tagKeys.departure, true);
-    emit platformIndexChanged();
+    Q_EMIT platformIndexChanged();
     if (m_arrivalPlatformRow >= 0) {
-        emit dataChanged(index(m_arrivalPlatformRow, 0), index(m_arrivalPlatformRow, 0));
+        Q_EMIT dataChanged(index(m_arrivalPlatformRow, 0), index(m_arrivalPlatformRow, 0));
     }
     if (m_departurePlatformRow >= 0) {
-        emit dataChanged(index(m_departurePlatformRow, 0), index(m_departurePlatformRow, 0));
+        Q_EMIT dataChanged(index(m_departurePlatformRow, 0), index(m_departurePlatformRow, 0));
     }
 }
 

src/map/renderer/view.cpp

@@ -93,7 +93,7 @@ void View::setLevel(int level)
     }
 
     m_level = level;
-    emit floorLevelChanged();
+    Q_EMIT floorLevelChanged();
 }
 
 double View::zoomLevel() const
@@ -118,7 +118,7 @@ void View::setZoomLevel(double zoom, QPointF screenCenter)
 
     m_viewport.adjust(-xr * dx, -yr * dy, (1-xr) * dx, (1-yr) * dy);
     constrainViewToScene();
-    emit transformationChanged();
+    Q_EMIT transformationChanged();
 }
 
 QRectF View::viewport() const
@@ -311,7 +311,7 @@ void View::centerOnGeoCoordinate(QPointF geoCoord)
     const auto sceneCenter = mapGeoToScene(OSM::Coordinate(geoCoord.y(), geoCoord.x()));
     m_viewport.moveCenter(sceneCenter);
     constrainViewToScene();
-    emit transformationChanged();
+    Q_EMIT transformationChanged();
 }
 
 QDateTime View::beginTime() const
@@ -326,7 +326,7 @@ void View::setBeginTime(const QDateTime &beginTime)
         return;
     }
     m_beginTime = alignedTime;
-    emit timeChanged();
+    Q_EMIT timeChanged();
 }
 
 QDateTime View::endTime() const
@@ -341,5 +341,5 @@ void View::setEndTime(const QDateTime& endTime)
         return;
     }
     m_endTime = alignedTime;
-    emit timeChanged();
+    Q_EMIT timeChanged();
 }

src/osm/CMakeLists.txt

@@ -31,7 +31,7 @@ add_library(KOSM
 )
 generate_export_header(KOSM BASE_NAME KOSM)
 set_target_properties(KOSM PROPERTIES
-    VERSION ${KOSMINDOORMAP_VERSION_STRING}
+    VERSION ${KOSMINDOORMAP_VERSION}
     SOVERSION ${KOSMINDOORMAP_SOVERSION}
     EXPORT_NAME KOSM
 )