From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * 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 --- libkcal/incidencebase.h | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'libkcal/incidencebase.h') diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index 72455b432..fa3a1a619 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h @@ -131,16 +131,28 @@ class LIBKCAL_EXPORT IncidenceBase : public CustomProperties /** for setting the event's starting date/time with a TQDateTime. */ virtual void setDtStart( const TQDateTime &dtStart ); /** returns an event's starting date/time as a TQDateTime. */ + virtual TQDateTime dtStart() const; - /** returns an event's starting time as a string formatted according to the - users locale settings */ - virtual TQString dtStartTimeStr() const; - /** returns an event's starting date as a string formatted according to the - users locale settings */ - virtual TQString dtStartDateStr( bool shortfmt = true ) const; - /** returns an event's starting date and time as a string formatted according - to the users locale settings */ - virtual TQString dtStartStr() const; + + /** + returns an event's starting time as a string formatted according to the + users locale settings. + @deprecated use IncidenceFormatter::timeToString() + */ + virtual KDE_DEPRECATED TQString dtStartTimeStr() const; + + /** + returns an event's starting date as a string formatted according to the + users locale settings + @deprecated use IncidenceFormatter::dateToString() + */ + virtual KDE_DEPRECATED TQString dtStartDateStr( bool shortfmt = true ) const; + /** + returns an event's starting date and time as a string formatted according + to the users locale settings + @deprecated use IncidenceFormatter::dateTimeToString() + */ + virtual KDE_DEPRECATED TQString dtStartStr() const; virtual void setDuration( int seconds ); int duration() const; -- cgit v1.2.1