summaryrefslogtreecommitdiffstats
path: root/korganizer/koeditorgeneraljournal.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/koeditorgeneraljournal.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/koeditorgeneraljournal.h')
-rw-r--r--korganizer/koeditorgeneraljournal.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/korganizer/koeditorgeneraljournal.h b/korganizer/koeditorgeneraljournal.h
index 28827c8c8..649a6d345 100644
--- a/korganizer/koeditorgeneraljournal.h
+++ b/korganizer/koeditorgeneraljournal.h
@@ -25,6 +25,8 @@
#ifndef KOEDITORGENERALJOURNAL_H
#define KOEDITORGENERALJOURNAL_H
+#include "koeditorgeneral.h"
+
#include <tqobject.h>
#include <tqdatetime.h>
@@ -43,11 +45,11 @@ class Journal;
}
using namespace KCal;
-class KOEditorGeneralJournal : public QObject
+class KOEditorGeneralJournal : public KOEditorGeneral
{
- Q_OBJECT
+ Q_OBJECT
public:
- KOEditorGeneralJournal ( TQObject* parent=0, const char* name=0 );
+ KOEditorGeneralJournal ( TQWidget *parent=0, const char* name=0 );
virtual ~KOEditorGeneralJournal();
void initDate( TQWidget *, TQBoxLayout * );
@@ -59,7 +61,7 @@ class KOEditorGeneralJournal : public QObject
void setDate( const TQDate &date );
void setTime( const TQTime &time );
/** Read journal object and setup widgets accordingly */
- void readJournal( Journal *, bool tmpl = false );
+ void readJournal( Journal *, const TQDate &, bool tmpl = false );
/** Write journal settings to event object */
void writeJournal( Journal * );