Fix for crash which was introduced by commit

[dolphin.git] / src / dolphintabbar.cpp

diff --git a/src/dolphintabbar.cpp b/src/dolphintabbar.cpp
index c7216843107fe73b7db19d913e7f59cf723b6e7c..dbd324db56c29fa21a760dfc0e42434a3ff281d0 100644 (file)
--- a/src/dolphintabbar.cpp
+++ b/src/dolphintabbar.cpp
@@ -22,9 +22,10 @@
 #include <QTimer>
 #include <QDragEnterEvent>
 #include <KLocalizedString>
 #include <QTimer>
 #include <QDragEnterEvent>
 #include <KLocalizedString>

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

 #include <QIcon>
 #include <QIcon>

-#include <KUrl>
+#include <QUrl>
+#include <QMimeData>

 
 DolphinTabBar::DolphinTabBar(QWidget* parent) :
     QTabBar(parent),
 
 DolphinTabBar::DolphinTabBar(QWidget* parent) :
     QTabBar(parent),


@@ -47,7 +48,7 @@ void DolphinTabBar::dragEnterEvent(QDragEnterEvent* event)
     const QMimeData* mimeData = event->mimeData();
     const int index = tabAt(event->pos());
 
     const QMimeData* mimeData = event->mimeData();
     const int index = tabAt(event->pos());
 

-    if (KUrl::List::canDecode(mimeData)) {
+    if (mimeData->hasUrls()) {

         event->acceptProposedAction();
         updateAutoActivationTimer(index);
     }
         event->acceptProposedAction();
         updateAutoActivationTimer(index);
     }


@@ -67,7 +68,7 @@ void DolphinTabBar::dragMoveEvent(QDragMoveEvent* event)
     const QMimeData* mimeData = event->mimeData();
     const int index = tabAt(event->pos());
 
     const QMimeData* mimeData = event->mimeData();
     const int index = tabAt(event->pos());
 

-    if (KUrl::List::canDecode(mimeData)) {
+    if (mimeData->hasUrls()) {

         updateAutoActivationTimer(index);
     }
 
         updateAutoActivationTimer(index);
     }
 


@@ -82,7 +83,7 @@ void DolphinTabBar::dropEvent(QDropEvent* event)
     const QMimeData* mimeData = event->mimeData();
     const int index = tabAt(event->pos());
 
     const QMimeData* mimeData = event->mimeData();
     const int index = tabAt(event->pos());
 

-    if (index >= 0 && KUrl::List::canDecode(mimeData)) {
+    if (index >= 0 && mimeData->hasUrls()) {

         emit tabDropEvent(index, event);
     }
 
         emit tabDropEvent(index, event);
     }
 


@@ -122,7 +123,7 @@ void DolphinTabBar::contextMenuEvent(QContextMenuEvent* event)
 
     if (index >= 0) {
         // Tab context menu
 
     if (index >= 0) {
         // Tab context menu

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

 
         QAction* newTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@action:inmenu", "New Tab"));
         QAction* detachTabAction = menu.addAction(QIcon::fromTheme("tab-detach"), i18nc("@action:inmenu", "Detach Tab"));
 
         QAction* newTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@action:inmenu", "New Tab"));
         QAction* detachTabAction = menu.addAction(QIcon::fromTheme("tab-detach"), i18nc("@action:inmenu", "Detach Tab"));