From ba1d3ab422f773460b3aa166cc25720e824efd22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodn=C3=A1r=20Zsombor?= <bodzsoaa@sch.bme.hu>
Date: Sat, 6 Feb 2021 14:46:44 +0100
Subject: [PATCH] Move MuebReceiverPrivate to private header file
---
src/CMakeLists.txt | 2 +-
src/muebreceiver.cc | 27 +--------------------------
src/muebreceiver_p.h | 32 ++++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+), 27 deletions(-)
create mode 100644 src/muebreceiver_p.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d422e1a..978fc1a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(
muebreceiver SHARED
${CMAKE_SOURCE_DIR}/include/libmueb/libmueb_global.h
${CMAKE_SOURCE_DIR}/include/libmueb/muebreceiver.h configuration.h
- muebreceiver.cc configuration.cc)
+ muebreceiver_p.h muebreceiver.cc configuration.cc)
target_include_directories(muebreceiver PUBLIC ../include/${PROJECT_NAME})
target_link_libraries(
muebreceiver
diff --git a/src/muebreceiver.cc b/src/muebreceiver.cc
index dd3b6ab..92f4f2d 100644
--- a/src/muebreceiver.cc
+++ b/src/muebreceiver.cc
@@ -1,31 +1,6 @@
#include "muebreceiver.h"
-#include <QNetworkDatagram>
-#include <QUdpSocket>
-
-#include "configuration.h"
-
-class MuebReceiverPrivate {
- Q_DECLARE_PUBLIC(MuebReceiver)
- Q_DISABLE_COPY(MuebReceiverPrivate)
-
- public:
- explicit MuebReceiverPrivate(MuebReceiver *q)
- : frame(configuration.frame()), q_ptr(q) {
- socket.bind(configuration.broadcast_animation_port());
-
- QObject::connect(&socket, &QUdpSocket::readyRead, q,
- &MuebReceiver::readPendingDatagrams);
-
- qInfo() << "[MuebReceiver] UDP Socket will receive packets on port"
- << configuration.broadcast_animation_port();
- }
-
- Configuration configuration;
- libmueb::Frame frame;
- QUdpSocket socket;
- MuebReceiver *q_ptr;
-};
+#include "muebreceiver_p.h"
MuebReceiver::MuebReceiver(QObject *parent)
: QObject(parent), d_ptr_(new MuebReceiverPrivate(this)) {}
diff --git a/src/muebreceiver_p.h b/src/muebreceiver_p.h
new file mode 100644
index 0000000..4cde98b
--- /dev/null
+++ b/src/muebreceiver_p.h
@@ -0,0 +1,32 @@
+#ifndef LIBMUEB_MUEBRECEIVER_P_H_
+#define LIBMUEB_MUEBRECEIVER_P_H_
+
+#include <QNetworkDatagram>
+#include <QUdpSocket>
+
+#include "configuration.h"
+#include "muebreceiver.h"
+
+class MuebReceiverPrivate {
+ Q_DECLARE_PUBLIC(MuebReceiver)
+ Q_DISABLE_COPY(MuebReceiverPrivate)
+
+ public:
+ explicit MuebReceiverPrivate(MuebReceiver *q)
+ : frame(configuration.frame()), q_ptr(q) {
+ socket.bind(configuration.broadcast_animation_port());
+
+ QObject::connect(&socket, &QUdpSocket::readyRead, q,
+ &MuebReceiver::readPendingDatagrams);
+
+ qInfo() << "[MuebReceiver] UDP Socket will receive packets on port"
+ << configuration.broadcast_animation_port();
+ }
+
+ Configuration configuration;
+ libmueb::Frame frame;
+ QUdpSocket socket;
+ MuebReceiver *q_ptr;
+};
+
+#endif // LIBMUEB_MUEBRECEIVER_P_H_
--
GitLab