[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepimlibs/kcal
From: Sergio Luis Martins <iamsergio () gmail ! com>
Date: 2010-09-19 18:36:13
Message-ID: 20100919183613.8DF1FAC7CB () svn ! kde ! org
[Download RAW message or body]
SVN commit 1177202 by smartins:
Fix replace bug, where KCAL_EXPORT_DEPRECATED became \
KCAL_EXPORT_DEPRECATED_DEPRECATED.
M +1 -1 calendarresources.h
M +4 -4 calhelper.h
M +1 -1 htmlexportsettings.kcfgc
M +5 -5 incidenceformatter.h
M +9 -9 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
M +1 -1 tests/CMakeLists.txt
--- trunk/KDE/kdepimlibs/kcal/calendarresources.h #1177201:1177202
@@ -54,7 +54,7 @@
- birthdays and anniversaries contained in an addressbook
*/
-class KCAL_EXPORT_DEPRECATED_DEPRECATED CalendarResources
+class KCAL_EXPORT_DEPRECATED CalendarResources
: public Calendar, public KRES::ManagerObserver<ResourceCalendar>
{
Q_OBJECT
--- trunk/KDE/kdepimlibs/kcal/calhelper.h #1177201:1177202
@@ -56,7 +56,7 @@
to the user in their Kolab resource; false otherwise.
@since 4.4
*/
- KCAL_EXPORT_DEPRECATED_DEPRECATED 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_DEPRECATED_DEPRECATED 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_DEPRECATED_DEPRECATED 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_DEPRECATED_DEPRECATED bool usingGroupware( Calendar *calendar );
+ KCAL_EXPORT_DEPRECATED bool usingGroupware( Calendar *calendar );
}
}
--- trunk/KDE/kdepimlibs/kcal/htmlexportsettings.kcfgc #1177201:1177202
@@ -8,4 +8,4 @@
GlobalEnums=true
ItemAccessors=true
SetUserTexts=true
-Visibility=KCAL_EXPORT_DEPRECATED
+Visibility=KCAL_EXPORT
--- trunk/KDE/kdepimlibs/kcal/incidenceformatter.h #1177201:1177202
@@ -114,7 +114,7 @@
@since 4.2
@deprecated use toolTipStr( Calendar *, IncidenceBase *, bool, KDateTime::Spec)
*/
- KCAL_EXPORT_DEPRECATED_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_DEPRECATED_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_DEPRECATED_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_DEPRECATED_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_DEPRECATED_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 #1177201:1177202
@@ -18,29 +18,29 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#ifndef KCAL_EXPORT_DEPRECATED_H
-#define KCAL_EXPORT_DEPRECATED_H
+#ifndef KCAL_EXPORT_H
+#define KCAL_EXPORT_H
#include <kdemacros.h>
-#ifndef KCAL_EXPORT_DEPRECATED
+#ifndef KCAL_EXPORT
# if defined(KDEPIM_STATIC_LIBS)
/* No export/import for static libraries */
-# define KCAL_EXPORT_DEPRECATED
+# define KCAL_EXPORT
# elif defined(MAKE_KCAL_LIB)
/* We are building this library */
-# define KCAL_EXPORT_DEPRECATED KDE_EXPORT
+# define KCAL_EXPORT KDE_EXPORT
# else
/* We are using this library */
-# define KCAL_EXPORT_DEPRECATED KDE_IMPORT
+# define KCAL_EXPORT KDE_IMPORT
# endif
#endif
-# ifndef KCAL_EXPORT_DEPRECATED_DEPRECATED
+# ifndef KCAL_EXPORT_DEPRECATED
# if !defined( WANT_DEPRECATED_KCAL_API )
-# define KCAL_EXPORT_DEPRECATED_DEPRECATED KDE_DEPRECATED KCAL_EXPORT_DEPRECATED
+# define KCAL_EXPORT_DEPRECATED KDE_DEPRECATED KCAL_EXPORT
# else
-# define KCAL_EXPORT_DEPRECATED_DEPRECATED KCAL_EXPORT_DEPRECATED
+# define KCAL_EXPORT_DEPRECATED KCAL_EXPORT
# endif
# endif
--- trunk/KDE/kdepimlibs/kcal/resourcecached.h #1177201:1177202
@@ -40,7 +40,7 @@
This class provides a calendar resource using a local CalendarLocal object to
cache the calendar data.
*/
-class KCAL_EXPORT_DEPRECATED_DEPRECATED ResourceCached : public ResourceCalendar,
+class KCAL_EXPORT_DEPRECATED ResourceCached : public ResourceCalendar,
public \
KCal::Calendar::CalendarObserver {
Q_OBJECT
--- trunk/KDE/kdepimlibs/kcal/resourcecachedconfig.h #1177201:1177202
@@ -33,7 +33,7 @@
@see ResourceCached
*/
-class KCAL_EXPORT_DEPRECATED_DEPRECATED ResourceCachedReloadConfig : public QWidget
+class KCAL_EXPORT_DEPRECATED ResourceCachedReloadConfig : public QWidget
{
Q_OBJECT
public:
@@ -59,7 +59,7 @@
@see ResourceCached
*/
-class KCAL_EXPORT_DEPRECATED_DEPRECATED ResourceCachedSaveConfig : public QWidget
+class KCAL_EXPORT_DEPRECATED ResourceCachedSaveConfig : public QWidget
{
Q_OBJECT
public:
--- trunk/KDE/kdepimlibs/kcal/resourcecalendar.h #1177201:1177202
@@ -47,7 +47,7 @@
This class provides the interfaces for a calendar resource. It makes use of
the kresources framework.
*/
-class KCAL_EXPORT_DEPRECATED_DEPRECATED ResourceCalendar : public KRES::Resource
+class KCAL_EXPORT_DEPRECATED ResourceCalendar : public KRES::Resource
{
Q_OBJECT
public:
--- trunk/KDE/kdepimlibs/kcal/resourcelocal.h #1177201:1177202
@@ -43,7 +43,7 @@
/**
@brief Provides a calendar resource stored as a local file.
*/
-class KCAL_EXPORT_DEPRECATED_DEPRECATED ResourceLocal : public ResourceCached
+class KCAL_EXPORT_DEPRECATED ResourceLocal : public ResourceCached
{
Q_OBJECT
--- trunk/KDE/kdepimlibs/kcal/resourcelocalconfig.h #1177201:1177202
@@ -38,7 +38,7 @@
@see ResourceLocal
*/
-class KCAL_EXPORT_DEPRECATED_DEPRECATED ResourceLocalConfig : public \
KRES::ConfigWidget +class KCAL_EXPORT_DEPRECATED ResourceLocalConfig : public \
KRES::ConfigWidget {
Q_OBJECT
public:
--- trunk/KDE/kdepimlibs/kcal/resourcelocaldir.h #1177201:1177202
@@ -30,7 +30,7 @@
@brief
This class provides a calendar stored as a file per incidence in a directory.
*/
-class KCAL_EXPORT_DEPRECATED_DEPRECATED ResourceLocalDir : public ResourceCached
+class KCAL_EXPORT_DEPRECATED ResourceLocalDir : public ResourceCached
{
Q_OBJECT
friend class ResourceLocalDirConfig;
--- trunk/KDE/kdepimlibs/kcal/resourcelocaldirconfig.h #1177201:1177202
@@ -36,7 +36,7 @@
@see ResourceLocalDir
*/
-class KCAL_EXPORT_DEPRECATED_DEPRECATED ResourceLocalDirConfig : public \
KRES::ConfigWidget +class KCAL_EXPORT_DEPRECATED ResourceLocalDirConfig : public \
KRES::ConfigWidget {
Q_OBJECT
public:
--- trunk/KDE/kdepimlibs/kcal/tests/CMakeLists.txt #1177201:1177202
@@ -47,7 +47,7 @@
testtimesininterval
)
# this test cannot work with msvc because libical should not be altered
-# and therefore we can't add KCAL_EXPORT there
+# and therefore we can't add KCAL_EXPORT_DEPRECATED there
# it should work fine with mingw because of the auto-import feature
if(NOT MSVC)
KCAL_UNIT_TESTS(testicaltimezones)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic