summaryrefslogtreecommitdiffstats
path: root/korganizer/journalentry.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/journalentry.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/journalentry.h')
-rw-r--r--korganizer/journalentry.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index 090909f39..9350d5ead 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -26,6 +26,7 @@
//
// Widget showing one Journal entry
+#include <libkcal/resourcecalendar.h>
#include <tqvbox.h>
class TQLabel;
@@ -78,7 +79,7 @@ class JournalEntry : public TQWidget {
signals:
void deleteIncidence( Incidence * );
- void editIncidence( Incidence * );
+ void editIncidence( Incidence *, const TQDate& );
protected:
void clearFields();
@@ -131,9 +132,9 @@ class JournalDateEntry : public TQVBox {
void setIncidenceChangerSignal( IncidenceChangerBase *changer );
void setDateSignal( const TQDate & );
void flushEntries();
- void editIncidence( Incidence * );
+ void editIncidence( Incidence *, const TQDate& );
void deleteIncidence( Incidence * );
- void newJournal( const TQDate & );
+ void newJournal( ResourceCalendar *, const TQString &, const TQDate & );
public slots:
void emitNewJournal();