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

List:       kde-commits
Subject:    KDE/kdebase/apps
From:       David Faure <faure () kde ! org>
Date:       2008-12-03 9:19:17
Message-ID: 1228295957.179101.32394.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 891905 by dfaure:

Add addIsCutSelection, and port as much code as possible to KDirModel::mimeData.


 M  +1 -6      dolphin/src/dolphinview.cpp  
 M  +8 -2      lib/konq/konqmimedata.cpp  
 M  +9 -1      lib/konq/konqmimedata.h  
 M  +4 -5      plasma/applets/folderview/folderview.cpp  


--- trunk/KDE/kdebase/apps/dolphin/src/dolphinview.cpp #891904:891905
@@ -702,18 +702,13 @@
 void DolphinView::cutSelectedItems()
 {
     QMimeData* mimeData = selectionMimeData();
-    const KUrl::List kdeUrls = simplifiedSelectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
+    KonqMimeData::addIsCutSelection(mimeData, true);
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
 void DolphinView::copySelectedItems()
 {
     QMimeData* mimeData = selectionMimeData();
-    const KUrl::List kdeUrls = selectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
--- trunk/KDE/kdebase/apps/lib/konq/konqmimedata.cpp #891904:891905
@@ -31,8 +31,7 @@
     else
         kdeURLs.populateMimeData(mostLocalURLs, mimeData);
 
-    QByteArray cutSelectionData = cut ? "1" : "0";
-    mimeData->setData( "application/x-kde-cutselection", cutSelectionData );
+    addIsCutSelection(mimeData, cut);
 
     // for compatibility reasons
     QString application_x_qiconlist;
@@ -58,3 +57,10 @@
         return (a.at(0) == '1'); // true if 1
     }
 }
+
+void KonqMimeData::addIsCutSelection(QMimeData* mimeData,
+                                     bool cut)
+{
+    const QByteArray cutSelectionData = cut ? "1" : "0";
+    mimeData->setData("application/x-kde-cutselection", cutSelectionData);
+}
--- trunk/KDE/kdebase/apps/lib/konq/konqmimedata.h #891904:891905
@@ -46,7 +46,15 @@
                                   const KUrl::List& mostLocalURLs,
                                   bool cut = false );
 
-    // TODO other methods for icon positions
+    /**
+     * Add the information whether the files were cut, into the mimedata.
+     * @param mimeData pointer to the mimeData object to be populated.
+     *                 Must not be 0.
+     * @param cut if true, the user selected "cut" (saved as \
application/x-kde-cutselection in the mimedata). +     * @since 4.2
+     */
+    static void addIsCutSelection(QMimeData* mimeData,
+                                  bool cut);
 
     /**
      * @return true if the urls in @p mimeData were cut
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderview.cpp #891904:891905
@@ -1225,15 +1225,14 @@
 
 void FolderView::copy()
 {
-    QMimeData *mimeData = new QMimeData;
-    KonqMimeData::populateMimeData(mimeData, selectedUrls(), KUrl::List(), false);
+    QMimeData *mimeData = m_model->mimeData(m_selectionModel->selectedIndexes());
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
 void FolderView::cut()
 {
-    QMimeData *mimeData = new QMimeData;
-    KonqMimeData::populateMimeData(mimeData, selectedUrls(), KUrl::List(), true);
+    QMimeData *mimeData = m_model->mimeData(m_selectionModel->selectedIndexes());
+    KonqMimeData::addIsCutSelection(mimeData, true);
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
@@ -1471,7 +1470,7 @@
 	} else {
 	    setUrl(KUrl(QDir::homePath()));
 	}
-	    
+
         m_dirModel->dirLister()->openUrl(m_url);
         updateIconWidget();
     }


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