Skip to content

Commit 6ac8d64

Browse files
ltoenningltoenning
committed
refactor(afv): Fix some clang-tidy warnings
1 parent 8c73eb4 commit 6ac8d64

28 files changed

+61
-98
lines changed

‎src/core/afv/audio/callsigndelaycache.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,35 @@
33

44
#include "core/afv/audio/callsigndelaycache.h"
55

6+
#include <algorithm>
7+
68
namespace swift::core::afv::audio
79
{
810
void CallsignDelayCache::initialise(const QString &callsign)
911
{
1012
if (!m_delayCache.contains(callsign)) { m_delayCache[callsign] = delayDefault; }
11-
if (!successfulTransmissionsCache.contains(callsign)) { successfulTransmissionsCache[callsign] = 0; }
13+
if (!m_successfulTransmissionsCache.contains(callsign)) { m_successfulTransmissionsCache[callsign] = 0; }
1214
}
1315

1416
int CallsignDelayCache::get(const QString &callsign) { return m_delayCache[callsign]; }
1517

1618
void CallsignDelayCache::underflow(const QString &callsign)
1719
{
18-
if (!successfulTransmissionsCache.contains(callsign)) return;
20+
if (!m_successfulTransmissionsCache.contains(callsign)) return;
1921

20-
successfulTransmissionsCache[callsign] = 0;
22+
m_successfulTransmissionsCache[callsign] = 0;
2123
increaseDelayMs(callsign);
2224
}
2325

2426
void CallsignDelayCache::success(const QString &callsign)
2527
{
26-
if (!successfulTransmissionsCache.contains(callsign)) return;
28+
if (!m_successfulTransmissionsCache.contains(callsign)) return;
2729

28-
successfulTransmissionsCache[callsign]++;
29-
if (successfulTransmissionsCache[callsign] > 5)
30+
m_successfulTransmissionsCache[callsign]++;
31+
if (m_successfulTransmissionsCache[callsign] > 5)
3032
{
3133
decreaseDelayMs(callsign);
32-
successfulTransmissionsCache[callsign] = 0;
34+
m_successfulTransmissionsCache[callsign] = 0;
3335
}
3436
}
3537

@@ -38,15 +40,15 @@ namespace swift::core::afv::audio
3840
if (!m_delayCache.contains(callsign)) return;
3941

4042
m_delayCache[callsign] += delayIncrement;
41-
if (m_delayCache[callsign] > delayMax) { m_delayCache[callsign] = delayMax; }
43+
m_delayCache[callsign] = std::min(m_delayCache[callsign], delayMax);
4244
}
4345

4446
void CallsignDelayCache::decreaseDelayMs(const QString &callsign)
4547
{
4648
if (!m_delayCache.contains(callsign)) return;
4749

4850
m_delayCache[callsign] -= delayIncrement;
49-
if (m_delayCache[callsign] < delayMin) { m_delayCache[callsign] = delayMin; }
51+
m_delayCache[callsign] = std::max(m_delayCache[callsign], delayMin);
5052
}
5153

5254
CallsignDelayCache &CallsignDelayCache::instance()

‎src/core/afv/audio/callsigndelaycache.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
//! \file
55

6-
#ifndef SWIFT_ORE_AFV_AUDIO_CALLSIGNDELAYCACHE_H
7-
#define SWIFT_ORE_AFV_AUDIO_CALLSIGNDELAYCACHE_H
6+
#ifndef SWIFT_CORE_AFV_AUDIO_CALLSIGNDELAYCACHE_H
7+
#define SWIFT_CORE_AFV_AUDIO_CALLSIGNDELAYCACHE_H
88

99
#include <QHash>
1010
#include <QString>
@@ -46,9 +46,9 @@ namespace swift::core::afv::audio
4646
static constexpr int delayMax = 300;
4747

4848
QHash<QString, int> m_delayCache;
49-
QHash<QString, int> successfulTransmissionsCache;
49+
QHash<QString, int> m_successfulTransmissionsCache;
5050
};
5151

5252
} // namespace swift::core::afv::audio
5353

54-
#endif // guard
54+
#endif // SWIFT_CORE_AFV_AUDIO_CALLSIGNDELAYCACHE_H

‎src/core/afv/audio/callsignsampleprovider.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include "core/afv/audio/callsignsampleprovider.h"
55

6-
#include <QDebug>
76
#include <QStringBuilder>
87
#include <QStringLiteral>
98
#include <QtMath>
@@ -205,8 +204,7 @@ namespace swift::core::afv::audio
205204
{
206205
double crackleFactor = (((qExp(m_distanceRatio) * qPow(m_distanceRatio, -4.0)) / 350.0) - 0.00776652);
207206

208-
if (crackleFactor < 0.0) { crackleFactor = 0.0; }
209-
if (crackleFactor > 0.20) { crackleFactor = 0.20; }
207+
crackleFactor = std::clamp(crackleFactor, 0.0, 0.2);
210208

211209
m_crackleSoundProvider->setGain(crackleFactor * 2);
212210
m_whiteNoise->setGain(m_whiteNoiseGainMin);

‎src/core/afv/audio/callsignsampleprovider.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include <QAudioFormat>
1010
#include <QDateTime>
11-
#include <QSharedPointer>
1211
#include <QSoundEffect>
1312
#include <QTimer>
1413

@@ -17,7 +16,6 @@
1716
#include "sound/sampleprovider/bufferedwaveprovider.h"
1817
#include "sound/sampleprovider/equalizersampleprovider.h"
1918
#include "sound/sampleprovider/mixingsampleprovider.h"
20-
#include "sound/sampleprovider/pinknoisegenerator.h"
2119
#include "sound/sampleprovider/resourcesoundsampleprovider.h"
2220
#include "sound/sampleprovider/sawtoothgenerator.h"
2321
#include "sound/sampleprovider/simplecompressoreffect.h"
@@ -108,4 +106,4 @@ namespace swift::core::afv::audio
108106
};
109107
} // namespace swift::core::afv::audio
110108

111-
#endif // guard
109+
#endif // SWIFT_CORE_AFV_AUDIO_CALLSIGNSAMPLEPROVIDER_H

‎src/core/afv/audio/input.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
#include <cmath>
99

1010
#include <QAudioDevice>
11-
#include <QDebug>
12-
#include <QStringBuilder>
1311
#include <QtGlobal>
1412

1513
#include "misc/logmessage.h"
@@ -49,7 +47,6 @@ namespace swift::core::afv::audio
4947
const int byteCount = 1920 * m_format.channelCount();
5048
while (m_buffer.size() > byteCount)
5149
{
52-
// qDebug() << QDateTime::currentMSecsSinceEpoch() << "CAudioInputBuffer::writeData " << m_buffer.size();
5350
emit frameAvailable(m_buffer.left(byteCount));
5451
m_buffer.remove(0, byteCount);
5552
}

‎src/core/afv/audio/input.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#endif
1616

1717
#include <QAudioSource>
18-
#include <QDateTime>
19-
#include <QSharedPointer>
2018
#include <QString>
2119

2220
namespace swift::core::afv::audio

‎src/core/afv/audio/output.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include <cmath>
77

8-
#include <QDebug>
98
#include <QStringBuilder>
109

1110
#include "misc/logmessage.h"

‎src/core/afv/audio/output.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ namespace swift::core::afv::audio
4545
#endif
4646

4747
//! \copydoc QIODevice::readData
48-
virtual qint64 readData(char *data, qint64 maxlen) override;
48+
qint64 readData(char *data, qint64 maxlen) override;
4949

5050
//! \copydoc QIODevice::writeData
51-
virtual qint64 writeData(const char *data, qint64 len) override;
51+
qint64 writeData(const char *data, qint64 len) override;
5252

5353
private:
5454
swift::sound::sample_provider::ISampleProvider *m_sampleProvider = nullptr; //!< related provider
@@ -71,7 +71,7 @@ namespace swift::core::afv::audio
7171
COutput(QObject *parent = nullptr);
7272

7373
//! Dtor
74-
virtual ~COutput() override { this->stop(); }
74+
~COutput() override { this->stop(); }
7575

7676
//! Start output
7777
void start(const swift::misc::audio::CAudioDeviceInfo &outputDevice,
@@ -103,4 +103,4 @@ namespace swift::core::afv::audio
103103
};
104104
} // namespace swift::core::afv::audio
105105

106-
#endif // guard
106+
#endif // SWIFT_CORE_AFV_AUDIO_OUTPUT_H

‎src/core/afv/audio/receiversampleprovider.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include "core/afv/audio/receiversampleprovider.h"
77

8-
#include <QDebug>
98
#include <QStringBuilder>
109

1110
#include "misc/logmessage.h"
@@ -65,9 +64,8 @@ namespace swift::core::afv::audio
6564

6665
int CReceiverSampleProvider::activeCallsigns() const
6766
{
68-
const int numberOfCallsigns =
69-
static_cast<int>(std::count_if(m_voiceInputs.begin(), m_voiceInputs.end(),
70-
[](const CCallsignSampleProvider *p) { return p->inUse() == true; }));
67+
const int numberOfCallsigns = static_cast<int>(std::count_if(
68+
m_voiceInputs.begin(), m_voiceInputs.end(), [](const CCallsignSampleProvider *p) { return p->inUse(); }));
7169
return numberOfCallsigns;
7270
}
7371

@@ -92,11 +90,9 @@ namespace swift::core::afv::audio
9290

9391
if (m_doClickWhenAppropriate && numberOfInUseInputs == 0)
9492
{
95-
CResourceSoundSampleProvider *resourceSound =
96-
new CResourceSoundSampleProvider(Samples::instance().click(), m_mixer);
93+
auto *resourceSound = new CResourceSoundSampleProvider(Samples::instance().click(), m_mixer);
9794
m_mixer->addMixerInput(resourceSound);
9895
m_doClickWhenAppropriate = false;
99-
// CLogMessage(this).debug(u"AFV Click...");
10096
}
10197

10298
//! \todo KB 2020-04 not entirely correct, as it can be the number is the same, but changed callsign
@@ -132,7 +128,7 @@ namespace swift::core::afv::audio
132128
if (!voiceInput)
133129
{
134130
it = std::find_if(m_voiceInputs.begin(), m_voiceInputs.end(),
135-
[](const CCallsignSampleProvider *p) { return p->inUse() == false; });
131+
[](const CCallsignSampleProvider *p) { return !p->inUse(); });
136132
if (it != m_voiceInputs.end())
137133
{
138134
voiceInput = *it;
@@ -162,7 +158,7 @@ namespace swift::core::afv::audio
162158
if (!voiceInput)
163159
{
164160
it = std::find_if(m_voiceInputs.begin(), m_voiceInputs.end(),
165-
[](const CCallsignSampleProvider *p) { return p->inUse() == false; });
161+
[](const CCallsignSampleProvider *p) { return !p->inUse(); });
166162
if (it != m_voiceInputs.end())
167163
{
168164
voiceInput = *it;

‎src/core/afv/audio/receiversampleprovider.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "core/afv/audio/callsignsampleprovider.h"
1212
#include "misc/audio/audiosettings.h"
1313
#include "misc/aviation/callsignset.h"
14-
#include "misc/logcategories.h"
1514
#include "sound/sampleprovider/mixingsampleprovider.h"
1615
#include "sound/sampleprovider/sampleprovider.h"
1716
#include "sound/sampleprovider/sinusgenerator.h"
@@ -22,7 +21,7 @@ namespace swift::core::afv::audio
2221
//! Arguments
2322
struct TransceiverReceivingCallsignsChangedArgs
2423
{
25-
quint16 transceiverID; //!< transceiver id
24+
quint16 transceiverID {}; //!< transceiver id
2625
QStringList receivingCallsigns; //!< callsigns
2726
};
2827

@@ -58,7 +57,7 @@ namespace swift::core::afv::audio
5857
//! @}
5958

6059
//! \copydoc swift::sound::sample_provider::ISampleProvider::readSamples
61-
virtual int readSamples(QVector<float> &samples, qint64 count) override;
60+
int readSamples(QVector<float> &samples, qint64 count) override;
6261

6362
//! @{
6463
//! Add samples
@@ -117,4 +116,4 @@ namespace swift::core::afv::audio
117116

118117
Q_DECLARE_METATYPE(swift::core::afv::audio::TransceiverReceivingCallsignsChangedArgs)
119118

120-
#endif // guard
119+
#endif // SWIFT_CORE_AFV_AUDIO_RECEIVERSAMPLEPROVIDER_H

‎src/core/afv/audio/soundcardsampleprovider.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace swift::core::afv::audio
3535
void pttUpdate(bool active, const QVector<TxTransceiverDto> &txTransceivers);
3636

3737
//! \copydoc swift::sound::sample_provider::ISampleProvider::readSamples
38-
virtual int readSamples(QVector<float> &samples, qint64 count) override;
38+
int readSamples(QVector<float> &samples, qint64 count) override;
3939

4040
//! Add OPUS samples
4141
void addOpusSamples(const IAudioDto &audioDto, const QVector<RxTransceiverDto> &rxTransceivers);
@@ -65,4 +65,4 @@ namespace swift::core::afv::audio
6565

6666
} // namespace swift::core::afv::audio
6767

68-
#endif // guard
68+
#endif // SWIFT_CORE_AFV_AUDIO_SOUNDCARDSAMPLEPROVIDER_H

‎src/core/afv/clients/afvclient.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "core/afv/clients/afvclient.h"
55

6-
#include <QDebug>
7-
86
#ifdef Q_OS_WIN
97
# include "comdef.h"
108
#endif
@@ -33,15 +31,6 @@ using namespace swift::sound::sample_provider;
3331

3432
namespace swift::core::afv::clients
3533
{
36-
constexpr int CAfvClient::PositionUpdatesMs;
37-
constexpr int CAfvClient::SampleRate;
38-
constexpr int CAfvClient::FrameSize;
39-
constexpr double CAfvClient::MinDbIn;
40-
constexpr double CAfvClient::MaxDbIn;
41-
constexpr double CAfvClient::MinDbOut;
42-
constexpr double CAfvClient::MaxDbOut;
43-
constexpr quint32 CAfvClient::UniCom;
44-
4534
const QStringList &CAfvClient::getLogCategories()
4635
{
4736
static const QStringList cats { CLogCategories::audio(), CLogCategories::vatsimSpecific() };

‎src/core/afv/clients/afvclient.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
#include <atomic>
1010

11-
#include <QAudioInput>
12-
#include <QAudioOutput>
13-
#include <QDateTime>
1411
#include <QObject>
1512
#include <QString>
1613
#include <QVector>

‎src/core/afv/connection/apiserverconnection.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include <QJsonArray>
77
#include <QJsonObject>
8-
#include <QMetaEnum>
98
#include <QPointer>
109
#include <QScopedPointer>
1110
#include <QUrl>

‎src/core/afv/connection/apiserverconnection.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#ifndef SWIFT_CORE_AFV_CONNECTION_APISERVERCONNECTION_H
77
#define SWIFT_CORE_AFV_CONNECTION_APISERVERCONNECTION_H
88

9-
#include <QDebug>
10-
#include <QElapsedTimer>
119
#include <QEventLoop>
1210
#include <QJsonDocument>
1311
#include <QNetworkAccessManager>

‎src/core/afv/connection/clientconnection.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <QString>
1111
#include <QTimer>
1212
#include <QUdpSocket>
13+
#include <QUuid>
1314

1415
#include "core/afv/connection/apiserverconnection.h"
1516
#include "core/afv/connection/clientconnectiondata.h"
@@ -137,4 +138,4 @@ namespace swift::core::afv::connection
137138
};
138139
} // namespace swift::core::afv::connection
139140

140-
#endif // guard
141+
#endif // SWIFT_CORE_AFV_CONNECTION_CLIENTCONNECTION_H

‎src/core/afv/connection/clientconnectiondata.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "core/afv/connection/clientconnectiondata.h"
55

6-
#include <QDebug>
7-
86
#include "misc/logmessage.h"
97

108
using namespace swift::misc;

‎src/core/afv/connection/clientconnectiondata.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "core/afv/connection/apiserverconnection.h"
1515
#include "core/afv/crypto/cryptodtochannel.h"
1616
#include "core/afv/dto.h"
17-
#include "misc/logcategories.h"
1817

1918
namespace swift::core::afv::connection
2019
{
@@ -114,4 +113,4 @@ namespace swift::core::afv::connection
114113
};
115114
} // namespace swift::core::afv::connection
116115

117-
#endif // guard
116+
#endif // SWIFT_CORE_AFV_CONNECTION_CLIENTCONNECTIONDATA_H

‎src/core/afv/constants.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ namespace swift::core::afv
1515
constexpr int c_sampleRate = 48000;
1616
} // namespace swift::core::afv
1717

18-
#endif // guard
18+
#endif // SWIFT_CORE_AFV_CONSTANTS_H

0 commit comments

Comments
 (0)