summaryrefslogtreecommitdiffstats
path: root/korganizer/koeditorgeneralevent.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /korganizer/koeditorgeneralevent.h
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korganizer/koeditorgeneralevent.h')
-rw-r--r--korganizer/koeditorgeneralevent.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index a13fa47c6..57ffba8df 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -58,14 +58,14 @@ class KOEditorGeneralEvent : public KOEditorGeneral
Read event object and setup widgets accordingly. If templ is true, the
event is read as template, i.e. the time and date information isn't set.
*/
- void readEvent( Event *event, Calendar *calendar, bool tmpl = false );
+ void readEvent( Event *event, Calendar *calendar, const TQDate &date, bool tmpl = false );
/** Write event settings to event object */
void writeEvent( Event * );
/** Check if the input is valid. */
bool validateInput();
- void updateRecurrenceSummary( const TQString &summary );
+ void updateRecurrenceSummary( Event *event );
TQFrame* invitationBar() const { return mInvitationBar; }
@@ -102,7 +102,6 @@ class KOEditorGeneralEvent : public KOEditorGeneral
TQLabel *mDurationLabel;
TQCheckBox *mAlldayEventCheckbox;
TQComboBox *mFreeTimeCombo;
- TQLabel *mRecurrenceSummary;
TQFrame *mInvitationBar;
// current start and end date and time