From a02bb759845072e18fad7ee0234aff4e398a1699 Mon Sep 17 00:00:00 2001 From: leverington Date: Sat, 16 Sep 2023 15:32:24 +0200 Subject: [PATCH] fixed type specify in evenbuilder c++17 again --- hit2023v2/eventbuilder.cpp | 18 +++++++++--------- hit2023v2/release/hit2023v2.exe | Bin 1497088 -> 1497088 bytes 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hit2023v2/eventbuilder.cpp b/hit2023v2/eventbuilder.cpp index 364827f..1232799 100644 --- a/hit2023v2/eventbuilder.cpp +++ b/hit2023v2/eventbuilder.cpp @@ -1,14 +1,14 @@ #include "eventbuilder.h" #include "hit_analyse_v2.h" -#include ; +#include EventBuilder::EventBuilder( QObject *parent) : QObject(parent) { - connect(this, EventBuilder::sigInit, this, EventBuilder::onInit); - connect(this, EventBuilder::sigDeinit, this, EventBuilder::onDeinit); - connect(this, EventBuilder::sigStartLogging, this, EventBuilder::onStartLogging); - connect(this, EventBuilder::sigStopLogging, this, EventBuilder::onStopLogging); - connect(this, EventBuilder::sigStartTakingHistos, this, EventBuilder::onStartTakingHistos); - connect(this, EventBuilder::sigStopTakingHistos, this, EventBuilder::onStopTakingHistos); + connect(this, &EventBuilder::sigInit, this, &EventBuilder::onInit); + connect(this, &EventBuilder::sigDeinit, this, &EventBuilder::onDeinit); + connect(this, &EventBuilder::sigStartLogging, this, &EventBuilder::onStartLogging); + connect(this, &EventBuilder::sigStopLogging, this, &EventBuilder::onStopLogging); + connect(this, &EventBuilder::sigStartTakingHistos, this, &EventBuilder::onStartTakingHistos); + connect(this, &EventBuilder::sigStopTakingHistos, this, &EventBuilder::onStopTakingHistos); moveToThread(&thread); thread.start(); @@ -292,13 +292,13 @@ void EventBuilder::addSource(DataReceiver* source) nrReceivers = receivers.length(); currentFrame.resize(nrReceivers); backgroundFrame.resize(nrReceivers); - connect(source, DataReceiver::sigDataReady, this, EventBuilder::onNewData); + connect(source, &DataReceiver::sigDataReady, this, &EventBuilder::onNewData); } void EventBuilder::deleteSources() { for (int i = 0; i < receivers.length(); i++) - disconnect(receivers[i], DataReceiver::sigDataReady, this, EventBuilder::onNewData); + disconnect(receivers[i], &DataReceiver::sigDataReady, this, &EventBuilder::onNewData); receivers.clear(); nrReceivers = receivers.length(); diff --git a/hit2023v2/release/hit2023v2.exe b/hit2023v2/release/hit2023v2.exe index 85afb72bebeae79d2616c718516075ffaaba53f1..09b0718277fca0bd814fe4133d4792c213ad4227 100644 GIT binary patch delta 86 zcmV~$%MF4+06@X8s3`bB1xlbA6AGXTI)KAVS5|UTxa{4)J6t@Bjb+ delta 86 zcmV~$yA6U+06@|3P*ISN3XH%y4)B(61T1bMoi@xt!z?Cu6FSZrmpCr*`$^{C^bFhU kEhZQ+#RDGkgc+Xkf;kp=#S$y5vB4YO@qsONtNrlb0SMhGNdN!<