From cd82b0a6695be1d0a393bd4a46f6f6743426946c Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 2 Jul 2021 18:45:53 +0200 Subject: [PATCH] Fix spelling and typos --- 3rdparty/macdeployqt/main.cpp | 4 ++-- 3rdparty/macdeployqt/shared.cpp | 6 ++--- .../singleapplication/singleapplication.cpp | 2 +- .../singleapplication/singleapplication.h | 2 +- .../singlecoreapplication.cpp | 2 +- .../singleapplication/singlecoreapplication.h | 2 +- Changelog | 12 +++++----- src/analyzer/blockanalyzer.cpp | 4 ++-- src/covermanager/albumcoverfetchersearch.cpp | 2 +- src/device/udisks2lister.h | 2 +- src/dialogs/snapdialog.cpp | 2 +- src/engine/gstenginepipeline.cpp | 2 +- src/playlistparsers/parserbase.h | 2 +- src/scrobbler/lastfmimport.cpp | 24 +++++++++---------- src/transcoder/transcoderoptionsopus.cpp | 2 +- tests/src/collectionmodel_test.cpp | 2 +- 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/3rdparty/macdeployqt/main.cpp b/3rdparty/macdeployqt/main.cpp index 33c7dad22..86ed1470e 100644 --- a/3rdparty/macdeployqt/main.cpp +++ b/3rdparty/macdeployqt/main.cpp @@ -198,7 +198,7 @@ int main(int argc, char **argv) LogDebug() << "Argument found:" << argument; appstoreCompliant = true; - // Undocumented option, may not work as intented + // Undocumented option, may not work as intended } else if (argument == QByteArray("-deploy-framework")) { LogDebug() << "Argument found:" << argument; deployFramework = true; @@ -231,7 +231,7 @@ int main(int argc, char **argv) if (deployFramework && deploymentInfo.isFramework) fixupFramework(appBundlePath); - // Convenience: Look for .qml files in the current directoty if no -qmldir specified. + // Convenience: Look for .qml files in the current directory if no -qmldir specified. if (qmlDirs.isEmpty()) { QDir dir; if (!dir.entryList(QStringList() << QStringLiteral("*.qml")).isEmpty()) { diff --git a/3rdparty/macdeployqt/shared.cpp b/3rdparty/macdeployqt/shared.cpp index f116a3845..556ef9794 100644 --- a/3rdparty/macdeployqt/shared.cpp +++ b/3rdparty/macdeployqt/shared.cpp @@ -752,7 +752,7 @@ QString copyDylib(const FrameworkInfo &framework, const QString path) return QString(); } - // Retrun if the dylib has aleardy been deployed + // Return if the dylib has aleardy been deployed if (QFileInfo(dylibDestinationBinaryPath).exists() && !alwaysOwerwriteEnabled) return dylibDestinationBinaryPath; @@ -786,13 +786,13 @@ QString copyFramework(const FrameworkInfo &framework, const QString path) // Now copy the framework. Some parts should be left out (headers/, .prl files). // Some parts should be included (Resources/, symlink structure). We want this - // function to make as few assumtions about the framework as possible while at + // function to make as few assumptions about the framework as possible while at // the same time producing a codesign-compatible framework. // Copy framework binary copyFilePrintStatus(framework.sourceFilePath, frameworkDestinationBinaryPath); - // Copy Resouces/, Libraries/ and Helpers/ + // Copy Resources/, Libraries/ and Helpers/ const QString resourcesSourcePath = framework.frameworkPath + "/Resources"; const QString resourcesDestianationPath = frameworkDestinationDirectory + "/Versions/" + framework.version + "/Resources"; recursiveCopy(resourcesSourcePath, resourcesDestianationPath); diff --git a/3rdparty/singleapplication/singleapplication.cpp b/3rdparty/singleapplication/singleapplication.cpp index d69a98369..dfa5cd04c 100644 --- a/3rdparty/singleapplication/singleapplication.cpp +++ b/3rdparty/singleapplication/singleapplication.cpp @@ -234,7 +234,7 @@ QString SingleApplication::currentUser() { * Sends message to the Primary Instance. * @param message The message to send. * @param timeout the maximum timeout in milliseconds for blocking functions. - * @return true if the message was sent successfuly, false otherwise. + * @return true if the message was sent successfully, false otherwise. */ bool SingleApplication::sendMessage(const QByteArray &message, const int timeout) { diff --git a/3rdparty/singleapplication/singleapplication.h b/3rdparty/singleapplication/singleapplication.h index 8a3ca290e..b55a46a21 100644 --- a/3rdparty/singleapplication/singleapplication.h +++ b/3rdparty/singleapplication/singleapplication.h @@ -42,7 +42,7 @@ class SingleApplicationPrivate; /** - * @brief The SingleApplication class handles multipe instances of the same Application + * @brief The SingleApplication class handles multiple instances of the same Application * @see QApplication */ class SingleApplication : public QApplication { // clazy:exclude=ctor-missing-parent-argument diff --git a/3rdparty/singleapplication/singlecoreapplication.cpp b/3rdparty/singleapplication/singlecoreapplication.cpp index 9f9f349a2..bcaeec416 100644 --- a/3rdparty/singleapplication/singlecoreapplication.cpp +++ b/3rdparty/singleapplication/singlecoreapplication.cpp @@ -234,7 +234,7 @@ QString SingleCoreApplication::currentUser() { * Sends message to the Primary Instance. * @param message The message to send. * @param timeout the maximum timeout in milliseconds for blocking functions. - * @return true if the message was sent successfuly, false otherwise. + * @return true if the message was sent successfully, false otherwise. */ bool SingleCoreApplication::sendMessage(const QByteArray &message, const int timeout) { diff --git a/3rdparty/singleapplication/singlecoreapplication.h b/3rdparty/singleapplication/singlecoreapplication.h index 670f1a41b..2b1eff799 100644 --- a/3rdparty/singleapplication/singlecoreapplication.h +++ b/3rdparty/singleapplication/singlecoreapplication.h @@ -42,7 +42,7 @@ class SingleCoreApplicationPrivate; /** - * @brief The SingleCoreApplication class handles multipe instances of the same Application + * @brief The SingleCoreApplication class handles multiple instances of the same Application * @see QCoreApplication */ class SingleCoreApplication : public QCoreApplication { diff --git a/Changelog b/Changelog index 7410cc34d..3ef5c35f2 100644 --- a/Changelog +++ b/Changelog @@ -137,8 +137,8 @@ Unreleased: * Add support for native global shortcuts on KDE. * Add track progress in system tray icon as an option. * Only strip problematic characters in suggested filename when saving a playlist to file. - * Change star/unstar playlist to doubleclick instead of singleclick. - * Don't edit playlist name on doubleclick in playlists view. + * Change star/unstar playlist to double-click instead of singleclick. + * Don't edit playlist name on double-click in playlists view. * Make context view top label text selectable. * Add setting to change Qt style. * Clear ID3v3 tags that are empty, and clear ID3v1 tags when setting ID3v3 tags. @@ -333,7 +333,7 @@ Unreleased: 0.6.10: Bugfixes: - * Fixed Subsonic album covers not working for albums with non ASCII charcters. + * Fixed Subsonic album covers not working for albums with non ASCII characters. * Fixed reading date and genre from individual tracks in CUE sheets. * Fixed resume playback on startup for CUE songs. * Fixed album cover manager not showing complete album titles in the list of album covers. @@ -342,7 +342,7 @@ Unreleased: * Fixed engine and device in context using too large icons when icons were loaded from the system theme. * Fixed "Secure connection setup failed" problem on Windows when playing streams. * Fixed margin for song title text in context. - * Fixed UNC paths with non ASCII charcters not working. + * Fixed UNC paths with non ASCII characters not working. Enhancements: * Allowing all characters except slash and backslash when organising music unless options to strip characters is checked. @@ -357,9 +357,9 @@ Unreleased: * Only showing song length in context when available. * Sort album cover search results by score and pick the best 3 first before trying others to improve album cover search speed. * Make scrobbler work for streams. - * Added search for lyrics as a seperate option in context. + * Added search for lyrics as a separate option in context. * Made font and font sizes in context configurable. - * Splitting artist and song title to the relevant metadata when artist and song title is sent as title seperated by a dash in streams. + * Splitting artist and song title to the relevant metadata when artist and song title is sent as title separated by a dash in streams. * Added label to show collection pixmap disk cache used in settings. * Icreased default collection pixmap disk cache to 360. diff --git a/src/analyzer/blockanalyzer.cpp b/src/analyzer/blockanalyzer.cpp index e763cbc2d..17cf7b12e 100644 --- a/src/analyzer/blockanalyzer.cpp +++ b/src/analyzer/blockanalyzer.cpp @@ -37,8 +37,8 @@ const int BlockAnalyzer::kHeight = 2; const int BlockAnalyzer::kWidth = 4; -const int BlockAnalyzer::kMinRows = 3; // arbituary -const int BlockAnalyzer::kMinColumns = 32; // arbituary +const int BlockAnalyzer::kMinRows = 3; // arbitrary +const int BlockAnalyzer::kMinColumns = 32; // arbitrary const int BlockAnalyzer::kMaxColumns = 256; // must be 2**n const int BlockAnalyzer::kFadeSize = 90; diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp index 12170eb9a..3a48235cd 100644 --- a/src/covermanager/albumcoverfetchersearch.cpp +++ b/src/covermanager/albumcoverfetchersearch.cpp @@ -217,7 +217,7 @@ void AlbumCoverFetcherSearch::ProviderSearchResults(CoverProvider *provider, con results_copy[i].score_match -= 0.5; } - // Set the initial image quality score besed on the size returned by the API, this is recalculated when the image is received. + // Set the initial image quality score based on the size returned by the API, this is recalculated when the image is received. results_copy[i].score_quality += ScoreImage(results_copy[i].image_size); } diff --git a/src/device/udisks2lister.h b/src/device/udisks2lister.h index c8483ed7c..8243176a0 100644 --- a/src/device/udisks2lister.h +++ b/src/device/udisks2lister.h @@ -107,7 +107,7 @@ class Udisks2Lister : public DeviceLister { quint64 capacity; QString dbus_drive_path; - // Paritition + // Partition QString label; QString uuid; quint64 free_space; diff --git a/src/dialogs/snapdialog.cpp b/src/dialogs/snapdialog.cpp index 110a0583a..74eae3c75 100644 --- a/src/dialogs/snapdialog.cpp +++ b/src/dialogs/snapdialog.cpp @@ -65,7 +65,7 @@ SnapDialog::SnapDialog(QWidget *parent) : QDialog(parent), ui_(new Ui_SnapDialog text += QString("

"); text += QString("

"); - text += tr("Copy your strawberry.conf and strawberry.db from your ~/snap directory to avoid losing configration before you uninstall the snap:"); + text += tr("Copy your strawberry.conf and strawberry.db from your ~/snap directory to avoid losing configuration before you uninstall the snap:"); text += QString("
"); text += QString("cp ~/snap/strawberry/current/.config/strawberry/strawberry.conf ~/.config/strawberry/strawberry.conf
"); text += QString("cp ~/snap/strawberry/current/.local/share/strawberry/strawberry/strawberry.db ~/.local/share/strawberry/strawberry/strawberry.db
"); diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index 79c1bfd13..2d617066c 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -1236,7 +1236,7 @@ void GstEnginePipeline::FaderTimelineFinished() { fader_.reset(); - // Wait a little while longer before emitting the finished signal (and probably distroying the pipeline) to account for delays in the audio server/driver. + // Wait a little while longer before emitting the finished signal (and probably destroying the pipeline) to account for delays in the audio server/driver. if (use_fudge_timer_) { fader_fudge_timer_.start(kFaderFudgeMsec, this); } diff --git a/src/playlistparsers/parserbase.h b/src/playlistparsers/parserbase.h index 874d0cc95..e9c949af6 100644 --- a/src/playlistparsers/parserbase.h +++ b/src/playlistparsers/parserbase.h @@ -50,7 +50,7 @@ class ParserBase : public QObject { virtual bool TryMagic(const QByteArray &data) const = 0; // Loads all songs from playlist found at path 'playlist_path' in directory 'dir'. - // The 'device' argument is an opened and ready to read from represantation of this playlist. + // The 'device' argument is an opened and ready to read from representation of this playlist. // This method might not return all of the songs found in the playlist. // Any playlist parser may decide to leave out some entries if it finds them incomplete or invalid. // This means that the final resulting SongList should be considered valid (at least from the parser's point of view). diff --git a/src/scrobbler/lastfmimport.cpp b/src/scrobbler/lastfmimport.cpp index 01ba1dfaa..00b79ae38 100644 --- a/src/scrobbler/lastfmimport.cpp +++ b/src/scrobbler/lastfmimport.cpp @@ -304,7 +304,7 @@ void LastFMImport::GetRecentTracksRequestFinished(QNetworkReply *reply, const in } if (!json_obj["recenttracks"].isObject()) { - Error("Failed to pase JSON: recenttracks is not an object!", json_obj); + Error("Failed to parse JSON: recenttracks is not an object!", json_obj); return; } json_obj = json_obj["recenttracks"].toObject(); @@ -320,27 +320,27 @@ void LastFMImport::GetRecentTracksRequestFinished(QNetworkReply *reply, const in } if (!json_obj["@attr"].isObject()) { - Error("Failed to pase JSON: @attr is not an object.", json_obj); + Error("Failed to parse JSON: @attr is not an object.", json_obj); return; } if (!json_obj["track"].isArray()) { - Error("Failed to pase JSON: track is not an object.", json_obj); + Error("Failed to parse JSON: track is not an object.", json_obj); return; } QJsonObject obj_attr = json_obj["@attr"].toObject(); if (!obj_attr.contains("page")) { - Error("Failed to pase JSON: attr object is missing page.", json_obj); + Error("Failed to parse JSON: attr object is missing page.", json_obj); return; } if (!obj_attr.contains("totalPages")) { - Error("Failed to pase JSON: attr object is missing totalPages.", json_obj); + Error("Failed to parse JSON: attr object is missing totalPages.", json_obj); return; } if (!obj_attr.contains("total")) { - Error("Failed to pase JSON: attr object is missing total.", json_obj); + Error("Failed to parse JSON: attr object is missing total.", json_obj); return; } @@ -467,7 +467,7 @@ void LastFMImport::GetTopTracksRequestFinished(QNetworkReply *reply, const int p } if (!json_obj["toptracks"].isObject()) { - Error("Failed to pase JSON: toptracks is not an object!", json_obj); + Error("Failed to parse JSON: toptracks is not an object!", json_obj); return; } json_obj = json_obj["toptracks"].toObject(); @@ -483,27 +483,27 @@ void LastFMImport::GetTopTracksRequestFinished(QNetworkReply *reply, const int p } if (!json_obj["@attr"].isObject()) { - Error("Failed to pase JSON: @attr is not an object.", json_obj); + Error("Failed to parse JSON: @attr is not an object.", json_obj); return; } if (!json_obj["track"].isArray()) { - Error("Failed to pase JSON: track is not an object.", json_obj); + Error("Failed to parse JSON: track is not an object.", json_obj); return; } QJsonObject obj_attr = json_obj["@attr"].toObject(); if (!obj_attr.contains("page")) { - Error("Failed to pase JSON: attr object is missing page.", json_obj); + Error("Failed to parse JSON: attr object is missing page.", json_obj); return; } if (!obj_attr.contains("totalPages")) { - Error("Failed to pase JSON: attr object is missing page.", json_obj); + Error("Failed to parse JSON: attr object is missing page.", json_obj); return; } if (!obj_attr.contains("total")) { - Error("Failed to pase JSON: attr object is missing total.", json_obj); + Error("Failed to parse JSON: attr object is missing total.", json_obj); return; } diff --git a/src/transcoder/transcoderoptionsopus.cpp b/src/transcoder/transcoderoptionsopus.cpp index befb65ad9..f3ad9126a 100644 --- a/src/transcoder/transcoderoptionsopus.cpp +++ b/src/transcoder/transcoderoptionsopus.cpp @@ -31,7 +31,7 @@ #include "transcoderoptionsopus.h" #include "ui_transcoderoptionsopus.h" -// TODO: Add more options than only bitrate as soon as gst doesn't crash anymore while using the cbr parmameter (like cbr=false) +// TODO: Add more options than only bitrate as soon as gst doesn't crash anymore while using the cbr parameter (like cbr=false) const char *TranscoderOptionsOpus::kSettingsGroup = "Transcoder/opusenc"; diff --git a/tests/src/collectionmodel_test.cpp b/tests/src/collectionmodel_test.cpp index ffd636ae0..f046e2a51 100644 --- a/tests/src/collectionmodel_test.cpp +++ b/tests/src/collectionmodel_test.cpp @@ -603,7 +603,7 @@ TEST_F(CollectionModelTest, TestContainerNodes) { ASSERT_EQ(model2->song_nodes().count(), songs.count()); ASSERT_EQ(model3->song_nodes().count(), songs.count()); - // Container nodes for all models should now be indentical. + // Container nodes for all models should now be identical. for (int i = 0 ; i < 3 ; ++i) { for (CollectionItem *node : model1->container_nodes(i).values()) { ASSERT_TRUE(model2->container_nodes(i).keys().contains(node->key));