1 files changed, 4 insertions, 1 deletions

diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index b36dc1a..9aa517c 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -164,244 +164,247 @@ void IncidenceBase::setOrganizer(const QString &o)
 
 QString IncidenceBase::organizer() const
 {
   return mOrganizer;
 }
 
 void IncidenceBase::setReadOnly( bool readOnly )
 {
   mReadOnly = readOnly;
 }
 
 void IncidenceBase::setDtStart(const QDateTime &dtStart)
 {
 //  if (mReadOnly) return;
   mDtStart = getEvenTime(dtStart);
   updated();
 }
 
 QDateTime IncidenceBase::dtStart() const
 {
   return mDtStart;
 }
 
 QString IncidenceBase::dtStartTimeStr() const
 {
   return KGlobal::locale()->formatTime(dtStart().time());
 }
 
 QString IncidenceBase::dtStartDateStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDate(dtStart().date(),shortfmt);
 }
 
 QString IncidenceBase::dtStartStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDateTime(dtStart(), shortfmt);
 }
 
 
 bool IncidenceBase::doesFloat() const
 {
   return mFloats;
 }
 
 void IncidenceBase::setFloats(bool f)
 {
   if (mReadOnly) return;
   mFloats = f;
   updated();
 }
 
 
 void IncidenceBase::addAttendee(Attendee *a, bool doupdate)
 {
   if (mReadOnly) return;
   if (a->name().left(7).upper() == "MAILTO:")
     a->setName(a->name().remove(0,7));
 
   mAttendees.append(a);
   if (doupdate) updated();
 }
 
 #if 0
 void IncidenceBase::removeAttendee(Attendee *a)
 {
   if (mReadOnly) return;
   mAttendees.removeRef(a);
   updated();
 }
 
 void IncidenceBase::removeAttendee(const char *n)
 {
   Attendee *a;
 
   if (mReadOnly) return;
   for (a = mAttendees.first(); a; a = mAttendees.next())
     if (a->getName() == n) {
       mAttendees.remove();
       break;
     }
 }
 #endif
 
 void IncidenceBase::clearAttendees()
 {
   if (mReadOnly) return;
   mAttendees.clear();
 }
 
 #if 0
 Attendee *IncidenceBase::getAttendee(const char *n) const
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
   while (qli) {
     if (qli.current()->getName() == n)
       return qli.current();
     ++qli;
   }
   return 0L;
 }
 #endif
 
 Attendee *IncidenceBase::attendeeByMail(const QString &email)
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
   while (qli) {
       if (qli.current()->email().lower() == email.lower())
       return qli.current();
     ++qli;
   }
   return 0L;
 }
 
 Attendee *IncidenceBase::attendeeByMails(const QStringList &emails, const QString& email)
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   QStringList mails = emails;
   if (!email.isEmpty()) {
     mails.append(email);
   }
   qli.toFirst();
   while (qli) {
     for ( QStringList::Iterator it = mails.begin(); it != mails.end(); ++it ) {
         if (qli.current()->email().lower() == (*it).lower())
         return qli.current();
      }
 
     ++qli;
   }
   return 0L;
 }
 
 void IncidenceBase::setDuration(int seconds)
 {
   mDuration = seconds;
   setHasDuration(true);
 }
 
 int IncidenceBase::duration() const
 {
   return mDuration;
 }
 
 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::tempSyncStat() const
 {
   return mTempSyncStat;
 }
 void IncidenceBase::setTempSyncStat( int id )
 {
   if (mReadOnly) return;
   mTempSyncStat = id;
 }
 
 void IncidenceBase::removeID(const QString &prof)
 {
-    mExternalId = KIdManager::removeId ( mExternalId, prof);
+    if ( prof.isEmpty() )
+        mExternalId = ":";
+    else
+        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 , 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 );
   }
 }