[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/libkonq
From: Wilco Greven <greven () kde ! org>
Date: 2005-10-07 17:33:55
Message-ID: 1128706435.599394.3963.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 468319 by wgreven:
Change KonqDrag::decodeIsCutSelection to take a QMimeData argument.
M +3 -3 konq_dirpart.cc
M +2 -2 konq_drag.cc
M +1 -1 konq_drag.h
M +2 -2 konq_operations.cc
--- trunk/KDE/kdebase/libkonq/konq_dirpart.cc #468318:468319
@@ -411,10 +411,10 @@
// This is very related to KDIconView::slotClipboardDataChanged
KURL::List lst;
- QMimeSource *data = QApplication::clipboard()->data();
- if ( data->provides( "application/x-kde-cutselection" ) && data->provides( "text/uri-list" ) )
+ const QMimeData *data = QApplication::clipboard()->mimeData();
+ if ( data->hasFormat( "application/x-kde-cutselection" ) && data->hasFormat( "text/uri-list" ) )
if ( KonqDrag::decodeIsCutSelection( data ) )
- (void) K3URLDrag::decode( data, lst );
+ lst = KURL::List::fromMimeData( data );
disableIcons( lst );
--- trunk/KDE/kdebase/libkonq/konq_drag.cc #468318:468319
@@ -272,9 +272,9 @@
// Used for KonqIconDrag too
-bool KonqDrag::decodeIsCutSelection( const QMimeSource *e )
+bool KonqDrag::decodeIsCutSelection( const QMimeData *e )
{
- QByteArray a = e->encodedData( "application/x-kde-cutselection" );
+ QByteArray a = e->data( "application/x-kde-cutselection" );
if ( a.isEmpty() )
return false;
else
--- trunk/KDE/kdebase/libkonq/konq_drag.h #468318:468319
@@ -117,7 +117,7 @@
void setMoveSelection( bool move ) { m_bCutSelection = move; }
// Returns true if the data was cut (used for KonqIconDrag too)
- static bool decodeIsCutSelection( const QMimeSource *e );
+ static bool decodeIsCutSelection( const QMimeData *e );
protected: // ##### TODO private. And d pointer...
bool m_bCutSelection;
--- trunk/KDE/kdebase/libkonq/konq_operations.cc #468318:468319
@@ -129,8 +129,8 @@
{
// move or not move ?
bool move = false;
- QMimeSource *data = QApplication::clipboard()->data();
- if ( data->provides( "application/x-kde-cutselection" ) ) {
+ const QMimeData *data = QApplication::clipboard()->mimeData();
+ if ( data->hasFormat( "application/x-kde-cutselection" ) ) {
move = KonqDrag::decodeIsCutSelection( data );
kdDebug(1203) << "move (from clipboard data) = " << move << endl;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic