author | hakan <hakan> | 2002-03-29 16:33:34 (UTC) |
---|---|---|
committer | hakan <hakan> | 2002-03-29 16:33:34 (UTC) |
commit | 3a1684894efb2106f957469b94350abf754a404e (patch) (unidiff) | |
tree | 22e475a3dd11da80fa4f3735b479102715ba7eb3 /core/pim | |
parent | d31e0363e905aae78034626896b0d6620ffbc8fc (diff) | |
download | opie-3a1684894efb2106f957469b94350abf754a404e.zip opie-3a1684894efb2106f957469b94350abf754a404e.tar.gz opie-3a1684894efb2106f957469b94350abf754a404e.tar.bz2 |
Editing an event will no longer clears it's uid
-rw-r--r-- | core/pim/datebook/datebook.cpp | 12 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/timepicker.cpp | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 2deb96f..97c305c 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -212,2 +212,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
212 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 212 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
213 | qDebug("olle\n"); | ||
213 | #endif | 214 | #endif |
@@ -232,8 +233,6 @@ void DateBook::receive( const QCString &msg, const QByteArray &data ) | |||
232 | else if (msg == "editEvent(int)") { | 233 | else if (msg == "editEvent(int)") { |
233 | /* Not yet working... | 234 | int uid; |
234 | int uid; | 235 | stream >> uid; |
235 | stream >> uid; | 236 | Event e=db->getEvent(uid); |
236 | Event e=db->getEvent(uid); | 237 | editEvent(e); |
237 | editEvent(e); | ||
238 | */ | ||
239 | } | 238 | } |
@@ -403,2 +402,3 @@ void DateBook::editEvent( const Event &e ) | |||
403 | Event newEv = entry->event(); | 402 | Event newEv = entry->event(); |
403 | newEv.setUid(e.uid()); // FIXME: Hack not to clear uid | ||
404 | QString error = checkEvent(newEv); | 404 | QString error = checkEvent(newEv); |
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index 1c43363..e563db0 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -115,4 +115,6 @@ void DateEntry::setDates( const QDateTime& s, const QDateTime& e ) | |||
115 | endTime = e.time(); | 115 | endTime = e.time(); |
116 | |||
116 | startDateChanged( s.date().year(), s.date().month(), s.date().day() ); | 117 | startDateChanged( s.date().year(), s.date().month(), s.date().day() ); |
117 | endDateChanged( e.date().year(), e.date().month(), e.date().day() ); | 118 | endDateChanged( e.date().year(), e.date().month(), e.date().day() ); |
119 | |||
118 | updateTimeEdit(true,true); | 120 | updateTimeEdit(true,true); |
diff --git a/core/pim/datebook/timepicker.cpp b/core/pim/datebook/timepicker.cpp index 5f08a05..9097e1b 100644 --- a/core/pim/datebook/timepicker.cpp +++ b/core/pim/datebook/timepicker.cpp | |||
@@ -7,2 +7,3 @@ | |||
7 | #include <qstring.h> | 7 | #include <qstring.h> |
8 | #include <stdio.h> | ||
8 | 9 | ||