From 5d383b82570f4b15e4f70c589ddf4edda9fb6924 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Thu, 29 Dec 2022 15:50:51 +0100 Subject: [PATCH] #29 some more renaming --- Common/DummyAPRSHandlerThread.cpp | 16 ++++++++-------- Common/DummyAPRSHandlerThread.h | 6 +++--- DStarGateway/DStarGatewayApp.cpp | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Common/DummyAPRSHandlerThread.cpp b/Common/DummyAPRSHandlerThread.cpp index 1c9f007..c404fe0 100644 --- a/Common/DummyAPRSHandlerThread.cpp +++ b/Common/DummyAPRSHandlerThread.cpp @@ -18,38 +18,38 @@ #include "DummyAPRSHandlerThread.h" -CDummyAPRSHandlerThread::CDummyAPRSHandlerThread() +CDummyAPRSHandlerBackend::CDummyAPRSHandlerBackend() { } -CDummyAPRSHandlerThread::~CDummyAPRSHandlerThread() +CDummyAPRSHandlerBackend::~CDummyAPRSHandlerBackend() { } -bool CDummyAPRSHandlerThread::start() +bool CDummyAPRSHandlerBackend::start() { return true; } -bool CDummyAPRSHandlerThread::isConnected() const +bool CDummyAPRSHandlerBackend::isConnected() const { return true; } -void CDummyAPRSHandlerThread::write(CAPRSFrame &) +void CDummyAPRSHandlerBackend::write(CAPRSFrame &) { } -void CDummyAPRSHandlerThread::clock(unsigned int) +void CDummyAPRSHandlerBackend::clock(unsigned int) { } -void CDummyAPRSHandlerThread::stop() +void CDummyAPRSHandlerBackend::stop() { } -void CDummyAPRSHandlerThread::addReadAPRSCallback(IReadAPRSFrameCallback *) +void CDummyAPRSHandlerBackend::addReadAPRSCallback(IReadAPRSFrameCallback *) { } \ No newline at end of file diff --git a/Common/DummyAPRSHandlerThread.h b/Common/DummyAPRSHandlerThread.h index 9ae91f2..3401813 100644 --- a/Common/DummyAPRSHandlerThread.h +++ b/Common/DummyAPRSHandlerThread.h @@ -20,11 +20,11 @@ #include "IAPRSHandlerBackend.h" -class CDummyAPRSHandlerThread : public IAPRSHandlerBackend +class CDummyAPRSHandlerBackend : public IAPRSHandlerBackend { public: - CDummyAPRSHandlerThread(); - ~CDummyAPRSHandlerThread(); + CDummyAPRSHandlerBackend(); + ~CDummyAPRSHandlerBackend(); bool start(); bool isConnected() const; diff --git a/DStarGateway/DStarGatewayApp.cpp b/DStarGateway/DStarGatewayApp.cpp index 0e8fd44..e218e12 100644 --- a/DStarGateway/DStarGatewayApp.cpp +++ b/DStarGateway/DStarGatewayApp.cpp @@ -200,7 +200,7 @@ bool CDStarGatewayApp::createThread() CAPRSHandlerThread* thread = new CAPRSHandlerThread(gatewayConfig.callsign, aprsConfig.password, gatewayConfig.address, aprsConfig.hostname, aprsConfig.port); outgoingAprsWriter = new CAPRSHandler((IAPRSHandlerBackend *)thread); - incomingAprsWriter = new CAPRSHandler((IAPRSHandlerBackend *)new CDummyAPRSHandlerThread()); + incomingAprsWriter = new CAPRSHandler((IAPRSHandlerBackend *)new CDummyAPRSHandlerBackend()); if(outgoingAprsWriter->open()) { #ifdef USE_GPSD