diff options
50 files changed, 54 insertions, 54 deletions
diff --git a/lib/benchmark/src/benchmark_api_internal.cc b/lib/benchmark/src/benchmark_api_internal.cc index d468a257e3..83c4eeb5c3 100644 --- a/lib/benchmark/src/benchmark_api_internal.cc +++ b/lib/benchmark/src/benchmark_api_internal.cc @@ -11,5 +11,5 @@ State BenchmarkInstance::Run(IterationCount iters, int thread_id, return st; } -} // internal -} // benchmark +} // namespace internal +} // namespace benchmark diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp index 18a9801b8e..2456559ffc 100644 --- a/src/broadcast/broadcastmanager.cpp +++ b/src/broadcast/broadcastmanager.cpp @@ -18,7 +18,7 @@ namespace { const mixxx::Logger kLogger("BroadcastManager"); -} +} // namespace BroadcastManager::BroadcastManager(SettingsManager* pSettingsManager, SoundManager* pSoundManager) diff --git a/src/controllers/controllerpresetinfoenumerator.cpp b/src/controllers/controllerpresetinfoenumerator.cpp index 10201ac645..8281717c1d 100644 --- a/src/controllers/controllerpresetinfoenumerator.cpp +++ b/src/controllers/controllerpresetinfoenumerator.cpp @@ -21,7 +21,7 @@ bool presetInfoNameComparator(const PresetInfo &a, const PresetInfo &b) { return a.getDirPath() < b.getDirPath(); } } -} +} // namespace PresetInfoEnumerator::PresetInfoEnumerator(const QString& searchPath) : PresetInfoEnumerator(QList<QString>{searchPath}) { diff --git a/src/controllers/dlgcontrollerlearning.cpp b/src/controllers/dlgcontrollerlearning.cpp index d11b6597e9..4f16566006 100644 --- a/src/controllers/dlgcontrollerlearning.cpp +++ b/src/controllers/dlgcontrollerlearning.cpp @@ -13,7 +13,7 @@ typedef QPair<QString, ConfigKey> NamedControl; bool namedControlComparator(const NamedControl& l1, const NamedControl& l2) { return l1.first < l2.first; } -} +} // namespace DlgControllerLearning::DlgControllerLearning(QWidget * parent, Controller* controller) diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp index a25f926254..bdbd148287 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -20,7 +20,7 @@ namespace { const QString kPresetExt(".midi.xml"); -} +} // namespace DlgPrefController::DlgPrefController(QWidget* parent, Controller* controller, diff --git a/src/database/schemamanager.cpp b/src/database/schemamanager.cpp index 36f39863a3..4d7750ef44 100644 --- a/src/database/schemamanager.cpp +++ b/src/database/schemamanager.cpp @@ -29,7 +29,7 @@ namespace { return schemaVersion; } } -} + } // namespace SchemaManager::SchemaManager(const QSqlDatabase& database) : m_database(database), diff --git a/src/effects/builtin/flangereffect.cpp b/src/effects/builtin/flangereffect.cpp index 5954286f3b..542bd58a1a 100644 --- a/src/effects/builtin/flangereffect.cpp +++ b/src/effects/builtin/flangereffect.cpp @@ -13,7 +13,7 @@ inline CSAMPLE tanh_approx(CSAMPLE input) { // return tanhf(input); // 142ns for process; return input / (1 + input * input / (3 + input * input / 5)); // 119ns for process } -} +} // namespace // static QString FlangerEffect::getId() { diff --git a/src/effects/builtin/parametriceqeffect.cpp b/src/effects/builtin/parametriceqeffect.cpp index 1d56d38b52..11927b5885 100644 --- a/src/effects/builtin/parametriceqeffect.cpp +++ b/src/effects/builtin/parametriceqeffect.cpp @@ -2,10 +2,10 @@ #include "util/math.h" namespace { - constexpr int kBandCount = 2; - constexpr double kDefaultCenter1 = 1000; // 1 kHz - constexpr double kDefaultCenter2 = 3000; // 3 kHz -} +constexpr int kBandCount = 2; +constexpr double kDefaultCenter1 = 1000; // 1 kHz +constexpr double kDefaultCenter2 = 3000; // 3 kHz +} // namespace // static QString ParametricEQEffect::getId() { diff --git a/src/effects/builtin/tremoloeffect.cpp b/src/effects/builtin/tremoloeffect.cpp index 616cac0f34..7d116e0b25 100644 --- a/src/effects/builtin/tremoloeffect.cpp +++ b/src/effects/builtin/tremoloeffect.cpp @@ -3,7 +3,7 @@ namespace { // Used to avoid gain discontinuities when changing parameters too fast constexpr double kMaxGainIncrement = 0.001; -} +} // namespace // static QString TremoloEffect::getId() { diff --git a/src/encoder/encoderopus.cpp b/src/encoder/encoderopus.cpp index a36b844c5f..69b2b9142d 100644 --- a/src/encoder/encoderopus.cpp +++ b/src/encoder/encoderopus.cpp @@ -76,7 +76,7 @@ int getSerial() { kLogger.debug() << "RETURNING SERIAL " << serial; return serial; } -} +} // namespace //static int EncoderOpus::getMasterSamplerate() { diff --git a/src/encoder/encoderopussettings.cpp b/src/encoder/encoderopussettings.cpp index f37dd7b781..d4ec046f64 100644 --- a/src/encoder/encoderopussettings.cpp +++ b/src/encoder/encoderopussettings.cpp @@ -9,7 +9,7 @@ namespace { const int kDefaultQualityIndex = 6; const char* kQualityKey = "Opus_Quality"; const mixxx::Logger kLogger("EncoderOpusSettings"); -} +} // namespace const QString EncoderOpusSettings::BITRATE_MODE_GROUP = "Opus_BitrateMode"; diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp index 98202c30d6..ee3bbf8f21 100644 --- a/src/engine/controls/bpmcontrol.cpp +++ b/src/engine/controls/bpmcontrol.cpp @@ -39,7 +39,7 @@ constexpr int kBpmTapFilterLength = 5; // the actual number of beats is this x2. constexpr int kLocalBpmSpan = 4; constexpr SINT kSamplesPerFrame = 2; -} +} // namespace BpmControl::BpmControl(const QString& group, UserSettingsPointer pConfig) diff --git a/src/engine/enginetalkoverducking.cpp b/src/engine/enginetalkoverducking.cpp index e4e6f9f5f0..65d25b1edf 100644 --- a/src/engine/enginetalkoverducking.cpp +++ b/src/engine/enginetalkoverducking.cpp @@ -7,7 +7,7 @@ namespace { constexpr CSAMPLE kDuckThreshold = 0.1f; -} +} // namespace EngineTalkoverDucking::EngineTalkoverDucking( UserSettingsPointer pConfig, const QString& group) diff --git a/src/engine/sidechain/enginenetworkstream.cpp b/src/engine/sidechain/enginenetworkstream.cpp index ea0b6eb586..6c8b75c643 100644 --- a/src/engine/sidechain/enginenetworkstream.cpp +++ b/src/engine/sidechain/enginenetworkstream.cpp @@ -33,7 +33,7 @@ const int kBufferFrames = kNetworkLatencyFrames * 4; // 743 ms @ 44100 Hz // the broadcast thread is not scheduled in time. const mixxx::Logger kLogger("EngineNetworkStream"); -} +} // namespace EngineNetworkStream::EngineNetworkStream(int numOutputChannels, int numInputChannels) diff --git a/src/engine/sidechain/networkoutputstreamworker.cpp b/src/engine/sidechain/networkoutputstreamworker.cpp index ac616a9c8d..f53c6bb47b 100644 --- a/src/engine/sidechain/networkoutputstreamworker.cpp +++ b/src/engine/sidechain/networkoutputstreamworker.cpp @@ -6,7 +6,7 @@ namespace { const mixxx::Logger kLogger("NetworkStreamWorker"); -} +} // namespace NetworkOutputStreamWorker::NetworkOutputStreamWorker() : m_sampleRate(0), diff --git a/src/engine/sidechain/shoutconnection.cpp b/src/engine/sidechain/shoutconnection.cpp index 1b4171f8f7..2407df7516 100644 --- a/src/engine/sidechain/shoutconnection.cpp +++ b/src/engine/sidechain/shoutconnection.cpp @@ -40,7 +40,7 @@ const int kMaxShoutFailures = 3; const mixxx::Logger kLogger("ShoutConnection"); -} +} // namespace ShoutConnection::ShoutConnection(BroadcastProfilePtr profile, UserSettingsPointer pConfig) diff --git a/src/library/autodj/autodjfeature.cpp b/src/library/autodj/autodjfeature.cpp index 6209eff423..1d04ca26bc 100644 --- a/src/library/autodj/autodjfeature.cpp +++ b/src/library/autodj/autodjfeature.cpp @@ -26,7 +26,7 @@ namespace { const QString kViewName = QStringLiteral("Auto DJ"); -} +} // namespace namespace { const int kMaxRetrieveAttempts = 3; diff --git a/src/library/banshee/bansheeplaylistmodel.cpp b/src/library/banshee/bansheeplaylistmodel.cpp index f3a7b70eba..70aacfce9c 100644 --- a/src/library/banshee/bansheeplaylistmodel.cpp +++ b/src/library/banshee/bansheeplaylistmodel.cpp @@ -39,7 +39,7 @@ namespace { QAtomicInt sTableNumber; -} +} // namespace BansheePlaylistModel::BansheePlaylistModel(QObject* pParent, TrackCollectionManager* pTrackCollectionManager, BansheeDbConnection* pConnection) : BaseSqlTableModel(pParent, pTrackCollectionManager, "mixxx.db.model.banshee_playlist"), diff --git a/src/library/baseexternallibraryfeature.cpp b/src/library/baseexternallibraryfeature.cpp index 32b4160c04..de0caabd5f 100644 --- a/src/library/baseexternallibraryfeature.cpp +++ b/src/library/baseexternallibraryfeature.cpp @@ -14,7 +14,7 @@ namespace { const mixxx::Logger kLogger("BaseExternalLibraryFeature"); -} +} // namespace BaseExternalLibraryFeature::BaseExternalLibraryFeature( Library* pLibrary, diff --git a/src/library/browse/browsefeature.cpp b/src/library/browse/browsefeature.cpp index 68aee79d22..e18fbd7dac 100644 --- a/src/library/browse/browsefeature.cpp +++ b/src/library/browse/browsefeature.cpp @@ -358,7 +358,7 @@ QList<TreeItem*> getRemovableDevices() { #endif return ret; } -} +} // namespace // This is called whenever you double click or use the triangle symbol to expand // the subtree. The method will read the subfolders. diff --git a/src/library/browse/browsethread.cpp b/src/library/browse/browsethread.cpp index 24a9a250f5..eae977680b 100644 --- a/src/library/browse/browsethread.cpp +++ b/src/library/browse/browsethread.cpp @@ -113,7 +113,7 @@ public: } }; -} +} // namespace void BrowseThread::populateModel() { m_path_mutex.lock(); diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp index 2888750d14..1f5020bb7c 100644 --- a/src/library/dao/trackdao.cpp +++ b/src/library/dao/trackdao.cpp @@ -1574,7 +1574,7 @@ namespace { } return matchLength; } -} + } // namespace // Look for moved files. Look for files that have been marked as // "deleted on disk" and see if another "file" with the same name and diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp index f8e06869bf..60d5b2696d 100644 --- a/src/mixer/basetrackplayer.cpp +++ b/src/mixer/basetrackplayer.cpp @@ -33,7 +33,7 @@ const double kShiftCuesOffsetSmallMillis = 1; inline double trackColorToDouble(mixxx::RgbColor::optional_t color) { return (color ? static_cast<double>(*color) : kNoTrackColor); } -} +} // namespace BaseTrackPlayer::BaseTrackPlayer(QObject* pParent, const QString& group) : BasePlayer(pParent, group) { diff --git a/src/mixer/playerinfo.cpp b/src/mixer/playerinfo.cpp index ee894310fb..91b2bfc42c 100644 --- a/src/mixer/playerinfo.cpp +++ b/src/mixer/playerinfo.cpp @@ -16,7 +16,7 @@ const int kPlayingDeckUpdateIntervalMillis = 2000; PlayerInfo* s_pPlayerInfo = nullptr; -} +} // namespace PlayerInfo::PlayerInfo() : m_pCOxfader(new ControlProxy("[Master]","crossfader", this)), diff --git a/src/preferences/broadcastsettings_legacy.cpp b/src/preferences/broadcastsettings_legacy.cpp index 6573355748..428f457f05 100644 --- a/src/preferences/broadcastsettings_legacy.cpp +++ b/src/preferences/broadcastsettings_legacy.cpp @@ -30,7 +30,7 @@ const char* kStreamGenre = "stream_genre"; const char* kStreamName = "stream_name"; const char* kStreamPublic = "stream_public"; const char* kStreamWebsite = "stream_website"; -} +} // namespace void BroadcastSettings::loadLegacySettings(BroadcastProfilePtr profile) { if (!profile) diff --git a/src/preferences/broadcastsettingsmodel.cpp b/src/preferences/broadcastsettingsmodel.cpp index 33ebcb895d..b3140e0cdd 100644 --- a/src/preferences/broadcastsettingsmodel.cpp +++ b/src/preferences/broadcastsettingsmodel.cpp @@ -8,7 +8,7 @@ namespace { const int kColumnEnabled = 0; const int kColumnName = 1; const int kColumnStatus = 2; -} +} // namespace BroadcastSettingsModel::BroadcastSettingsModel() { } diff --git a/src/preferences/colorpaletteeditor.cpp b/src/preferences/colorpaletteeditor.cpp index 23d709f3ec..1d3408787f 100644 --- a/src/preferences/colorpaletteeditor.cpp +++ b/src/preferences/colorpaletteeditor.cpp @@ -16,7 +16,7 @@ namespace { const QColor kDefaultPaletteColor(0, 0, 0); -} +} // namespace ColorPaletteEditor::ColorPaletteEditor(QWidget* parent, bool showHotcueNumbers) : QDialog(parent), diff --git a/src/preferences/dialog/dlgprefbroadcast.cpp b/src/preferences/dialog/dlgprefbroadcast.cpp index 17bc3bf671..f06add02c1 100644 --- a/src/preferences/dialog/dlgprefbroadcast.cpp +++ b/src/preferences/dialog/dlgprefbroadcast.cpp @@ -30,7 +30,7 @@ const char* kSettingsGroupHeader = "Settings for %1"; const int kColumnEnabled = 0; const int kColumnName = 1; const mixxx::Logger kLogger("DlgPrefBroadcast"); -} +} // namespace DlgPrefBroadcast::DlgPrefBroadcast(QWidget *parent, BroadcastSettingsPointer pBroadcastSettings) diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp index 412954e9f4..c79f0fa5f2 100644 --- a/src/preferences/dialog/dlgprefdeck.cpp +++ b/src/preferences/dialog/dlgprefdeck.cpp @@ -33,7 +33,7 @@ constexpr double kDefaultPermanentRateChangeFine = 0.05; constexpr int kDefaultRateRampSensitivity = 250; // bool kDefaultCloneDeckOnLoad is defined in header file to make it available // to playermanager.cpp -} +} // namespace DlgPrefDeck::DlgPrefDeck(QWidget* parent, UserSettingsPointer pConfig) diff --git a/src/preferences/dialog/dlgpreflibrary.cpp b/src/preferences/dialog/dlgpreflibrary.cpp index ab71b3d92c..861b2eec08 100644 --- a/src/preferences/dialog/dlgpreflibrary.cpp +++ b/src/preferences/dialog/dlgpreflibrary.cpp @@ -18,7 +18,7 @@ namespace { const ConfigKey kSearchDebouncingTimeoutMillisKey = ConfigKey("[Library]","SearchDebouncingTimeoutMillis"); -} + } // namespace DlgPrefLibrary::DlgPrefLibrary( QWidget* pParent, diff --git a/src/preferences/effectsettingsmodel.cpp b/src/preferences/effectsettingsmodel.cpp index 780a1c450f..324e63d0a1 100644 --- a/src/preferences/effectsettingsmodel.cpp +++ b/src/preferences/effectsettingsmodel.cpp @@ -7,7 +7,7 @@ const int kColumnEnabled = 0; const int kColumnName = 1; const int kColumnType = 2; const int kNumberOfColumns = 3; -} +} // namespace EffectSettingsModel::EffectSettingsModel() { } diff --git a/src/soundio/sounddevicenetwork.cpp b/src/soundio/sounddevicenetwork.cpp index bce818e71f..461e506644 100644 --- a/src/soundio/sounddevicenetwork.cpp +++ b/src/soundio/sounddevicenetwork.cpp @@ -28,7 +28,7 @@ const int kNetworkLatencyFrames = 8192; // 185 ms @ 44100 Hz // which is 185 @ 44100 ms and twice the maximum of the max mixxx audio buffer const mixxx::Logger kLogger("SoundDeviceNetwork"); -} +} // namespace SoundDeviceNetwork::SoundDeviceNetwork(UserSettingsPointer config, SoundManager *sm, diff --git a/src/soundio/soundmanagerconfig.cpp b/src/soundio/soundmanagerconfig.cpp index 1ffa35fb7b..1b7e7e0229 100644 --- a/src/soundio/soundmanagerconfig.cpp +++ b/src/soundio/soundmanagerconfig.cpp @@ -38,7 +38,7 @@ const QString xmlElementOutput = "output"; const QString xmlElementInput = "input"; const QRegularExpression kLegacyFormatRegex("((\\d*), )(.*) \\((plug)?(hw:(\\d)+(,(\\d)+))?\\)"); -} +} // namespace SoundManagerConfig::SoundManagerConfig(SoundManager* pSoundManager) : m_api(kDefaultAPI), diff --git a/src/test/controlobjecttest.cpp b/src/test/controlobjecttest.cpp index 8df7831daa..c4854998e4 100644 --- a/src/test/controlobjecttest.cpp +++ b/src/test/controlobjecttest.cpp @@ -85,4 +85,4 @@ TEST_F(ControlObjectTest, Persistence_ValidValue) { EXPECT_DOUBLE_EQ(5.0, co.get()); } -} +} // namespace diff --git a/src/test/enginefilterbiquadtest.cpp b/src/test/enginefilterbiquadtest.cpp index d43419177e..bc3e37c851 100644 --- a/src/test/enginefilterbiquadtest.cpp +++ b/src/test/enginefilterbiquadtest.cpp @@ -19,4 +19,4 @@ TEST_F(EngineFilterBiquadTest, fidspecLengthIsLongEnough) { ASSERT_TRUE(FIDSPEC_LENGTH > strlen("LsBq/1.2200000000/-12.0000000000")); } -} +} // namespace diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp index d058fee95b..7fe2b467bd 100644 --- a/src/test/enginesynctest.cpp +++ b/src/test/enginesynctest.cpp @@ -18,7 +18,7 @@ namespace { constexpr double kMaxFloatingPointErrorLowPrecision = 0.005; constexpr double kMaxFloatingPointErrorHighPrecision = 0.0000000000000005; constexpr double kMaxBeatDistanceEpsilon = 1e-9; -} +} // namespace /// Tests for Master Sync. /// The following manual tests should probably be performed: diff --git a/src/test/librarytest.cpp b/src/test/librarytest.cpp index 9157433769..f3d710f644 100644 --- a/src/test/librarytest.cpp +++ b/src/test/librarytest.cpp @@ -26,7 +26,7 @@ std::unique_ptr<TrackCollectionManager> newTrackCollectionManager( deleteTrack); } -} +} // namespace LibraryTest::LibraryTest() : m_mixxxDb(config(), kInMemoryDbConnection), diff --git a/src/test/readaheadmanager_test.cpp b/src/test/readaheadmanager_test.cpp index 2e29c1a84f..64e6c4aec2 100644 --- a/src/test/readaheadmanager_test.cpp +++ b/src/test/readaheadmanager_test.cpp @@ -14,7 +14,7 @@ namespace { const QString kGroup = "[test]"; -} +} // namespace class StubReader : public CachingReader { public: diff --git a/src/track/cue.cpp b/src/track/cue.cpp index 7fc02e8ede..c0ac41b11d 100644 --- a/src/track/cue.cpp +++ b/src/track/cue.cpp @@ -36,7 +36,7 @@ inlin |