diff options
| author | Alex Richardson <[email protected]> | 2014-04-06 03:32:55 +0200 |
|---|---|---|
| committer | Alex Richardson <[email protected]> | 2014-05-05 23:05:13 +0200 |
| commit | 2f045c60109e0a5811f68bcce617236e3478e402 (patch) | |
| tree | 9c46f4506f5a693ddecd2564e0883e9fe2d0cf13 /src/settings/general | |
| parent | c2887688f102d0412ba93c74facd5ed007185e3a (diff) | |
Allow compiling Dolphin with KF5
This does not work properly yet, there are probably quite a few bad signal/
slot connections due to KUrl -> QUrl. However dolphin starts without
crashing.
Accessibility is not ported since that changed quite a lot from Qt4 -> Qt5
and I have no idea how it is supposed to be used.
This is the first commit for review 117395
Diffstat (limited to 'src/settings/general')
| -rw-r--r-- | src/settings/general/behaviorsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/settings/general/configurepreviewplugindialog.cpp | 3 | ||||
| -rw-r--r-- | src/settings/general/previewssettingspage.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index cbbde1d7c..15e4de797 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -115,7 +115,7 @@ void BehaviorSettingsPage::applySettings() const bool naturalSorting = m_naturalSorting->isChecked(); if (KGlobalSettings::naturalSorting() != naturalSorting) { - KConfigGroup group(KGlobal::config(), "KDE"); + KConfigGroup group(KSharedConfig::openConfig(), "KDE"); group.writeEntry("NaturalSorting", naturalSorting, KConfig::Persistent | KConfig::Global); KGlobalSettings::emitChange(KGlobalSettings::NaturalSortingChanged); } diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp index 3ca08dfd0..86ae184ba 100644 --- a/src/settings/general/configurepreviewplugindialog.cpp +++ b/src/settings/general/configurepreviewplugindialog.cpp @@ -27,6 +27,7 @@ #include <QApplication> #include <QDir> #include <QVBoxLayout> +#include <QUrl> ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& pluginName, const QString& desktopEntryName, @@ -73,7 +74,7 @@ void ConfigurePreviewPluginDialog::slotOk() // for a specific MIME-type should be regenerated. As this is not available yet we // delete the whole thumbnails directory. QApplication::changeOverrideCursor(Qt::BusyCursor); - KIO::NetAccess::del(QString(QDir::homePath() + "/.thumbnails/"), this); + KIO::NetAccess::del(QUrl::fromLocalFile(QDir::homePath() + "/.thumbnails/"), this); QApplication::restoreOverrideCursor(); } diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index 38b61b996..dbae987d1 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -159,7 +159,7 @@ void PreviewsSettingsPage::loadPreviewPlugins() QAbstractItemModel* model = m_listView->model(); const KService::List plugins = KServiceTypeTrader::self()->query(QLatin1String("ThumbCreator")); - foreach (const KSharedPtr<KService>& service, plugins) { + foreach (const KService::Ptr& service, plugins) { const bool configurable = service->property("Configurable", QVariant::Bool).toBool(); const bool show = m_enabledPreviewPlugins.contains(service->desktopEntryName()); |
