From 5f18d87e0b5c634b4863c77d2f1d2e9a31bdb3a4 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Fri, 28 Aug 2020 00:36:42 +0100
Subject: [PATCH] Issue #77 Break dependency of loghandler and tokenbucket on
 time and units

---
 src/blackcore/fsd/fsdclient.cpp            | 2 +-
 src/blackgui/components/mappingcomponent.h | 2 +-
 src/blackmisc/loghandler.cpp               | 3 +--
 src/blackmisc/tokenbucket.cpp              | 7 -------
 src/blackmisc/tokenbucket.h                | 4 ----
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp
index 42e48f76a..a8d870720 100644
--- a/src/blackcore/fsd/fsdclient.cpp
+++ b/src/blackcore/fsd/fsdclient.cpp
@@ -102,7 +102,7 @@ namespace BlackCore
               CClientAware(clientProvider),
               COwnAircraftAware(ownAircraftProvider),
               CRemoteAircraftAware(remoteAircraftProvider),
-              m_tokenBucket(10, CTime(5, CTimeUnit::s()), 1)
+              m_tokenBucket(10, 5000, 1)
         {
             initializeMessageTypes();
             connect(&m_socket, &QTcpSocket::readyRead, this, &CFSDClient::readDataFromSocket,  Qt::QueuedConnection);
diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h
index 4263bb768..d68871eba 100644
--- a/src/blackgui/components/mappingcomponent.h
+++ b/src/blackgui/components/mappingcomponent.h
@@ -183,7 +183,7 @@ namespace BlackGui
             QScopedPointer<Ui::CMappingComponent> ui;
             QTimer m_updateTimer;
             bool m_missedRenderedAircraftUpdate = true; //! Rendered aircraft need update
-            BlackMisc::CTokenBucket m_bucket { 3, BlackMisc::PhysicalQuantities::CTime(5.0, BlackMisc::PhysicalQuantities::CTimeUnit::s()), 1};
+            BlackMisc::CTokenBucket m_bucket { 3, 5000, 1};
             BlackMisc::CSettingReadOnly<Settings::TViewUpdateSettings> m_settings { this, &CMappingComponent::settingsChanged }; //!< settings changed
             Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr; //! checkbox in view
         };
diff --git a/src/blackmisc/loghandler.cpp b/src/blackmisc/loghandler.cpp
index 1d3f5b6d4..9f6a124dc 100644
--- a/src/blackmisc/loghandler.cpp
+++ b/src/blackmisc/loghandler.cpp
@@ -156,9 +156,8 @@ namespace BlackMisc
             else if (statusMessage.getMessage().startsWith(QStringLiteral("QCommandLineParser: option not defined"))) { statusMessage.setSeverity(CStatusMessage::SeverityDebug); }
         }
 
-        using namespace BlackMisc::PhysicalQuantities;
         auto bucket = m_tokenBuckets.find(statusMessage);
-        if (bucket == m_tokenBuckets.end()) { bucket = m_tokenBuckets.insert(statusMessage, { { 5, CTime(1, CTimeUnit::s()), 1 }, 0 }); }
+        if (bucket == m_tokenBuckets.end()) { bucket = m_tokenBuckets.insert(statusMessage, { { 5, 1000, 1 }, 0 }); }
         if (! bucket->first.tryConsume())
         {
             bucket->second++;
diff --git a/src/blackmisc/tokenbucket.cpp b/src/blackmisc/tokenbucket.cpp
index db8221dba..c51e86719 100644
--- a/src/blackmisc/tokenbucket.cpp
+++ b/src/blackmisc/tokenbucket.cpp
@@ -7,18 +7,11 @@
  */
 
 #include "blackmisc/tokenbucket.h"
-#include "blackmisc/pq/units.h"
 
 #include <QtGlobal>
 
-using namespace BlackMisc::PhysicalQuantities;
-
 namespace BlackMisc
 {
-    CTokenBucket::CTokenBucket(int capacity, const CTime &interval, int numTokensToRefill)
-        : m_capacity(capacity), m_numTokensToRefill(numTokensToRefill), m_intervalMs(interval.value(CTimeUnit::ms()))
-    {}
-
     CTokenBucket::CTokenBucket(int capacity, qint64 intervalMs, int numTokensToRefill)
         : m_capacity(capacity), m_numTokensToRefill(numTokensToRefill), m_intervalMs(intervalMs)
     {}
diff --git a/src/blackmisc/tokenbucket.h b/src/blackmisc/tokenbucket.h
index 596daeffa..71b8adf1e 100644
--- a/src/blackmisc/tokenbucket.h
+++ b/src/blackmisc/tokenbucket.h
@@ -10,7 +10,6 @@
 #define BLACKMISC_TOKENBUCKET_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/pq/time.h"
 #include <QDateTime>
 
 namespace BlackMisc
@@ -25,9 +24,6 @@ namespace BlackMisc
     class BLACKMISC_EXPORT CTokenBucket
     {
     public:
-        //! Constructor for given replenishment policy
-        CTokenBucket(int capacity, const PhysicalQuantities::CTime &interval, int numTokensToRefill);
-
         //! Constructor for given replenishment policy
         CTokenBucket(int capacity, qint64 intervalMs, int numTokensToRefill);