summaryrefslogtreecommitdiffabout
path: root/kde2file
authorzautrix <zautrix>2004-10-16 23:24:31 (UTC)
committer zautrix <zautrix>2004-10-16 23:24:31 (UTC)
commit6564856660d583425a5f5d51bf77bc52c01da444 (patch) (side-by-side diff)
tree223ef7aab1d489113681e3f29d07ca499bb6d1c5 /kde2file
parent4bab2cac8beb6103b982bd2b42eeb7061a18a0d1 (diff)
downloadkdepimpi-6564856660d583425a5f5d51bf77bc52c01da444.zip
kdepimpi-6564856660d583425a5f5d51bf77bc52c01da444.tar.gz
kdepimpi-6564856660d583425a5f5d51bf77bc52c01da444.tar.bz2
added KDE sync
Diffstat (limited to 'kde2file') (more/less context) (ignore whitespace changes)
-rw-r--r--kde2file/caldump/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 95ae29e..76bfad3 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -124,12 +124,13 @@ int main( int argc, char *argv[] )
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();
+ cl->setLastModified( (*it)->lastModified() );
if ( cl->type() == "Journal" )
localCalendar->addJournal( (Journal *) cl );
else if ( cl->type() == "Todo" )
localCalendar->addTodo( (Todo *) cl );
else if ( cl->type() == "Event" )
localCalendar->addEvent( (Event *) cl );
@@ -159,13 +160,15 @@ int main( int argc, char *argv[] )
Incidence::List::ConstIterator it;
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 ) {
+ QDateTime lm = cl->lastModified();
cl->setResources( (*it)->resources() );
+ cl->setLastModified(lm);
}
++del;
cl = (*it);
if ( cl->type() == "Journal" )
calendarResource->deleteJournal( (Journal *) cl );
else if ( cl->type() == "Todo" )
@@ -175,12 +178,13 @@ int main( int argc, char *argv[] )
}
}
for( it = newInc.begin(); it != newInc.end(); ++it ) {
Incidence* cl = (*it)->clone();
++num;
calendarResource->addIncidence( cl );
+ //cl->setLastModified( (*it)->lastModified() );
}
calendarResource->save();
qDebug("************************************* ");
qDebug("************************************* ");
qDebug("************************************* ");
qDebug("%d calendar entries deleted/ %d added from file /tmp/kdedumpall.ics", del, num);