[kdelibs/frameworks] /: Merge the 2 fromMimeData functions

[Stephen Kelly]

Nicolas Lécureuil wrote:

> Git commit 0ec434954c5919b6714449016d2dfcef51585204 by Nicolas Lécureuil.
> Committed on 04/01/2012 at 18:05.
> Pushed by nlecureuil into branch 'frameworks'.
> 
> Merge the 2 fromMimeData functions
> 

This change is source incompatible.

In the name of source compatibility (which is important), I recommend you 
revert it.

Thanks,

Steve.

> M  +3    -3    kdecore/tests/kurlmimetest.cpp
> M  +0    -5    staging/libkcoreaddons/src/io/kurl.cpp
> M  +1    -11   staging/libkcoreaddons/src/io/kurl.h
> 
> http://commits.kde.org/kdelibs/0ec434954c5919b6714449016d2dfcef51585204
> 
> diff --git a/kdecore/tests/kurlmimetest.cpp
> b/kdecore/tests/kurlmimetest.cpp index eade10e..681dd0d 100644
> --- a/kdecore/tests/kurlmimetest.cpp
> +++ b/kdecore/tests/kurlmimetest.cpp
> @@ -48,7 +48,7 @@ void KUrlMimeTest::testURLList()
>      QVERIFY(mimeData->hasText());
>  
>      QMap<QString, QString> decodedMetaData;
> -    KUrl::List decodedURLs = KUrl::List::fromMimeData( mimeData,
> &decodedMetaData );
> +    KUrl::List decodedURLs = KUrl::List::fromMimeData( mimeData,
> KUrl::List::PreferKdeUrls, &decodedMetaData );
>      QVERIFY( !decodedURLs.isEmpty() );
>      KUrl::List expectedUrls = urls;
>      expectedUrls[1] = KUrl("http://wstephenson@example.com/path"); //
>      password removed
> @@ -75,7 +75,7 @@ void KUrlMimeTest::testOneURL()
>  
>      QVERIFY( KUrl::List::canDecode( mimeData ) );
>      QMap<QString, QString> decodedMetaData;
> -    KUrl::List decodedURLs = KUrl::List::fromMimeData( mimeData,
> &decodedMetaData );
> +    KUrl::List decodedURLs = KUrl::List::fromMimeData( mimeData,
> KUrl::List::PreferKdeUrls, &decodedMetaData );
>      QVERIFY( !decodedURLs.isEmpty() );
>      QCOMPARE( decodedURLs.count(), 1 );
>      QCOMPARE( decodedURLs[0].url(), oneURL.url() );
> @@ -93,7 +93,7 @@ void KUrlMimeTest::testFromQUrl()
>  
>      QVERIFY(KUrl::List::canDecode(mimeData));
>      QMap<QString, QString> decodedMetaData;
> -    KUrl::List decodedURLs = KUrl::List::fromMimeData( mimeData,
> &decodedMetaData );
> +    KUrl::List decodedURLs = KUrl::List::fromMimeData( mimeData,
> KUrl::List::PreferKdeUrls, &decodedMetaData );
>      QVERIFY( !decodedURLs.isEmpty() );
>      QCOMPARE( decodedURLs.count(), 2 );
>      QCOMPARE( static_cast<QUrl>(decodedURLs[0]), qurls[0] );
> diff --git a/staging/libkcoreaddons/src/io/kurl.cpp
> b/staging/libkcoreaddons/src/io/kurl.cpp index ed1686d..8de0dd5 100644
> --- a/staging/libkcoreaddons/src/io/kurl.cpp
> +++ b/staging/libkcoreaddons/src/io/kurl.cpp
> @@ -365,11 +365,6 @@ KUrl::List KUrl::List::fromMimeData(const QMimeData
> *mimeData,
>      return uris;
>  }
>  
> -KUrl::List KUrl::List::fromMimeData( const QMimeData *mimeData,
> KUrl::MetaDataMap* metaData ) -{
> -    return fromMimeData(mimeData, PreferKdeUrls, metaData);
> -}
> -
>  KUrl::List::operator QVariant() const
>  {
>    return qVariantFromValue(*this);
> diff --git a/staging/libkcoreaddons/src/io/kurl.h
> b/staging/libkcoreaddons/src/io/kurl.h index 84900d3..5d4060b 100644
> --- a/staging/libkcoreaddons/src/io/kurl.h
> +++ b/staging/libkcoreaddons/src/io/kurl.h
> @@ -273,16 +273,6 @@ public:
>        static QStringList mimeDataTypes();
>  
>        /**
> -       * Extract a list of KUrls from the contents of @p mimeData.
> -       * Decoding will fail if @p mimeData does not contain any URLs, or
> if at
> -       * least one extracted URL is not valid.
> -       * @param mimeData the mime data to extract from; cannot be 0
> -       * @param metaData optional pointer to a map holding the metadata
> -       * @return the list of urls
> -       */
> -      static KUrl::List fromMimeData( const QMimeData *mimeData,
> KUrl::MetaDataMap* metaData = 0 ); -
> -      /**
>         * Flags to be used in fromMimeData.
>         * @since 4.2.3
>         */
> @@ -314,7 +304,7 @@ public:
>         * @since 4.2.3
>         */
>        static KUrl::List fromMimeData( const QMimeData *mimeData,
> -                                      DecodeOptions decodeOptions, //
> TODO KDE5: = PreferKdeUrls, and merge with above
> +                                      DecodeOptions decodeOptions =
> PreferKdeUrls,
>                                        KUrl::MetaDataMap* metaData = 0 );
>  
>    };