[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepimlibs/kabc
From: Thomas McGuire <mcguire () kde ! org>
Date: 2010-05-15 15:28:57
Message-ID: 20100515152857.466EEAC8B7 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1127129 by tmcguire:
Deprecate the kresource-based KABC API.
Use #define WANT_DEPRECATED_KABC_API to suppress the warnings.
M +2 -0 CMakeLists.txt
M +5 -3 addressbook.h
M +1 -1 addresseedialog.h
M +1 -1 addresslineedit.h
M +1 -1 distributionlist.h
M +2 -2 distributionlistdialog.h
M +1 -1 format.h
M +1 -1 formatfactory.h
M +20 -0 kabc_export.h
M +1 -1 lock.h
M +1 -1 locknull.h
M +4 -4 resource.h
M +1 -1 resourceabc.h
M +1 -1 resourcecached.h
M +1 -1 stdaddressbook.h
M +1 -1 vcardformat.h
--- trunk/KDE/kdepimlibs/kabc/CMakeLists.txt #1127128:1127129
@@ -6,6 +6,8 @@
add_definitions(${QDBUS_DEFINITIONS} -DKDE_DEFAULT_DEBUG_AREA=5700)
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
+add_definitions( -DWANT_DEPRECATED_KRESOURCE_API )
+add_definitions( -DWANT_DEPRECATED_KABC_API )
# these apply also for all subdirs
include_directories(
--- trunk/KDE/kdepimlibs/kabc/addressbook.h #1127128:1127129
@@ -21,6 +21,8 @@
#ifndef KABC_ADDRESSBOOK_H
#define KABC_ADDRESSBOOK_H
+#include "kabc_export.h"
+
#include "addressee.h"
#include "field.h"
@@ -41,7 +43,7 @@
This class provides access to a collection of address book entries.
*/
-class KABC_EXPORT AddressBook : public QObject
+class KABC_EXPORT_DEPRECATED AddressBook : public QObject
{
Q_OBJECT
@@ -59,7 +61,7 @@
This class provides an iterator for address book entries.
*/
- class KABC_EXPORT Iterator //krazy:exclude=dpointer
+ class KABC_EXPORT_DEPRECATED Iterator //krazy:exclude=dpointer
{
friend class AddressBook;
friend class ConstIterator;
@@ -164,7 +166,7 @@
This class provides a const iterator for address book entries.
*/
- class KABC_EXPORT ConstIterator //krazy:exclude=dpointer
+ class KABC_EXPORT_DEPRECATED ConstIterator //krazy:exclude=dpointer
{
friend class AddressBook;
public:
--- trunk/KDE/kdepimlibs/kabc/addresseedialog.h #1127128:1127129
@@ -95,7 +95,7 @@
return or pressing the ok button to return the selected addressee to the
application.
*/
-class KABC_EXPORT AddresseeDialog : public KDialog
+class KABC_EXPORT_DEPRECATED AddresseeDialog : public KDialog
{
Q_OBJECT
--- trunk/KDE/kdepimlibs/kabc/addresslineedit.h #1127128:1127129
@@ -40,7 +40,7 @@
*
* @see AddressLineEdit::enableCompletion()
*/
-class KABC_EXPORT AddressLineEdit : public KLineEdit
+class KABC_EXPORT_DEPRECATED AddressLineEdit : public KLineEdit
{
Q_OBJECT
--- trunk/KDE/kdepimlibs/kabc/distributionlist.h #1127128:1127129
@@ -42,7 +42,7 @@
associated with an address book entry. If the address book entry changes, the
entry in the distribution list is automatically updated.
*/
-class KABC_EXPORT DistributionList
+class KABC_EXPORT_DEPRECATED DistributionList
{
public:
/**
--- trunk/KDE/kdepimlibs/kabc/distributionlistdialog.h #1127128:1127129
@@ -48,7 +48,7 @@
dlg->exec();
\endcode
*/
-class KABC_EXPORT DistributionListDialog : public KDialog
+class KABC_EXPORT_DEPRECATED DistributionListDialog : public KDialog
{
Q_OBJECT
@@ -74,7 +74,7 @@
/**
@short Helper class
*/
-class KABC_EXPORT EmailSelector : public KDialog
+class KABC_EXPORT_DEPRECATED EmailSelector : public KDialog
{
public:
/**
--- trunk/KDE/kdepimlibs/kabc/format.h #1127128:1127129
@@ -39,7 +39,7 @@
*
* @internal
*/
-class KABC_EXPORT Format : public Plugin
+class KABC_EXPORT_DEPRECATED Format : public Plugin
{
public:
--- trunk/KDE/kdepimlibs/kabc/formatfactory.h #1127128:1127129
@@ -92,7 +92,7 @@
* }
* \endcode
*/
-class KABC_EXPORT FormatFactory
+class KABC_EXPORT_DEPRECATED FormatFactory
{
public:
/**
--- trunk/KDE/kdepimlibs/kabc/kabc_export.h #1127128:1127129
@@ -74,19 +74,39 @@
#endif
# ifndef KABC_EXPORT_DEPRECATED
+# if !defined( WANT_DEPRECATED_KABC_API )
# define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT
+# else
+# define KABC_EXPORT_DEPRECATED KABC_EXPORT
# endif
+# endif
# ifndef KABC_FILE_CORE_EXPORT_DEPRECATED
+# if !defined( WANT_DEPRECATED_KABC_API )
# define KABC_FILE_CORE_EXPORT_DEPRECATED KDE_DEPRECATED KABC_FILE_CORE_EXPORT
+# else
+# define KABC_FILE_CORE_EXPORT_DEPRECATED KABC_FILE_CORE_EXPORT
# endif
+# endif
# ifndef KABC_DIRECTORY_EXPORT_DEPRECATED
+# if !defined( WANT_DEPRECATED_KABC_API )
# define KABC_DIRECTORY_EXPORT_DEPRECATED KDE_DEPRECATED KABC_DIRECTORY_EXPORT
+# else
+# define KABC_DIRECTORY_EXPORT_DEPRECATED KABC_DIRECTORY_EXPORT
# endif
+# endif
# ifndef KABC_NET_EXPORT_DEPRECATED
+# if !defined( WANT_DEPRECATED_KABC_API )
# define KABC_NET_EXPORT_DEPRECATED KDE_DEPRECATED KABC_NET_EXPORT
+# else
+# define KABC_NET_EXPORT_DEPRECATED KABC_NET_EXPORT
# endif
+# endif
# ifndef KABC_LDAPKIO_EXPORT_DEPRECATED
+# if !defined( WANT_DEPRECATED_KABC_API )
# define KABC_LDAPKIO_EXPORT_DEPRECATED KDE_DEPRECATED KABC_LDAPKIO_EXPORT
+# else
+# define KABC_LDAPKIO_EXPORT_DEPRECATED KABC_LDAPKIO_EXPORT
# endif
+# endif
#endif
--- trunk/KDE/kdepimlibs/kabc/lock.h #1127128:1127129
@@ -31,7 +31,7 @@
This class provides locking functionality for a file, directory or an
arbitrary string-represented resource.
*/
-class KABC_EXPORT Lock : public QObject
+class KABC_EXPORT_DEPRECATED Lock : public QObject
{
Q_OBJECT
public:
--- trunk/KDE/kdepimlibs/kabc/locknull.h #1127128:1127129
@@ -30,7 +30,7 @@
This class provides a lock without actually locking. It can be constructed in
two ways: One that let all locks succeed and one that let all locks fail.
*/
-class KABC_EXPORT LockNull : public Lock
+class KABC_EXPORT_DEPRECATED LockNull : public Lock
{
public:
/**
--- trunk/KDE/kdepimlibs/kabc/resource.h #1127128:1127129
@@ -34,7 +34,7 @@
* This class is used as helper class for saving address book.
* @see requestSaveTicket(), save().
*/
-class KABC_EXPORT Ticket
+class KABC_EXPORT_DEPRECATED Ticket
{
friend class Resource;
@@ -61,7 +61,7 @@
/**
* @internal
*/
-class KABC_EXPORT Resource : public KRES::Resource
+class KABC_EXPORT_DEPRECATED Resource : public KRES::Resource
{
Q_OBJECT
@@ -73,7 +73,7 @@
This class provides an iterator for resource entries.
*/
class ConstIterator;
- class KABC_EXPORT Iterator
+ class KABC_EXPORT_DEPRECATED Iterator
{
friend class KABC::Resource::ConstIterator;
friend class KABC::Resource;
@@ -162,7 +162,7 @@
This class provides a const iterator for resource entries.
*/
- class KABC_EXPORT ConstIterator
+ class KABC_EXPORT_DEPRECATED ConstIterator
{
friend class KABC::Resource;
--- trunk/KDE/kdepimlibs/kabc/resourceabc.h #1127128:1127129
@@ -38,7 +38,7 @@
* handle subresources.
*/
-class KABC_EXPORT ResourceABC : public Resource
+class KABC_EXPORT_DEPRECATED ResourceABC : public Resource
{
Q_OBJECT
--- trunk/KDE/kdepimlibs/kabc/resourcecached.h #1127128:1127129
@@ -28,7 +28,7 @@
namespace KABC {
-class KABC_EXPORT ResourceCached : public Resource
+class KABC_EXPORT_DEPRECATED ResourceCached : public Resource
{
Q_OBJECT
--- trunk/KDE/kdepimlibs/kabc/stdaddressbook.h #1127128:1127129
@@ -53,7 +53,7 @@
}
\endcode
*/
-class KABC_EXPORT StdAddressBook : public AddressBook
+class KABC_EXPORT_DEPRECATED StdAddressBook : public AddressBook
{
public:
--- trunk/KDE/kdepimlibs/kabc/vcardformat.h #1127128:1127129
@@ -34,7 +34,7 @@
This class implements the file format interface of address book entries for
the vCard format.
*/
-class KABC_EXPORT VCardFormat : public Format
+class KABC_EXPORT_DEPRECATED VCardFormat : public Format
{
public:
VCardFormat();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic