diff options
| author | Harald Sitter <[email protected]> | 2015-08-21 12:12:54 +0200 |
|---|---|---|
| committer | Harald Sitter <[email protected]> | 2015-08-21 12:12:54 +0200 |
| commit | dc7b83169d4ed55d402de71b38b6cd8d1e2fda8d (patch) | |
| tree | 9c6dff4a82052ab25beddcd25da7c63eecf13ae4 /src/panels/places/placesitemmodel.cpp | |
| parent | 03adb27dc8b3b1f8b54c6e2d03538b79e99178fe (diff) | |
| parent | 31f0acc72653972845f83abd60eaffde511801f1 (diff) | |
Merge branch 'Applications/15.08'
Conflicts:
CMakeLists.txt
Diffstat (limited to 'src/panels/places/placesitemmodel.cpp')
| -rw-r--r-- | src/panels/places/placesitemmodel.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index f3d344963..013b99731 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -101,8 +101,6 @@ PlacesItemModel::PlacesItemModel(QObject* parent) : connect(m_bookmarkManager, &KBookmarkManager::changed, m_updateBookmarksTimer, static_cast<void(QTimer::*)()>(&QTimer::start)); - connect(m_bookmarkManager, &KBookmarkManager::bookmarksChanged, - m_updateBookmarksTimer, static_cast<void(QTimer::*)()>(&QTimer::start)); } PlacesItemModel::~PlacesItemModel() @@ -917,16 +915,16 @@ void PlacesItemModel::createSystemBookmarks() "view-calendar-month", I18N_NOOP2("KFile System Bookmarks", "Last Month"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/documents"), - "folder-txt", + "folder-text", I18N_NOOP2("KFile System Bookmarks", "Documents"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/images"), - "folder-image", + "folder-images", I18N_NOOP2("KFile System Bookmarks", "Images"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/audio"), "folder-sound", I18N_NOOP2("KFile System Bookmarks", "Audio Files"))); m_systemBookmarks.append(SystemBookmarkData(QUrl("search:/videos"), - "folder-video", + "folder-videos", I18N_NOOP2("KFile System Bookmarks", "Videos"))); } |