openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File r708854.diff of Package kdepim3

------------------------------------------------------------------------
r708854 | tokoe | 2007-09-05 22:59:57 +0200 (Wed, 05 Sep 2007) | 3 lines

Forward port of patch which fixes vCard loading when
KAddressBook is used as part in Kontact

------------------------------------------------------------------------
--- kaddressbook/xxportmanager.cpp
+++ kaddressbook/xxportmanager.cpp
@@ -66,7 +66,7 @@ void XXPortManager::importVCard( const K
   importURL = KURL();
 }
 
-void XXPortManager::importVCard( const QString &vCard )
+void XXPortManager::importVCardFromData( const QString &vCard )
 {
   importData = vCard;
   slotImport( "vcard", "<empty>" );
--- kaddressbook/interfaces/core.h
+++ kaddressbook/interfaces/core.h
@@ -166,7 +166,7 @@ class KDE_EXPORT Core : public QObject
     /**
       DCOP METHOD: Imports the given vCard.
      */
-    virtual void importVCard( const QString& vCard ) = 0;
+    virtual void importVCardFromData( const QString& vCard ) = 0;
 
     /**
       DCOP METHOD: Opens contact editor to input a new contact.
--- kaddressbook/kaddressbook_part.h
+++ kaddressbook/kaddressbook_part.h
@@ -49,7 +49,8 @@ class KAddressbookPart: public KParts::R
     virtual void loadProfile( const QString& path );
   public slots:
     virtual void addEmail( QString addr );
-    virtual void importVCard( const QString& vCardURL );
+    virtual void importVCard( const KURL& url );
+    virtual void importVCardFromData( const QString& vCard );
     virtual ASYNC showContactEditor( QString uid );
     virtual void newContact();
     virtual void newDistributionList();
--- kaddressbook/kaddressbookmain.h
+++ kaddressbook/kaddressbookmain.h
@@ -52,7 +52,8 @@ class KAddressBookMain : public KMainWin
 
   public slots:
     virtual void addEmail( QString addr );
-    virtual void importVCard( const QString& vCardURL );
+    virtual void importVCard( const KURL& url );
+    virtual void importVCardFromData( const QString& vCard );
     virtual ASYNC showContactEditor( QString uid );
     virtual void newContact();
     virtual void newDistributionList();
--- kaddressbook/kaddressbook_part.cpp
+++ kaddressbook/kaddressbook_part.cpp
@@ -87,9 +87,14 @@ void KAddressbookPart::addEmail( QString
   mCore->addEmail( addr );
 }
 
-void KAddressbookPart::importVCard( const QString& vCardURL )
+void KAddressbookPart::importVCard( const KURL& url )
 {
-  mCore->importVCard( vCardURL );
+  mCore->importVCard( url );
+}
+
+void KAddressbookPart::importVCardFromData( const QString& vCard )
+{
+  mCore->importVCardFromData( vCard );
 }
 
 ASYNC KAddressbookPart::showContactEditor( QString uid )
--- kaddressbook/kaddressbookservice.cpp
+++ kaddressbook/kaddressbookservice.cpp
@@ -30,9 +30,9 @@ KAddressBookService::KAddressBookService
 {
 }
 
-void KAddressBookService::importVCard( const QString& vCard )
+void KAddressBookService::importVCardFromData( const QString& vCard )
 {
-  mCore->importVCard( vCard );
+  mCore->importVCardFromData( vCard );
 }
 
 void KAddressBookService::importVCard( const KURL& url )
--- kaddressbook/kabcore.cpp
+++ kaddressbook/kabcore.cpp
@@ -687,9 +687,9 @@ void KABCore::importVCard( const KURL &u
   mXXPortManager->importVCard( url );
 }
 
-void KABCore::importVCard( const QString &vCardURL )
+void KABCore::importVCardFromData( const QString &vCard )
 {
-  mXXPortManager->importVCard( vCardURL );
+  mXXPortManager->importVCardFromData( vCard );
 }
 
 void KABCore::editContact( const QString &uid )
--- kaddressbook/kaddressbookiface.h
+++ kaddressbook/kaddressbookiface.h
@@ -25,6 +25,7 @@
 #define KADDRESSBOOKIFACE_H
 
 #include <dcopobject.h>
+#include <kurl.h>
 #include <qstringlist.h>
 #include <kdepimmacros.h>
 
@@ -34,7 +35,8 @@ class KDE_EXPORT KAddressBookIface : vir
 
   k_dcop:
     virtual void addEmail( QString addr ) = 0;
-    virtual void importVCard( const QString& vCardURL ) = 0;
+    virtual void importVCard( const KURL& url ) = 0;
+    virtual void importVCardFromData( const QString& vCard ) = 0;
 
     virtual ASYNC showContactEditor( QString uid ) = 0;
 
--- kaddressbook/kaddressbookservice.h
+++ kaddressbook/kaddressbookservice.h
@@ -40,7 +40,7 @@ class KAddressBookService : virtual publ
 
       @param vCard The vCard in string representation.
      */
-    void importVCard( const QString& vCard );
+    void importVCardFromData( const QString& vCard );
 
     /**
       This method will add a vcard to the address book.
--- kaddressbook/xxportmanager.h
+++ kaddressbook/xxportmanager.h
@@ -53,7 +53,7 @@ class KDE_EXPORT XXPortManager : public 
 
   public slots:
     void importVCard( const KURL &url );
-    void importVCard( const QString &vCard );
+    void importVCardFromData( const QString &vCard );
 
   signals:
     void modified();
--- kaddressbook/kabcore.h
+++ kaddressbook/kabcore.h
@@ -301,7 +301,7 @@ class KDE_EXPORT KABCore : public KAB::C
     /**
       DCOP METHOD: Imports the given vCard.
      */
-    virtual void importVCard( const QString& vCardURL );
+    virtual void importVCardFromData( const QString& vCard );
 
     /**
       DCOP METHOD: Opens contact editor to input a new contact.
--- kaddressbook/kaddressbookmain.cpp
+++ kaddressbook/kaddressbookmain.cpp
@@ -84,9 +84,14 @@ void KAddressBookMain::addEmail( QString
   mCore->addEmail( addr );
 }
 
-void KAddressBookMain::importVCard( const QString& file )
+void KAddressBookMain::importVCard( const KURL& url )
 {
-  mCore->importVCard( KURL( file ) );
+  mCore->importVCard( url );
+}
+
+void KAddressBookMain::importVCardFromData( const QString& vCard )
+{
+  mCore->importVCardFromData( vCard );
 }
 
 ASYNC KAddressBookMain::showContactEditor( QString uid )
--- libkdepim/interfaces/AddressBookServiceIface.h
+++ libkdepim/interfaces/AddressBookServiceIface.h
@@ -43,7 +43,7 @@ namespace KPIM {
 
         @param vCard The vCard in string representation.
        */
-      virtual void importVCard( const QString& vCard ) = 0;
+      virtual void importVCardFromData( const QString& vCard ) = 0;
 
       /**
         This method will add a vcard to the address book.

Places

File r708854.diff of Package kdepim3

Places