More sync stuff converted

3 files changed, 35 insertions, 94 deletions

diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 5d8785b..15c4fa8 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -1,96 +1,95 @@
 /*
     This file is part of libkcal.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
+#include <kidmanager.h>
 
 #include "calformat.h"
 
 #include "incidencebase.h"
 
 using namespace KCal;
 
 IncidenceBase::IncidenceBase() :
   mReadOnly(false), mFloats(true), mDuration(0), mHasDuration(false),
   mPilotId(0), mSyncStatus(SYNCMOD)
 {
   setUid(CalFormat::createUniqueId());
   mOrganizer = "";
   mFloats = false;
   mDuration = 0;
   mHasDuration = false;
-  mPilotId = 0; 
-  mZaurusUid = 0;
+  mPilotId = 0;
   mExternalId = ":";
   mTempSyncStat = 0;
   mSyncStatus = 0;
   mAttendees.setAutoDelete( true );
 }
 
 IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   CustomProperties( i )
 {
   mReadOnly = i.mReadOnly;
   mDtStart = i.mDtStart;
   mDuration = i.mDuration;
   mHasDuration = i.mHasDuration;
   mOrganizer = i.mOrganizer;
   mUid = i.mUid;
   QPtrList<Attendee> attendees = i.attendees();
   for( Attendee *a = attendees.first(); a; a = attendees.next() ) {
     mAttendees.append( new Attendee( *a ) );
   }
   mFloats = i.mFloats;
   mLastModified = i.mLastModified;
   mPilotId = i.mPilotId;
-  mZaurusUid = i.mZaurusUid;
   mTempSyncStat = i.mTempSyncStat;
   mSyncStatus = i.mSyncStatus;
   mExternalId = i.mExternalId;
   // The copied object is a new one, so it isn't observed by the observer
   // of the original object.
   mObservers.clear();
   
   mAttendees.setAutoDelete( true );
 }
 
 IncidenceBase::~IncidenceBase()
 {
 }
 
 
 bool KCal::operator==( const IncidenceBase& i1, const IncidenceBase& i2 )
 {
     // do not compare mSyncStatus and mExternalId 
     if( i1.attendees().count() != i2.attendees().count() ) {
         return false; // no need to check further
     }
     if ( i1.attendees().count() > 0 ) {
         Attendee * a1 = i1.attendees().first(), *a2 =i2.attendees().first() ;
         while ( a1 ) {
             if ( !( (*a1) == (*a2)) ) 
                 {
                     //qDebug("Attendee not equal ");
                     return false;
                 }
             a1 = i1.attendees().next();
             a2 = i2.attendees().next();
         }
@@ -312,151 +311,96 @@ int IncidenceBase::duration() const
 void IncidenceBase::setHasDuration(bool b)
 {
   mHasDuration = b;
 }
 
 bool IncidenceBase::hasDuration() const
 {
   return mHasDuration;
 }
 
 void IncidenceBase::setSyncStatus(int stat)
 {
   if (mReadOnly) return;
   mSyncStatus = stat;
 }
 
 int IncidenceBase::syncStatus() const
 {
   return mSyncStatus;
 }
 
 void IncidenceBase::setPilotId( int id )
 {
   if (mReadOnly) return;
   mPilotId = id;
 }
 
 int IncidenceBase::pilotId() const
 {
   return mPilotId;
 }
 
-int IncidenceBase::zaurusUid() const
-{
-  return mZaurusUid;
-}
-void IncidenceBase::setZaurusUid( int id )
-{
-  if (mReadOnly) return;
-  mZaurusUid = id;
-}
-
 int IncidenceBase::tempSyncStat() const
 {
   return mTempSyncStat;
 }
 void IncidenceBase::setTempSyncStat( int id )
 {
   if (mReadOnly) return;
   mTempSyncStat = id;
 }
 
-void IncidenceBase::setID( const QString & prof , int id )
+void IncidenceBase::removeID(const QString &prof)
 {
-    int num = mExternalId.find( ":"+prof+";" );
-    if ( num >= 0 ) {
-        int len = prof.length()+2;
-        int end = mExternalId.find( ";", num+len );
-        if ( end > 0 ) {
-            mExternalId = mExternalId.left( num+len ) +QString::number( id)+mExternalId.mid( end );
-        } else
-            qDebug("Error in IncidenceBase::setID ");
-    } else {
-        mExternalId += prof+";"+QString::number( id) +";0:";
-    }
-    qDebug("setID*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() );
-}
-int IncidenceBase::getID( const QString &  prof)
-{
-    int ret = -1;
-    int num = mExternalId.find(":"+ prof+";" );
-    if ( num >= 0 ) {
-        int len = prof.length()+2;
-        int end = mExternalId.find( ";", num+len );
-        if ( end > 0 ) {
-            bool ok;
-            ret = mExternalId.mid ( num + len,end-len-num).toInt( &ok );
-            if (!ok)
-                ret = -1;
-        }
-    }
-    qDebug("getID*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() );
-    return ret; 
+    mExternalId = KIdManager::removeId ( mExternalId, prof);
+
+}
+void IncidenceBase::setID( const QString & prof , const QString & id )
+{
+    mExternalId = KIdManager::setId ( mExternalId, prof, id );
+}
+QString IncidenceBase::getID( const QString &  prof)
+{
+    return KIdManager::getId ( mExternalId, prof ); 
 }
 
 // example  :Sharp_DTM;22;23566:TP;-1;8654:TPP;18;0:
 // format name;III;JJJ:  III >= 0, may be -1.  JJJ always >= 0  
-void IncidenceBase::setCsum( const QString & prof , int id )
-{
-    int num = mExternalId.find( ":"+prof+";");
-    if ( num >= 0 ) {
-        int len = prof.length()+2;
-        num = mExternalId.find(  ";", num+len );
-        int end = mExternalId.find( ":", num+1 );
-        if ( end > 0 ) {
-            mExternalId = mExternalId.left( num ) +QString::number(id)+mExternalId.mid( end );
-        } else
-            qDebug("Error in IncidenceBase::setCsum ");
-    } else {
-        mExternalId += prof+";-1;"+QString::number( id) +":";
-    }
-    qDebug("setCsum*%s*%d*%s* ", prof.latin1(), id,mExternalId.latin1() );
-}
-int IncidenceBase::getCsum( const QString &  prof)
-{
-    int ret = -1;
-    int num = mExternalId.find( ":"+prof+";" );
-    if ( num >= 0 ) {
-        int len = prof.length()+2;
-        num = mExternalId.find(  ";", num+len );
-        int end = mExternalId.find( ":", num+1 );
-        if ( end > 0 ) {
-            bool ok;
-            ret = mExternalId.mid ( num ,end-num).toInt( &ok );
-            if (!ok)
-                ret = -1;
-        }
-    }
-    qDebug("getCsum*%s*%d*%s* ", prof.latin1(), ret,mExternalId.latin1() );
-    return ret;
+void IncidenceBase::setCsum( const QString & prof , const QString & id )
+{
+    mExternalId = KIdManager::setCsum ( mExternalId, prof, id );
+}
+QString IncidenceBase::getCsum( const QString &  prof)
+{
+    return KIdManager::getCsum ( mExternalId, prof ); 
 }
 
 void IncidenceBase::setIDStr( const QString & s )
 {
   if (mReadOnly) return;
   mExternalId = s;
 }
 
 QString IncidenceBase::IDStr() const
 {
     return mExternalId ;
 }
 void IncidenceBase::registerObserver( IncidenceBase::Observer *observer )
 {
   if( !mObservers.contains(observer) ) mObservers.append( observer );
 }
 
 void IncidenceBase::unRegisterObserver( IncidenceBase::Observer *observer )
 {
   mObservers.remove( observer );
 }
 
 void IncidenceBase::updated()
 {
   QPtrListIterator<Observer> it(mObservers);
   while( it.current() ) {
     Observer *o = it.current();
     ++it;
     o->incidenceUpdated( this );
   }
 }
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index e2950d3..e02d03a 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -97,79 +97,76 @@ class IncidenceBase : public CustomProperties
     void setFloats(bool f);
 
     /**
       Add Attendee to this incidence. IncidenceBase takes ownership of the
       Attendee object.
     */
     void addAttendee(Attendee *a, bool doupdate=true );
 //    void removeAttendee(Attendee *a);
 //    void removeAttendee(const char *n);
     /** Remove all Attendees. */
     void clearAttendees();
     /** Return list of attendees. */
     QPtrList<Attendee> attendees() const { return mAttendees; };
     /** Return number of attendees. */
     int attendeeCount() const { return mAttendees.count(); };
     /** Return the Attendee with this email */
     Attendee* attendeeByMail(const QString &);
     /** Return first Attendee with one of this emails */
     Attendee* attendeeByMails(const QStringList &, const QString& email = QString::null);
 
     /** pilot syncronization states */
     enum { SYNCNONE = 0, SYNCMOD = 1, SYNCDEL = 3 };
     /** Set synchronisation satus. */
     void setSyncStatus(int stat);
     /** Return synchronisation status. */
     int syncStatus() const;
 
     /** Set Pilot Id. */
     void setPilotId(int id);
     /** Return Pilot Id. */
     int pilotId() const;
 
-    void setZaurusUid(int id);
-    int zaurusUid() const;
     void setTempSyncStat(int id);
     int tempSyncStat() const;
     void setIDStr( const QString & );
     QString IDStr() const;
-    void setID( const QString &, int );
-    int getID( const QString & );
-    void setCsum( const QString &, int );
-    int getCsum( const QString & );
-
+    void setID( const QString &, const QString & );
+    QString  getID( const QString & );
+    void setCsum( const QString &, const QString & );
+    QString getCsum( const QString & );
+    void removeID(const QString &);
 
     void registerObserver( Observer * );
     void unRegisterObserver( Observer * );
     void updated();
 
   protected:
     bool mReadOnly;
     QDateTime getEvenTime( QDateTime );
 
   private:
     // base components
     QDateTime mDtStart;
     QString mOrganizer;
     QString mUid;
     QDateTime mLastModified;
     QPtrList<Attendee> mAttendees;
 
     bool mFloats;
 
     int mDuration;
     bool mHasDuration;
     QString  mExternalId;
-    int mZaurusUid;
     int mTempSyncStat;
 
     // PILOT SYNCHRONIZATION STUFF
     int mPilotId;                         // unique id for pilot sync
     int mSyncStatus;                      // status (for sync)
 
     QPtrList<Observer> mObservers;
 };
 
 bool operator==( const IncidenceBase&, const IncidenceBase& );
 }
 
 #endif
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 605a54d..e8934bf 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -61,66 +61,66 @@ using namespace KCal;
 //MDAY
 
 class SharpParser : public QObject
 {
   public:
     SharpParser( Calendar *calendar ) : mCalendar( calendar ) {
         oldCategories = 0;
     }
   
     bool startElement( Calendar *existingCalendar, const QStringList & attList, QString qName )
     {
         int i = 1;
         bool skip = true;
         int max = attList.count() -2;
         while ( i < max ) {
             if ( !attList[i].isEmpty() ) {
                 skip = false;
                 break;
             } 
             ++i ;
         }
         if ( skip )
             return false;
         ulong cSum = SharpFormat::getCsum(attList );
         
         if ( qName == "Event" ) {
             Event *event;
             event = existingCalendar->event( "Sharp_DTM",attList[0].toInt() );
             if ( event )
                 event = (Event*)event->clone();
             else
                 event = new Event;
-            event->setID("Sharp_DTM", attList[0].toInt() );
-            event->setZaurusUid( cSum );
+            event->setID("Sharp_DTM", attList[0] );
+            event->setCsum( "Sharp_DTM", QString::number( cSum ));
             event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL );
 
             event->setSummary( attList[2] );
             event->setLocation( attList[3] );
             event->setDescription( attList[4]  );
             if ( attList[7] == "1" ) {
                 event->setDtStart( QDateTime(fromString( attList[17]+"000000", false ).date(),QTime(0,0,0 ) ));
                 event->setDtEnd( QDateTime(fromString( attList[18]+"000000", false ).date(),QTime(0,0,0 )));
                 event->setFloats( true );
             } else {
                 event->setFloats( false );
                 event->setDtStart( fromString( attList[5] ) );
                 event->setDtEnd( fromString( attList[6]  ));
             }
         
             QString rtype = attList[11];
             if ( rtype != "255" ) {
                 //  qDebug("recurs ");
                 QDate startDate = event->dtStart().date();
         
                 QString freqStr = attList[12];
                 int freq = freqStr.toInt();
 
                 QString hasEndDateStr = attList[15] ;
                 bool hasEndDate = hasEndDateStr == "1";
         
                 QString endDateStr = attList[16];
                 QDate endDate = fromString( endDateStr ).date();
 
                 QString weekDaysStr = attList[14];
                 uint weekDaysNum = weekDaysStr.toInt();
         
@@ -172,66 +172,66 @@ class SharpParser : public QObject
 
             // strange 0 semms to mean: alarm enabled
             if ( attList[8] == "0" ) {
                 Alarm *alarm;
                 if (  event->alarms().count() > 0 )
                     alarm = event->alarms().first();
                 else {
                     alarm = new Alarm( event );
                     event->addAlarm( alarm );
                 }
                 alarm->setType( Alarm::Audio );
                 alarm->setEnabled( true );
                 int alarmOffset = attList[9].toInt();
                 alarm->setStartOffset( alarmOffset * -60 );
             }
         
             mCalendar->addEvent( event);
         } else if ( qName == "Todo" ) {
             Todo *todo;
 
             todo = existingCalendar->todo( "Sharp_DTM", attList[0].toInt() );
             if (todo )
                 todo = (Todo*)todo->clone();
             else
                 todo = new Todo;
 
 //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1
 //  0      1       2    3    4    5    6    7    8
 //1,,,,,1,4,Loch zumachen,""
 //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb ""   "
 //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes
      
-            todo->setID( "Sharp_DTM", attList[0].toInt() );
-            todo->setZaurusUid( cSum );
+            todo->setID( "Sharp_DTM", attList[0]);
+            todo->setCsum( "Sharp_DTM", QString::number( cSum ));
             todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
       
             todo->setSummary( attList[7] );
             todo->setDescription( attList[8]);
         
             int priority = attList[6].toInt();
             if ( priority == 0 ) priority = 3;
             todo->setPriority( priority );
         
             QString categoryList = attList[1];
             todo->setCategories( lookupCategories( categoryList ) );
         
        
         
             QString hasDateStr = attList[3]; // due
             if ( !hasDateStr.isEmpty() ) {
                 if ( hasDateStr.right(6) == "000000" ) {
                     todo->setDtDue( QDateTime(fromString( hasDateStr, false ).date(), QTime(0,0,0 )) );
                     todo->setFloats( true );
                 }
                 else {
                     todo->setDtDue( fromString( hasDateStr ) );
                     todo->setFloats( false );
                 }
                 
                 todo->setHasDueDate( true );
             }
             hasDateStr = attList[2];//start
             if ( !hasDateStr.isEmpty() ) {
           
                 todo->setDtStart( fromString( hasDateStr ) );
                 todo->setHasStartDate( true);
@@ -437,119 +437,119 @@ int  SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
     start = end;
     int ccc = 0;
     while ( start > 0 ) {
         templist.clear();
         ok = true;
         int loopCount = 0;
         while ( ok ) {
             ++loopCount;
             if ( loopCount >  25 ) {
                 qDebug("KO: Error in while loop"); 
                 ok = false;
                 start = 0;
                 break;
             }
             if ( ok )
                 tempString = getPart(  answer, ok, start );
             if ( start >= len || start == 0 ) {
                 start = 0;
                 ok = false;
             }
             if ( tempString.right(1) =="\n" )
                 tempString = tempString.left( tempString.length()-1);
            
             templist.append( tempString ); 
         }
         ++ccc;
         if ( ccc == 2 && loopCount < 25 ) { 
             start = 0;
             bool ok;
             int newnum = templist[0].toInt( &ok );
             if ( ok && newnum > 0) {
                 retval = newnum; 
-                inc->setID( "Sharp_DTM",newnum );
-                inc->setZaurusUid( getCsum( templist ) );
+                inc->setID( "Sharp_DTM",templist[0] );
+                inc->setCsum( "Sharp_DTM", QString::number( getCsum( templist ) ));
                 inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
             }
         }
     }
     //qDebug("getNumFromRecord returning : %d ", retval);
     return retval;
 }
 bool SharpFormat::save( Calendar *calendar)
 {
 
     QLabel status ( i18n("Processing/adding events ..."), 0 );
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 200;
     int h = status.sizeHint().height()+20 ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     status.setCaption(i18n("Writing DTM Data") );
     status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     status.show();
     status.raise();
     qApp->processEvents();
     bool debug = DEBUGMODE;
     QString codec = "utf8";
     QString answer;
     QString ePrefix = "CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY\n";
     QString tPrefix = "CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1\n";
     QString command;
     QPtrList<Event> er = calendar->rawEvents(); 
     Event* ev = er.first();
     QString  fileName = "/tmp/kopitempout";
     int i = 0;
     QString changeString = ePrefix;
     QString  deleteString = ePrefix;
     bool deleteEnt = false;
     bool changeEnt = false;
     QString message = i18n("Processing event # ");
     int procCount = 0;
     while ( ev ) {
         //qDebug("i %d ", ++i);
         if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
             status.setText ( message + QString::number ( ++procCount ) );
              qApp->processEvents();
             QString eString = getEventString( ev );
             if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                 // deleting empty strings does not work.
                 // we write first and x  and then delete the record with the x
                 eString = eString.replace( QRegExp(",\"\""),",\"x\"" );
                 changeString += eString + "\n";
                 deleteString += eString + "\n";
                 deleteEnt = true;
                 changeEnt = true;
                 }
-            else  if ( ev->getID("Sharp_DTM") == -1  ) {       // add new 
+            else  if ( ev->getID("Sharp_DTM").isEmpty()  ) {       // add new 
                 command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
                 system (  command.utf8() );
                 QFile file( fileName );
                 if (!file.open( IO_ReadOnly ) ) {
                     return false;
                     
                 } 
                 QTextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
                 file.close();  
                 //qDebug("answer \n%s ", answer.latin1());
                 getNumFromRecord( answer, ev  ) ;
 
             }
             else { // change existing
                 //qDebug("canging %d %d",ev->zaurusStat() ,ev->zaurusId() );
                 //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
                 changeString += eString + "\n";
                 changeEnt = true;
 
             }
         } 
         ev =  er.next();
     }
     status.setText ( i18n("Changing events ...") );
     qApp->processEvents();
     //qDebug("changing... ");
     if ( changeEnt ) {
         QFile file( fileName );
         if (!file.open( IO_WriteOnly ) ) {
             return false;
@@ -577,65 +577,65 @@ bool SharpFormat::save( Calendar *calendar)
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << deleteString;
         file.close();
         command = "db2file datebook -d -c " + codec+ " < "+ fileName;
         system ( command.latin1() );
         // qDebug("command %s file :\n%s ", command.latin1(), deleteString.latin1());
     }
 
 
     changeString = tPrefix;
     deleteString = tPrefix;
     status.setText ( i18n("Processing todos ...") );
     qApp->processEvents();
     QPtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     i = 0;
     message = i18n("Processing todo # ");
     procCount = 0;
     while ( to ) {
        if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
              status.setText ( message + QString::number ( ++procCount ) );
              qApp->processEvents();
             QString eString = getTodoString( to );
             if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                 // deleting empty strings does not work.
                 // we write first and x  and then delete the record with the x
                 eString = eString.replace( QRegExp(",\"\""),",\"x\"" );
                 changeString += eString + "\n";
                 deleteString += eString + "\n";
                 deleteEnt = true;
                 changeEnt = true;
                 }
-            else  if ( to->getID("Sharp_DTM") == -1  ) {       // add new 
+            else  if ( to->getID("Sharp_DTM").isEmpty() ) {       // add new 
                 command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName;
                 system (  command.utf8() );
                 QFile file( fileName );
                 if (!file.open( IO_ReadOnly ) ) {
                     return false;
                     
                 } 
                 QTextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
                 file.close();  
                 //qDebug("answer \n%s ", answer.latin1());
                 getNumFromRecord( answer, to  ) ;
 
             }
             else { // change existing
                 //qDebug("canging %d %d",to->zaurusStat() ,to->zaurusId() );
                 //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
                 changeString += eString + "\n";
                 changeEnt = true;
 
             }
         } 
         
         to = tl.next();
     }
     status.setText ( i18n("Changing todos ...") );
     qApp->processEvents();
     //qDebug("changing... ");
     if ( changeEnt ) {
         QFile file( fileName );
         if (!file.open( IO_WriteOnly ) ) {
@@ -667,65 +667,65 @@ bool SharpFormat::save( Calendar *calendar)
         command = "db2file todo -d -c " + codec+ " < "+ fileName;
         system ( command.latin1() );
         // qDebug("command %s file :\n%s ", command.latin1(), deleteString.latin1());
     }
         
   return true;
 }
 QString SharpFormat::dtToString( const QDateTime& dti, bool useTZ )
 {
 	QString datestr;
 	QString timestr;
     int offset =  KGlobal::locale()->localTimeOffset( dti );
     QDateTime   dt;
     if (useTZ)
         dt =  dti.addSecs ( -(offset*60));
     else
         dt =  dti;
 	if(dt.date().isValid()){
 		const QDate& date = dt.date();
 		datestr.sprintf("%04d%02d%02d",
     		date.year(), date.month(), date.day());
 	}
 	if(dt.time().isValid()){
 		const QTime& time = dt.time();
 		timestr.sprintf("T%02d%02d%02d",
     		time.hour(), time.minute(), time.second());
 	}
 	return datestr + timestr;
 }
 QString SharpFormat::getEventString( Event* event )
 {
     QStringList list;
-    list.append( QString::number(event->getID("Sharp_DTM") ) );
+    list.append( event->getID("Sharp_DTM")  );
     list.append( event->categories().join(",") );
     if ( !event->summary().isEmpty() )
         list.append( event->summary() );
     else
         list.append("" );
     if ( !event->location().isEmpty() )
         list.append( event->location() );
     else
         list.append("" );
     if ( !event->description().isEmpty() )
         list.append( event->description() );
     else
         list.append( "" );
     if ( event->doesFloat () ) {
         list.append( dtToString( QDateTime(event->dtStart().date(), QTime(0,0,0)), false ));
         list.append( dtToString( QDateTime(event->dtEnd().date(),QTime(23,59,59)), false )); //6
         list.append( "1" );
 
     }
     else {
         list.append( dtToString( event->dtStart()) );
         list.append( dtToString( event->dtEnd()) ); //6
         list.append( "0" );
     }
     bool noAlarm = true;
     if ( event->alarms().count() > 0 ) {
         Alarm * al = event->alarms().first();
         if ( al->enabled() ) {
             noAlarm = false;
             list.append( "0" ); // yes, 0 == alarm
             list.append( QString::number( al->startOffset().asSeconds()/(-60) ) ); 
             if ( al->type() == Alarm::Audio )
@@ -831,65 +831,65 @@ QString SharpFormat::getEventString( Event* event )
         list.append( dtToString( event->dtEnd(), false ).left( 8 )); //6
         
     }
     else {
         list.append( QString() );
         list.append( QString() );
         
     }
     if (event->dtStart().date() == event->dtEnd().date() )
         list.append( "0" );
     else
         list.append( "1" );
 
 
 		for(QStringList::Iterator it=list.begin();
 				it!=list.end(); ++it){
 			QString& s = (*it);
 			s.replace(QRegExp("\""), "\"\"");
 			if(s.contains(QRegExp("[,\"\r\n]")) || s.stripWhiteSpace() != s){
 				s.prepend('\"');
 				s.append('\"');
 			} else if(s.isEmpty() && !s.isNull()){
 				s = "\"\"";
 			}
 		}
 		return list.join(",");
 
 
 }
 QString SharpFormat::getTodoString( Todo* todo )
 {
     QStringList list;
-    list.append( QString::number( todo->getID("Sharp_DTM") ) );
+    list.append(  todo->getID("Sharp_DTM")  );
     list.append( todo->categories().join(",") );
 
     if ( todo->hasStartDate() ) {
         list.append( dtToString( todo->dtStart()) );
     } else
         list.append( QString() );
 
     if ( todo->hasDueDate() ) {
         QTime tim;
         if ( todo->doesFloat()) {
         list.append( dtToString( QDateTime(todo->dtDue().date(),QTime( 0,0,0  )), false)) ;
         } else {
             list.append( dtToString(todo->dtDue() ) );
         }
     } else
         list.append( QString() );
 
     if ( todo->isCompleted() ) {  
         list.append( dtToString( todo->completed()) );
         list.append( "0" ); // yes 0 == completed
     } else {
         list.append( dtToString( todo->completed()) );
         list.append( "1" );
     }
     list.append( QString::number( todo->priority() ));
     if( ! todo->summary().isEmpty() )
         list.append( todo->summary() );
     else
         list.append( "" );
     if (! todo->description().isEmpty()  )
         list.append( todo->description() );
     else