From 78bc9e87692f5fdc42943772f8e28054d58e2eb8 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sun, 12 Apr 2015 15:12:52 +0200 Subject: [PATCH] refs #375 Rename CNetworkVatlib::update to sendPositionUpdate --- src/blackcore/network_vatlib.cpp | 12 ++++++------ src/blackcore/network_vatlib.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index a7d20779f..16d54d575 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -53,7 +53,7 @@ namespace BlackCore Vat_SetNetworkLogHandler(SeverityError, CNetworkVatlib::networkLogHandler); connect(&m_processingTimer, SIGNAL(timeout()), this, SLOT(process())); - connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(update())); + connect(&m_positionUpdateTimer, &QTimer::timeout, this, &CNetworkVatlib::sendPositionUpdate); m_processingTimer.start(c_processingIntervalMsec); this->connect(&this->m_scheduledConfigUpdate, &QTimer::timeout, this, &CNetworkVatlib::sendIncrementalAircraftConfig); @@ -113,7 +113,7 @@ namespace BlackCore Vat_ExecuteNetworkTasks(m_net.data()); } - void CNetworkVatlib::update() + void CNetworkVatlib::sendPositionUpdate() { if (!m_net) { return; } @@ -183,7 +183,7 @@ namespace BlackCore if (isDisconnected()) { - m_updateTimer.stop(); + m_positionUpdateTimer.stop(); } } } @@ -349,15 +349,15 @@ namespace BlackCore Vat_Logon(m_net.data()); - if (! m_updateTimer.isActive()) + if (! m_positionUpdateTimer.isActive()) { - m_updateTimer.start(c_updateIntervalMsec); + m_positionUpdateTimer.start(c_updateIntervalMsec); } } void CNetworkVatlib::terminateConnection() { - m_updateTimer.stop(); + m_positionUpdateTimer.stop(); if (m_net && isConnected()) { diff --git a/src/blackcore/network_vatlib.h b/src/blackcore/network_vatlib.h index aaaaf4852..5d0ae3b29 100644 --- a/src/blackcore/network_vatlib.h +++ b/src/blackcore/network_vatlib.h @@ -145,7 +145,7 @@ namespace BlackCore private slots: void process(); - void update(); + void sendPositionUpdate(); void customPacketDispatcher(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data); signals: @@ -170,7 +170,7 @@ namespace BlackCore bool m_sendInterimPositions = false; //!< send interim positions QTimer m_processingTimer; - QTimer m_updateTimer; + QTimer m_positionUpdateTimer; static int const c_processingIntervalMsec = 100; static int const c_updateIntervalMsec = 5000; static int const c_logoffTimeoutSec = 5;