From 856e1a540b40bc4f18f5b21412a601934de3aa81 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Wed, 18 Sep 2019 15:25:01 -0400 Subject: [PATCH] Fix misc. doxy, debug and source comment typos Found via `codespell -q 3 -L acount,aline,ang,atleast,creat,dur,filesnames,mut,nd,nto,originaly,shotcut,splitted,tim,uint,unselect -S ./src/lib/external/kiss_fft,./.git/logs` --- src/bin/bin.cpp | 2 +- src/bin/binplaylist.cpp | 2 +- src/bin/model/markerlistmodel.cpp | 2 +- src/bin/projectclip.cpp | 2 +- src/jobs/audiothumbjob.cpp | 2 +- src/jobs/cutclipjob.h | 2 +- src/lib/audio/audioEnvelope.cpp | 2 +- src/lib/audio/fftTools.cpp | 2 +- src/mainwindow.cpp | 2 +- src/monitor/scopes/scopewidget.h | 2 +- src/timeline2/model/timelinefunctions.cpp | 2 +- src/timeline2/model/timelinemodel.cpp | 2 +- src/timeline2/model/timelinemodel.hpp | 4 ++-- src/timeline2/model/trackmodel.hpp | 4 ++-- src/timeline2/view/timelinecontroller.h | 2 +- .../transitionlist/view/transitionlistwidget.cpp | 2 +- tests/catch.hpp | 6 +++--- tests/groupstest.cpp | 10 +++++----- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp index 7d5e7a848..ddd88b096 100644 --- a/src/bin/bin.cpp +++ b/src/bin/bin.cpp @@ -1590,7 +1590,7 @@ void Bin::contextMenuEvent(QContextMenuEvent *event) continue; } if (noCodecInfo) { - // No audio / video codec, this is an MLT clip, disable conditionnal transcoding + // No audio / video codec, this is an MLT clip, disable conditional transcoding transcodeActions.at(i)->setEnabled(false); continue; } diff --git a/src/bin/binplaylist.cpp b/src/bin/binplaylist.cpp index 877f7bb53..3a8a4d7c0 100644 --- a/src/bin/binplaylist.cpp +++ b/src/bin/binplaylist.cpp @@ -123,7 +123,7 @@ void BinPlaylist::saveDocumentProperties(const QMap &props, co std::shared_ptr guideModel) { Q_UNUSED(guideModel) - // Clear previous properites + // Clear previous properties Mlt::Properties playlistProps(m_binPlaylist->get_properties()); Mlt::Properties docProperties; docProperties.pass_values(playlistProps, "kdenlive:docproperties."); diff --git a/src/bin/model/markerlistmodel.cpp b/src/bin/model/markerlistmodel.cpp index 4b1725d6c..290c440e3 100644 --- a/src/bin/model/markerlistmodel.cpp +++ b/src/bin/model/markerlistmodel.cpp @@ -357,7 +357,7 @@ void MarkerListModel::registerSnapModel(const std::weak_ptr &snap // we now add the already existing markers to the snap for (const auto &marker : m_markerList) { - qDebug() << " *- *-* REGISTEING MARKER: " << marker.first.frames(pCore->getCurrentFps()); + qDebug() << " *- *-* REGISTERING MARKER: " << marker.first.frames(pCore->getCurrentFps()); ptr->addPoint(marker.first.frames(pCore->getCurrentFps())); } } else { diff --git a/src/bin/projectclip.cpp b/src/bin/projectclip.cpp index 0cbff5bf1..06afbc705 100644 --- a/src/bin/projectclip.cpp +++ b/src/bin/projectclip.cpp @@ -795,7 +795,7 @@ std::shared_ptr ProjectClip::cloneProducer(bool removeEffects) qDebug() << "// EFFECT " << ct << " : " << filter->get("mlt_service"); QString ix = QString::fromLatin1(filter->get("kdenlive_id")); if (!ix.isEmpty()) { - qDebug() << "/ + + DELTING"; + qDebug() << "/ + + DELETING"; if (prod->detach(*filter) == 0) { } else { ct++; diff --git a/src/jobs/audiothumbjob.cpp b/src/jobs/audiothumbjob.cpp index c5d22adcd..2d7a27f3e 100644 --- a/src/jobs/audiothumbjob.cpp +++ b/src/jobs/audiothumbjob.cpp @@ -136,7 +136,7 @@ bool AudioThumbJob::computeWithFFMPEG() bool isFFmpeg = KdenliveSettings::ffmpegpath().contains(QLatin1String("ffmpeg")); args << QStringLiteral("-filter_complex:a"); if (m_channels == 1) { - //TODO: this does not correcty generate the correct stream data + //TODO: this does not correctly generate the correct stream data args << QStringLiteral("aformat=channel_layouts=mono,%1=100").arg(isFFmpeg ? "aresample=async" : "sample_rates"); args << QStringLiteral("-map") << QStringLiteral("0:a%1").arg(m_audioStream > 0 ? ":" + QString::number(m_audioStream) : QString()) << QStringLiteral("-c:a") << QStringLiteral("pcm_s16le") << QStringLiteral("-y") << QStringLiteral("-f") << QStringLiteral("data") diff --git a/src/jobs/cutclipjob.h b/src/jobs/cutclipjob.h index 5c83c93aa..1762b9c8d 100644 --- a/src/jobs/cutclipjob.h +++ b/src/jobs/cutclipjob.h @@ -36,7 +36,7 @@ class CutClipJob : public AbstractClipJob Q_OBJECT public: - /** @brief Extract part of a clip with ffmpeg whithout re-encoding + /** @brief Extract part of a clip with ffmpeg without re-encoding */ CutClipJob(const QString &binId, const QString sourcePath, GenTime inTime, GenTime outTime, const QString destPath, QStringList encodingParams); diff --git a/src/lib/audio/audioEnvelope.cpp b/src/lib/audio/audioEnvelope.cpp index c3d1bbedb..3e6a0eec2 100644 --- a/src/lib/audio/audioEnvelope.cpp +++ b/src/lib/audio/audioEnvelope.cpp @@ -67,7 +67,7 @@ void AudioEnvelope::startComputeEnvelope() bool AudioEnvelope::hasComputationStarted() const { // An empty qFuture is canceled. QtConcurrent::run() returns a - // future that does not support cancelation, so this is a good way + // future that does not support cancellation, so this is a good way // to check whether the computations have started. return !m_audioSummary.isCanceled(); } diff --git a/src/lib/audio/fftTools.cpp b/src/lib/audio/fftTools.cpp index 5f003952d..a3029b86d 100644 --- a/src/lib/audio/fftTools.cpp +++ b/src/lib/audio/fftTools.cpp @@ -268,7 +268,7 @@ const QVector FFTTools::interpolatePeakPreserving(const QVector &i // Use linear interpolation in order to get smoother display if (xi == 0 || xi == (int)in.size() - 1) { - // ... except if we are at the left or right border of the input sigal. + // ... except if we are at the left or right border of the input signal. // Special case here since we consider previous and future values as well for // the actual interpolation (not possible here). out[i] = in[xi]; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b93f81eb1..75611fd90 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -3357,7 +3357,7 @@ void MainWindow::slotAlignPlayheadToMousePos() void MainWindow::triggerKey(QKeyEvent *ev) { - // Hack: The QQuickWindow that displays fullscreen monitor does not integrate quith QActions. + // Hack: The QQuickWindow that displays fullscreen monitor does not integrate with QActions. // so on keypress events we parse keys and check for shortcuts in all existing actions QKeySequence seq; // Remove the Num modifier or some shortcuts like "*" will not work diff --git a/src/monitor/scopes/scopewidget.h b/src/monitor/scopes/scopewidget.h index 3b4595f73..5dfc6cb39 100644 --- a/src/monitor/scopes/scopewidget.h +++ b/src/monitor/scopes/scopewidget.h @@ -46,7 +46,7 @@ refreshScope() function returns, the ScopeWidget will automatically request the GUI thread to update(). A well implemented ScopeWidget will be designed such that most of the CPU intensive work will be done in refreshScope() and - the paintEvent() implementation will complete quicly to avoid hanging up the + the paintEvent() implementation will complete quickly to avoid hanging up the GUI thread. Subclasses shall also implement getTitle() so that the application can display diff --git a/src/timeline2/model/timelinefunctions.cpp b/src/timeline2/model/timelinefunctions.cpp index 72a3c8710..a483bc24b 100644 --- a/src/timeline2/model/timelinefunctions.cpp +++ b/src/timeline2/model/timelinefunctions.cpp @@ -217,7 +217,7 @@ bool TimelineFunctions::requestClipCut(const std::shared_ptr auto criterion = [timeline, position](int cid) { return timeline->getClipPosition(cid) < position; }; bool res = true; for (const int topId : topElements) { - qDebug()<<"// CHECKING REGROUP ELMENT: "<isClip(topId)<isGroup(topId); + qDebug()<<"// CHECKING REGROUP ELEMENT: "<isClip(topId)<isGroup(topId); res = res && timeline->m_groups->split(topId, criterion, undo, redo); } if (!res) { diff --git a/src/timeline2/model/timelinemodel.cpp b/src/timeline2/model/timelinemodel.cpp index 58706aebd..fc227a54c 100644 --- a/src/timeline2/model/timelinemodel.cpp +++ b/src/timeline2/model/timelinemodel.cpp @@ -136,7 +136,7 @@ void TimelineModel::prepareClose() { requestClearSelection(true); QWriteLocker locker(&m_lock); - // Unlock all tracks to allow delting clip from tracks + // Unlock all tracks to allow deleting clip from tracks m_closing = true; auto it = m_allTracks.begin(); while (it != m_allTracks.end()) { diff --git a/src/timeline2/model/timelinemodel.hpp b/src/timeline2/model/timelinemodel.hpp index 1ddea399d..9e7dff653 100644 --- a/src/timeline2/model/timelinemodel.hpp +++ b/src/timeline2/model/timelinemodel.hpp @@ -52,7 +52,7 @@ class TrackModel; This is the entry point for any modifications that has to be made on an element. The dataflow beyond this entry point may vary, for example when the user request a clip resize, the call is deferred to the clip itself, that check if there is enough data to extend by the requested amount, compute the new in and - out, and then asks the track if there is enough room for extension. To avoid any confusion on which function to call first, rembember to always call the + out, and then asks the track if there is enough room for extension. To avoid any confusion on which function to call first, remember to always call the version in timeline. This is also required to generate the Undo/Redo operators The undo/redo system is designed around lambda functions. Each time a function executes an elementary change to the model, it writes the corresponding @@ -166,7 +166,7 @@ public: */ void loadTractor(); - /* @brief Returns the current tractor's producer, useful fo control seeking, playing, etc + /* @brief Returns the current tractor's producer, useful for control seeking, playing, etc */ std::shared_ptr producer(); Mlt::Profile *getProfile(); diff --git a/src/timeline2/model/trackmodel.hpp b/src/timeline2/model/trackmodel.hpp index 7f4a3315f..3337a0189 100644 --- a/src/timeline2/model/trackmodel.hpp +++ b/src/timeline2/model/trackmodel.hpp @@ -150,7 +150,7 @@ protected: @param undo Lambda function containing the current undo stack. Will be updated with current operation @param redo Lambda function containing the current redo queue. Will be updated with current operation @param groupMove If true, this is part of a larger operation and some operations like checking track duration will not be performed and have to be performed separately - @param finalDeletion If true, the clip will be deselected (should be false if this is a clip move doing delte/insert) + @param finalDeletion If true, the clip will be deselected (should be false if this is a clip move doing delete/insert) */ bool requestClipDeletion(int clipId, bool updateView, bool finalMove, Fun &undo, Fun &redo, bool groupMove, bool finalDeletion); /* @brief This function returns a lambda that performs the requested operation */ @@ -257,7 +257,7 @@ protected: /* @brief Import effects from a service that contains some (another track) */ bool importEffects(std::weak_ptr service); - /* @brief Copy effects from anoter effect stack */ + /* @brief Copy effects from another effect stack */ bool copyEffect(const std::shared_ptr &stackModel, int rowId); public slots: diff --git a/src/timeline2/view/timelinecontroller.h b/src/timeline2/view/timelinecontroller.h index a7f5d32cd..126dd9e41 100644 --- a/src/timeline2/view/timelinecontroller.h +++ b/src/timeline2/view/timelinecontroller.h @@ -220,7 +220,7 @@ public: Q_INVOKABLE void triggerAction(const QString &name); - /* @brief Returns id of the timeline selcted clip if there is only 1 clip selected + /* @brief Returns id of the timeline selected clip if there is only 1 clip selected * or an AVSplit group. If allowComposition is true, returns composition id if * only 1 is selected, otherwise returns -1. If restrictToCurrentPos is true, it will * only return the id if timeline cursor is inside item diff --git a/src/transitions/transitionlist/view/transitionlistwidget.cpp b/src/transitions/transitionlist/view/transitionlistwidget.cpp index 309de559e..c96c990ec 100644 --- a/src/transitions/transitionlist/view/transitionlistwidget.cpp +++ b/src/transitions/transitionlist/view/transitionlistwidget.cpp @@ -101,6 +101,6 @@ void TransitionListWidget::downloadNewLumas() { if (getNewStuff(QStringLiteral(":data/kdenlive_wipes.knsrc")) > 0) { MltConnection::refreshLumas(); - // TODO: refresh currently displayd trans ? + // TODO: refresh currently displayed trans ? } } diff --git a/tests/catch.hpp b/tests/catch.hpp index a1b6ed9e5..94e0de599 100644 --- a/tests/catch.hpp +++ b/tests/catch.hpp @@ -1843,7 +1843,7 @@ namespace Catch { m_result( result ) {} - // We don't actually need a virtual destructor, but many static analysers + // We don't actually need a virtual destructor, but many static analyzers // complain if it's not here :-( virtual ~ITransientExpression(); @@ -3091,7 +3091,7 @@ public: // The following functions create the actual matcher objects. // The user has to explicitly specify type to the function, because - // infering std::function is hard (but possible) and + // inferring std::function is hard (but possible) and // requires a lot of TMP. template Generic::PredicateMatcher Predicate(std::function const& predicate, std::string const& description = "") { @@ -9591,7 +9591,7 @@ namespace Catch { if (strerror_s(buffer, errno)) { CATCH_RUNTIME_ERROR("Could not translate errno to a string"); } - CATCH_RUNTIME_ERROR("Coul dnot open the temp file: '" << m_buffer << "' because: " << buffer); + CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer); } } #else diff --git a/tests/groupstest.cpp b/tests/groupstest.cpp index c82e0f390..1e4f43a39 100644 --- a/tests/groupstest.cpp +++ b/tests/groupstest.cpp @@ -96,7 +96,7 @@ TEST_CASE("Functional test of the group hierarchy", "[GroupsModel]") REQUIRE(groups.getSubtree(5) == std::unordered_set({5, 8})); } - SECTION("Test root retieving") + SECTION("Test root retrieving") { std::set first_tree = {0, 1, 2, 3, 4, 6, 7, 9}; for (int n : first_tree) { @@ -138,7 +138,7 @@ TEST_CASE("Functional test of the group hierarchy", "[GroupsModel]") REQUIRE(groups.getSubtree(5) == std::unordered_set({5, 8, 3, 4, 6, 7, 9})); } - SECTION("Test root retieving 2") + SECTION("Test root retrieving 2") { std::set first_tree = {0, 1, 2}; for (int n : first_tree) { @@ -180,7 +180,7 @@ TEST_CASE("Functional test of the group hierarchy", "[GroupsModel]") REQUIRE(groups.getSubtree(5) == std::unordered_set({5, 8, 3, 4, 6, 7, 9})); } - SECTION("Test root retieving 3") + SECTION("Test root retrieving 3") { for (int i = 0; i < 10; i++) { CAPTURE(i); @@ -216,7 +216,7 @@ TEST_CASE("Functional test of the group hierarchy", "[GroupsModel]") REQUIRE(groups.getSubtree(5) == std::unordered_set({5})); } - SECTION("Test root retieving 4") + SECTION("Test root retrieving 4") { std::set first_tree = {0, 1, 2, 5}; for (int n : first_tree) { @@ -552,7 +552,7 @@ TEST_CASE("Integration with timeline", "[GroupsModel]") qDebug() << "ERROR: did not find correspondence for group" << gid; } } else { - // we find correspondances of all the children + // we find correspondences of all the children auto children = timeline2->m_groups->getDirectChildren(gid); std::unordered_set corresp; for (int c : children) { -- 2.23.0