[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kdesktop
From:       Hamish Rodda <rodda () kde ! org>
Date:       2005-10-12 12:40:19
Message-ID: 1129120819.670483.24087.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 469892 by rodda:

Portings:
KURLDrag -> replacements
remove use of deprecated KAction signal


 M  +0 -1      desktop.cc  
 M  +5 -6      kdiconview.cc  
 M  +1 -1      kdiconview.h  


--- trunk/KDE/kdebase/kdesktop/desktop.cc #469891:469892
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <k3colordrag.h>
-#include <kurldrag.h>
 
 #include <qdir.h>
 #include <qevent.h>
--- trunk/KDE/kdebase/kdesktop/kdiconview.cc #469891:469892
@@ -42,7 +42,6 @@
 #include <kprotocolinfo.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
-#include <kurldrag.h>
 #include <kwin.h>
 #include <kwinmodule.h>
 
@@ -420,8 +419,8 @@
         (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Qt::Key_F2, this, \
                SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
         (void) new KAction( i18n( "&Properties" ), Qt::ALT+Qt::Key_Return, this, \
                SLOT( slotProperties() ), &m_actionCollection, "properties" );
         KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", \
                Qt::Key_Delete, 0, 0, &m_actionCollection, "trash" );
-        connect( trash, SIGNAL( activated( KAction::ActivationReason, \
                Qt::ButtonState ) ),
-                 this, SLOT( slotTrashActivated( KAction::ActivationReason, \
Qt::ButtonState ) ) ); +        connect( trash, SIGNAL( activated( \
KAction::ActivationReason, Qt::MouseButtons, Qt::KeyboardModifiers ) ), +             \
this, SLOT( slotTrashActivated( KAction::ActivationReason, Qt::MouseButtons, \
Qt::KeyboardModifiers ) ) );  
         KConfig config("kdeglobals", true, false);
         config.setGroup( "KDE" );
@@ -738,12 +737,12 @@
     return !itemsLeft;
 }
 
-void KDIconView::slotTrashActivated( KAction::ActivationReason reason, \
Qt::ButtonState state ) +void KDIconView::slotTrashActivated( \
KAction::ActivationReason reason, Qt::MouseButtons, Qt::KeyboardModifiers modifiers ) \
{  if (deleteGlobalDesktopFiles())
        return; // All items deleted
 
-    if ( reason == KAction::PopupMenuActivation && ( state & Qt::ShiftModifier ) )
+    if ( reason == KAction::PopupMenuActivation && ( modifiers & Qt::ShiftModifier ) \
)  KonqOperations::del(this, KonqOperations::DEL, selectedUrls());
     else
        KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());
@@ -1323,7 +1322,7 @@
     // that contains the same line "Set as Wallpaper" in void \
KonqOperations::asyncDrop  bool isColorDrag = K3ColorDrag::canDecode(e);
     bool isImageDrag = Q3ImageDrag::canDecode(e);
-    bool isUrlDrag = KURLDrag::canDecode(e);
+    bool isUrlDrag = KURL::List::canDecode(e->mimeData());
 
     bool isImmutable = KGlobal::config()->isImmutable();
 
--- trunk/KDE/kdebase/kdesktop/kdiconview.h #469891:469892
@@ -131,7 +131,7 @@
     // slots connected to the popupmenu (actions)
     void slotCut();
     void slotCopy();
-    void slotTrashActivated( KAction::ActivationReason reason, Qt::ButtonState state \
); +    void slotTrashActivated( KAction::ActivationReason reason, Qt::MouseButtons \
buttons, Qt::KeyboardModifiers modifiers );  void slotDelete();
     void slotPopupPasteTo();
     void slotProperties();


[prev in list] [next in list] [prev in thread] [next in thread]