┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dolphintabpage.h4
-rw-r--r--src/kitemviews/kfileitemlistview.cpp2
-rw-r--r--src/kitemviews/kfileitemmodelrolesupdater.cpp4
-rw-r--r--src/kitemviews/kitemlistview.h2
-rw-r--r--src/kitemviews/private/kpixmapmodifier.h2
-rw-r--r--src/panels/places/placesitemmodel.h2
-rw-r--r--src/settings/viewpropertiesdialog.cpp2
-rw-r--r--src/statusbar/dolphinstatusbar.cpp2
-rw-r--r--src/tests/kitemlistselectionmanagertest.cpp2
-rw-r--r--src/tests/kitemsettest.cpp4
-rw-r--r--src/views/dolphinview.h2
-rw-r--r--src/views/dolphinviewactionhandler.h2
-rw-r--r--src/views/versioncontrol/kversioncontrolplugin.h2
-rw-r--r--src/views/viewproperties.cpp2
14 files changed, 17 insertions, 17 deletions
diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h
index 6c70a6062..6e3e008ac 100644
--- a/src/dolphintabpage.h
+++ b/src/dolphintabpage.h
@@ -53,12 +53,12 @@ public:
void setSplitViewEnabled(bool enabled, const QUrl &secondaryUrl = QUrl());
/**
- * @return The primary view containter.
+ * @return The primary view container.
*/
DolphinViewContainer* primaryViewContainer() const;
/**
- * @return The secondary view containter, can be 0 if split view is disabled.
+ * @return The secondary view container, can be 0 if split view is disabled.
*/
DolphinViewContainer* secondaryViewContainer() const;
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 3c1ef1b98..b1d3da643 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -35,7 +35,7 @@
namespace {
// If the visible index range changes, KFileItemModelRolesUpdater is not
- // informed immediatetly, but with a short delay. This ensures that scrolling
+ // informed immediately, but with a short delay. This ensures that scrolling
// always feels smooth and is not interrupted by icon loading (which can be
// quite expensive if a disk access is required to determine the final icon).
const int ShortInterval = 50;
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index f4d69dec2..1d45e44c5 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -521,7 +521,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
scaledPixmap);
scaledPixmap = largeFrame;
} else {
- // The image must be shrinked as it is too large to fit into
+ // The image must be shrunk as it is too large to fit into
// the available icon size
KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);
}
@@ -1148,7 +1148,7 @@ QList<int> KFileItemModelRolesUpdater::indexesToResolve() const
// We need a reasonable upper limit for number of items to resolve after
// and before the visible range. m_maximumVisibleItems can be quite large
- // when using Compace View.
+ // when using Compact View.
const int readAheadItems = qMin(ReadAheadPages * m_maximumVisibleItems, ResolveAllItemsLimit / 2);
// Add items after the visible range.
diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index 8320883f1..3a4a469bb 100644
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -210,7 +210,7 @@ public:
/**
* If set to true, items having child-items can be expanded to show the child-items as
- * part of the view. Per default the expanding of items is is disabled. If expanding of
+ * part of the view. Per default the expanding of items is disabled. If expanding of
* items is enabled, the methods KItemModelBase::setExpanded(), KItemModelBase::isExpanded(),
* KItemModelBase::isExpandable() and KItemModelBase::expandedParentsCount()
* must be reimplemented. The view-implementation
diff --git a/src/kitemviews/private/kpixmapmodifier.h b/src/kitemviews/private/kpixmapmodifier.h
index e48abf515..3f7747b55 100644
--- a/src/kitemviews/private/kpixmapmodifier.h
+++ b/src/kitemviews/private/kpixmapmodifier.h
@@ -45,7 +45,7 @@ public:
/**
* return and paint a frame round an icon
* @arg framesize is in device-independent pixels
- * @return is in device-indepent pixels
+ * @return is in device-independent pixels
*/
static QSize sizeInsideFrame(const QSize& frameSize);
diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index c4ff7e2dd..58d0d55b2 100644
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -60,7 +60,7 @@ public:
PlacesItem* placesItem(int index) const;
/**
- * @brief Mark an item as hiden
+ * @brief Mark an item as hidden
* @param index of the item to be hidden
*/
void hideItem(int index);
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 9002765b5..a7aa87098 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -366,7 +366,7 @@ void ViewPropertiesDialog::applyViewProperties()
const bool applyToAllFolders = m_applyToAllFolders && m_applyToAllFolders->isChecked();
- // If the user selected 'Apply To All Folders' the view properties implicitely
+ // If the user selected 'Apply To All Folders' the view properties implicitly
// are also used as default for new folders.
const bool useAsDefault = applyToAllFolders || (m_useAsDefault && m_useAsDefault->isChecked());
if (useAsDefault) {
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index b3fddba10..0feaa119b 100644
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -147,7 +147,7 @@ void DolphinStatusBar::setText(const QString& text)
if (text.isEmpty()) {
// Assure that the previous set text won't get
- // cleared immediatelly.
+ // cleared immediately.
m_resetToDefaultTextTimer->start();
} else {
m_text = text;
diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index b65486357..0655dcfb0 100644
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -451,7 +451,7 @@ void KItemListSelectionManagerTest::testChangeSelection()
QVERIFY(!m_selectionManager->hasSelection());
QVERIFY(m_selectionManager->selectedItems().isEmpty());
- // Perform the initial selectiion
+ // Perform the initial selection
m_selectionManager->setSelectedItems(initialSelection);
verifySelectionChange(spySelectionChanged, initialSelection, KItemSet());
diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp
index 3e74184c2..27f8413a7 100644
--- a/src/tests/kitemsettest.cpp
+++ b/src/tests/kitemsettest.cpp
@@ -326,7 +326,7 @@ void KItemSetTest::testFind_data()
/**
* Test all functions that find items:
- * contais(int), find(int), constFind(int)
+ * contains(int), find(int), constFind(int)
*/
void KItemSetTest::testFind()
{
@@ -498,7 +498,7 @@ void KItemSetTest::testChangingOneItem()
QCOMPARE(tmp.end(), tmp.find(i));
QCOMPARE(tmp.constEnd(), tmp.constFind(i));
- // Check the returen value, now contained in 'it'.
+ // Check the returned value, now contained in 'it'.
if (i == max) {
QCOMPARE(it, tmp.end());
} else {
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index ea1b9c007..a618b2ce3 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -646,7 +646,7 @@ private slots:
/**
* Invoked when the file item model indicates that the loading of a directory has
- * been completed. Assures that pasted items and renamed items get seleced.
+ * been completed. Assures that pasted items and renamed items get selected.
*/
void slotDirectoryLoadingCompleted();
diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index fa0487e1b..537adb4da 100644
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -84,7 +84,7 @@ public Q_SLOTS:
Q_SIGNALS:
/**
* Emitted by DolphinViewActionHandler when the user triggered an action.
- * This is only used for clearining the statusbar in DolphinMainWindow.
+ * This is only used for clearing the statusbar in DolphinMainWindow.
*/
void actionBeingHandled();
diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index d59da515b..287974534 100644
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -137,7 +137,7 @@ public:
*/
IgnoredVersion,
/**
- * The file is is tracked by the version control system, but
+ * The file is tracked by the version control system, but
* is missing in the directory (e.g. by deleted without using
* a version control command).
* @since 4.8
diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index d7c6abd65..e056e25e3 100644
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -283,7 +283,7 @@ QList<QByteArray> ViewProperties::visibleRoles() const
//
// For the details-view a special case must be respected: Per default the size
// and date should be shown without creating a .directory file. Only if
- // the user explictly has modified the properties of the details view (marked
+ // the user explicitly has modified the properties of the details view (marked
// by "CustomizedDetails"), also a details-view with no additional information
// is accepted.