From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Sun, 14 Dec 2014 16:46:58 +0000 (+0100)
Subject: port away from deprecated KFileItem(mode_t mode, mode_t permissions, const QUrl ... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a07d63d419469592b2600e668795cea2f9bee403?ds=inline

port away from deprecated KFileItem(mode_t mode, mode_t permissions, const QUrl &url, bool delayedMimeTypes = false);
---

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 0ecd7376d..a7300334f 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -468,7 +468,7 @@ KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const
 KFileItem DolphinContextMenu::baseFileItem()
 {
     if (!m_baseFileItem) {
-        m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
+        m_baseFileItem = new KFileItem(m_baseUrl);
     }
     return *m_baseFileItem;
 }
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 8484b7ef9..cfde90ada 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -404,7 +404,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
         popupFlags |= KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
         item = m_view->rootItem();
         if (item.isNull())
-            item = KFileItem( S_IFDIR, (mode_t)-1, url() );
+            item = KFileItem(url());
         else
             item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799)
     }
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index f64689d01..3954a12e6 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -479,7 +479,7 @@ void DolphinViewContainer::slotDirectoryLoadingCanceled()
 
 void DolphinViewContainer::slotUrlIsFileError(const QUrl& url)
 {
-    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
+    const KFileItem item(url);
 
     // Find out if the file can be opened in the view (for example, this is the
     // case if the file is an archive). The mime type must be known for that.
diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index 3d7a05f03..3f778b07a 100644
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -228,7 +228,7 @@ void InformationPanel::slotFileRenamed(const QString& source, const QString& des
 {
     if (m_shownUrl == QUrl::fromLocalFile(source)) {
         m_shownUrl = QUrl::fromLocalFile(dest);
-        m_fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl);
+        m_fileItem = KFileItem(m_shownUrl);
 
         if ((m_selection.count() == 1) && (m_selection[0].url() == QUrl::fromLocalFile(source))) {
             m_selection[0] = m_fileItem;
@@ -247,7 +247,7 @@ void InformationPanel::slotFilesAdded(const QString& directory)
     if (m_shownUrl == QUrl::fromLocalFile(directory)) {
         // If the 'trash' icon changes because the trash has been emptied or got filled,
         // the signal filesAdded("trash:/") will be emitted.
-        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, QUrl::fromLocalFile(directory));
+        KFileItem item(QUrl::fromLocalFile(directory));
         requestDelayedItemInfo(item);
     }
 }
@@ -277,7 +277,7 @@ void InformationPanel::slotFilesRemoved(const QStringList& files)
 void InformationPanel::slotEnteredDirectory(const QString& directory)
 {
     if (m_shownUrl == QUrl::fromLocalFile(directory)) {
-        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, QUrl::fromLocalFile(directory));
+        KFileItem item(QUrl::fromLocalFile(directory));
         requestDelayedItemInfo(item);
     }
 }
diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index f7bcbc685..75ec445df 100644
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -118,7 +118,7 @@ void StartupSettingsPage::applySettings()
     GeneralSettings* settings = GeneralSettings::self();
 
     const QUrl url(QUrl::fromLocalFile(m_homeUrl->text()));
-    KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, url);
+    KFileItem fileItem(url);
     if ((url.isValid() && fileItem.isDir()) || (url.scheme() == QLatin1String("timeline"))) {
         settings->setHomeUrl(url.toDisplayString(QUrl::PreferLocalFile));
     } else {
diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
index d224e1a2e..fbe34e2a7 100644
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@ -1448,7 +1448,7 @@ void KFileItemModelTest::testInconsistentModel()
     // in the model yet). Otherwise, KFileItemModel::slotItemsAdded() will see that
     // it receives items that are in the model already and ignore them.
     QUrl url(m_model->directory().url() + "/a2");
-    KFileItem newItem(KFileItem::Unknown, KFileItem::Unknown, url);
+    KFileItem newItem(url);
 
     KFileItemList items;
     items << newItem << m_model->fileItem(2) << m_model->fileItem(3);
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 00281af73..cb25c6555 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1698,7 +1698,8 @@ void DolphinView::updateWritableState()
     if (item.isNull()) {
         // Try to find out if the URL is writable even if the "root item" is
         // null, see https://bugs.kde.org/show_bug.cgi?id=330001
-        item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, url(), true);
+        item = KFileItem(url());
+        item.setDelayedMimeTypes(true);
     }
 
     KFileItemListProperties capabilities(KFileItemList() << item);