summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-17 15:13:12 (UTC)
committer zautrix <zautrix>2004-10-17 15:13:12 (UTC)
commit711c4c06a7d1a52b97fd24efa3586543f46cc6d7 (patch) (side-by-side diff)
tree249481286ad20efb0239d21dfcab0313a9692a4b
parent780a12295cbbcf4eff4f9570322c1cac517414ad (diff)
downloadkdepimpi-711c4c06a7d1a52b97fd24efa3586543f46cc6d7.zip
kdepimpi-711c4c06a7d1a52b97fd24efa3586543f46cc6d7.tar.gz
kdepimpi-711c4c06a7d1a52b97fd24efa3586543f46cc6d7.tar.bz2
sync fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kde2file/caldump/main.cpp45
1 files changed, 24 insertions, 21 deletions
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 8d81307..03571b9 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -109,25 +109,25 @@ int main( int argc, char *argv[] )
QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
CalendarResources *calendarResource = 0;
CalendarLocal *localCalendar = 0;
KConfig c( locate( "config", "korganizerrc" ) );
c.setGroup( "Time & Date" );
QString tz = c.readEntry( "TimeZoneId" );
calendarResource = new CalendarResources( tz );
calendarResource->readConfig();
calendarResource->load();
qDebug("************************************* ");
qDebug("**************kdecaldump************* ");
qDebug("************************************* ");
- qDebug("Using timezone id: %s", calendarResource->timeZoneId().latin1());
+ qDebug("Using timezone ID: %s", calendarResource->timeZoneId().latin1());
if ( !read ) {
localCalendar = new CalendarLocal();
localCalendar->setTimeZoneId( calendarResource->timeZoneId());
KCal::Incidence::List allInc = calendarResource->rawIncidences();
Incidence::List::ConstIterator it;
int num = 0;
for( it = allInc.begin(); it != allInc.end(); ++it ) {
ResourceCalendar * re = calendarResource->resource( (*it) );
if ( re && !re->readOnly() ) {
++num;
Incidence* cl = (*it)->clone();
@@ -143,32 +143,34 @@ int main( int argc, char *argv[] )
FileStorage* storage = new FileStorage( calendarResource );
storage->setFileName( fileName );
storage->setSaveFormat( new ICalFormat() );
storage->save();
delete storage;
qDebug("************************************* ");
qDebug("************kdecaldump*************** ");
qDebug("************************************* ");
qDebug("%d calendar entries dumped to file %s", num, fileName.latin1());
} else {
+ qDebug("*************************load");
localCalendar = new CalendarLocal();
localCalendar->setTimeZoneId( calendarResource->timeZoneId());
FileStorage* storage = new FileStorage( localCalendar );
storage->setFileName( fileName );
int num = 0;
int del = 0;
int add = 0;
if ( storage->load() ) {
+ qDebug("*************************loaded!");
KCal::Incidence::List newInc = localCalendar->rawIncidences();
Incidence::List::ConstIterator it;
for( it = newInc.begin(); it != newInc.end(); ++it ) {
Incidence* cl = (*it)->clone();
Incidence *incOld = calendarResource->incidence( cl->uid() );
ResourceCalendar * res = 0;
if ( incOld )
res = calendarResource->resource( incOld );
if ( res ) {
++num;
if ( incOld->type() == "Journal" )
calendarResource->deleteJournal( (Journal *) incOld );
@@ -189,54 +191,55 @@ int main( int argc, char *argv[] )
qDebug("ERROR: no resource found for old incidence ");
if ( incOld->type() == "Journal" )
calendarResource->deleteJournal( (Journal *) incOld );
else if ( incOld->type() == "Todo" )
calendarResource->deleteTodo( (Todo *) incOld );
else if ( incOld->type() == "Event" )
calendarResource->deleteEvent( (Event *) incOld );
}
calendarResource->addIncidence( cl );
++add;
}
- KCal::Incidence::List allInc = calendarResource->rawIncidences();
+ }
+ KCal::Incidence::List allInc = calendarResource->rawIncidences();
- for( it = allInc.begin(); it != allInc.end(); ++it ) {
- ResourceCalendar * re = calendarResource->resource( (*it) );
- if ( re && !re->readOnly() ) {
- Incidence* cl = localCalendar->incidence( (*it)->uid() );
- if ( !cl ) {
- ++del;
- cl = (*it);
- if ( cl->type() == "Journal" )
- calendarResource->deleteJournal( (Journal *) cl );
- else if ( cl->type() == "Todo" )
- calendarResource->deleteTodo( (Todo *) cl );
- else if ( cl->type() == "Event" )
- calendarResource->deleteEvent( (Event *) cl );
- //QDateTime lm = cl->lastModified();
- //cl->setResources( (*it)->resources() );
- //cl->setLastModified(lm);
- }
- }
+ for( it = allInc.begin(); it != allInc.end(); ++it ) {
+ ResourceCalendar * re = calendarResource->resource( (*it) );
+ if ( re && !re->readOnly() ) {
+ Incidence* cl = localCalendar->incidence( (*it)->uid() );
+ if ( !cl ) {
+ ++del;
+ cl = (*it);
+ if ( cl->type() == "Journal" )
+ calendarResource->deleteJournal( (Journal *) cl );
+ else if ( cl->type() == "Todo" )
+ calendarResource->deleteTodo( (Todo *) cl );
+ else if ( cl->type() == "Event" )
+ calendarResource->deleteEvent( (Event *) cl );
+ //QDateTime lm = cl->lastModified();
+ //cl->setResources( (*it)->resources() );
+ //cl->setLastModified(lm);
+ }
}
}
+
calendarResource->save();
qDebug("************************************* ");
qDebug("************kdecaldump*************** ");
qDebug("************************************* ");
qDebug("Calendar entries\nchanged %d\ndeleted %d\nadded %d\nfrom file %s", num,del, add, fileName.latin1());
} else
- qDebug("error loading file /tmp/kdedumpall.ics");
+ qDebug("ERROR loading file %s",fileName.latin1() );
}
if ( localCalendar ) {
localCalendar->close();
delete localCalendar;
}
if ( calendarResource ) {
calendarResource->close();
delete calendarResource;
}