kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use KURLDrag for DND-specific url-encoding.

Browse source 
svn path=/trunk/kdebase/libkonq/; revision=226684
This commit is contained in:
Waldo Bastian 2003-05-19 09:41:08 +00:00
parent 082f14c623
commit 27e51dbbd6
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/konq/konq_drag.cc
View file

@ -69,7 +69,7 @@ QByteArray KonqIconDrag::encodedData( const char* mime ) const
{
QStringList uris;
for (QStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
uris.append(KURLDrag::checkFilenameURL(KURL((*it).latin1(), 106).prettyURL())); // 106 is mib enum for utf8 codec
uris.append(KURLDrag::stringToUrl((*it).latin1()).prettyURL());
QCString s = uris.join( "\n" ).local8Bit();
if( uris.count() > 1 )
s.append( "\n" );
@ -84,7 +84,7 @@ QByteArray KonqIconDrag::encodedData( const char* mime ) const
QStringList uris;
for (QStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
uris.append(KURLDrag::checkFilenameURL(KURL(*it, 106).url(0, 4))); // 106 is mib enum for utf8 codec; 4 for latin1
uris.append(KURLDrag::stringToUrl((*it).latin1()).url(0, 4)); // 4 for latin1
QCString s = uris.join( "\n" ).latin1();
if( uris.count() > 1 )
@ -99,7 +99,7 @@ QByteArray KonqIconDrag::encodedData( const char* mime ) const
{
QStringList uris;
for (QStringList::ConstIterator it = urls.begin(); it != urls.end(); ++it)
uris.append(KURLDrag::checkFilenameURL(KURL(*it, 106).prettyURL())); // 106 is mib enum for utf8 codec
uris.append(KURLDrag::stringToUrl((*it).latin1()).prettyURL());
QCString s = uris.join( "\n" ).utf8();
if( uris.count() > 1 )
s.append( "\n" );
@ -121,7 +121,7 @@ void KonqIconDrag::append( const QIconDragItem &item, const QRect &pr,
const QRect &tr, const QString &url )
{
QIconDrag::append( item, pr, tr );
urls.append( KURLDrag::checkFilenameURL(url));
urls.append( url );
}
//
@ -135,11 +135,7 @@ KonqDrag * KonqDrag::newDrag( const KURL::List & urls, bool move, QWidget * drag
// Get each URL encoded in utf8 - and since we get it in escaped
// form on top of that, .latin1() is fine.
for ( ; uit != uEnd ; ++uit )
{
QString url = (*uit).url(0,106); // 106 is mib enum for utf8 codec
url = KURLDrag::checkFilenameURL( url );
uris.append( url.latin1() );
}
uris.append( KURLDrag::urlToString( *uit ).latin1() );
return new KonqDrag( uris, move, dragSource, name );
}
@ -175,7 +171,7 @@ QByteArray KonqDrag::encodedData( const char* mime ) const
{
QStringList uris;
for (QStrListIterator it(m_urls); *it; ++it)
uris.append(KURL(*it, 106).prettyURL()); // 106 is mib enum for utf8 codec
uris.append(KURLDrag::stringToUrl(*it).prettyURL());
QCString s = uris.join( "\n" ).local8Bit();
if( uris.count() > 1 )
s.append( "\n" );

3
lib/konq/konq_iconviewwidget.cc
View file

@ -1081,7 +1081,8 @@ KonqIconDrag * KonqIconViewWidget::konqDragObject( QWidget * dragSource )
// Append all items to the drag object
for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() ) {
if ( it->isSelected() ) {
QString itemURL = (static_cast<KFileIVI *>(it))->item()->url().url(0, 106); // 106 is mib enum for utf8 codec
KURL url = (static_cast<KFileIVI *>(it))->item()->url();
QString itemURL = KURLDrag::urlToString(url);
kdDebug(1203) << "itemURL=" << itemURL << endl;
QIconDragItem id;
id.setData( QCString(itemURL.latin1()) );