diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -168,7 +168,7 @@ private: /** - * Remove bookmarks created by the previous version of dolphin that is + * Remove bookmarks created by the previous version of dolphin that are * not valid anymore */ void cleanupBookmarks(); diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -56,7 +56,7 @@ // Hence a prefix to the application-name of the stored bookmarks is // added, which is only read by PlacesItemModel. const char AppNamePrefix[] = "-places-panel"; - static QList baloonUrls = { + static QList balooURLs = { QUrl(QStringLiteral("timeline:/today")), QUrl(QStringLiteral("timeline:/yesterday")), QUrl(QStringLiteral("timeline:/thismonth")), @@ -73,7 +73,7 @@ m_hiddenItemsShown(false), m_deviceToTearDown(nullptr), m_storageSetupInProgress(), - m_sourceModel(new KFilePlacesModel(this, KAboutData::applicationData().componentName() + AppNamePrefix)) + m_sourceModel(new KFilePlacesModel(KAboutData::applicationData().componentName() + AppNamePrefix, this)) { cleanupBookmarks(); loadBookmarks(); @@ -617,18 +617,18 @@ void PlacesItemModel::cleanupBookmarks() { - // KIO model now provides support for ballon urls, and because of that we - // need to remove old ulrs that was visibile only on dolphin to avoid duplication + // KIO model now provides support for baloo urls, and because of that we + // need to remove old URLs that were visible only in Dolphin to avoid duplication int row = 0; do { const QModelIndex sourceIndex = m_sourceModel->index(row, 0); const KBookmark bookmark = m_sourceModel->bookmarkForIndex(sourceIndex); const QUrl url = bookmark.url(); const QString appName = bookmark.metaDataItem(QStringLiteral("OnlyInApp")); if ((appName == KAboutData::applicationData().componentName() || - appName == KAboutData::applicationData().componentName() + AppNamePrefix) && baloonUrls.contains(url)) { - qCDebug(DolphinDebug) << "Removing old ballon url:" << url; + appName == KAboutData::applicationData().componentName() + AppNamePrefix) && balooURLs.contains(url)) { + qCDebug(DolphinDebug) << "Removing old baloo url:" << url; m_sourceModel->removePlace(sourceIndex); } else { row++;