1 files changed, 21 insertions, 21 deletions

diff --git a/kuser/kgroupldap.cpp b/kuser/kgroupldap.cpp
index 2419c23..c969e19 100644
--- a/kuser/kgroupldap.cpp
+++ b/kuser/kgroupldap.cpp
@@ -53,7 +53,7 @@ KGroupLDAP::KGroupLDAP( KUserPrefsBase *cfg ) : KU::KGroups( cfg )
     mUrl.setExtension( "x-mech", mCfg->ldapsaslmech() );
   }
 
-  mUrl.setScope(KABC::LDAPUrl::One);
+  mUrl.setScope(TDEABC::LDAPUrl::One);
   mUrl.setExtension("x-dir","base");
 
   caps = Cap_Passwd;
@@ -108,13 +108,13 @@ void KGroupLDAP::data( TDEIO::Job*, const TQByteArray& data )
     mParser.endLDIF();
   }
 
-  KABC::LDIF::ParseVal ret;
+  TDEABC::LDIF::ParseVal ret;
   TQString name, val;
   TQByteArray value;
   do {
     ret = mParser.nextItem();
     switch ( ret ) {
-      case KABC::LDIF::Item:
+      case TDEABC::LDIF::Item:
         name = mParser.attr().lower();
         value = mParser.val();
         val = TQString::fromUtf8( value, value.size() );
@@ -138,7 +138,7 @@ void KGroupLDAP::data( TDEIO::Job*, const TQByteArray& data )
         else if ( name == "description" )
           mGroup->setDesc( val );
         break;
-      case KABC::LDIF::EndEntry: {
+      case TDEABC::LDIF::EndEntry: {
         KU::KGroup newGroup;
         mGroups.append( new KU::KGroup( mGroup ) );
         mGroup->copy( &newGroup );
@@ -152,7 +152,7 @@ void KGroupLDAP::data( TDEIO::Job*, const TQByteArray& data )
       default:
         break;
     }
-  } while ( ret != KABC::LDIF::MoreData );
+  } while ( ret != TDEABC::LDIF::MoreData );
 }
 
 bool KGroupLDAP::reload()
@@ -242,18 +242,18 @@ void KGroupLDAP::addData( KU::KGroup *group )
     mUrl.dn().utf8() + "\n" + "objectclass: posixGroup\n";
 
   ldif +=
-    KABC::LDIF::assembleLine( "cn", group->getName() ) + "\n" +
-    KABC::LDIF::assembleLine( "gidnumber", TQString::number(group->getGID()) ) + "\n" +
-    KABC::LDIF::assembleLine( "userpassword", group->getPwd() ) + "\n";
+    TDEABC::LDIF::assembleLine( "cn", group->getName() ) + "\n" +
+    TDEABC::LDIF::assembleLine( "gidnumber", TQString::number(group->getGID()) ) + "\n" +
+    TDEABC::LDIF::assembleLine( "userpassword", group->getPwd() ) + "\n";
   for ( uint i=0; i < group->count(); i++ ) {
-    ldif += KABC::LDIF::assembleLine( "memberuid", group->user(i) ) + "\n";
+    ldif += TDEABC::LDIF::assembleLine( "memberuid", group->user(i) ) + "\n";
   }
   if ( ( getCaps() & Cap_Samba ) && ( group->getCaps() & KU::KGroup::Cap_Samba ) ) {
     ldif += "objectclass: sambagroupmapping\n" +
-      KABC::LDIF::assembleLine( "sambasid", group->getSID().getSID() ) + "\n" +
-      KABC::LDIF::assembleLine( "displayname", group->getDisplayName() ) + "\n" +
-      KABC::LDIF::assembleLine( "description", group->getDesc() ) + "\n" +
-      KABC::LDIF::assembleLine( "sambagrouptype", TQString::number( group->getType() ) ) + "\n";
+      TDEABC::LDIF::assembleLine( "sambasid", group->getSID().getSID() ) + "\n" +
+      TDEABC::LDIF::assembleLine( "displayname", group->getDisplayName() ) + "\n" +
+      TDEABC::LDIF::assembleLine( "description", group->getDesc() ) + "\n" +
+      TDEABC::LDIF::assembleLine( "sambagrouptype", TQString::number( group->getType() ) ) + "\n";
   }
   ldif += "\n\n";
   kdDebug() << "ldif: " << ldif << endl;
@@ -288,26 +288,26 @@ void KGroupLDAP::modData( KU::KGroup *group )
   }
   ldif +=
     "-\nreplace: cn\n" +
-    KABC::LDIF::assembleLine( "cn", group->getName() ) +
+    TDEABC::LDIF::assembleLine( "cn", group->getName() ) +
     "\n-\nreplace: gidnumber\n" +
-    KABC::LDIF::assembleLine( "gidnumber", TQString::number(group->getGID()) ) +
+    TDEABC::LDIF::assembleLine( "gidnumber", TQString::number(group->getGID()) ) +
     "\n-\nreplace: userpassword\n" +
-    KABC::LDIF::assembleLine( "userpassword", group->getPwd() ) +
+    TDEABC::LDIF::assembleLine( "userpassword", group->getPwd() ) +
     "\n-\nreplace: memberuid\n";
   for ( uint i=0; i < group->count(); i++ ) {
-    ldif += KABC::LDIF::assembleLine( "memberuid", group->user(i)) + "\n";
+    ldif += TDEABC::LDIF::assembleLine( "memberuid", group->user(i)) + "\n";
   }
   if ( getCaps() & Cap_Samba ) {
     if ( group->getCaps() & KU::KGroup::Cap_Samba ) {
       ldif +=
         "-\nreplace: sambasid\n" +
-        KABC::LDIF::assembleLine( "sambasid", group->getSID().getSID() ) +
+        TDEABC::LDIF::assembleLine( "sambasid", group->getSID().getSID() ) +
         "\n-\nreplace: displayname\n" +
-        KABC::LDIF::assembleLine( "displayname", group->getDisplayName() ) +
+        TDEABC::LDIF::assembleLine( "displayname", group->getDisplayName() ) +
         "\n-\nreplace: description\n" +
-        KABC::LDIF::assembleLine( "description", group->getDesc() ) +
+        TDEABC::LDIF::assembleLine( "description", group->getDesc() ) +
         "\n-\nreplace: sambagrouptype\n" +
-        KABC::LDIF::assembleLine( "sambagrouptype", TQString::number( group->getType() ) ) + "\n";
+        TDEABC::LDIF::assembleLine( "sambagrouptype", TQString::number( group->getType() ) ) + "\n";
     } else {
       ldif += "-\nreplace: sambasid\n";
       ldif += "-\nreplace: displayname\n";