From 00e27e3c699b0e02f9ade4b46f54cd560cf2fa0b Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Fri, 28 Sep 2018 10:11:23 +0200
Subject: [PATCH] FitProgressInfo removed from Qt meta system
---
.../Views/FitWidgets/FitProgressInfo.cpp | 23 +------------------
.../Views/FitWidgets/FitProgressInfo.h | 12 +++-------
GUI/main/main.cpp | 1 -
3 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp b/GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp
index e0a1207cfec..4fe7d8cb7b7 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp
@@ -14,27 +14,6 @@
#include "FitProgressInfo.h"
-FitProgressInfo::FitProgressInfo()
- : m_chi2(0.0)
- , m_iteration_count(0)
+FitProgressInfo::FitProgressInfo() : m_chi2(0.0), m_iteration_count(0)
{
-
-}
-
-//! Copy constructor is reimplemented as required by Qt's meta-object system
-
-FitProgressInfo::FitProgressInfo(const FitProgressInfo &other)
-{
- m_chi2 = other.m_chi2;
- m_iteration_count = other.m_iteration_count;
- m_values = other.m_values;
- m_log_info = other.m_log_info;
- m_sim_values = other.m_sim_values;
-}
-
-//! Destructor is reimplemented as required by Qt's meta-object system
-
-FitProgressInfo::~FitProgressInfo()
-{
-
}
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressInfo.h b/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
index c9baf9f662d..4dfe565429f 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
+++ b/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
@@ -16,21 +16,16 @@
#define FITPROGRESSINFO_H
#include "WinDllMacros.h"
-#include <QMetaType>
#include <QVector>
#include <vector>
//! The FitProgressInfo class contains all essential information about fit progress.
//! It is send from GUIFitObserver to FitSuiteWidget on every nth iteration.
-//! Important: the class is used for Qt::QueuedConnection type, when sender leaves in another
-//! thread. To make it possible, it is also registered in main.cpp.
-
-class BA_CORE_API_ FitProgressInfo {
+class BA_CORE_API_ FitProgressInfo
+{
public:
FitProgressInfo();
- FitProgressInfo(const FitProgressInfo &other);
- ~FitProgressInfo();
double chi2() const { return m_chi2; }
int iterationCount() const { return m_iteration_count; }
@@ -39,6 +34,7 @@ public:
std::vector<double> simValues() const { return m_sim_values; }
friend class GUIFitObserver;
+
private:
double m_chi2;
int m_iteration_count;
@@ -47,6 +43,4 @@ private:
std::vector<double> m_sim_values;
};
-Q_DECLARE_METATYPE(FitProgressInfo)
-
#endif // FITPROGRESSINFO_H
diff --git a/GUI/main/main.cpp b/GUI/main/main.cpp
index 83fee95438f..01640ddd0b2 100644
--- a/GUI/main/main.cpp
+++ b/GUI/main/main.cpp
@@ -30,7 +30,6 @@ int main(int argc, char* argv[])
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
qRegisterMetaType<QVector<double>>("QVector<double>");
- qRegisterMetaType<FitProgressInfo>("FitProgressInfo");
if( options.enableHighDPISupport())
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
--
GitLab