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

List:       kde-commits
Subject:    KDE/kdepimlibs/kabc
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-05-13 10:56:07
Message-ID: 20100513110106.C9E03AC8B4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1126225 by tokoe:

Remove VCardDrag::mimeType()


 M  +7 -11     tests/vcarddragtest.cpp  
 M  +4 -9      vcarddrag.cpp  
 M  +1 -11     vcarddrag.h  


--- trunk/KDE/kdepimlibs/kabc/tests/vcarddragtest.cpp #1126224:1126225
@@ -65,29 +65,29 @@
   QMimeData *data = new QMimeData();
   bool result = VCardDrag::populateMimeData( data, vcard );
   QVERIFY( result );
-  QVERIFY( data->hasFormat( VCardDrag::mimeType() ) );
-  QCOMPARE( data->data( VCardDrag::mimeType() ), vcard );
+  QVERIFY( data->hasFormat( KABC::Addressee::mimeType() ) );
+  QCOMPARE( data->data( KABC::Addressee::mimeType() ), vcard );
   delete data;
 
   data = new QMimeData();
   result = VCardDrag::populateMimeData( data, Addressee::List() << mAddressee1 );
   QVERIFY( result );
-  QVERIFY( data->hasFormat( VCardDrag::mimeType() ) );
-  QCOMPARE( data->data( VCardDrag::mimeType() ), vcard );
+  QVERIFY( data->hasFormat( KABC::Addressee::mimeType() ) );
+  QCOMPARE( data->data( KABC::Addressee::mimeType() ), vcard );
   delete data;
 
   const QByteArray vcards = converter.createVCards( Addressee::List() << mAddressee1 << mAddressee2 );
   data = new QMimeData();
   result = VCardDrag::populateMimeData( data, Addressee::List() << mAddressee1 << mAddressee2 );
   QVERIFY( result );
-  QVERIFY( data->hasFormat( VCardDrag::mimeType() ) );
-  QCOMPARE( data->data( VCardDrag::mimeType() ), vcards );
+  QVERIFY( data->hasFormat( KABC::Addressee::mimeType() ) );
+  QCOMPARE( data->data( KABC::Addressee::mimeType() ), vcards );
   delete data;
 
   data = new QMimeData();
   result = VCardDrag::populateMimeData( data, Addressee::List() );
   QVERIFY( !result );
-  QVERIFY( !data->hasFormat( VCardDrag::mimeType() ) );
+  QVERIFY( !data->hasFormat( KABC::Addressee::mimeType() ) );
   delete data;
 }
 
@@ -97,8 +97,6 @@
   const QByteArray vcard = converter.createVCard( mAddressee1 );
   QVERIFY( !vcard.isEmpty() );
 
-  QCOMPARE( Addressee::mimeType(), VCardDrag::mimeType() );
-
   QMimeData *data = new QMimeData();
   data->setData( Addressee::mimeType(), vcard );
   QVERIFY( VCardDrag::canDecode( data ) );
@@ -121,8 +119,6 @@
   const QByteArray vcard = converter.createVCard( mAddressee1 );
   QVERIFY( !vcard.isEmpty() );
 
-  QCOMPARE( Addressee::mimeType(), VCardDrag::mimeType() );
-
   QByteArray content;
 
   QMimeData *data = new QMimeData();
--- trunk/KDE/kdepimlibs/kabc/vcarddrag.cpp #1126224:1126225
@@ -32,15 +32,15 @@
 static QString findCompatibleMimeType( const QMimeData *md )
 {
   // check the canonical MIME type first
-  if ( md->hasFormat( VCardDrag::mimeType() ) ) {
-    return VCardDrag::mimeType();
+  if ( md->hasFormat( KABC::Addressee::mimeType() ) ) {
+    return KABC::Addressee::mimeType();
   }
 
   const QStringList mimeTypeOffers = md->formats();
   Q_FOREACH( const QString &mimeType, mimeTypeOffers ) {
    const KMimeType::Ptr mimeTypePtr = KMimeType::mimeType( mimeType, KMimeType::ResolveAliases );
     if ( !mimeTypePtr.isNull() ) {
-      if ( mimeTypePtr->is( VCardDrag::mimeType() ) ) {
+      if ( mimeTypePtr->is( KABC::Addressee::mimeType() ) ) {
         return mimeType;
       }
     }
@@ -49,14 +49,9 @@
   return QString();
 }
 
-QString VCardDrag::mimeType()
-{
-  return Addressee::mimeType();
-}
-
 bool VCardDrag::populateMimeData( QMimeData *md, const QByteArray &content )
 {
-  md->setData( mimeType(), content );
+  md->setData( KABC::Addressee::mimeType(), content );
   return true;
 }
 
--- trunk/KDE/kdepimlibs/kabc/vcarddrag.h #1126224:1126225
@@ -24,7 +24,7 @@
 
 #include "kabc_export.h"
 
-#include <kabc/contact.h>
+#include <kabc/addressee.h>
 
 namespace KABC {
 
@@ -38,16 +38,6 @@
 namespace VCardDrag
 {
   /**
-    Mime-type of vCard.
-
-    @see Addressee::mimeType()
-
-    @return the MIME type used for vcards: @c text/directory
-  */
-  //AK_REVIEW: remove in favor of KABC::Addressee::mimeType()
-  KABC_EXPORT QString mimeType();
-
-  /**
     Adds the vCard representation as data of the drag object.
 
     @param md the object to set the data on
[prev in list] [next in list] [prev in thread] [next in thread]