X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5252c12db4929886dbe502013e0a1fee6500f568..7fbae445277374fb2bacfcd7c04e8d7fbb2c3f05:/src/itemeffectsmanager.cpp

diff --git a/src/itemeffectsmanager.cpp b/src/itemeffectsmanager.cpp
index f47c43998..782dfe3c5 100644
--- a/src/itemeffectsmanager.cpp
+++ b/src/itemeffectsmanager.cpp
@@ -26,7 +26,6 @@
 #include <QPixmap>
 #include <kglobalsettings.h>
 #include <qclipboard.h>
-#include <kurldrag.h>
 #include <klocale.h>
 
 #include "dolphin.h"
@@ -42,7 +41,7 @@ ItemEffectsManager::~ItemEffectsManager()
     delete m_pixmapCopy;
     m_pixmapCopy = 0;
 
-    m_highlightedURL = 0;
+    m_highlightedUrl = 0;
 }
 
 void ItemEffectsManager::zoomIn()
@@ -58,8 +57,8 @@ void ItemEffectsManager::zoomOut()
 void ItemEffectsManager::activateItem(void* context)
 {
     KFileItem* fileInfo = contextFileInfo(context);
-    const KUrl itemURL(fileInfo->url());
-    if (m_highlightedURL == itemURL) {
+    const KUrl itemUrl(fileInfo->url());
+    if (m_highlightedUrl == itemUrl) {
         // the item is already highlighted
         return;
     }
@@ -71,13 +70,13 @@ void ItemEffectsManager::activateItem(void* context)
         // remember the pixmap and item to be able to
         // restore it to the old state later
         *m_pixmapCopy = *itemPixmap;
-        m_highlightedURL = itemURL;
+        m_highlightedUrl = itemUrl;
 
         // apply an icon effect to the item below the mouse pointer
         KIconEffect iconEffect;
         QPixmap pixmap = iconEffect.apply(*itemPixmap,
-                                          KIcon::Desktop,
-                                          KIcon::ActiveState);
+                                          K3Icon::Desktop,
+                                          K3Icon::ActiveState);
         setContextPixmap(context, pixmap);
     }
 
@@ -89,18 +88,18 @@ void ItemEffectsManager::activateItem(void* context)
 
 void ItemEffectsManager::resetActivatedItem()
 {
-    if (m_highlightedURL.isEmpty()) {
+    if (m_highlightedUrl.isEmpty()) {
         return;
     }
 
     for (void* context = firstContext(); context != 0; context = nextContext(context)) {
-        KUrl itemURL(contextFileInfo(context)->url());
-        if (itemURL == m_highlightedURL) {
+        KUrl itemUrl(contextFileInfo(context)->url());
+        if (itemUrl == m_highlightedUrl) {
             // the highlighted item has been found and is restored to the default state
             KIconEffect iconEffect;
             QPixmap pixmap = iconEffect.apply(*m_pixmapCopy,
-                                              KIcon::Desktop,
-                                              KIcon::DefaultState);
+                                              K3Icon::Desktop,
+                                              K3Icon::DefaultState);
 
             // TODO: KFileIconView does not emit any signal when the preview has been finished.
             // Hence check the size to prevent that a preview is hidden by restoring a
@@ -115,7 +114,7 @@ void ItemEffectsManager::resetActivatedItem()
         }
     }
 
-    m_highlightedURL = 0;
+    m_highlightedUrl = 0;
 
     DolphinStatusBar* statusBar = Dolphin::mainWin().activeView()->statusBar();
     statusBar->clear();
@@ -127,10 +126,10 @@ void ItemEffectsManager::updateDisabledItems()
         // restore all disabled items with their original pixmap
         for (void* context = firstContext(); context != 0; context = nextContext(context)) {
             const KFileItem* fileInfo = contextFileInfo(context);
-            const KUrl& fileURL = fileInfo->url();
+            const KUrl& fileUrl = fileInfo->url();
             Q3ValueListIterator<DisabledItem> it = m_disabledItems.begin();
             while (it != m_disabledItems.end()) {
-                if (fileURL == (*it).url) {
+                if (fileUrl == (*it).url) {
                     setContextPixmap(context, (*it).pixmap);
                 }
                 ++it;
@@ -144,32 +143,31 @@ void ItemEffectsManager::updateDisabledItems()
     }
 
     QClipboard* clipboard = QApplication::clipboard();
-    QMimeSource* data = clipboard->data();
-    if (!KUrlDrag::canDecode(data)) {
+    const QMimeData* data = clipboard->mimeData();
+    KUrl::List urls = KUrl::List::fromMimeData(data);
+    if (urls.isEmpty()) {
         return;
     }
 
     // The clipboard contains items, which have been cutted. Change the pixmaps of all those
     // items to the disabled state.
-    KUrl::List urls;
-    KUrlDrag::decode(data, urls);
     for (void* context = firstContext(); context != 0; context = nextContext(context)) {
         const KFileItem* fileInfo = contextFileInfo(context);
-        const KUrl& fileURL = fileInfo->url();
+        const KUrl& fileUrl = fileInfo->url();
         for(KUrl::List::ConstIterator it = urls.begin(); it != urls.end(); ++it) {
-            if (fileURL == (*it)) {
+            if (fileUrl == (*it)) {
                 const QPixmap* itemPixmap = contextPixmap(context);
                 if (itemPixmap != 0) {
                     // remember old pixmap
                     DisabledItem disabledItem;
-                    disabledItem.url = fileURL;
+                    disabledItem.url = fileUrl;
                     disabledItem.pixmap = *itemPixmap;
                     m_disabledItems.append(disabledItem);
 
                     KIconEffect iconEffect;
                     QPixmap disabledPixmap = iconEffect.apply(*itemPixmap,
-                                                              KIcon::Desktop,
-                                                              KIcon::DisabledState);
+                                                              K3Icon::Desktop,
+                                                              K3Icon::DisabledState);
                     setContextPixmap(context, disabledPixmap);
                 }
                 break;
@@ -184,7 +182,7 @@ QString ItemEffectsManager::statusBarText(KFileItem* fileInfo) const
         // KFileItem::getStatusBar() returns "MyDocuments/ Folder" as
         // status bar text for a folder 'MyDocuments'. This is adjusted
         // to "MyDocuments (Folder)" in Dolphin.
-        return i18n("%1 (Folder)").arg(fileInfo->name());
+        return i18n("%1 (Folder)",fileInfo->name());
     }
 
     return fileInfo->getStatusBarInfo();