X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a75e81ca01ea61c615582e93ceed69398967831e..49396318f0f37f913a91bf02484a16e34fec6bf4:/src/panels/places/placesitem.cpp diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 173da29c5..4ba1217f0 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -23,10 +23,9 @@ #include "placesitem.h" #include -#include +#include "dolphindebug.h" #include -#include -#include +#include #include "placesitemsignalhandler.h" #include #include @@ -52,16 +51,16 @@ PlacesItem::~PlacesItem() delete m_trashDirLister; } -void PlacesItem::setUrl(const KUrl& url) +void PlacesItem::setUrl(const QUrl &url) { // The default check in KStandardItem::setDataValue() // for equal values does not work with a custom value - // like KUrl. Hence do a manual check to prevent that + // like QUrl. Hence do a manual check to prevent that // setting an equal URL results in an itemsChanged() // signal. - if (dataValue("url").value() != url) { + if (dataValue("url").toUrl() != url) { delete m_trashDirLister; - if (url.protocol() == QLatin1String("trash")) { + if (url.scheme() == QLatin1String("trash")) { // The trash icon must always be updated dependent on whether // the trash is empty or not. We use a KDirLister that automatically // watches for changes if the number of items has been changed. @@ -69,8 +68,8 @@ void PlacesItem::setUrl(const KUrl& url) m_trashDirLister = new KDirLister(); m_trashDirLister->setAutoErrorHandlingEnabled(false, 0); m_trashDirLister->setDelayedMimeTypes(true); - QObject::connect(m_trashDirLister, SIGNAL(completed()), - m_signalHandler, SLOT(onTrashDirListerCompleted())); + QObject::connect(m_trashDirLister.data(), static_cast(&KDirLister::completed), + m_signalHandler.data(), &PlacesItemSignalHandler::onTrashDirListerCompleted); m_trashDirLister->openUrl(url); } @@ -78,9 +77,9 @@ void PlacesItem::setUrl(const KUrl& url) } } -KUrl PlacesItem::url() const +QUrl PlacesItem::url() const { - return dataValue("url").value(); + return dataValue("url").toUrl(); } void PlacesItem::setUdi(const QString& udi) @@ -132,10 +131,10 @@ void PlacesItem::setBookmark(const KBookmark& bookmark) delete m_mtp; - const QString udi = bookmark.metaDataItem("UDI"); + const QString udi = bookmark.metaDataItem(QStringLiteral("UDI")); if (udi.isEmpty()) { setIcon(bookmark.icon()); - setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().data())); + setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().constData())); setUrl(bookmark.url()); } else { initializeDevice(udi); @@ -144,10 +143,10 @@ void PlacesItem::setBookmark(const KBookmark& bookmark) const GroupType type = groupType(); if (icon().isEmpty()) { switch (type) { - case RecentlySavedType: setIcon("chronometer"); break; - case SearchForType: setIcon("nepomuk"); break; + case RecentlySavedType: setIcon(QStringLiteral("chronometer")); break; + case SearchForType: setIcon(QStringLiteral("system-search")); break; case PlacesType: - default: setIcon("folder"); + default: setIcon(QStringLiteral("folder")); } } @@ -160,7 +159,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark) default: Q_ASSERT(false); break; } - setHidden(bookmark.metaDataItem("IsHidden") == QLatin1String("true")); + setHidden(bookmark.metaDataItem(QStringLiteral("IsHidden")) == QLatin1String("true")); } KBookmark PlacesItem::bookmark() const @@ -171,7 +170,7 @@ KBookmark PlacesItem::bookmark() const PlacesItem::GroupType PlacesItem::groupType() const { if (udi().isEmpty()) { - const QString protocol = url().protocol(); + const QString protocol = url().scheme(); if (protocol == QLatin1String("timeline")) { return RecentlySavedType; } @@ -180,7 +179,7 @@ PlacesItem::GroupType PlacesItem::groupType() const return SearchForType; } - if (protocol == QLatin1String("bluetooth")) { + if (protocol == QLatin1String("bluetooth") || protocol == QLatin1String("obexftp") || protocol == QLatin1String("kdeconnect")) { return DevicesType; } @@ -197,7 +196,7 @@ bool PlacesItem::storageSetupNeeded() const KBookmark PlacesItem::createBookmark(KBookmarkManager* manager, const QString& text, - const KUrl& url, + const QUrl& url, const QString& iconName) { KBookmarkGroup root = manager->root(); @@ -207,7 +206,7 @@ KBookmark PlacesItem::createBookmark(KBookmarkManager* manager, KBookmark bookmark = root.addBookmark(text, url, iconName); bookmark.setFullText(text); - bookmark.setMetaDataItem("ID", generateNewId()); + bookmark.setMetaDataItem(QStringLiteral("ID"), generateNewId()); return bookmark; } @@ -221,8 +220,8 @@ KBookmark PlacesItem::createDeviceBookmark(KBookmarkManager* manager, } KBookmark bookmark = root.createNewSeparator(); - bookmark.setMetaDataItem("UDI", udi); - bookmark.setMetaDataItem("isSystemItem", "true"); + bookmark.setMetaDataItem(QStringLiteral("UDI"), udi); + bookmark.setMetaDataItem(QStringLiteral("isSystemItem"), QStringLiteral("true")); return bookmark; } @@ -270,34 +269,34 @@ void PlacesItem::initializeDevice(const QString& udi) setUdi(udi); if (m_access) { - setUrl(m_access->filePath()); - QObject::connect(m_access, SIGNAL(accessibilityChanged(bool,QString)), - m_signalHandler, SLOT(onAccessibilityChanged())); + setUrl(QUrl::fromLocalFile(m_access->filePath())); + QObject::connect(m_access.data(), &Solid::StorageAccess::accessibilityChanged, + m_signalHandler.data(), &PlacesItemSignalHandler::onAccessibilityChanged); } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) { Solid::Block *block = m_device.as(); if (block) { const QString device = block->device(); - setUrl(QString("audiocd:/?device=%1").arg(device)); + setUrl(QUrl(QStringLiteral("audiocd:/?device=%1").arg(device))); } else { - setUrl(QString("audiocd:/")); + setUrl(QUrl(QStringLiteral("audiocd:/"))); } } else if (m_mtp) { - setUrl(QString("mtp:udi=%1").arg(m_device.udi())); + setUrl(QUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi()))); } } void PlacesItem::onAccessibilityChanged() { setIconOverlays(m_device.emblems()); - setUrl(m_access->filePath()); + setUrl(QUrl::fromLocalFile(m_access->filePath())); } void PlacesItem::onTrashDirListerCompleted() { - Q_ASSERT(url().protocol() == QLatin1String("trash")); + Q_ASSERT(url().scheme() == QLatin1String("trash")); const bool isTrashEmpty = m_trashDirLister->items().isEmpty(); - setIcon(isTrashEmpty ? "user-trash" : "user-trash-full"); + setIcon(isTrashEmpty ? QStringLiteral("user-trash") : QStringLiteral("user-trash-full")); } void PlacesItem::updateBookmarkForRole(const QByteArray& role) @@ -317,12 +316,12 @@ void PlacesItem::updateBookmarkForRole(const QByteArray& role) } } else if (role == "url") { m_bookmark.setUrl(url()); - } else if (role == "udi)") { - m_bookmark.setMetaDataItem("UDI", udi()); + } else if (role == "udi") { + m_bookmark.setMetaDataItem(QStringLiteral("UDI"), udi()); } else if (role == "isSystemItem") { - m_bookmark.setMetaDataItem("isSystemItem", isSystemItem() ? "true" : "false"); + m_bookmark.setMetaDataItem(QStringLiteral("isSystemItem"), isSystemItem() ? QStringLiteral("true") : QStringLiteral("false")); } else if (role == "isHidden") { - m_bookmark.setMetaDataItem("IsHidden", isHidden() ? "true" : "false"); + m_bookmark.setMetaDataItem(QStringLiteral("IsHidden"), isHidden() ? QStringLiteral("true") : QStringLiteral("false")); } } @@ -333,6 +332,6 @@ QString PlacesItem::generateNewId() // " (V2)" to indicate that the ID has been generated by // a new version of the places view. static int count = 0; - return QString::number(QDateTime::currentDateTime().toTime_t()) + + return QString::number(QDateTime::currentDateTimeUtc().toTime_t()) + '/' + QString::number(count++) + " (V2)"; }