From 31ce82418cf1950ba3f9a902a24da5cc3b885514 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Mon, 8 Jun 2020 16:30:30 +0200
Subject: [PATCH] cleaning from old Qt5 relics
---
CMakeLists.txt | 4 ++--
GeoModelDBManager/src/GMDBManager.cpp | 13 +++----------
GeoModelWrite/src/WriteGeoModel.cpp | 2 +-
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21ff22088..af0931982 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,11 @@ include( PrintBuildInfo )
# Project's dependencies.
find_package( GeoModelCore 3.2.0 REQUIRED )
-find_package( Qt5 COMPONENTS Core Sql REQUIRED )
+# find_package( Qt5 COMPONENTS Core Sql REQUIRED )
find_package( SQLite3 REQUIRED )
# Set sub-packages to build.
-add_subdirectory( GeoModelErrorHandler )
+# add_subdirectory( GeoModelErrorHandler ) // unused at the moment.
add_subdirectory( GeoModelDBManager )
add_subdirectory( TFPersistification )
add_subdirectory( GeoModelRead )
diff --git a/GeoModelDBManager/src/GMDBManager.cpp b/GeoModelDBManager/src/GMDBManager.cpp
index b3d798c78..5189dff46 100644
--- a/GeoModelDBManager/src/GMDBManager.cpp
+++ b/GeoModelDBManager/src/GMDBManager.cpp
@@ -8,18 +8,11 @@
#include <GeoModelDBManager/GMDBManager.h>
-// fmt library
-#define FMT_HEADER_ONLY 1
+// include the 'fmt' library, which is hosted locally as header-only
+#define FMT_HEADER_ONLY 1 // to use 'fmt' header-only
#include "fmt/format.h"
-
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QSqlRecord>
-#include <QSqlDriver>
-#include <QDebug>
-
-
+// C++ includes
#include <stdlib.h> /* exit, EXIT_FAILURE */
#include <sstream>
diff --git a/GeoModelWrite/src/WriteGeoModel.cpp b/GeoModelWrite/src/WriteGeoModel.cpp
index cda91242f..2454c0fd7 100644
--- a/GeoModelWrite/src/WriteGeoModel.cpp
+++ b/GeoModelWrite/src/WriteGeoModel.cpp
@@ -1446,7 +1446,7 @@ unsigned int WriteGeoModel::addFullPhysVol(const unsigned int &logVolId, const u
{
std::vector<std::vector<std::string>>* container = &m_fullPhysVols;
std::vector<std::string> values;
- values.push_back( std::to_string(logVolId) );
+ values.push_back( std::to_string(logVolId) );
unsigned int idx = addRecord(container, values);
if (isRootVolume) {
std::vector<std::string> rootValues;
--
GitLab