From 3ce08d0dd201d39a07f891d3a97252f27d64f9d6 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Fri, 6 May 2022 16:30:22 +0200 Subject: [PATCH 1/3] Fix #526 : do not use OpenStudio in openstudio_lib OSAppBase::relaodFile is a (pure) virtual function, so it'll work already. --- src/openstudio_lib/ApplyMeasureNowDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openstudio_lib/ApplyMeasureNowDialog.cpp b/src/openstudio_lib/ApplyMeasureNowDialog.cpp index e02f8217d..409db50e9 100644 --- a/src/openstudio_lib/ApplyMeasureNowDialog.cpp +++ b/src/openstudio_lib/ApplyMeasureNowDialog.cpp @@ -103,7 +103,7 @@ ApplyMeasureNowDialog::ApplyMeasureNowDialog(QWidget* parent) createWidgets(); OSAppBase* app = OSAppBase::instance(); - connect(this, &ApplyMeasureNowDialog::reloadFile, static_cast(app), &OpenStudioApp::reloadFile, Qt::QueuedConnection); + connect(this, &ApplyMeasureNowDialog::reloadFile, app, &OSAppBase::reloadFile, Qt::QueuedConnection); m_advancedOutputDialog = new TextEditDialog("Advanced Output"); From a8337ee929523bf62a3e6af6353fe905aeb07ff2 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Fri, 6 May 2022 17:18:30 +0200 Subject: [PATCH 2/3] Limit verbosity of translations --- translations/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt index d99927157..9cf153605 100644 --- a/translations/CMakeLists.txt +++ b/translations/CMakeLists.txt @@ -43,8 +43,8 @@ endforeach() list(REMOVE_DUPLICATES TS_SOURCE_DIRS) list(REMOVE_DUPLICATES TS_SOURCES) -message("TS_SOURCE_DIRS=${TS_SOURCE_DIRS}") -message("TS_SOURCES=${TS_SOURCES}") +message(VERBOSE "TS_SOURCE_DIRS=${TS_SOURCE_DIRS}") +message(VERBOSE "TS_SOURCES=${TS_SOURCES}") qt6_add_translations(translations_interface TS_FILES ${TS_FILES} QM_FILES_OUTPUT_VARIABLE QM_FILES INCLUDE_DIRECTORIES From 1e565a3806087df377cf0b947c4ec99763329d9b Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Fri, 6 May 2022 17:18:58 +0200 Subject: [PATCH 3/3] Fix #528 - the m_networkAccessManager is actually not used anywhere --- src/shared_gui_components/MeasureManager.cpp | 4 +--- src/shared_gui_components/MeasureManager.hpp | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/shared_gui_components/MeasureManager.cpp b/src/shared_gui_components/MeasureManager.cpp index a99e0642d..092b3fe09 100644 --- a/src/shared_gui_components/MeasureManager.cpp +++ b/src/shared_gui_components/MeasureManager.cpp @@ -82,9 +82,7 @@ namespace openstudio { -MeasureManager::MeasureManager(BaseApp* t_app) : m_app(t_app), m_started(false), m_mutex() { - m_networkAccessManager = new QNetworkAccessManager(this); -} +MeasureManager::MeasureManager(BaseApp* t_app) : m_app(t_app), m_started(false) {} QUrl MeasureManager::url() const { return m_url; diff --git a/src/shared_gui_components/MeasureManager.hpp b/src/shared_gui_components/MeasureManager.hpp index 3f23e38d0..2e7f2d8a3 100644 --- a/src/shared_gui_components/MeasureManager.hpp +++ b/src/shared_gui_components/MeasureManager.hpp @@ -211,7 +211,6 @@ class MeasureManager : public QObject std::map> m_measureArguments; QUrl m_url; QSharedPointer m_libraryController; - QNetworkAccessManager* m_networkAccessManager; bool m_started; QMutex m_mutex; };