mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 00:41:23 +00:00
Port KImageIO
svn path=/trunk/KDE/kdebase/libkonq/; revision=502375
This commit is contained in:
parent
32a50c9293
commit
5ad07a7bf8
|
@ -39,6 +39,7 @@
|
|||
#include <kuser.h>
|
||||
#include <kdialog.h>
|
||||
#include <kimageio.h>
|
||||
#include <kmimetype.h>
|
||||
#include <kstandarddirs.h>
|
||||
#include <kaboutdata.h>
|
||||
#include <kgenericfactory.h>
|
||||
|
@ -327,7 +328,8 @@ inline KUrl *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
|
|||
{
|
||||
KUrl *url = new KURL(uris.first());
|
||||
|
||||
if( KImageIO::types(KImageIO::Reading).contains(url->fileName()) )
|
||||
KMimeType::Ptr mime = KMimeType::findByURL( *url );
|
||||
if ( mime && KImageIO::isSupported( mime->name(), KImageIO::Reading ) )
|
||||
return url;
|
||||
|
||||
QStringList qs = KImageIO::pattern().split( '\n');
|
||||
|
|
|
@ -543,10 +543,8 @@ void KonqOperations::doFileCopy()
|
|||
{
|
||||
KUrl url = lst.first();
|
||||
KMimeType::Ptr mime = KMimeType::findByURL( url );
|
||||
#warning "kde4: is it correct ? !KImageIO::type(url.path()).isEmpty() -> mime.isNull() ?"
|
||||
if ( ( !mime.isNull() ) ||
|
||||
( KImageIO::isSupported(mime->name(), KImageIO::Reading) ) ||
|
||||
mime->is( "image/svg+xml" ) )
|
||||
if ( mime && ( ( KImageIO::isSupported(mime->name(), KImageIO::Reading) ) ||
|
||||
mime->is( "image/svg+xml" ) ) )
|
||||
{
|
||||
bSetWallpaper = true;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue