[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepimlibs/kcal
From: Thomas McGuire <mcguire () kde ! org>
Date: 2010-05-15 15:28:59
Message-ID: 20100515152859.97A05AC8B9 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1127130 by tmcguire:
Deprecate the kresource-based KCAL API.
Use #define WANT_DEPRECATED_KCAL_API to suppress the warnings.
M +3 -0 CMakeLists.txt
M +1 -1 calendarresources.h
M +4 -4 calhelper.h
M +5 -5 incidenceformatter.h
M +8 -0 kcal_export.h
M +1 -1 resourcecached.h
M +2 -2 resourcecachedconfig.h
M +1 -1 resourcecalendar.h
M +1 -1 resourcelocal.h
M +1 -1 resourcelocalconfig.h
M +1 -1 resourcelocaldir.h
M +1 -1 resourcelocaldirconfig.h
--- trunk/KDE/kdepimlibs/kcal/CMakeLists.txt #1127129:1127130
@@ -5,6 +5,9 @@
macro_log_feature(LIBICAL_FOUND "libical" "Reference implementation of the iCalendar \
data type and serialization format" "http://sourceforge.net/projects/freeassociation" \
TRUE "${LIBICAL_MIN_VERSION}" "Required for the critical PIM kcal library.")
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5800)
+add_definitions(-DWANT_DEPRECATED_KCAL_API)
+add_definitions(-DWANT_DEPRECATED_KABC_API)
+add_definitions(-DWANT_DEPRECATED_KRESOURCE_API)
include (ConfigureChecks.cmake)
--- trunk/KDE/kdepimlibs/kcal/calendarresources.h #1127129:1127130
@@ -54,7 +54,7 @@
- birthdays and anniversaries contained in an addressbook
*/
-class KCAL_EXPORT CalendarResources
+class KCAL_EXPORT_DEPRECATED CalendarResources
: public Calendar, public KRES::ManagerObserver<ResourceCalendar>
{
Q_OBJECT
--- trunk/KDE/kdepimlibs/kcal/calhelper.h #1127129:1127130
@@ -56,7 +56,7 @@
to the user in their Kolab resource; false otherwise.
@since 4.4
*/
- KCAL_EXPORT bool isMyKolabIncidence( Calendar *calendar, Incidence *incidence );
+ KCAL_EXPORT_DEPRECATED bool isMyKolabIncidence( Calendar *calendar, Incidence \
*incidence );
/**
Determine if the specified incidence is likely owned by the the user,
@@ -69,7 +69,7 @@
to the user; false otherwise.
@since 4.4
*/
- KCAL_EXPORT bool isMyCalendarIncidence( Calendar *calendar, Incidence *incidence \
); + KCAL_EXPORT_DEPRECATED bool isMyCalendarIncidence( Calendar *calendar, \
Incidence *incidence );
/**
Searches for the specified Incidence by UID, returning an Incidence pointer
@@ -82,7 +82,7 @@
or the Incidence is found but is not owned by the user.
@since 4.4
*/
- KCAL_EXPORT Incidence *findMyCalendarIncidenceByUid( Calendar *calendar, const \
QString &uid ); + KCAL_EXPORT_DEPRECATED Incidence *findMyCalendarIncidenceByUid( \
Calendar *calendar, const QString &uid );
/**
Determines if the Calendar is using a Groupware resource type.
@@ -92,7 +92,7 @@
false otherwise.
@since 4.4
*/
- KCAL_EXPORT bool usingGroupware( Calendar *calendar );
+ KCAL_EXPORT_DEPRECATED bool usingGroupware( Calendar *calendar );
/**
Determines if the Calendar has any writable folders with Events content
--- trunk/KDE/kdepimlibs/kcal/incidenceformatter.h #1127129:1127130
@@ -114,7 +114,7 @@
@since 4.2
@deprecated use toolTipStr( Calendar *, IncidenceBase *, bool, KDateTime::Spec)
*/
- KCAL_EXPORT KDE_DEPRECATED QString toolTipStr( IncidenceBase *incidence,
+ KCAL_EXPORT_DEPRECATED QString toolTipStr( IncidenceBase *incidence,
bool richText=true,
KDateTime::Spec \
spec=KDateTime::Spec() );
@@ -125,7 +125,7 @@
@param richText if yes, the QString will be created as RichText.
@deprecated use toolTipStr( Calendar *, IncidenceBase *, bool, KDateTime::Spec)
*/
- KCAL_EXPORT KDE_DEPRECATED QString toolTipString( IncidenceBase *incidence,
+ KCAL_EXPORT_DEPRECATED QString toolTipString( IncidenceBase *incidence,
bool richText=true );
/**
Create a RichText QString representation of an Incidence in a nice format
@@ -168,7 +168,7 @@
@since 4.2
@deprecated use extensiveDisplayStr( Calendar *, IncidenceBase *, \
KDateTime::Spec )
*/
- KCAL_EXPORT KDE_DEPRECATED QString extensiveDisplayStr( IncidenceBase *incidence,
+ KCAL_EXPORT_DEPRECATED QString extensiveDisplayStr( IncidenceBase *incidence,
KDateTime::Spec \
spec=KDateTime::Spec() );
/**
@@ -177,7 +177,7 @@
@param incidence is a pointer to the Incidence to be formatted.
@deprecated use extensiveDisplayStr( Calendar *, IncidenceBase *, \
KDateTime::Spec )
*/
- KCAL_EXPORT KDE_DEPRECATED QString extensiveDisplayString( IncidenceBase \
*incidence ); + KCAL_EXPORT_DEPRECATED QString extensiveDisplayString( IncidenceBase \
*incidence );
/**
Create a QString representation of an Incidence in format suitable for
@@ -196,7 +196,7 @@
@param incidence is a pointer to the Incidence to be formatted.
@deprecated use mailBodyStr( IncidenceBase *, KDateTime::Spec )
*/
- KCAL_EXPORT KDE_DEPRECATED QString mailBodyString( IncidenceBase *incidence );
+ KCAL_EXPORT_DEPRECATED QString mailBodyString( IncidenceBase *incidence );
/**
Deliver an HTML formatted string displaying an invitation.
--- trunk/KDE/kdepimlibs/kcal/kcal_export.h #1127129:1127130
@@ -33,6 +33,14 @@
# endif
#endif
+# ifndef KCAL_EXPORT_DEPRECATED
+# if !defined( WANT_DEPRECATED_KCAL_API )
+# define KCAL_EXPORT_DEPRECATED KDE_DEPRECATED KCAL_EXPORT
+# else
+# define KCAL_EXPORT_DEPRECATED KCAL_EXPORT
+# endif
+# endif
+
#ifdef COMPILING_TESTS
#ifndef KCAL_TEST_EXPORT
# if defined(MAKE_KCAL_TEST_LIB)
--- trunk/KDE/kdepimlibs/kcal/resourcecached.h #1127129:1127130
@@ -40,7 +40,7 @@
This class provides a calendar resource using a local CalendarLocal object to
cache the calendar data.
*/
-class KCAL_EXPORT ResourceCached : public ResourceCalendar,
+class KCAL_EXPORT_DEPRECATED ResourceCached : public ResourceCalendar,
public KCal::Calendar::CalendarObserver
{
Q_OBJECT
--- trunk/KDE/kdepimlibs/kcal/resourcecachedconfig.h #1127129:1127130
@@ -33,7 +33,7 @@
@see ResourceCached
*/
-class KCAL_EXPORT ResourceCachedReloadConfig : public QWidget
+class KCAL_EXPORT_DEPRECATED ResourceCachedReloadConfig : public QWidget
{
Q_OBJECT
public:
@@ -59,7 +59,7 @@
@see ResourceCached
*/
-class KCAL_EXPORT ResourceCachedSaveConfig : public QWidget
+class KCAL_EXPORT_DEPRECATED ResourceCachedSaveConfig : public QWidget
{
Q_OBJECT
public:
--- trunk/KDE/kdepimlibs/kcal/resourcecalendar.h #1127129:1127130
@@ -47,7 +47,7 @@
This class provides the interfaces for a calendar resource. It makes use of
the kresources framework.
*/
-class KCAL_EXPORT ResourceCalendar : public KRES::Resource
+class KCAL_EXPORT_DEPRECATED ResourceCalendar : public KRES::Resource
{
Q_OBJECT
public:
--- trunk/KDE/kdepimlibs/kcal/resourcelocal.h #1127129:1127130
@@ -43,7 +43,7 @@
/**
@brief Provides a calendar resource stored as a local file.
*/
-class KCAL_EXPORT ResourceLocal : public ResourceCached
+class KCAL_EXPORT_DEPRECATED ResourceLocal : public ResourceCached
{
Q_OBJECT
--- trunk/KDE/kdepimlibs/kcal/resourcelocalconfig.h #1127129:1127130
@@ -38,7 +38,7 @@
@see ResourceLocal
*/
-class KCAL_EXPORT ResourceLocalConfig : public KRES::ConfigWidget
+class KCAL_EXPORT_DEPRECATED ResourceLocalConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
--- trunk/KDE/kdepimlibs/kcal/resourcelocaldir.h #1127129:1127130
@@ -30,7 +30,7 @@
@brief
This class provides a calendar stored as a file per incidence in a directory.
*/
-class KCAL_EXPORT ResourceLocalDir : public ResourceCached
+class KCAL_EXPORT_DEPRECATED ResourceLocalDir : public ResourceCached
{
Q_OBJECT
friend class ResourceLocalDirConfig;
--- trunk/KDE/kdepimlibs/kcal/resourcelocaldirconfig.h #1127129:1127130
@@ -36,7 +36,7 @@
@see ResourceLocalDir
*/
-class KCAL_EXPORT ResourceLocalDirConfig : public KRES::ConfigWidget
+class KCAL_EXPORT_DEPRECATED ResourceLocalDirConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic