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

List:       kde-commits
Subject:    KDE/kdebase/kioslave/ldap
From:       Szombathelyi György <gyurco () freemail ! hu>
Date:       2006-03-17 17:12:29
Message-ID: 1142615549.621483.26776.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 519614 by gyurco:

Ported to new LDIF API.


 M  +6 -9      kio_ldap.cpp  


--- trunk/KDE/kdebase/kioslave/ldap/kio_ldap.cpp #519613:519614
@@ -976,9 +976,7 @@
   LDAPControl **serverctrls = 0, **clientctrls = 0;
   QByteArray buffer;
   int result = 0;
-#warning "kde4: port it"
-#if 0
-  LDIF::ParseVal ret;
+  LDIF::ParseValue ret;
   LDIF ldif;
   ret = LDIF::MoreData;
   int ldaperr;
@@ -1086,12 +1084,12 @@
                   modtype = LDAP_MOD_DELETE;
                   break;
               }
-              addModOp( &lmod, modtype, ldif.attr(), ldif.val() );
+              addModOp( &lmod, modtype, ldif.attr(), ldif.value() );
               break;
             }
             case LDIF::Entry_Add:
-              if ( ldif.val().size() > 0 )
-                addModOp( &lmod, 0, ldif.attr(), ldif.val() );
+              if ( ldif.value().size() > 0 )
+                addModOp( &lmod, 0, ldif.attr(), ldif.value() );
               break;
             default:
               error( ERR_INTERNAL, i18n("The LDIF parser failed.") );
@@ -1100,11 +1098,11 @@
           }
           break;
         case LDIF::Control:
-          addControlOp( &serverctrls, ldif.oid(), ldif.val(), ldif.critical() );
+          addControlOp( &serverctrls, ldif.oid(), ldif.value(), ldif.isCritical() );
           break;
         case LDIF::Err:
           error( ERR_SLAVE_DEFINED,
-            i18n( "Invalid LDIF file in line %1." ).arg( ldif.lineNo() ) );
+            i18n( "Invalid LDIF file in line %1." ).arg( ldif.lineNumber() ) );
           FREELDAPMEM;
           return;
       }
@@ -1112,7 +1110,6 @@
   } while ( result > 0 );
 
   FREELDAPMEM;
-#endif  
   finished();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]