From 2448916479b456ca7c880427a80e8e32e95b2fba Mon Sep 17 00:00:00 2001 From: zautrix Date: Wed, 08 Jun 2005 10:56:24 +0000 Subject: more type API changes --- diff --git a/korganizer/incomingdialog.cpp b/korganizer/incomingdialog.cpp index 50e3077..fe78356 100644 --- a/korganizer/incomingdialog.cpp +++ b/korganizer/incomingdialog.cpp @@ -178,7 +178,7 @@ void IncomingDialog::retrieve() ScheduleMessage::Status status = message->status(); ScheduleItemIn *item = new ScheduleItemIn(mMessageListView,inc,method,status); - if(inc->type()!="FreeBusy") { + if(inc->typeID() != freebusyID ) { Incidence *incidence = static_cast(inc); ScheduleItemVisitor v(item); if (!incidence->accept(v)) delete item; @@ -255,7 +255,7 @@ void IncomingDialog::rejectMessage() void IncomingDialog::showEvent(QListViewItem *item) { IncidenceBase *incidence = ((ScheduleItemIn *)item)->event(); - if( incidence && incidence->type() == "Event" ) { + if( incidence && incidence->typeID() == eventID ) { Event *event = static_cast(incidence); KOEventViewerDialog *eventViewer = new KOEventViewerDialog(this); eventViewer->setEvent(event); @@ -290,7 +290,7 @@ bool IncomingDialog::incomeCounter(ScheduleItemIn *item) { IncidenceBase *incidence = ((ScheduleItemIn *)item)->event(); // currently only events supportet - attetion at insertion below! - if ( incidence->type() != "Event" ) return false; + if ( incidence->typeID() != eventID ) return false; Event *counterEvent = static_cast( incidence ); @@ -368,7 +368,7 @@ bool IncomingDialog::incomeDeclineCounter(ScheduleItemIn *item) bool IncomingDialog::incomeAdd(ScheduleItemIn *item) { IncidenceBase *incidence = ((ScheduleItemIn *)item)->event(); - if (incidence->type() == "Event" ) { + if (incidence->typeID() == eventID ) { Event *refr = static_cast( incidence ); mOutgoing->addMessage(refr,Scheduler::Refresh); mScheduler->deleteTransaction( incidence ); @@ -402,7 +402,7 @@ bool IncomingDialog::incomeDefault(ScheduleItemIn *item) bool IncomingDialog::incomeRequest(ScheduleItemIn *item) { - if (item->event()->type()=="FreeBusy") { + if (item->event()->typeID() == freebusyID ) { //handel freebusy request IncidenceBase *inc = item->event(); QDateTime start = inc->dtStart(); @@ -437,7 +437,7 @@ bool IncomingDialog::automaticAction(ScheduleItemIn *item) IncidenceBase *inc = item->event(); Scheduler::Method method = item->method(); - if( inc->type()=="FreeBusy" ) { + if( inc->typeID() == freebusyID ) { if ( method==Scheduler::Request ) { if ( KOPrefs::instance()->mIMIPAutoFreeBusy==KOPrefs::addressbookAuto ) { // reply freebusy information @@ -465,7 +465,7 @@ bool IncomingDialog::automaticAction(ScheduleItemIn *item) } } - if ( inc->type()=="Event" ) { + if ( inc->typeID() == eventID ) { if ( method==Scheduler::Request || method==Scheduler::Publish ) { if ( KOPrefs::instance()->mIMIPAutoInsertRequest==KOPrefs::addressbookAuto ) { // insert event diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 1320a2e..b2b136a 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -581,7 +581,7 @@ void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld ) calendar()->addIncidence( inc ); if ( incOld ) { - if ( incOld->type() == "Todo" ) + if ( incOld->typeID() == todoID ) emit todoMoved((Todo*)incOld, KOGlobals::EVENTEDITED ); else emit incidenceChanged(incOld, KOGlobals::EVENTEDITED); @@ -967,7 +967,7 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) // qDebug("RESIZEBOTTOM "); // if ( type == KOAgenda::MOVE ) // qDebug("MOVE "); - if ( item->incidence()->type() == "Event" ) { + if ( item->incidence()->typeID() == eventID ) { startDt =item->incidence()->dtStart(); endDt = item->incidence()->dtEnd(); lenInSecs = startDt.secsTo( endDt ); @@ -975,7 +975,7 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED ); - if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) { + if ( item->incidence()->typeID()== todoID && item->mLastMoveXPos > 0 ) { startDate = mSelectedDates[item->mLastMoveXPos]; } else { if (item->cellX() < 0) { @@ -991,7 +991,7 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) } else { if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE ) startDt.setTime(mAgenda->gyToTime(item->cellYTop())); - if ( item->incidence()->type() == "Event" ) { + if ( item->incidence()->typeID() == eventID ) { if ( type == KOAgenda::MOVE ) { endDt = startDt.addSecs(lenInSecs); @@ -1021,10 +1021,10 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) } } } - if ( item->incidence()->type() == "Event" ) { + if ( item->incidence()->typeID() == eventID ) { item->incidence()->setDtStart(startDt); (static_cast(item->incidence()))->setDtEnd(endDt); - } else if ( item->incidence()->type() == "Todo" ) { + } else if ( item->incidence()->typeID() == todoID ) { Todo* to = static_cast(item->incidence()); to->setDtDue(endDt); @@ -1038,7 +1038,7 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) item->incidence()->setRevision(item->incidence()->revision()+1); item->setItemDate(startDt.date()); //item->updateItem(); - if ( item->incidence()->type() == "Todo" ) { + if ( item->incidence()->typeID() == todoID ) { emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED ); } diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index e165017..dea8981 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -871,7 +871,7 @@ void KOEditorRecurrence::readEvent(Incidence *event) { QDateTime dtEnd; - if ( event->type() == "Event" ) + if ( event->typeID() == eventID ) dtEnd = ((Event*)event)->dtEnd(); else dtEnd = ((Todo*)event)->dtDue(); diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index e5ff8af..02f13c7 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -148,20 +148,20 @@ void KOEventViewerDialog::setEvent(Event *event) } void KOEventViewerDialog::setIncidence(Incidence *in ) { - if ( in->type() == "Event" ) + if ( in->typeID() == eventID ) setEvent( (Event*) in ); - else if ( in->type() =="Todo" ) + else if ( in->typeID() == todoID ) setTodo( (Todo*) in ); - else if ( in->type() =="Journal" ) + else if ( in->typeID() == journalID ) setJournal( (Journal*) in ); } void KOEventViewerDialog::addIncidence(Incidence *in) { - if ( in->type() == "Event" ) + if ( in->typeID() == eventID ) addEvent( (Event*) in ); - else if ( in->type() =="Todo" ) + else if ( in->typeID() == todoID ) mEventViewer->setTodo( (Todo*) in, false ); - else if ( in->type() =="Journal" ) + else if ( in->typeID() == journalID ) mEventViewer->setJournal( (Journal*) in, false ); if ( mSyncMode ) { findButton( User1 )->setFocus(); diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 678cab6..c868270 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -382,7 +382,7 @@ void MonthViewItem::paint(QPainter *p) x += sizeM + 1; } - if ( mIncidence->type() == "Todo" ){ + if ( mIncidence->typeID() == todoID ){ Todo* td = ( Todo* ) mIncidence; if ( td->isCompleted() ) { int half = size/2; @@ -1943,7 +1943,7 @@ void KOMonthView::showContextMenu( Incidence *incidence ) mNewItemMenu->popup(QCursor::pos()); } /* - if( incidence && incidence->type() == "Event" ) { + if( incidence && incidence->typeID() == eventID ) { Event *event = static_cast(incidence); mContextMenu->showEventPopup(event); } else { diff --git a/korganizer/outgoingdialog.cpp b/korganizer/outgoingdialog.cpp index 0fc90c4..7253c8e 100644 --- a/korganizer/outgoingdialog.cpp +++ b/korganizer/outgoingdialog.cpp @@ -55,7 +55,7 @@ ScheduleItemOut::ScheduleItemOut(QListView *parent,IncidenceBase *ev, // kdDebug() << "ScheduleItemOut: setting the summary" << endl; //Set the summary - if(ev->type() != "FreeBusy") { + if(ev->typeID() != freebusyID ) { Incidence *incidence = static_cast(ev); setText(0,incidence->summary()); } else { @@ -64,7 +64,7 @@ ScheduleItemOut::ScheduleItemOut(QListView *parent,IncidenceBase *ev, // kdDebug() << "ScheduleItemOut: checking if the object is an event" << endl; //If the object is an event - if(ev->type()=="Event") { + if(ev->typeID()== eventID ) { Event *event = static_cast(ev); setText(1,event->dtStartDateStr()); @@ -88,7 +88,7 @@ ScheduleItemOut::ScheduleItemOut(QListView *parent,IncidenceBase *ev, } //If the object is an Todo - if(ev->type()=="Todo") { + if(ev->typeID() == todoID ) { Todo *event = static_cast(ev); if (event->hasStartDate()) { setText(1,event->dtStartDateStr()); @@ -106,7 +106,7 @@ ScheduleItemOut::ScheduleItemOut(QListView *parent,IncidenceBase *ev, // kdDebug() << "ScheduleItemOut: checking if the object is a FreeBusy object" << endl; //If the object is a freebusy object - if(ev->type() == "FreeBusy") { + if(ev->typeID() == freebusyID ) { FreeBusy *freebusy = static_cast(ev); setText(1,freebusy->dtStartDateStr()); @@ -241,10 +241,10 @@ void OutgoingDialog::showEvent(QListViewItem *qitem) ScheduleItemOut *item = (ScheduleItemOut *)qitem; Event *event = 0; Todo *todo = 0; - if ( item->event()->type()=="Event" ) { + if ( item->event()->typeID() == eventID ) { event = static_cast(item->event()); } - if ( item->event()->type()=="Todo" ) { + if ( item->event()->typeID() == todoID ) { todo = static_cast(item->event()); } QString sendText; diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp index 6de1566..0afa0a7 100644 --- a/libkcal/alarm.cpp +++ b/libkcal/alarm.cpp @@ -338,7 +338,7 @@ void Alarm::setTime(const QDateTime &alarmTime) int Alarm::offset() { if ( hasTime() ) { - if (mParent->type()=="Todo") { + if (mParent->typeID() == todoID ) { Todo *t = static_cast(mParent); return t->dtDue().secsTo( mAlarmTime ) ; } else @@ -381,7 +381,7 @@ QDateTime Alarm::time() const return mAlarmTime; else { - if (mParent->type()=="Todo") { + if (mParent->typeID() == todoID ) { Todo *t = static_cast(mParent); return mOffset.end( t->dtDue() ); } else if (mEndOffset) { -- cgit v0.9.0.2