mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-04-29 10:16:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

port from KStandardDirs to QStandardPaths

Browse Source 
REVIEW: 120498
This commit is contained in:
Michal Humpula
2014-10-05 12:04:29 +02:00
parent cc85a5243c
commit 15d09f9161
11 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/BookmarkHandler.cpp
View File

@@ -26,12 +26,13 @@
// Qt
#include <QtCore/QFileInfo>
#include <QtCore/QStandardPaths>
#include <QtCore/QDir>
// KDE
#include <KShell>
#include <KBookmarkMenu>
#include <KBookmarkOwner>
#include <KStandardDirs>
#include <KLocalizedString>
// Konsole
@@ -51,9 +52,13 @@ BookmarkHandler::BookmarkHandler(KActionCollection* collection,
{
setObjectName(QLatin1String("BookmarkHandler"));
_file = KStandardDirs::locate("data", "konsole/bookmarks.xml");
if (_file.isEmpty())
_file = KStandardDirs::locateLocal("data", "konsole/bookmarks.xml");
_file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/bookmarks.xml"));
if (_file.isEmpty()) {
_file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/konsole");
QDir().mkpath(_file);
_file += QStringLiteral("/bookmarks.xml");
}
KBookmarkManager* manager = KBookmarkManager::managerForFile(_file, "konsole");