From 8d15f307c293085c75386fca64199921cb8fc78e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 15 Dec 2013 21:46:47 +0000 Subject: [PATCH] let INetwork have a QObject parent refs #81 --- src/blackcore/network.h | 7 +++++++ src/blackcore/network_vatlib.cpp | 5 +++-- src/blackcore/network_vatlib.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 7c4b23491..81809f1ec 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -36,6 +36,13 @@ namespace BlackCore { Q_OBJECT + protected: + /*! + * \brief Constructor + * \param parent + */ + INetwork(QObject *parent = nullptr) : QObject(parent) {} + public: virtual ~INetwork() {} diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index faa609ba2..c9760df51 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -29,8 +29,9 @@ namespace BlackCore void exceptionDispatcher(const char* caller); - NetworkVatlib::NetworkVatlib() - : m_net(Create_Cvatlib_Network()), + NetworkVatlib::NetworkVatlib(QObject *parent) + : INetwork(parent), + m_net(Create_Cvatlib_Network()), m_status(Cvatlib_Network::connStatus_Idle), m_fsdTextCodec(QTextCodec::codecForName("latin1")) { diff --git a/src/blackcore/network_vatlib.h b/src/blackcore/network_vatlib.h index 2e6268db5..c06acdafc 100644 --- a/src/blackcore/network_vatlib.h +++ b/src/blackcore/network_vatlib.h @@ -26,7 +26,7 @@ namespace BlackCore Q_OBJECT public: - NetworkVatlib(); + NetworkVatlib(QObject *parent = nullptr); virtual ~NetworkVatlib(); protected: // QObject overrides