Don't block unmounting when terminal panel's cwd is the mountpoint

[dolphin.git] / src / panels / places / placespanel.cpp

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 61c15a7a12631d0a8d36e96e0298cd96646f5d32..0ce6d69a5f1c72e21446f69432dfc026610d1281 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -25,17 +25,23 @@
 
 #include "dolphin_generalsettings.h"
 
 
 #include "dolphin_generalsettings.h"
 

-#include <KDebug>
+#include "global.h"
+#include <KFileItem>
+#include "dolphindebug.h"

 #include <KDirNotify>
 #include <KDirNotify>

-#include <KIcon>
+#include <QIcon>

 #include <KIO/Job>
 #include <KIO/Job>

+#include <KIO/DropJob>
+#include <KIO/EmptyTrashJob>

 #include <KIO/JobUiDelegate>
 #include <KIO/JobUiDelegate>

-#include <KLocale>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KIconLoader>

 #include <kitemviews/kitemlistcontainer.h>
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kitemlistselectionmanager.h>
 #include <kitemviews/kstandarditem.h>
 #include <kitemviews/kitemlistcontainer.h>
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kitemlistselectionmanager.h>
 #include <kitemviews/kstandarditem.h>

-#include <KMenu>
+#include <QMenu>

 #include <KMessageBox>
 #include <KNotification>
 #include "placesitem.h"
 #include <KMessageBox>
 #include <KNotification>
 #include "placesitem.h"


@@ -48,6 +54,7 @@
 #include <QGraphicsSceneDragDropEvent>
 #include <QVBoxLayout>
 #include <QShowEvent>
 #include <QGraphicsSceneDragDropEvent>
 #include <QVBoxLayout>
 #include <QShowEvent>

+#include <QMimeData>

 
 PlacesPanel::PlacesPanel(QWidget* parent) :
     Panel(parent),
 
 PlacesPanel::PlacesPanel(QWidget* parent) :
     Panel(parent),


@@ -65,9 +72,14 @@ PlacesPanel::~PlacesPanel()
 {
 }
 
 {
 }
 

+void PlacesPanel::proceedWithTearDown()
+{
+    m_model->proceedWithTearDown();
+}
+

 bool PlacesPanel::urlChanged()
 {
 bool PlacesPanel::urlChanged()
 {

-    if (!url().isValid() || url().protocol().contains("search")) {
+    if (!url().isValid() || url().scheme().contains(QStringLiteral("search"))) {

         // Skip results shown by a search, as possible identical
         // directory names are useless without parent-path information.
         return false;
         // Skip results shown by a search, as possible identical
         // directory names are useless without parent-path information.
         return false;


@@ -101,8 +113,12 @@ void PlacesPanel::showEvent(QShowEvent* event)
         // used at all and stays invisible.
         m_model = new PlacesItemModel(this);
         m_model->setGroupedSorting(true);
         // used at all and stays invisible.
         m_model = new PlacesItemModel(this);
         m_model->setGroupedSorting(true);

-        connect(m_model, SIGNAL(errorMessage(QString)),
-                this, SIGNAL(errorMessage(QString)));
+        connect(m_model, &PlacesItemModel::errorMessage,
+                this, &PlacesPanel::errorMessage);
+        connect(m_model, &PlacesItemModel::storageTearDownRequested,
+                this, &PlacesPanel::storageTearDownRequested);
+        connect(m_model, &PlacesItemModel::storageTearDownExternallyRequested,
+                this, &PlacesPanel::storageTearDownExternallyRequested);

 
         m_view = new PlacesView();
         m_view->setWidgetCreator(new KItemListWidgetCreator<PlacesItemListWidget>());
 
         m_view = new PlacesView();
         m_view->setWidgetCreator(new KItemListWidgetCreator<PlacesItemListWidget>());


@@ -110,16 +126,16 @@ void PlacesPanel::showEvent(QShowEvent* event)
 
         m_controller = new KItemListController(m_model, m_view, this);
         m_controller->setSelectionBehavior(KItemListController::SingleSelection);
 
         m_controller = new KItemListController(m_model, m_view, this);
         m_controller->setSelectionBehavior(KItemListController::SingleSelection);

-        m_controller->setSingleClickActivation(true);
+        m_controller->setSingleClickActivationEnforced(true);

 
 

-       readSettings();
+        readSettings();

 
 

-        connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
-        connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
-        connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
-        connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
-        connect(m_controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
-        connect(m_controller, SIGNAL(aboveItemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotAboveItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
+        connect(m_controller, &KItemListController::itemActivated, this, &PlacesPanel::slotItemActivated);
+        connect(m_controller, &KItemListController::itemMiddleClicked, this, &PlacesPanel::slotItemMiddleClicked);
+        connect(m_controller, &KItemListController::itemContextMenuRequested, this, &PlacesPanel::slotItemContextMenuRequested);
+        connect(m_controller, &KItemListController::viewContextMenuRequested, this, &PlacesPanel::slotViewContextMenuRequested);
+        connect(m_controller, &KItemListController::itemDropEvent, this, &PlacesPanel::slotItemDropEvent);
+        connect(m_controller, &KItemListController::aboveItemDropEvent, this, &PlacesPanel::slotAboveItemDropEvent);

 
         KItemListContainer* container = new KItemListContainer(m_controller, this);
         container->setEnabledFrame(false);
 
         KItemListContainer* container = new KItemListContainer(m_controller, this);
         container->setEnabledFrame(false);


@@ -151,11 +167,9 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
         return;
     }
 
         return;
     }
 

-    KMenu menu(this);
+    QMenu menu(this);

 
     QAction* emptyTrashAction = 0;
 
     QAction* emptyTrashAction = 0;

-    QAction* addAction = 0;
-    QAction* mainSeparator = 0;

     QAction* editAction = 0;
     QAction* teardownAction = 0;
     QAction* ejectAction = 0;
     QAction* editAction = 0;
     QAction* teardownAction = 0;
     QAction* ejectAction = 0;


@@ -163,6 +177,7 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
     const QString label = item->text();
 
     const bool isDevice = !item->udi().isEmpty();
     const QString label = item->text();
 
     const bool isDevice = !item->udi().isEmpty();

+    const bool isTrash = (item->url().scheme() == QLatin1String("trash"));

     if (isDevice) {
         ejectAction = m_model->ejectAction(index);
         if (ejectAction) {
     if (isDevice) {
         ejectAction = m_model->ejectAction(index);
         if (ejectAction) {


@@ -177,47 +192,88 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
         }
 
         if (teardownAction || ejectAction) {
         }
 
         if (teardownAction || ejectAction) {

-            mainSeparator = menu.addSeparator();
+            menu.addSeparator();

         }
     } else {
         }
     } else {

-        if (item->url() == KUrl("trash:/")) {
-            emptyTrashAction = menu.addAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"));
-            emptyTrashAction->setEnabled(item->icon() == "user-trash-full");
+        if (isTrash) {
+            emptyTrashAction = menu.addAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash"));
+            emptyTrashAction->setEnabled(item->icon() == QLatin1String("user-trash-full"));

             menu.addSeparator();
         }
             menu.addSeparator();
         }

-        addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry..."));
-        mainSeparator = menu.addSeparator();
-        editAction = menu.addAction(KIcon("document-properties"), i18nc("@item:inmenu", "Edit '%1'...", label));

     }
 
     }
 

-    if (!addAction) {
-        addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry..."));
+    QAction* openInNewWindowAction = menu.addAction(QIcon::fromTheme("window-new"), i18nc("@item:inmenu", "Open in New Window"));
+    QAction* openInNewTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@item:inmenu", "Open in New Tab"));
+    if (!isDevice && !isTrash) {
+        menu.addSeparator();

     }
 
     }
 

-    QAction* openInNewTabAction = menu.addAction(i18nc("@item:inmenu", "Open '%1' in New Tab", label));
-    openInNewTabAction->setIcon(KIcon("tab-new"));
+    if (!isDevice) {
+        editAction = menu.addAction(QIcon::fromTheme("document-properties"), i18nc("@item:inmenu", "Edit..."));
+    }

 
     QAction* removeAction = 0;
     if (!isDevice && !item->isSystemItem()) {
 
     QAction* removeAction = 0;
     if (!isDevice && !item->isSystemItem()) {

-        removeAction = menu.addAction(KIcon("edit-delete"), i18nc("@item:inmenu", "Remove '%1'", label));
+        removeAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@item:inmenu", "Remove"));

     }
 
     }
 

-    QAction* hideAction = menu.addAction(i18nc("@item:inmenu", "Hide '%1'", label));
+    QAction* hideAction = menu.addAction(i18nc("@item:inmenu", "Hide"));

     hideAction->setCheckable(true);
     hideAction->setChecked(item->isHidden());
 
     hideAction->setCheckable(true);
     hideAction->setChecked(item->isHidden());
 

+    QAction* action = menu.exec(pos.toPoint());
+    if (action) {
+        if (action == emptyTrashAction) {
+            emptyTrash();
+        } else {
+            // The index might have changed if devices were added/removed while
+            // the context menu was open.
+            index = m_model->index(item);
+            if (index < 0) {
+                // The item is not in the model any more, probably because it was an
+                // external device that has been removed while the context menu was open.
+                return;
+            }
+
+            if (action == editAction) {
+                editEntry(index);
+            } else if (action == removeAction) {
+                m_model->removeItem(index);
+                m_model->saveBookmarks();
+            } else if (action == hideAction) {
+                item->setHidden(hideAction->isChecked());
+                m_model->saveBookmarks();
+            } else if (action == openInNewWindowAction) {
+                Dolphin::openNewWindow({PlacesItemModel::convertedUrl(m_model->data(index).value("url").toUrl())}, this);
+            } else if (action == openInNewTabAction) {
+                // TriggerItem does set up the storage first and then it will
+                // emit the slotItemMiddleClicked signal, because of Qt::MiddleButton.
+                triggerItem(index, Qt::MiddleButton);
+            } else if (action == teardownAction) {
+                m_model->requestTearDown(index);
+            } else if (action == ejectAction) {
+                m_model->requestEject(index);
+            }
+        }
+    }
+
+    selectClosestItem();
+}
+
+void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
+{
+    QMenu menu(this);
+
+    QAction* addAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("@item:inmenu", "Add Entry..."));
+

     QAction* showAllAction = 0;
     if (m_model->hiddenCount() > 0) {
     QAction* showAllAction = 0;
     if (m_model->hiddenCount() > 0) {

-        if (!mainSeparator) {
-            mainSeparator = menu.addSeparator();
-        }

         showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries"));
         showAllAction->setCheckable(true);
         showAllAction->setChecked(m_model->hiddenItemsShown());
     }
 
         showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries"));
         showAllAction->setCheckable(true);
         showAllAction->setChecked(m_model->hiddenItemsShown());
     }
 

-    menu.addSeparator();
-    KMenu* iconSizeSubMenu = new KMenu(i18nc("@item:inmenu", "Icon Size"), &menu);
+    QMenu* iconSizeSubMenu = new QMenu(i18nc("@item:inmenu", "Icon Size"), &menu);

 
     struct IconSizeInfo
     {
 
     struct IconSizeInfo
     {


@@ -258,25 +314,10 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 
     QAction* action = menu.exec(pos.toPoint());
     if (action) {
 
     QAction* action = menu.exec(pos.toPoint());
     if (action) {

-        if (action == emptyTrashAction) {
-            emptyTrash();
-        } else if (action == addAction) {
+        if (action == addAction) {

             addEntry();
             addEntry();

-        } else if (action == editAction) {
-            editEntry(index);
-        } else if (action == removeAction) {
-            m_model->removeItem(index);
-        } else if (action == hideAction) {
-            item->setHidden(hideAction->isChecked());
-        } else if (action == openInNewTabAction) {
-            const KUrl url = m_model->item(index)->dataValue("url").value<KUrl>();
-            emit placeMiddleClicked(url);

         } else if (action == showAllAction) {
             m_model->setHiddenItemsShown(showAllAction->isChecked());
         } else if (action == showAllAction) {
             m_model->setHiddenItemsShown(showAllAction->isChecked());

-        } else if (action == teardownAction) {
-            m_model->requestTeardown(index);
-        } else if (action == ejectAction) {
-            m_model->requestEject(index);

         } else if (iconSizeActionMap.contains(action)) {
             m_view->setIconSize(iconSizeActionMap.value(action));
         }
         } else if (iconSizeActionMap.contains(action)) {
             m_view->setIconSize(iconSizeActionMap.value(action));
         }


@@ -285,45 +326,21 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
     selectClosestItem();
 }
 
     selectClosestItem();
 }
 

-void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
-{
-    KMenu menu(this);
-
-    QAction* addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry..."));
-
-    QAction* showAllAction = 0;
-    if (m_model->hiddenCount() > 0) {
-        showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries"));
-        showAllAction->setCheckable(true);
-        showAllAction->setChecked(m_model->hiddenItemsShown());
-    }
-
-    menu.addSeparator();
-    foreach (QAction* action, customContextMenuActions()) {
-        menu.addAction(action);
-    }
-
-    QAction* action = menu.exec(pos.toPoint());
-    if (action) {
-        if (action == addAction) {
-            addEntry();
-        } else if (action == showAllAction) {
-            m_model->setHiddenItemsShown(showAllAction->isChecked());
-        }
-    }
-
-    selectClosestItem();
-}
-

 void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     if (index < 0) {
         return;
     }
 
 void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     if (index < 0) {
         return;
     }
 

+    const PlacesItem* destItem = m_model->placesItem(index);
+    const PlacesItem::GroupType group = destItem->groupType();
+    if (group == PlacesItem::SearchForType || group == PlacesItem::RecentlySavedType) {
+        return;
+    }
+

     if (m_model->storageSetupNeeded(index)) {
     if (m_model->storageSetupNeeded(index)) {

-        connect(m_model, SIGNAL(storageSetupDone(int,bool)),
-                this, SLOT(slotItemDropEventStorageSetupDone(int,bool)));
+        connect(m_model, &PlacesItemModel::storageSetupDone,
+                this, &PlacesPanel::slotItemDropEventStorageSetupDone);

 
         m_itemDropEventIndex = index;
 
 
         m_itemDropEventIndex = index;
 


@@ -345,26 +362,25 @@ void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
         return;
     }
 
         return;
     }
 

-    KUrl destUrl = m_model->placesItem(index)->url();
+    QUrl destUrl = destItem->url();

     QDropEvent dropEvent(event->pos().toPoint(),
                          event->possibleActions(),
                          event->mimeData(),
                          event->buttons(),
                          event->modifiers());
 
     QDropEvent dropEvent(event->pos().toPoint(),
                          event->possibleActions(),
                          event->mimeData(),
                          event->buttons(),
                          event->modifiers());
 

-    DragAndDropHelper::dropUrls(KFileItem(), destUrl, &dropEvent);
+    slotUrlsDropped(destUrl, &dropEvent, this);

 }
 
 void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
 {
 }
 
 void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
 {

-    disconnect(m_model, SIGNAL(storageSetupDone(int,bool)),
-               this, SLOT(slotItemDropEventStorageSetupDone(int,bool)));
+    disconnect(m_model, &PlacesItemModel::storageSetupDone,
+               this, &PlacesPanel::slotItemDropEventStorageSetupDone);

 
     if ((index == m_itemDropEventIndex) && m_itemDropEvent && m_itemDropEventMimeData) {
         if (success) {
 
     if ((index == m_itemDropEventIndex) && m_itemDropEvent && m_itemDropEventMimeData) {
         if (success) {

-            KUrl destUrl = m_model->placesItem(index)->url();
-
-            DragAndDropHelper::dropUrls(KFileItem(), destUrl, m_itemDropEvent);
+            QUrl destUrl = m_model->placesItem(index)->url();
+            slotUrlsDropped(destUrl, m_itemDropEvent, this);

         }
 
         delete m_itemDropEventMimeData;
         }
 
         delete m_itemDropEventMimeData;


@@ -379,16 +395,15 @@ void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
 void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     m_model->dropMimeDataBefore(index, event->mimeData());
 void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     m_model->dropMimeDataBefore(index, event->mimeData());

+    m_model->saveBookmarks();

 }
 
 }
 

-void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
+void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* parent)

 {
 {

-    Q_UNUSED(parent);
-    const QString error = DragAndDropHelper::dropUrls(KFileItem(), dest, event);
-    if (!error.isEmpty()) {
-        emit errorMessage(error);
+    KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent);
+    if (job) {
+        connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) emit errorMessage(job->errorString()); });

     }
     }

-

 }
 
 void PlacesPanel::slotTrashUpdated(KJob* job)
 }
 
 void PlacesPanel::slotTrashUpdated(KJob* job)


@@ -396,13 +411,14 @@ void PlacesPanel::slotTrashUpdated(KJob* job)
     if (job->error()) {
         emit errorMessage(job->errorString());
     }
     if (job->error()) {
         emit errorMessage(job->errorString());
     }

-    org::kde::KDirNotify::emitFilesAdded("trash:/");
+    // as long as KIO doesn't do this, do it ourselves
+    KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), 0, KNotification::DefaultEvent);

 }
 
 void PlacesPanel::slotStorageSetupDone(int index, bool success)
 {
 }
 
 void PlacesPanel::slotStorageSetupDone(int index, bool success)
 {

-    disconnect(m_model, SIGNAL(storageSetupDone(int,bool)),
-               this, SLOT(slotStorageSetupDone(int,bool)));
+    disconnect(m_model, &PlacesItemModel::storageSetupDone,
+               this, &PlacesPanel::slotStorageSetupDone);

 
     if (m_triggerStorageSetupButton == Qt::NoButton) {
         return;
 
     if (m_triggerStorageSetupButton == Qt::NoButton) {
         return;


@@ -414,42 +430,34 @@ void PlacesPanel::slotStorageSetupDone(int index, bool success)
         m_triggerStorageSetupButton = Qt::NoButton;
     } else {
         setUrl(m_storageSetupFailedUrl);
         m_triggerStorageSetupButton = Qt::NoButton;
     } else {
         setUrl(m_storageSetupFailedUrl);

-        m_storageSetupFailedUrl = KUrl();
+        m_storageSetupFailedUrl = QUrl();

     }
 }
 
 void PlacesPanel::emptyTrash()
 {
     }
 }
 
 void PlacesPanel::emptyTrash()
 {

-    const QString text = i18nc("@info", "Do you really want to empty the Trash? All items will be deleted.");
-    const bool del = KMessageBox::warningContinueCancel(window(),
-                                                        text,
-                                                        QString(),
-                                                        KGuiItem(i18nc("@action:button", "Empty Trash"),
-                                                                 KIcon("user-trash"))
-                                                       ) == KMessageBox::Continue;
-    if (del) {
-        QByteArray packedArgs;
-        QDataStream stream(&packedArgs, QIODevice::WriteOnly);
-        stream << int(1);
-        KIO::Job *job = KIO::special(KUrl("trash:/"), packedArgs);
-        KNotification::event("Trash: emptied", QString() , QPixmap() , 0, KNotification::DefaultEvent);
-        job->ui()->setWindow(parentWidget());
-        connect(job, SIGNAL(result(KJob*)), SLOT(slotTrashUpdated(KJob*)));
+    KIO::JobUiDelegate uiDelegate;
+    uiDelegate.setWindow(window());
+    if (uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation)) {
+        KIO::Job* job = KIO::emptyTrash();
+        KJobWidgets::setWindow(job, window());
+        connect(job, &KIO::Job::result, this, &PlacesPanel::slotTrashUpdated);

     }
 }
 
 void PlacesPanel::addEntry()
 {
     const int index = m_controller->selectionManager()->currentItem();
     }
 }
 
 void PlacesPanel::addEntry()
 {
     const int index = m_controller->selectionManager()->currentItem();

-    const KUrl url = m_model->data(index).value("url").value<KUrl>();
+    const QUrl url = m_model->data(index).value("url").toUrl();

 
     QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);
 
     QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);

-    dialog->setCaption(i18nc("@title:window", "Add Places Entry"));
+    dialog->setWindowTitle(i18nc("@title:window", "Add Places Entry"));

     dialog->setAllowGlobal(true);
     dialog->setUrl(url);
     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* item = m_model->createPlacesItem(dialog->text(), dialog->url(), dialog->icon());
         m_model->appendItemToGroup(item);
     dialog->setAllowGlobal(true);
     dialog->setUrl(url);
     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* item = m_model->createPlacesItem(dialog->text(), dialog->url(), dialog->icon());
         m_model->appendItemToGroup(item);

+        m_model->saveBookmarks();

     }
 
     delete dialog;
     }
 
     delete dialog;


@@ -460,10 +468,10 @@ void PlacesPanel::editEntry(int index)
     QHash<QByteArray, QVariant> data = m_model->data(index);
 
     QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);
     QHash<QByteArray, QVariant> data = m_model->data(index);
 
     QPointer<PlacesItemEditDialog> dialog = new PlacesItemEditDialog(this);

-    dialog->setCaption(i18nc("@title:window", "Edit Places Entry"));
+    dialog->setWindowTitle(i18nc("@title:window", "Edit Places Entry"));

     dialog->setIcon(data.value("iconName").toString());
     dialog->setText(data.value("text").toString());
     dialog->setIcon(data.value("iconName").toString());
     dialog->setText(data.value("text").toString());

-    dialog->setUrl(data.value("url").value<KUrl>());
+    dialog->setUrl(data.value("url").toUrl());

     dialog->setAllowGlobal(true);
     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* oldItem = m_model->placesItem(index);
     dialog->setAllowGlobal(true);
     if (dialog->exec() == QDialog::Accepted) {
         PlacesItem* oldItem = m_model->placesItem(index);


@@ -471,6 +479,7 @@ void PlacesPanel::editEntry(int index)
             oldItem->setText(dialog->text());
             oldItem->setUrl(dialog->url());
             oldItem->setIcon(dialog->icon());
             oldItem->setText(dialog->text());
             oldItem->setUrl(dialog->url());
             oldItem->setIcon(dialog->icon());

+            m_model->saveBookmarks();

         }
     }
 
         }
     }
 


@@ -497,14 +506,14 @@ void PlacesPanel::triggerItem(int index, Qt::MouseButton button)
         m_triggerStorageSetupButton = button;
         m_storageSetupFailedUrl = url();
 
         m_triggerStorageSetupButton = button;
         m_storageSetupFailedUrl = url();
 

-        connect(m_model, SIGNAL(storageSetupDone(int,bool)),
-                this, SLOT(slotStorageSetupDone(int,bool)));
+        connect(m_model, &PlacesItemModel::storageSetupDone,
+                this, &PlacesPanel::slotStorageSetupDone);

 
         m_model->requestStorageSetup(index);
     } else {
         m_triggerStorageSetupButton = Qt::NoButton;
 
 
         m_model->requestStorageSetup(index);
     } else {
         m_triggerStorageSetupButton = Qt::NoButton;
 

-        const KUrl url = m_model->data(index).value("url").value<KUrl>();
+        const QUrl url = m_model->data(index).value("url").toUrl();

         if (!url.isEmpty()) {
             if (button == Qt::MiddleButton) {
                 emit placeMiddleClicked(PlacesItemModel::convertedUrl(url));
         if (!url.isEmpty()) {
             if (button == Qt::MiddleButton) {
                 emit placeMiddleClicked(PlacesItemModel::convertedUrl(url));


@@ -514,6 +523,3 @@ void PlacesPanel::triggerItem(int index, Qt::MouseButton button)
         }
     }
 }
         }
     }
 }

-
-
-#include "placespanel.moc"