1 files changed, 5 insertions, 47 deletions

diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 95e16b6..4adcae4 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -391,96 +391,54 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da
     database->writeField(ZdbAdrs::Anniversary, dateS );
     database->writeField(ZdbAdrs::Children, addr.custom( "KADDRESSBOOK", "X-Children" ));
     dt = addr.birthday().date(); 
     dateS = ""; 
     if ( dt.isValid() ) {
         dateS =  KGlobal::locale()->formatDate(dt, true );
     }
     database->writeField(ZdbAdrs::Birthday, dateS);
     database->writeField(ZdbAdrs::Nickname, addr.nickName());
 
     // other
     database->writeField(ZdbAdrs::Notes, addr.note());
 
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const; 
 
 
 	//qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works");
 
     return true;
 }
 
 
 bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact )
 {  
     QStringList list = addr.categories();
 
 	QArray<int> ids(list.count());
 	uint index = 0;
 	for(uint i=0; i<ids.size(); i++){
 		if(catDB->exists(list[i])){
 			ids[index] = catDB->id(list[i]);
-            qDebug("set ex cat %d %s ",ids[index] , list[i].latin1());
+            //qDebug("set exist cat %d %s ",ids[index] , list[i].latin1());
 			index++;
 		} else {
 			ids[index] = catDB->addCategory(list[i]);
-            qDebug("add new cat %d %s ",ids[index] , list[i].latin1());
+            //qDebug("add new cat %d %s ",ids[index] , list[i].latin1());
 			index++;
 		}
 	}
     bool res ;
-    if ( res = database->updateCategories(contact, ids) )
-        qDebug("cat updated ");
-    else
-        qDebug("error cat updating ");
+
+    if ( !(res = database->updateCategories(contact, ids) ))
+        qDebug("SharpDTMConverter::Error updating categories");
 
     return res;
 }
 
-#if 0
-	m_pCategories = new SlCategories;
-catDB
-
-	if(categories == QString::null) return true;
-	QStringList list = CSVParser::parse(categories);
-	QArray<int> ids(list.count());
-	uint index = 0;
-	for(uint i=0; i<ids.size(); i++){
-#if 0
-		bool ok;
-		ids[index] = list[i].toInt(&ok);
-		if(ok){
-			index++;
-		} else {
-			if(m_pCategories->exists(list[i])){
-				ids[index] = m_pCategories->id(list[i]);
-				index++;
-			}
-		}
-#else
-		if(m_pCategories->exists(list[i])){
-			ids[index] = m_pCategories->id(list[i]);
-			index++;
-		} else if(m_addCategory){
-			ids[index] = m_pCategories->addCategory(list[i]);
-			index++;
-		}
-#endif
-	}
-	if(ids.size() > 0 && index == 0){
-		return true;
-	} else if(index != ids.size()){
-		ids.resize(index);
-	}
-	if(!m_pZdb->updateCategories(id, ids)){
-		return false;
-	}
-	return true;
-#endif
-
 QDate SharpDTMConverter::convertDate( QString  s)
 {
     QDate dt = KGlobal::locale()->readDate( s ); 
     return dt;
     return QDate ();
 }