Fix for crash which was introduced by commit

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 7228b1131111123d476d3ca9ddb859f096b75e4d..cb25c6555ab2a4f3af67a762262f7868aaab687a 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -125,7 +125,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     m_model = new KFileItemModel(this);
     m_view = new DolphinItemListView();
     m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
     m_model = new KFileItemModel(this);
     m_view = new DolphinItemListView();
     m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());

-    m_view->setVisibleRoles(QList<QByteArray>() << "text");
+    m_view->setVisibleRoles({"text"});

     applyModeToView();
 
     KItemListController* controller = new KItemListController(m_model, m_view, this);
     applyModeToView();
 
     KItemListController* controller = new KItemListController(m_model, m_view, this);


@@ -1050,9 +1050,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
         // Mark the dropped urls as selected.
         m_clearSelectionBeforeSelectingNewItems = true;
         m_markFirstNewlySelectedItemAsCurrent = true;
         // Mark the dropped urls as selected.
         m_clearSelectionBeforeSelectingNewItems = true;
         m_markFirstNewlySelectedItemAsCurrent = true;

-        connect(job, static_cast<void(KonqOperations::*)(const QList<QUrl>&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
-        // TODO
-        //connect(job, &KIO::InteractiveDropJob::itemCreated, this, &DolphinView::slotItemCreated);
+        connect(job, &KonqOperations::itemCreated, this, &DolphinView::slotItemCreated);

         //connect(job, &KIO::InteractiveDropJob::result, this, &DolphinView::slotPasteJobResult);
     }
 
         //connect(job, &KIO::InteractiveDropJob::result, this, &DolphinView::slotPasteJobResult);
     }
 


@@ -1089,17 +1087,6 @@ void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons
     }
 }
 
     }
 }
 

-void DolphinView::slotAboutToCreate(const QList<QUrl>& urls)
-{
-    if (!urls.isEmpty()) {
-        if (m_markFirstNewlySelectedItemAsCurrent) {
-            markUrlAsCurrent(urls.first());
-            m_markFirstNewlySelectedItemAsCurrent = false;
-        }
-        m_selectedUrls << KDirModel::simplifiedUrlList(urls);
-    }
-}
-

 void DolphinView::slotItemCreated(const QUrl& url)
 {
     if (m_markFirstNewlySelectedItemAsCurrent) {
 void DolphinView::slotItemCreated(const QUrl& url)
 {
     if (m_markFirstNewlySelectedItemAsCurrent) {


@@ -1299,7 +1286,7 @@ void DolphinView::observeCreatedItem(const QUrl& url)
     if (m_active) {
         clearSelection();
         markUrlAsCurrent(url);
     if (m_active) {
         clearSelection();
         markUrlAsCurrent(url);

-        markUrlsAsSelected(QList<QUrl>() << url);
+        markUrlsAsSelected({url});

     }
 }
 
     }
 }
 


@@ -1526,7 +1513,7 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
 
             KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
             KJobWidgets::setWindow(job, this);
 
             KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
             KJobWidgets::setWindow(job, this);

-            KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, QList<QUrl>() << oldUrl, newUrl, job);
+            KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);

             job->ui()->setAutoErrorHandlingEnabled(true);
 
             if (!newNameExistsAlready) {
             job->ui()->setAutoErrorHandlingEnabled(true);
 
             if (!newNameExistsAlready) {


@@ -1711,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
     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);
     }
 
     KFileItemListProperties capabilities(KFileItemList() << item);