Merge pull request #527 from openstudiocoalition/526_debug_build

Fix #526 : do not use OpenStudioApp in openstudio_lib
openstudiocoalition · May 9, 2022 · 02c0c9e · 02c0c9e
2 parents 1211e23 + 1e565a3
commit 02c0c9e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git 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<OpenStudioApp*>(app), &OpenStudioApp::reloadFile, Qt::QueuedConnection);
+  connect(this, &ApplyMeasureNowDialog::reloadFile, app, &OSAppBase::reloadFile, Qt::QueuedConnection);
 
   m_advancedOutputDialog = new TextEditDialog("Advanced Output");
 

diff --git 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
@@ -211,7 +211,6 @@ class MeasureManager : public QObject
   std::map<openstudio::path, std::vector<measure::OSArgument>> m_measureArguments;
   QUrl m_url;
   QSharedPointer<LocalLibraryController> m_libraryController;
-  QNetworkAccessManager* m_networkAccessManager;
   bool m_started;
   QMutex m_mutex;
 };

diff --git 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