Port to new KStandardAction slot syntax

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index bf806055bf79cb62014eb0d74d2e1b82d92877e3..5fcec9241217e9d1d950eecb63d827873471186b 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -182,6 +182,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
             this, &DolphinView::slotSelectionChanged);
 
     m_toolTipManager = new ToolTipManager(this);
             this, &DolphinView::slotSelectionChanged);
 
     m_toolTipManager = new ToolTipManager(this);

+    connect(m_toolTipManager, &ToolTipManager::urlActivated, this, &DolphinView::urlActivated);

 
     m_versionControlObserver = new VersionControlObserver(this);
     m_versionControlObserver->setModel(m_model);
 
     m_versionControlObserver = new VersionControlObserver(this);
     m_versionControlObserver->setModel(m_model);


@@ -734,7 +735,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         if (GeneralSettings::useTabForSwitchingSplitView()) {
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
             if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier) {
         if (GeneralSettings::useTabForSwitchingSplitView()) {
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
             if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier) {

-                toggleActiveViewRequested();
+                emit toggleActiveViewRequested();

                 return true;
             }
         }
                 return true;
             }
         }


@@ -1050,14 +1051,14 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
                          event->mimeData(),
                          event->buttons(),
                          event->modifiers());
                          event->mimeData(),
                          event->buttons(),
                          event->modifiers());

-    dropUrls(destUrl, &dropEvent);
+    dropUrls(destUrl, &dropEvent, this);

 
     setActive(true);
 }
 
 
     setActive(true);
 }
 

-void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent)
+void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget)

 {
 {

-    KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, this);
+    KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);

 
     if (job) {
         connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult);
 
     if (job) {
         connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult);


@@ -1371,6 +1372,7 @@ void DolphinView::updateViewState()
             }
         }
 
             }
         }
 

+        selectionManager->beginAnchoredSelection(selectionManager->currentItem());

         selectionManager->setSelectedItems(selectedItems);
     }
 }
         selectionManager->setSelectedItems(selectedItems);
     }
 }