From 3d7de4f2c78b69b2fb6ee8749aec79daeca87fb9 Mon Sep 17 00:00:00 2001 From: fossdd Date: Sat, 24 Jul 2021 15:51:54 +0000 Subject: [PATCH] Rename Tenacity's config file Resolves #362 Signed-off-by: fossdd --- src/AudacityApp.cpp | 2 +- src/ProjectSettings.cpp | 2 +- src/commands/CommandManager.cpp | 4 ++-- src/effects/TruncSilence.cpp | 2 +- src/toolbars/ToolManager.cpp | 6 +++--- src/widgets/FileConfig.h | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index b060276e8..40ef64e3f 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -1197,7 +1197,7 @@ bool AudacityApp::OnInit() { // Initialize preferences and language { - wxFileName configFileName(FileNames::DataDir(), wxT("audacity.cfg")); + wxFileName configFileName(FileNames::DataDir(), wxT("tenacity.cfg")); auto appName = wxTheApp->GetAppName(); InitPreferences(AudacityFileConfig::Create( appName, wxEmptyString, diff --git a/src/ProjectSettings.cpp b/src/ProjectSettings.cpp index 78085edcd..17d09091d 100644 --- a/src/ProjectSettings.cpp +++ b/src/ProjectSettings.cpp @@ -73,7 +73,7 @@ ProjectSettings::ProjectSettings(AudacityProject &project) mRate = intRate; if ( !wasDefined ) { // The default given above can vary with host/devices. So unless there is - // an entry for the default sample rate in audacity.cfg, Audacity can open + // an entry for the default sample rate in tenacity.cfg, Tenacity can open // with a rate which is different from the rate with which it closed. // See bug 1879. QualitySettings::DefaultSampleRate.Write( mRate ); diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index 726d1920a..1fa4b3c6d 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -1608,8 +1608,8 @@ void CommandManager::CheckDups() // must both be in either the first or the second group, so there is no need // to test for this case. // Note that if a user is using the full set of default shortcuts, and one -// of these is changed, then if /GUI/Shortcuts/FullDefaults is not set in audacity.cfg, -// because the defaults appear as user assigned shortcuts in audacity.cfg, +// of these is changed, then if /GUI/Shortcuts/FullDefaults is not set in tenacity.cfg, +// because the defaults appear as user assigned shortcuts in tenacity.cfg, // the previous default overrides the changed default, and no duplicate can // be introduced. void CommandManager::RemoveDuplicateShortcuts() diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index bd7878df3..40c069cb7 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -141,7 +141,7 @@ EffectTruncSilence::EffectTruncSilence() SetLinearEffectFlag(false); - // This used to be changeable via the audacity.cfg/registry. Doubtful that was + // This used to be changeable via the tenacity.cfg/registry. Doubtful that was // ever done. // // Original comment: diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp index 27431bf4c..e04221765 100644 --- a/src/toolbars/ToolManager.cpp +++ b/src/toolbars/ToolManager.cpp @@ -743,9 +743,9 @@ void ToolManager::ReadConfig() int vMajor, vMinor, vMicro; gPrefs->GetVersionKeysInit(vMajor, vMinor, vMicro); bool useLegacyDock = false; - // note that vMajor, vMinor, and vMicro will all be zero if either it's a new audacity.cfg file + // note that vMajor, vMinor, and vMicro will all be zero if either it's a new tenaciyu.cfg file // or the version is less than 1.3.13 (when there were no version keys according to the comments in - // InitPreferences()). So for new audacity.cfg + // InitPreferences()). So for new tenacity.cfg // file useLegacyDock will be true, but this doesn't matter as there are no Dock or DockV2 keys in the file yet. if (vMajor <= 1 || (vMajor == 2 && (vMinor <= 1 || (vMinor == 2 && vMicro <= 1)))) // version <= 2.2.1 @@ -854,7 +854,7 @@ void ToolManager::ReadConfig() } #else // note that this section is here because if you had been using sync-lock and now you aren't, - // the space for the extra button is stored in audacity.cfg, and so you get an extra space + // the space for the extra button is stored in tenacity.cfg, and so you get an extra space // in the EditToolbar. // It is needed so that the meterToolbar size gets preserved. // Longer-term we should find a better fix for this. diff --git a/src/widgets/FileConfig.h b/src/widgets/FileConfig.h index a78d50a82..adc58371a 100644 --- a/src/widgets/FileConfig.h +++ b/src/widgets/FileConfig.h @@ -47,7 +47,7 @@ public: virtual bool DeleteGroup(const wxString& key) wxOVERRIDE; virtual bool DeleteAll() wxOVERRIDE; - // Set and Get values of the version major/minor/micro keys in audacity.cfg when Audacity first opens + // Set and Get values of the version major/minor/micro keys in tenacity.cfg when Tenacity first opens void SetVersionKeysInit( int major, int minor, int micro) { mVersionMajorKeyInit = major; @@ -90,8 +90,8 @@ private: std::unique_ptr mConfig; - // values of the version major/minor/micro keys in audacity.cfg - // when Audacity first opens + // values of the version major/minor/micro keys in tenacity.cfg + // when Tenacity first opens int mVersionMajorKeyInit{}; int mVersionMinorKeyInit{}; int mVersionMicroKeyInit{};