[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-03-25 14:39:37
Message-ID: 20100325143937.528F2AC876 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1107397 by tokoe:

Copy KLDAP::Ldif and KLDAP::LdapDn to break up
the dependency cycle, that will be caused by future
commits to kldap/


 M  +5 -3      CMakeLists.txt  
 A             ldapdn.cpp   trunk/KDE/kdepimlibs/kldap/ldapdn.cpp#1106664 [License: LGPL (v2+)]
 A             ldapdn_p.h   trunk/KDE/kdepimlibs/kldap/ldapdn.h#1106664 [License: LGPL (v2+)]
 A             ldif.cpp   trunk/KDE/kdepimlibs/kldap/ldif.cpp#1106664 [License: LGPL (v2+)]
 A             ldif_p.h   trunk/KDE/kdepimlibs/kldap/ldif.h#1106664 [License: LGPL (v2+)]
 M  +7 -7      ldifconverter.cpp  
 M  +0 -1      plugins/CMakeLists.txt  


--- trunk/KDE/kdepimlibs/kabc/CMakeLists.txt #1107396:1107397
@@ -53,11 +53,15 @@
    ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
    ${CMAKE_CURRENT_BINARY_DIR}/field.cpp
    addresseedialog.cpp
+   contactgroup.cpp
+   contactgrouptool.cpp
    distributionlist.cpp
    emailselectdialog.cpp
    errorhandler.cpp
    geo.cpp
    key.cpp
+   ldapdn.cpp
+   ldif.cpp
    phonenumber.cpp
    picture.cpp
    plugin.cpp
@@ -73,8 +77,6 @@
    locknull.cpp
    sortmode.cpp
    ${vcards_STAT_SRCS}
-   contactgroup.cpp
-   contactgrouptool.cpp
 )
 
 if (NOT KDEPIM_NO_KRESOURCES)
@@ -95,7 +97,7 @@
 
 kde4_add_library(kabc SHARED ${kabc_LIB_SRCS})
 
-target_link_libraries(kabc kldap ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS})
+target_link_libraries(kabc ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS})
 target_link_libraries(kabc LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS})
 if (NOT KDEPIM_NO_KRESOURCES)
   target_link_libraries(kabc kresources)
--- trunk/KDE/kdepimlibs/kabc/ldifconverter.cpp #1107396:1107397
@@ -37,7 +37,7 @@
 #include "address.h"
 #include "addressee.h"
 
-#include "kldap/ldif.h"
+#include "ldif_p.h"
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -67,7 +67,7 @@
     return;
   }
 
-  QByteArray txt = KLDAP::Ldif::assembleLine( formatStr, value, 72 );
+  QByteArray txt = Ldif::assembleLine( formatStr, value, 72 );
 
   // write the string
   t << QString::fromUtf8( txt ) << "\n";
@@ -188,8 +188,8 @@
   }
 
   bool endldif = false, end = false;
-  KLDAP::Ldif ldif;
-  KLDAP::Ldif::ParseValue ret;
+  Ldif ldif;
+  Ldif::ParseValue ret;
   Addressee a;
   Address homeAddr, workAddr;
 
@@ -205,14 +205,14 @@
   do {
     ret = ldif.nextItem();
     switch ( ret ) {
-      case KLDAP::Ldif::Item:
+      case Ldif::Item:
       {
         QString fieldname = ldif.attr().toLower();
         QString value = QString::fromUtf8( ldif.value(), ldif.value().size() );
         evaluatePair( a, homeAddr, workAddr, fieldname, value );
         break;
       }
-      case KLDAP::Ldif::EndEntry:
+      case Ldif::EndEntry:
       // if the new address is not empty, append it
         if ( !a.formattedName().isEmpty() || !a.name().isEmpty() ||
           !a.familyName().isEmpty() ) {
@@ -229,7 +229,7 @@
         homeAddr = Address( Address::Home );
         workAddr = Address( Address::Work );
         break;
-      case KLDAP::Ldif::MoreData:
+      case Ldif::MoreData:
       {
         if ( endldif ) {
           end = true;
--- trunk/KDE/kdepimlibs/kabc/plugins/CMakeLists.txt #1107396:1107397
@@ -3,4 +3,3 @@
 add_subdirectory( dir )
 add_subdirectory( net )
 add_subdirectory( ldapkio )
-
[prev in list] [next in list] [prev in thread] [next in thread]