diff options
20 files changed, 29 insertions, 29 deletions
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 8b9c4a211..4952085f0 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -110,7 +110,7 @@ public: KNewFileMenu *newFileMenu() const; /** - * Augments Qt's build-in QMainWindow context menu to add + * Augments Qt's built-in QMainWindow context menu to add * Dolphin-specific actions, such as "unlock panels". */ QMenu *createPopupMenu() override; diff --git a/src/kitemviews/accessibility/kitemlistdelegateaccessible.cpp b/src/kitemviews/accessibility/kitemlistdelegateaccessible.cpp index dcfe3af80..b50b71daf 100644 --- a/src/kitemviews/accessibility/kitemlistdelegateaccessible.cpp +++ b/src/kitemviews/accessibility/kitemlistdelegateaccessible.cpp @@ -177,12 +177,12 @@ QString KItemListDelegateAccessible::text(QAccessible::Text t) const continue; // No need to announce roles which are empty for this item. } description += - // i18n: The text starts with a comma because multiple occurences of this text can follow after each others as an enumeration. + // i18n: The text starts with a comma because multiple occurrences of this text can follow after each others as an enumeration. // Normally it would make sense to have a colon between property and value to make the relation between the property and its property value // clear, however this is accessible text that will be read out by screen readers. That's why there is only a space between the two here, // because screen readers would read the colon literally as "colon", which is just a waste of time for users who might go through a list of - // hundreds of items. So, if you want to add any more punctation there to improve structure, try to make sure that it will not lead to annoying - // announcements when read out by a screen reader. + // hundreds of items. So, if you want to add any more punctuation there to improve structure, try to make sure that it will not lead to + // annoying announcements when read out by a screen reader. i18nc("@info accessibility enumeration, %1 is property, %2 is value", ", %1 %2", model->roleDescription(roleInformation), roleText); } return description; diff --git a/src/kitemviews/accessibility/kitemlistviewaccessible.cpp b/src/kitemviews/accessibility/kitemlistviewaccessible.cpp index f58527be6..319b69f30 100644 --- a/src/kitemviews/accessibility/kitemlistviewaccessible.cpp +++ b/src/kitemviews/accessibility/kitemlistviewaccessible.cpp @@ -261,7 +261,7 @@ QString KItemListViewAccessible::text(QAccessible::Text t) const /** * Always announce the path last because it might be very long. - * We do not need to announce the total count of items here because accessibility software like Orca alrady announces this automatically for lists. + * We do not need to announce the total count of items here because accessibility software like Orca already announces this automatically for lists. */ if (!currentItem) { return i18nc("@info 1 states that the folder is empty and sometimes why, 2 is the full filesystem path", diff --git a/src/kitemviews/accessibility/kitemlistviewaccessible.h b/src/kitemviews/accessibility/kitemlistviewaccessible.h index 64b5a2442..5ab1ee5c3 100644 --- a/src/kitemviews/accessibility/kitemlistviewaccessible.h +++ b/src/kitemviews/accessibility/kitemlistviewaccessible.h @@ -27,7 +27,7 @@ class KItemListSelectionManager; * interact with the view using accessibility tools. It implements various interfaces mostly to generally allow working with the view as a whole. However, * actually interacting with singular items within the view is implemented in KItemListDelegateAccessible. * - * @note For documentation of most of the methods within this class, check out the documentation of the methods which are being overriden here. + * @note For documentation of most of the methods within this class, check out the documentation of the methods which are being overridden here. */ class DOLPHIN_EXPORT KItemListViewAccessible : public QAccessibleObject, public QAccessibleSelectionInterface, diff --git a/src/kitemviews/kfileitemlisttostring.h b/src/kitemviews/kfileitemlisttostring.h index 1cba1a43c..69ecd35a1 100644 --- a/src/kitemviews/kfileitemlisttostring.h +++ b/src/kitemviews/kfileitemlisttostring.h @@ -18,7 +18,7 @@ enum ItemsState { None, Selected }; * @brief Generates a textual representation of the given list of KFileItems. * * This method is especially useful to be very explicit about which items will be affected by an action. - * For example can a label for a delete button be enriched to say "Permanantly Delete `picture1` and `picture2`" + * For example can a label for a delete button be enriched to say "Permanently Delete `picture1` and `picture2`" * but also "Permanently Delete 7 Selected Folders" without requiring a huge amount of new translations for this. * * Unfortunately this doesn't always work. diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 4386bca16..9bba37e78 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -830,7 +830,7 @@ void KFileItemModel::applyFilters() itemShownBelow = itemData; } else { // We hide this item for now, however, for expanded folders this is not final: - // if after the next "for" loop we discover that its children must now be shown with the newly applied fliter, we shall re-insert it + // if after the next "for" loop we discover that its children must now be shown with the newly applied filter, we shall re-insert it newFilteredIndexes.prepend(index); m_filteredItems.insert(itemData->item, itemData); // indexShownBelow doesn't get updated since this item will be hidden diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h index eb2f01d19..681ff3bef 100644 --- a/src/kitemviews/kstandarditemlistview.h +++ b/src/kitemviews/kstandarditemlistview.h @@ -45,7 +45,7 @@ protected: void initializeItemListWidget(KItemListWidget *item) override; bool itemSizeHintUpdateRequired(const QSet<QByteArray> &changedRoles) const override; virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const; - /** To be overriden by sub-classes to specify when full row highlighting should be enabled. */ + /** To be overridden by sub-classes to specify when full row highlighting should be enabled. */ virtual bool itemLayoutHighlightEntireRow(ItemLayout layout) const; virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous); virtual qreal scrollSingleStep() const override; diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index f14414a86..d98aed94c 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -1550,7 +1550,7 @@ void KStandardItemListWidget::updateAdditionalInfoTextColor() QPixmap KStandardItemListWidget::addOverlays(const QPixmap &pixmap, const QHash<Qt::Corner, QString> &overlays, const QSize &size, qreal dpr, QIcon::Mode mode) const { - // similar to KIconUtils::addOverlays, keep in sync preferrably + // similar to KIconUtils::addOverlays, keep in sync preferably if (overlays.isEmpty()) { return pixmap; } diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h index cabe3a8c9..9e6fff935 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -61,7 +61,7 @@ protected: * @param role The role the text is being requested for. * @param values The data of the item. All the data is passed because the text might depend on multiple data points. * @param forUsageAs Whether the roleText should be optimized for displaying (i.e. kept somewhat short) or optimized for speaking e.g. by screen readers - * or text-to-speech in general (i.e. by prefering announcing a month as July instead of as the number 7). + * or text-to-speech in general (i.e. by preferring announcing a month as July instead of as the number 7). * @return String representation of the role \a role. The representation of * a role might depend on other roles, so the values of all roles * are passed as parameter. diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp index 57cf7b1bc..8a69fb4e2 100644 --- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp +++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp @@ -84,7 +84,7 @@ void KDirectoryContentsCounterWorker::walkDir(const QString &dirPath, bool count if (info == FTS_D) { if (node->fts_level == 0) { - // first read was sucessful, we can init counters + // first read was successful, we can init counters totalSize = 0; totalCount = 0; } diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp index 3dc82ad6b..378dd1d5d 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.cpp +++ b/src/kitemviews/private/kitemlistheaderwidget.cpp @@ -244,7 +244,7 @@ void KItemListHeaderWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) if (m_pressedGrip) { // Emitting a column width change removes automatic column resizing, so we do not emit if only the padding is being changed. - // Eception: In mouseMoveEvent() we also resize the last column if the right padding is at zero but the user still quickly resizes beyond the screen + // Exception: In mouseMoveEvent() we also resize the last column if the right padding is at zero but the user still quickly resizes beyond the screen // boarder. Such a resize "of the right padding" is let through when automatic column resizing was disabled by that resize. if (m_pressedGrip->roleToTheLeft != "leftPadding" && (m_pressedGrip->roleToTheRight != "rightPadding" || !m_automaticColumnResizing)) { const qreal currentWidth = m_columnWidths.value(m_pressedGrip->roleToTheLeft); diff --git a/src/search/bar.h b/src/search/bar.h index e8a401748..c45e838c7 100644 --- a/src/search/bar.h +++ b/src/search/bar.h @@ -137,7 +137,7 @@ private Q_SLOTS: /** * Is called when any component within this Bar emits a configurationChanged() signal. * This method is then responsible to communicate the changed search configuration to every other interested party by calling - * UpdatableStateInterface::updateStateToMatch() methods and commiting the new search configuration. + * UpdatableStateInterface::updateStateToMatch() methods and committing the new search configuration. * @see UpdatableStateInterface::updateStateToMatch(). * @see commitCurrentConfiguration(). */ @@ -145,7 +145,7 @@ private Q_SLOTS: /** * Changes the m_searchConfiguration in response to the user editing the search term. If no further changes to the search term happen within a time limit, - * the new search configuration will eventually be commited. + * the new search configuration will eventually be committed. * @see commitCurrentConfiguration. */ void slotSearchTermEdited(const QString &text); diff --git a/src/search/dolphinquery.cpp b/src/search/dolphinquery.cpp index 100bac4d0..55c9fa223 100644 --- a/src/search/dolphinquery.cpp +++ b/src/search/dolphinquery.cpp @@ -317,7 +317,7 @@ void DolphinQuery::initializeFromBalooQuery(const Baloo::Query &balooQuery, cons // UI does not support searching for differing strings in content and file name. m_searchTerm = value; } - if (!requestedToSearchThrough.has_value()) { // If requested to search thorugh contents, searching file names is already implied. + if (!requestedToSearchThrough.has_value()) { // If requested to search through contents, searching file names is already implied. requestedToSearchThrough = SearchThrough::FileNames; } } diff --git a/src/search/widgetmenu.h b/src/search/widgetmenu.h index def75354f..91680d983 100644 --- a/src/search/widgetmenu.h +++ b/src/search/widgetmenu.h @@ -40,7 +40,7 @@ protected: void mouseReleaseEvent(QMouseEvent *event) override; /** - * This unfortuantely needs to be explicitly called to resize the WidgetMenu because the size of a QMenu will not automatically change to fit the QWidgets + * This unfortunately needs to be explicitly called to resize the WidgetMenu because the size of a QMenu will not automatically change to fit the QWidgets * within. */ void resizeToFitContents(); @@ -53,7 +53,7 @@ protected: private: /** * @return the widget which is contained in this WidgetMenu. This method is at most called once per WidgetMenu object when the WidgetMenu is about to be - * shown for the first time. The ownership of the widget will be transfered to an internal QWidgetAction. + * shown for the first time. The ownership of the widget will be transferred to an internal QWidgetAction. */ virtual QWidget *init() = 0; }; diff --git a/src/selectionmode/bottombarcontentscontainer.cpp b/src/selectionmode/bottombarcontentscontainer.cpp index 0e3087a9c..124fae682 100644 --- a/src/selectionmode/bottombarcontentscontainer.cpp +++ b/src/selectionmode/bottombarcontentscontainer.cpp @@ -599,7 +599,7 @@ void BottomBarContentsContainer::updateMainActionButton(const KFileItemList& sel // If this sort of word puzzle can not be correctly translated in your language, translate it as "NULL" (without the quotes) // and a fallback will be used. buttonText = i18ncp("@action", "Copy %2 to the Clipboard", "Copy %2 to the Clipboard", selectedItems.count(), fileItemListToString(selectedItems, fontMetrics.averageCharWidth() * 20, fontMetrics)); - // All these long lines can not be broken up with line breaks becaue the i18n call should be completely + // All these long lines can not be broken up with line breaks because the i18n call should be completely // in the line following the "i18n:" comment without any line breaks within the i18n call // or the comment might not be correctly extracted. See: https://commits.kde.org/kxmlgui/a31135046e1b3335b5d7bbbe6aa9a883ce3284c1 break; diff --git a/src/tests/dolphinquerytest.cpp b/src/tests/dolphinquerytest.cpp index 76cea999f..937dc6065 100644 --- a/src/tests/dolphinquerytest.cpp +++ b/src/tests/dolphinquerytest.cpp @@ -172,7 +172,7 @@ void DolphinQueryTest::testBalooSearchParsing() const Search::DolphinQuery query = Search::DolphinQuery{searchUrl, /** No backupSearchPath should be needed because searchUrl should be valid. */ QUrl{}}; - // Checkt that the URL is supported + // Check that the URL is supported QVERIFY(Search::isSupportedSearchScheme(searchUrl.scheme())); // Check for parsed text (would be displayed on the input search bar) diff --git a/src/tests/kitemlistcontrollerexpandtest.cpp b/src/tests/kitemlistcontrollerexpandtest.cpp index 05708f4d2..8f16251b4 100644 --- a/src/tests/kitemlistcontrollerexpandtest.cpp +++ b/src/tests/kitemlistcontrollerexpandtest.cpp @@ -110,7 +110,7 @@ void KItemListControllerExpandTest::testDirExpand() QCOMPARE(m_view->itemLayout(), KFileItemListView::DetailsLayout); m_view->setSupportsItemExpanding(true); - // intial state + // initial state QCOMPARE(m_spyDirectoryLoadingCompleted->count(), 1); QCOMPARE(m_model->count(), 3); QCOMPARE(m_selectionManager->currentItem(), 0); diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp index 9252f17ba..1836f0445 100644 --- a/src/tests/viewpropertiestest.cpp +++ b/src/tests/viewpropertiestest.cpp @@ -245,14 +245,14 @@ void ViewPropertiesTest::testExtendedAttributeFull() KFileMetaData::UserMetaData metadata(m_testDir->url().toLocalFile()); if (!metadata.isSupported()) { - QSKIP("need extended attribute/filesystem metadata to be usefull"); + QSKIP("need extended attribute/filesystem metadata to be useful"); } QStorageInfo storageInfo(m_testDir->url().toLocalFile()); auto blockSize = storageInfo.blockSize(); KFileMetaData::UserMetaData::Error result; - // write a close to block size theorical maximum size for attributes in Linux for ext4 + // write a close to block size theoretical maximum size for attributes in Linux for ext4 // and btrfs (4Kib typically) when ReiserFS/XFS allow XATTR_SIZE_MAX (64Kib) result = metadata.setAttribute("data", QString(blockSize - 50, 'a')); if (result != KFileMetaData::UserMetaData::NoSpace) { @@ -294,13 +294,13 @@ void ViewPropertiesTest::testUseAsDefaultViewSettings() }); ViewProperties globalProps(globalPropertiesPath); - // Check that theres no .directory file and metadata is supported + // Check that there's no .directory file and metadata is supported QString dotDirectoryFile = m_testDir->url().toLocalFile() + "/.directory"; QVERIFY(!QFile::exists(dotDirectoryFile)); KFileMetaData::UserMetaData testDirMetadata(m_testDir->url().toLocalFile()); KFileMetaData::UserMetaData globalDirMetadata(globalPropertiesPath.toLocalFile()); if (!testDirMetadata.isSupported()) { - QSKIP("need extended attribute/filesystem metadata to be usefull"); + QSKIP("need extended attribute/filesystem metadata to be useful"); } const auto newDefaultViewMode = DolphinView::Mode::DetailsView; @@ -345,13 +345,13 @@ void ViewPropertiesTest::testUseAsCustomDefaultViewSettings() }); ViewProperties globalProps(globalPropertiesPath); - // Check that theres no .directory file and metadata is supported + // Check that there's no .directory file and metadata is supported QString dotDirectoryFile = m_testDir->url().toLocalFile() + "/.directory"; QVERIFY(!QFile::exists(dotDirectoryFile)); KFileMetaData::UserMetaData testDirMetadata(m_testDir->url().toLocalFile()); KFileMetaData::UserMetaData globalDirMetadata(globalPropertiesPath.toLocalFile()); if (!testDirMetadata.isSupported()) { - QSKIP("need extended attribute/filesystem metadata to be usefull"); + QSKIP("need extended attribute/filesystem metadata to be useful"); } // Equivalent of useAsDefault in ViewPropertiesDialog diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index 521ff8b90..008a9a4cf 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -177,7 +177,7 @@ void VersionControlObserver::verifyDirectory() } if (m_currentPlugin && rootItem.url().path().startsWith(m_localRepoRoot) && QFile::exists(m_localRepoRoot + '/' + m_currentPlugin->fileName())) { - // current directory is still versionned + // current directory is still versioned updateItemStates(); return; } diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index a3777ef21..13d4d8b0d 100644 --- a/src/views/versioncontrol/versioncontrolobserver.h +++ b/src/views/versioncontrol/versioncontrolobserver.h @@ -144,7 +144,7 @@ private: QTimer *m_dirVerificationTimer; bool m_pluginsInitialized; - // directories have at most one plugin, this is the dectected current one. + // directories have at most one plugin, this is the detected current one. KVersionControlPlugin *m_currentPlugin; QList<KVersionControlPlugin *> m_plugins; UpdateItemStatesThread *m_updateItemStatesThread; |