diff options
author | Jeremy Whiting <jeremy.whiting@collabora.com> | 2011-11-07 12:25:22 -0700 |
---|---|---|
committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-11-22 17:17:32 -0200 |
commit | e787c4422154da00c9867447c34629896f109785 (patch) | |
tree | 15ae13e8bb69c5de6e9262921ecc678605853b04 | |
parent | ec69a6dca62e2af1cca8dec6caa5b069a1f8293b (diff) |
Rename TELEPATHY_QT4_EXPORT to TP_QT_EXPORT.
92 files changed, 122 insertions, 122 deletions
@@ -74,8 +74,8 @@ short, it amounts to: private Q_SLOTS private * friend class xxx definitions must be placed right below the private keyword. - * All exported classes should use TELEPATHY_QT4_EXPORT macro as following: - class TELEPATHY_QT4_EXPORT xxx { ... }; + * All exported classes should use TP_QT_EXPORT macro as following: + class TP_QT_EXPORT xxx { ... }; * Every issue in APIs which can (or will) only be fixed later should be marked with a doxygen \todo and have a corresponding fd.o bug filed and mentioned in the \todo annotation diff --git a/TelepathyQt4/CMakeLists.txt b/TelepathyQt4/CMakeLists.txt index e7c9a92d..a84c5cd1 100644 --- a/TelepathyQt4/CMakeLists.txt +++ b/TelepathyQt4/CMakeLists.txt @@ -542,7 +542,7 @@ tpqt4_types_gen(stable-typesgen ${gen_stable_spec_xml} ${CMAKE_CURRENT_BINARY_DIR}/_gen/types.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/types-body.hpp Tp TelepathyQt4/types.h TelepathyQt4/Types --must-define=IN_TP_QT_HEADER - --visibility=TELEPATHY_QT4_EXPORT + --visibility=TP_QT_EXPORT DEPENDS stable-constants) tpqt4_types_gen(future-typesgen ${gen_future_spec_xml} ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-types.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-types-body.hpp diff --git a/TelepathyQt4/abstract-client.h b/TelepathyQt4/abstract-client.h index 7a928b97..9e574c86 100644 --- a/TelepathyQt4/abstract-client.h +++ b/TelepathyQt4/abstract-client.h @@ -43,7 +43,7 @@ namespace Tp class ClientRegistrar; class ChannelClassSpecList; -class TELEPATHY_QT4_EXPORT AbstractClient : public RefCounted +class TP_QT_EXPORT AbstractClient : public RefCounted { Q_DISABLE_COPY(AbstractClient) @@ -52,7 +52,7 @@ public: virtual ~AbstractClient(); }; -class TELEPATHY_QT4_EXPORT AbstractClientObserver : public virtual AbstractClient +class TP_QT_EXPORT AbstractClientObserver : public virtual AbstractClient { Q_DISABLE_COPY(AbstractClientObserver) @@ -98,7 +98,7 @@ private: Private *mPriv; }; -class TELEPATHY_QT4_EXPORT AbstractClientApprover : public virtual AbstractClient +class TP_QT_EXPORT AbstractClientApprover : public virtual AbstractClient { Q_DISABLE_COPY(AbstractClientApprover) @@ -126,7 +126,7 @@ private: * - DBusTubeHandler(QString(List) serviceName(s)) * - handleTube(DBusTubeChannelPtr, userActionTime) */ -class TELEPATHY_QT4_EXPORT AbstractClientHandler : public virtual AbstractClient +class TP_QT_EXPORT AbstractClientHandler : public virtual AbstractClient { Q_DISABLE_COPY(AbstractClientHandler) diff --git a/TelepathyQt4/abstract-interface.h b/TelepathyQt4/abstract-interface.h index b4be2510..29f4d36a 100644 --- a/TelepathyQt4/abstract-interface.h +++ b/TelepathyQt4/abstract-interface.h @@ -39,7 +39,7 @@ class PendingVariant; class PendingOperation; class PendingVariantMap; -class TELEPATHY_QT4_EXPORT AbstractInterface : public QDBusAbstractInterface +class TP_QT_EXPORT AbstractInterface : public QDBusAbstractInterface { Q_OBJECT Q_DISABLE_COPY(AbstractInterface) diff --git a/TelepathyQt4/account-factory.h b/TelepathyQt4/account-factory.h index 35e4e999..10826892 100644 --- a/TelepathyQt4/account-factory.h +++ b/TelepathyQt4/account-factory.h @@ -42,7 +42,7 @@ namespace Tp class PendingReady; -class TELEPATHY_QT4_EXPORT AccountFactory : public FixedFeatureFactory +class TP_QT_EXPORT AccountFactory : public FixedFeatureFactory { Q_OBJECT Q_DISABLE_COPY(AccountFactory) diff --git a/TelepathyQt4/account-manager.h b/TelepathyQt4/account-manager.h index b0396b9f..67b806e8 100644 --- a/TelepathyQt4/account-manager.h +++ b/TelepathyQt4/account-manager.h @@ -50,7 +50,7 @@ namespace Tp class PendingAccount; -class TELEPATHY_QT4_EXPORT AccountManager : public StatelessDBusProxy, +class TP_QT_EXPORT AccountManager : public StatelessDBusProxy, public OptionalInterfaceFactory<AccountManager> { Q_OBJECT diff --git a/TelepathyQt4/account-property-filter.h b/TelepathyQt4/account-property-filter.h index 35690a28..97864cb1 100644 --- a/TelepathyQt4/account-property-filter.h +++ b/TelepathyQt4/account-property-filter.h @@ -34,7 +34,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT AccountPropertyFilter : public GenericPropertyFilter<Account> +class TP_QT_EXPORT AccountPropertyFilter : public GenericPropertyFilter<Account> { public: static AccountPropertyFilterPtr create() diff --git a/TelepathyQt4/account-set.h b/TelepathyQt4/account-set.h index b36adcea..088a74c1 100644 --- a/TelepathyQt4/account-set.h +++ b/TelepathyQt4/account-set.h @@ -38,7 +38,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT AccountSet : public Object +class TP_QT_EXPORT AccountSet : public Object { Q_OBJECT Q_DISABLE_COPY(AccountSet) diff --git a/TelepathyQt4/account.h b/TelepathyQt4/account.h index ca3c78c2..0e122497 100644 --- a/TelepathyQt4/account.h +++ b/TelepathyQt4/account.h @@ -65,7 +65,7 @@ class PendingOperation; class PendingReady; class PendingStringList; -class TELEPATHY_QT4_EXPORT Account : public StatelessDBusProxy, +class TP_QT_EXPORT Account : public StatelessDBusProxy, public OptionalInterfaceFactory<Account> { Q_OBJECT diff --git a/TelepathyQt4/avatar.h b/TelepathyQt4/avatar.h index 2cba49c9..49c6645d 100644 --- a/TelepathyQt4/avatar.h +++ b/TelepathyQt4/avatar.h @@ -37,7 +37,7 @@ namespace Tp { -struct TELEPATHY_QT4_EXPORT AvatarData +struct TP_QT_EXPORT AvatarData { public: inline AvatarData(const QString &fileName, const QString &mimeType) @@ -48,7 +48,7 @@ public: QString mimeType; }; -class TELEPATHY_QT4_EXPORT AvatarSpec +class TP_QT_EXPORT AvatarSpec { public: AvatarSpec(); diff --git a/TelepathyQt4/capabilities-base.h b/TelepathyQt4/capabilities-base.h index 1ff6a339..a2947839 100644 --- a/TelepathyQt4/capabilities-base.h +++ b/TelepathyQt4/capabilities-base.h @@ -33,7 +33,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT CapabilitiesBase +class TP_QT_EXPORT CapabilitiesBase { public: CapabilitiesBase(); diff --git a/TelepathyQt4/channel-class-spec.h b/TelepathyQt4/channel-class-spec.h index 75764cfb..366816be 100644 --- a/TelepathyQt4/channel-class-spec.h +++ b/TelepathyQt4/channel-class-spec.h @@ -39,7 +39,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT ChannelClassSpec +class TP_QT_EXPORT ChannelClassSpec { public: ChannelClassSpec(); @@ -202,7 +202,7 @@ private: QSharedDataPointer<Private> mPriv; }; -class TELEPATHY_QT4_EXPORT ChannelClassSpecList : +class TP_QT_EXPORT ChannelClassSpecList : public QList<ChannelClassSpec> { public: diff --git a/TelepathyQt4/channel-dispatch-operation.h b/TelepathyQt4/channel-dispatch-operation.h index 12ef3c3d..c2cdb140 100644 --- a/TelepathyQt4/channel-dispatch-operation.h +++ b/TelepathyQt4/channel-dispatch-operation.h @@ -47,7 +47,7 @@ namespace Tp class PendingOperation; -class TELEPATHY_QT4_EXPORT ChannelDispatchOperation : public StatefulDBusProxy, +class TP_QT_EXPORT ChannelDispatchOperation : public StatefulDBusProxy, public OptionalInterfaceFactory<ChannelDispatchOperation> { Q_OBJECT diff --git a/TelepathyQt4/channel-factory.h b/TelepathyQt4/channel-factory.h index b78e322a..6ef20c6f 100644 --- a/TelepathyQt4/channel-factory.h +++ b/TelepathyQt4/channel-factory.h @@ -43,14 +43,14 @@ namespace Tp class ChannelClassSpec; -class TELEPATHY_QT4_EXPORT ChannelFactory : public DBusProxyFactory +class TP_QT_EXPORT ChannelFactory : public DBusProxyFactory { Q_OBJECT Q_DISABLE_COPY(ChannelFactory) public: #ifndef DOXYGEN_SHOULD_SKIP_THIS - struct TELEPATHY_QT4_EXPORT Constructor : public RefCounted + struct TP_QT_EXPORT Constructor : public RefCounted { virtual ~Constructor() {} diff --git a/TelepathyQt4/channel-request.h b/TelepathyQt4/channel-request.h index ec38e950..de828403 100644 --- a/TelepathyQt4/channel-request.h +++ b/TelepathyQt4/channel-request.h @@ -49,7 +49,7 @@ namespace Tp class ChannelRequestHints; class PendingOperation; -class TELEPATHY_QT4_EXPORT ChannelRequest : public StatefulDBusProxy, +class TP_QT_EXPORT ChannelRequest : public StatefulDBusProxy, public OptionalInterfaceFactory<ChannelRequest> { Q_OBJECT @@ -123,7 +123,7 @@ private: Private *mPriv; }; -class TELEPATHY_QT4_EXPORT ChannelRequestHints +class TP_QT_EXPORT ChannelRequestHints { public: ChannelRequestHints(); diff --git a/TelepathyQt4/channel.h b/TelepathyQt4/channel.h index 54cc1234..0288cbda 100644 --- a/TelepathyQt4/channel.h +++ b/TelepathyQt4/channel.h @@ -48,7 +48,7 @@ class Connection; class PendingOperation; class PendingReady; -class TELEPATHY_QT4_EXPORT Channel : public StatefulDBusProxy, +class TP_QT_EXPORT Channel : public StatefulDBusProxy, public OptionalInterfaceFactory<Channel> { Q_OBJECT diff --git a/TelepathyQt4/client-registrar.h b/TelepathyQt4/client-registrar.h index 3428f300..cbfd28e9 100644 --- a/TelepathyQt4/client-registrar.h +++ b/TelepathyQt4/client-registrar.h @@ -40,7 +40,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT ClientRegistrar : public Object +class TP_QT_EXPORT ClientRegistrar : public Object { Q_OBJECT Q_DISABLE_COPY(ClientRegistrar) diff --git a/TelepathyQt4/connection-capabilities.h b/TelepathyQt4/connection-capabilities.h index 40d63ac4..5ca7316e 100644 --- a/TelepathyQt4/connection-capabilities.h +++ b/TelepathyQt4/connection-capabilities.h @@ -35,7 +35,7 @@ namespace Tp class TestBackdoors; -class TELEPATHY_QT4_EXPORT ConnectionCapabilities : public CapabilitiesBase +class TP_QT_EXPORT ConnectionCapabilities : public CapabilitiesBase { public: ConnectionCapabilities(); diff --git a/TelepathyQt4/connection-factory.h b/TelepathyQt4/connection-factory.h index f2b328bc..f00dac9b 100644 --- a/TelepathyQt4/connection-factory.h +++ b/TelepathyQt4/connection-factory.h @@ -46,7 +46,7 @@ namespace Tp class PendingReady; -class TELEPATHY_QT4_EXPORT ConnectionFactory : public FixedFeatureFactory +class TP_QT_EXPORT ConnectionFactory : public FixedFeatureFactory { public: static ConnectionFactoryPtr create(const QDBusConnection &bus, diff --git a/TelepathyQt4/connection-lowlevel.h b/TelepathyQt4/connection-lowlevel.h index caea693e..5fa0cee6 100644 --- a/TelepathyQt4/connection-lowlevel.h +++ b/TelepathyQt4/connection-lowlevel.h @@ -40,7 +40,7 @@ class PendingHandles; class PendingOperation; class PendingReady; -class TELEPATHY_QT4_EXPORT ConnectionLowlevel : public QObject, public RefCounted +class TP_QT_EXPORT ConnectionLowlevel : public QObject, public RefCounted { Q_OBJECT Q_DISABLE_COPY(ConnectionLowlevel) diff --git a/TelepathyQt4/connection-manager-lowlevel.h b/TelepathyQt4/connection-manager-lowlevel.h index 0bcada29..c26435e3 100644 --- a/TelepathyQt4/connection-manager-lowlevel.h +++ b/TelepathyQt4/connection-manager-lowlevel.h @@ -35,7 +35,7 @@ namespace Tp class PendingConnection; -class TELEPATHY_QT4_EXPORT ConnectionManagerLowlevel : public QObject, public RefCounted +class TP_QT_EXPORT ConnectionManagerLowlevel : public QObject, public RefCounted { Q_OBJECT Q_DISABLE_COPY(ConnectionManagerLowlevel) diff --git a/TelepathyQt4/connection-manager.h b/TelepathyQt4/connection-manager.h index d5ef0344..a2ed5e58 100644 --- a/TelepathyQt4/connection-manager.h +++ b/TelepathyQt4/connection-manager.h @@ -49,7 +49,7 @@ class ConnectionManagerLowlevel; class PendingConnection; class PendingStringList; -class TELEPATHY_QT4_EXPORT ConnectionManager : public StatelessDBusProxy, +class TP_QT_EXPORT ConnectionManager : public StatelessDBusProxy, public OptionalInterfaceFactory<ConnectionManager> { Q_OBJECT diff --git a/TelepathyQt4/connection.h b/TelepathyQt4/connection.h index 517642b7..4cb61db3 100644 --- a/TelepathyQt4/connection.h +++ b/TelepathyQt4/connection.h @@ -59,7 +59,7 @@ class PendingHandles; class PendingOperation; class PendingReady; -class TELEPATHY_QT4_EXPORT Connection : public StatefulDBusProxy, +class TP_QT_EXPORT Connection : public StatefulDBusProxy, public OptionalInterfaceFactory<Connection> { Q_OBJECT diff --git a/TelepathyQt4/contact-capabilities.h b/TelepathyQt4/contact-capabilities.h index c9d999a3..aa6eb6b8 100644 --- a/TelepathyQt4/contact-capabilities.h +++ b/TelepathyQt4/contact-capabilities.h @@ -35,7 +35,7 @@ namespace Tp class TestBackdoors; -class TELEPATHY_QT4_EXPORT ContactCapabilities : public CapabilitiesBase +class TP_QT_EXPORT ContactCapabilities : public CapabilitiesBase { public: ContactCapabilities(); diff --git a/TelepathyQt4/contact-factory.h b/TelepathyQt4/contact-factory.h index 66b6b1af..14f2d23d 100644 --- a/TelepathyQt4/contact-factory.h +++ b/TelepathyQt4/contact-factory.h @@ -41,7 +41,7 @@ namespace Tp class ContactManager; class ReferencedHandles; -class TELEPATHY_QT4_EXPORT ContactFactory : public RefCounted +class TP_QT_EXPORT ContactFactory : public RefCounted { Q_DISABLE_COPY(ContactFactory) diff --git a/TelepathyQt4/contact-manager.h b/TelepathyQt4/contact-manager.h index 9950c6ae..890269c5 100644 --- a/TelepathyQt4/contact-manager.h +++ b/TelepathyQt4/contact-manager.h @@ -47,7 +47,7 @@ class Connection; class PendingContacts; class PendingOperation; -class TELEPATHY_QT4_EXPORT ContactManager : public Object +class TP_QT_EXPORT ContactManager : public Object { Q_OBJECT Q_DISABLE_COPY(ContactManager) diff --git a/TelepathyQt4/contact-messenger.h b/TelepathyQt4/contact-messenger.h index 3d2b8f5e..02378180 100644 --- a/TelepathyQt4/contact-messenger.h +++ b/TelepathyQt4/contact-messenger.h @@ -37,7 +37,7 @@ namespace Tp class PendingSendMessage; class MessageContentPartList; -class TELEPATHY_QT4_EXPORT ContactMessenger : public QObject, public RefCounted +class TP_QT_EXPORT ContactMessenger : public QObject, public RefCounted { Q_OBJECT Q_DISABLE_COPY(ContactMessenger) diff --git a/TelepathyQt4/contact-search-channel.h b/TelepathyQt4/contact-search-channel.h index 731aa8e6..7b02f1cf 100644 --- a/TelepathyQt4/contact-search-channel.h +++ b/TelepathyQt4/contact-search-channel.h @@ -34,7 +34,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT ContactSearchChannel : public Channel +class TP_QT_EXPORT ContactSearchChannel : public Channel { Q_OBJECT Q_DISABLE_COPY(ContactSearchChannel) diff --git a/TelepathyQt4/contact.h b/TelepathyQt4/contact.h index 8e1e9d2d..e13663ee 100644 --- a/TelepathyQt4/contact.h +++ b/TelepathyQt4/contact.h @@ -47,7 +47,7 @@ class PendingOperation; class Presence; class ReferencedHandles; -class TELEPATHY_QT4_EXPORT Contact : public Object +class TP_QT_EXPORT Contact : public Object { Q_OBJECT Q_DISABLE_COPY(Contact) diff --git a/TelepathyQt4/dbus-proxy-factory.h b/TelepathyQt4/dbus-proxy-factory.h index c79d7ea7..c73dd0ea 100644 --- a/TelepathyQt4/dbus-proxy-factory.h +++ b/TelepathyQt4/dbus-proxy-factory.h @@ -45,7 +45,7 @@ class Features; class PendingReady; class PendingOperation; -class TELEPATHY_QT4_EXPORT DBusProxyFactory : public QObject, public RefCounted +class TP_QT_EXPORT DBusProxyFactory : public QObject, public RefCounted { Q_OBJECT Q_DISABLE_COPY(DBusProxyFactory) diff --git a/TelepathyQt4/dbus-proxy.h b/TelepathyQt4/dbus-proxy.h index a2bbcdc4..52a94225 100644 --- a/TelepathyQt4/dbus-proxy.h +++ b/TelepathyQt4/dbus-proxy.h @@ -39,7 +39,7 @@ namespace Tp class TestBackdoors; -class TELEPATHY_QT4_EXPORT DBusProxy : public Object, public ReadyObject +class TP_QT_EXPORT DBusProxy : public Object, public ReadyObject { Q_OBJECT Q_DISABLE_COPY(DBusProxy) @@ -77,7 +77,7 @@ private: Private *mPriv; }; -class TELEPATHY_QT4_EXPORT StatelessDBusProxy : public DBusProxy +class TP_QT_EXPORT StatelessDBusProxy : public DBusProxy { Q_OBJECT Q_DISABLE_COPY(StatelessDBusProxy) @@ -93,7 +93,7 @@ private: Private *mPriv; }; -class TELEPATHY_QT4_EXPORT StatefulDBusProxy : public DBusProxy +class TP_QT_EXPORT StatefulDBusProxy : public DBusProxy { Q_OBJECT Q_DISABLE_COPY(StatefulDBusProxy) diff --git a/TelepathyQt4/debug-internal.h b/TelepathyQt4/debug-internal.h index 0f881341..5cdc7979 100644 --- a/TelepathyQt4/debug-internal.h +++ b/TelepathyQt4/debug-internal.h @@ -28,7 +28,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT Debug +class TP_QT_EXPORT Debug { public: inline Debug() : debug(0) { } @@ -112,8 +112,8 @@ private: // The telepathy-farsight Qt 4 binding links to these - they're not API outside // this source tarball, but they *are* ABI -TELEPATHY_QT4_EXPORT Debug enabledDebug(); -TELEPATHY_QT4_EXPORT Debug enabledWarning(); +TP_QT_EXPORT Debug enabledDebug(); +TP_QT_EXPORT Debug enabledWarning(); #ifdef ENABLE_DEBUG diff --git a/TelepathyQt4/debug.h b/TelepathyQt4/debug.h index b2968fdd..3de3c86f 100644 --- a/TelepathyQt4/debug.h +++ b/TelepathyQt4/debug.h @@ -32,14 +32,14 @@ namespace Tp { -TELEPATHY_QT4_EXPORT void enableDebug(bool enable); -TELEPATHY_QT4_EXPORT void enableWarnings(bool enable); +TP_QT_EXPORT void enableDebug(bool enable); +TP_QT_EXPORT void enableWarnings(bool enable); typedef void (*DebugCallback)(const QString &libraryName, const QString &libraryVersion, QtMsgType type, const QString &msg); -TELEPATHY_QT4_EXPORT void setDebugCallback(DebugCallback cb); +TP_QT_EXPORT void setDebugCallback(DebugCallback cb); } // Tp diff --git a/TelepathyQt4/feature.h b/TelepathyQt4/feature.h index 343e8fca..b66141cc 100644 --- a/TelepathyQt4/feature.h +++ b/TelepathyQt4/feature.h @@ -38,7 +38,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT Feature : public QPair<QString, uint> +class TP_QT_EXPORT Feature : public QPair<QString, uint> { public: Feature(); @@ -58,7 +58,7 @@ private: QSharedDataPointer<Private> mPriv; }; -class TELEPATHY_QT4_EXPORT Features : public QSet<Feature> +class TP_QT_EXPORT Features : public QSet<Feature> { public: Features() { } diff --git a/TelepathyQt4/file-transfer-channel-creation-properties.h b/TelepathyQt4/file-transfer-channel-creation-properties.h index ac42b49b..78eabcf7 100644 --- a/TelepathyQt4/file-transfer-channel-creation-properties.h +++ b/TelepathyQt4/file-transfer-channel-creation-properties.h @@ -38,7 +38,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT FileTransferChannelCreationProperties +class TP_QT_EXPORT FileTransferChannelCreationProperties { public: FileTransferChannelCreationProperties(); diff --git a/TelepathyQt4/file-transfer-channel.h b/TelepathyQt4/file-transfer-channel.h index c3bdad77..5ac25891 100644 --- a/TelepathyQt4/file-transfer-channel.h +++ b/TelepathyQt4/file-transfer-channel.h @@ -32,7 +32,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT FileTransferChannel : public Channel +class TP_QT_EXPORT FileTransferChannel : public Channel { Q_OBJECT Q_DISABLE_COPY(FileTransferChannel) diff --git a/TelepathyQt4/fixed-feature-factory.h b/TelepathyQt4/fixed-feature-factory.h index 5f01f5cf..fce9c373 100644 --- a/TelepathyQt4/fixed-feature-factory.h +++ b/TelepathyQt4/fixed-feature-factory.h @@ -40,7 +40,7 @@ namespace Tp class Feature; class Features; -class TELEPATHY_QT4_EXPORT FixedFeatureFactory : public DBusProxyFactory +class TP_QT_EXPORT FixedFeatureFactory : public DBusProxyFactory { Q_OBJECT Q_DISABLE_COPY(FixedFeatureFactory) diff --git a/TelepathyQt4/global.h b/TelepathyQt4/global.h index 3a4e05e6..44f0c6fc 100644 --- a/TelepathyQt4/global.h +++ b/TelepathyQt4/global.h @@ -30,9 +30,9 @@ #include <QtGlobal> #ifdef BUILDING_TP_QT -# define TELEPATHY_QT4_EXPORT Q_DECL_EXPORT +# define TP_QT_EXPORT Q_DECL_EXPORT #else -# define TELEPATHY_QT4_EXPORT Q_DECL_IMPORT +# define TP_QT_EXPORT Q_DECL_IMPORT #endif #if !defined(Q_OS_WIN) && defined(QT_VISIBILITY_AVAILABLE) diff --git a/TelepathyQt4/handled-channel-notifier.h b/TelepathyQt4/handled-channel-notifier.h index f1bb3063..2ffad2db 100644 --- a/TelepathyQt4/handled-channel-notifier.h +++ b/TelepathyQt4/handled-channel-notifier.h @@ -38,7 +38,7 @@ namespace Tp class ChannelRequestHints; class RequestTemporaryHandler; -class TELEPATHY_QT4_EXPORT HandledChannelNotifier : public QObject +class TP_QT_EXPORT HandledChannelNotifier : public QObject { Q_OBJECT Q_DISABLE_COPY(HandledChannelNotifier) diff --git a/TelepathyQt4/incoming-file-transfer-channel.h b/TelepathyQt4/incoming-file-transfer-channel.h index c0683509..61da63ad 100644 --- a/TelepathyQt4/incoming-file-transfer-channel.h +++ b/TelepathyQt4/incoming-file-transfer-channel.h @@ -34,7 +34,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT IncomingFileTransferChannel : public FileTransferChannel +class TP_QT_EXPORT IncomingFileTransferChannel : public FileTransferChannel { Q_OBJECT Q_DISABLE_COPY(IncomingFileTransferChannel) diff --git a/TelepathyQt4/incoming-stream-tube-channel.h b/TelepathyQt4/incoming-stream-tube-channel.h index 112c44a1..6b36e392 100644 --- a/TelepathyQt4/incoming-stream-tube-channel.h +++ b/TelepathyQt4/incoming-stream-tube-channel.h @@ -37,7 +37,7 @@ namespace Tp class PendingStreamTubeConnection; -class TELEPATHY_QT4_EXPORT IncomingStreamTubeChannel : public StreamTubeChannel +class TP_QT_EXPORT IncomingStreamTubeChannel : public StreamTubeChannel { Q_OBJECT Q_DISABLE_COPY(IncomingStreamTubeChannel) diff --git a/TelepathyQt4/key-file.h b/TelepathyQt4/key-file.h index a8388cb5..85e35e22 100644 --- a/TelepathyQt4/key-file.h +++ b/TelepathyQt4/key-file.h @@ -38,7 +38,7 @@ class QStringList; namespace Tp { -class TELEPATHY_QT4_EXPORT KeyFile +class TP_QT_EXPORT KeyFile { public: enum Status { diff --git a/TelepathyQt4/location-info.h b/TelepathyQt4/location-info.h index ad9bbe6f..91017407 100644 --- a/TelepathyQt4/location-info.h +++ b/TelepathyQt4/location-info.h @@ -37,7 +37,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT LocationInfo +class TP_QT_EXPORT LocationInfo { public: LocationInfo(); diff --git a/TelepathyQt4/manager-file.h b/TelepathyQt4/manager-file.h index 5fdd6795..d7734184 100644 --- a/TelepathyQt4/manager-file.h +++ b/TelepathyQt4/manager-file.h @@ -37,7 +37,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT ManagerFile +class TP_QT_EXPORT ManagerFile { public: ManagerFile(); diff --git a/TelepathyQt4/message-content-part.h b/TelepathyQt4/message-content-part.h index 08b727fd..4bde3e50 100644 --- a/TelepathyQt4/message-content-part.h +++ b/TelepathyQt4/message-content-part.h @@ -33,7 +33,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT MessageContentPart +class TP_QT_EXPORT MessageContentPart { public: MessageContentPart(); @@ -54,7 +54,7 @@ private: QSharedDataPointer<Private> mPriv; }; -class TELEPATHY_QT4_EXPORT MessageContentPartList : +class TP_QT_EXPORT MessageContentPartList : public QList<MessageContentPart> { public: diff --git a/TelepathyQt4/message.h b/TelepathyQt4/message.h index 8e45cb02..1c02dcca 100644 --- a/TelepathyQt4/message.h +++ b/TelepathyQt4/message.h @@ -41,7 +41,7 @@ namespace Tp class Contact; class TextChannel; -class TELEPATHY_QT4_EXPORT Message +class TP_QT_EXPORT Message { public: Message(ChannelTextMessageType, const QString &); @@ -94,7 +94,7 @@ private: QSharedDataPointer<Private> mPriv; }; -class TELEPATHY_QT4_EXPORT ReceivedMessage : public Message +class TP_QT_EXPORT ReceivedMessage : public Message { public: class DeliveryDetails diff --git a/TelepathyQt4/object.h b/TelepathyQt4/object.h index 12f5ed63..f61d6911 100644 --- a/TelepathyQt4/object.h +++ b/TelepathyQt4/object.h @@ -36,7 +36,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT Object : public QObject, public RefCounted +class TP_QT_EXPORT Object : public QObject, public RefCounted { Q_OBJECT Q_DISABLE_COPY(Object) diff --git a/TelepathyQt4/optional-interface-factory.h b/TelepathyQt4/optional-interface-factory.h index 69eaf142..a825e063 100644 --- a/TelepathyQt4/optional-interface-factory.h +++ b/TelepathyQt4/optional-interface-factory.h @@ -40,7 +40,7 @@ class AbstractInterface; #ifndef DOXYGEN_SHOULD_SKIP_THIS -class TELEPATHY_QT4_EXPORT OptionalInterfaceCache +class TP_QT_EXPORT OptionalInterfaceCache { Q_DISABLE_COPY(OptionalInterfaceCache) diff --git a/TelepathyQt4/outgoing-file-transfer-channel.h b/TelepathyQt4/outgoing-file-transfer-channel.h index 616c83cd..4d7fa620 100644 --- a/TelepathyQt4/outgoing-file-transfer-channel.h +++ b/TelepathyQt4/outgoing-file-transfer-channel.h @@ -34,7 +34,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT OutgoingFileTransferChannel : public FileTransferChannel +class TP_QT_EXPORT OutgoingFileTransferChannel : public FileTransferChannel { Q_OBJECT Q_DISABLE_COPY(OutgoingFileTransferChannel) diff --git a/TelepathyQt4/outgoing-stream-tube-channel.h b/TelepathyQt4/outgoing-stream-tube-channel.h index 8dc9e9e1..25eef954 100644 --- a/TelepathyQt4/outgoing-stream-tube-channel.h +++ b/TelepathyQt4/outgoing-stream-tube-channel.h @@ -36,7 +36,7 @@ class QLocalServer; namespace Tp { -class TELEPATHY_QT4_EXPORT OutgoingStreamTubeChannel : public StreamTubeChannel +class TP_QT_EXPORT OutgoingStreamTubeChannel : public StreamTubeChannel { Q_OBJECT Q_DISABLE_COPY(OutgoingStreamTubeChannel) diff --git a/TelepathyQt4/pending-account.h b/TelepathyQt4/pending-account.h index 0305dd99..3090022c 100644 --- a/TelepathyQt4/pending-account.h +++ b/TelepathyQt4/pending-account.h @@ -40,7 +40,7 @@ namespace Tp class AccountManager; -class TELEPATHY_QT4_EXPORT PendingAccount : public PendingOperation +class TP_QT_EXPORT PendingAccount : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingAccount); diff --git a/TelepathyQt4/pending-channel-request.h b/TelepathyQt4/pending-channel-request.h index d3e02a4c..42e8289b 100644 --- a/TelepathyQt4/pending-channel-request.h +++ b/TelepathyQt4/pending-channel-request.h @@ -43,7 +43,7 @@ namespace Tp class Account; class ChannelRequestHints; -class TELEPATHY_QT4_EXPORT PendingChannelRequest : public PendingOperation +class TP_QT_EXPORT PendingChannelRequest : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingChannelRequest) diff --git a/TelepathyQt4/pending-channel.h b/TelepathyQt4/pending-channel.h index 43450335..ecc53479 100644 --- a/TelepathyQt4/pending-channel.h +++ b/TelepathyQt4/pending-channel.h @@ -41,7 +41,7 @@ namespace Tp class Connection; class HandledChannelNotifier; -class TELEPATHY_QT4_EXPORT PendingChannel : public PendingOperation +class TP_QT_EXPORT PendingChannel : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingChannel) diff --git a/TelepathyQt4/pending-connection.h b/TelepathyQt4/pending-connection.h index f0faffaf..f61d4e61 100644 --- a/TelepathyQt4/pending-connection.h +++ b/TelepathyQt4/pending-connection.h @@ -40,7 +40,7 @@ namespace Tp class ConnectionManager; -class TELEPATHY_QT4_EXPORT PendingConnection : public PendingOperation +class TP_QT_EXPORT PendingConnection : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingConnection); diff --git a/TelepathyQt4/pending-contact-attributes.h b/TelepathyQt4/pending-contact-attributes.h index fdbf07d6..902e565a 100644 --- a/TelepathyQt4/pending-contact-attributes.h +++ b/TelepathyQt4/pending-contact-attributes.h @@ -37,7 +37,7 @@ namespace Tp class ReferencedHandles; -class TELEPATHY_QT4_EXPORT PendingContactAttributes : public PendingOperation +class TP_QT_EXPORT PendingContactAttributes : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingContactAttributes) diff --git a/TelepathyQt4/pending-contact-info.h b/TelepathyQt4/pending-contact-info.h index edfa0961..1540d9e8 100644 --- a/TelepathyQt4/pending-contact-info.h +++ b/TelepathyQt4/pending-contact-info.h @@ -36,7 +36,7 @@ class QDBusPendingCallWatcher; namespace Tp { -class TELEPATHY_QT4_EXPORT PendingContactInfo : public PendingOperation +class TP_QT_EXPORT PendingContactInfo : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingContactInfo); diff --git a/TelepathyQt4/pending-contacts.h b/TelepathyQt4/pending-contacts.h index 3015630e..9a14fddf 100644 --- a/TelepathyQt4/pending-contacts.h +++ b/TelepathyQt4/pending-contacts.h @@ -43,7 +43,7 @@ namespace Tp class ContactManager; -class TELEPATHY_QT4_EXPORT PendingContacts : public PendingOperation +class TP_QT_EXPORT PendingContacts : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingContacts); diff --git a/TelepathyQt4/pending-handles.h b/TelepathyQt4/pending-handles.h index 0806e0e5..d352069a 100644 --- a/TelepathyQt4/pending-handles.h +++ b/TelepathyQt4/pending-handles.h @@ -43,7 +43,7 @@ namespace Tp class PendingHandles; class ReferencedHandles; -class TELEPATHY_QT4_EXPORT PendingHandles : public PendingOperation +class TP_QT_EXPORT PendingHandles : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingHandles) diff --git a/TelepathyQt4/pending-operation.h b/TelepathyQt4/pending-operation.h index d4456da2..1dad0bb2 100644 --- a/TelepathyQt4/pending-operation.h +++ b/TelepathyQt4/pending-operation.h @@ -42,7 +42,7 @@ namespace Tp class ReadinessHelper; -class TELEPATHY_QT4_EXPORT PendingOperation : public QObject +class TP_QT_EXPORT PendingOperation : public QObject { Q_OBJECT Q_DISABLE_COPY(PendingOperation) diff --git a/TelepathyQt4/pending-ready.h b/TelepathyQt4/pending-ready.h index 13c94ffe..700f5552 100644 --- a/TelepathyQt4/pending-ready.h +++ b/TelepathyQt4/pending-ready.h @@ -37,7 +37,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT PendingReady: public PendingOperation +class TP_QT_EXPORT PendingReady: public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingReady); diff --git a/TelepathyQt4/pending-send-message.h b/TelepathyQt4/pending-send-message.h index 1e9561ce..b12cb0b5 100644 --- a/TelepathyQt4/pending-send-message.h +++ b/TelepathyQt4/pending-send-message.h @@ -38,7 +38,7 @@ namespace Tp class Message; -class TELEPATHY_QT4_EXPORT PendingSendMessage : public PendingOperation +class TP_QT_EXPORT PendingSendMessage : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingSendMessage) diff --git a/TelepathyQt4/pending-stream-tube-connection.h b/TelepathyQt4/pending-stream-tube-connection.h index ff13a461..0c968afe 100644 --- a/TelepathyQt4/pending-stream-tube-connection.h +++ b/TelepathyQt4/pending-stream-tube-connection.h @@ -40,7 +40,7 @@ namespace Tp class PendingVariant; class IncomingStreamTubeChannel; -class TELEPATHY_QT4_EXPORT PendingStreamTubeConnection : public PendingOperation +class TP_QT_EXPORT PendingStreamTubeConnection : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingStreamTubeConnection) diff --git a/TelepathyQt4/pending-string-list.h b/TelepathyQt4/pending-string-list.h index 1e3af84a..f4a04e03 100644 --- a/TelepathyQt4/pending-string-list.h +++ b/TelepathyQt4/pending-string-list.h @@ -34,7 +34,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT PendingStringList : public PendingOperation +class TP_QT_EXPORT PendingStringList : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingStringList); diff --git a/TelepathyQt4/pending-variant-map.h b/TelepathyQt4/pending-variant-map.h index f8cc8105..2c23e96f 100644 --- a/TelepathyQt4/pending-variant-map.h +++ b/TelepathyQt4/pending-variant-map.h @@ -35,7 +35,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT PendingVariantMap : public PendingOperation +class TP_QT_EXPORT PendingVariantMap : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingVariantMap); diff --git a/TelepathyQt4/pending-variant.h b/TelepathyQt4/pending-variant.h index d85cea8e..48b34e07 100644 --- a/TelepathyQt4/pending-variant.h +++ b/TelepathyQt4/pending-variant.h @@ -35,7 +35,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT PendingVariant : public PendingOperation +class TP_QT_EXPORT PendingVariant : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingVariant); diff --git a/TelepathyQt4/presence.h b/TelepathyQt4/presence.h index 587adad8..7f7edc79 100644 --- a/TelepathyQt4/presence.h +++ b/TelepathyQt4/presence.h @@ -33,7 +33,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT Presence +class TP_QT_EXPORT Presence { public: Presence(); @@ -71,7 +71,7 @@ private: QSharedDataPointer<Private> mPriv; }; -class TELEPATHY_QT4_EXPORT PresenceSpec +class TP_QT_EXPORT PresenceSpec { public: PresenceSpec(); @@ -98,7 +98,7 @@ private: QSharedDataPointer<Private> mPriv; }; -class TELEPATHY_QT4_EXPORT PresenceSpecList : public QList<PresenceSpec> +class TP_QT_EXPORT PresenceSpecList : public QList<PresenceSpec> { public: PresenceSpecList() { } diff --git a/TelepathyQt4/profile-manager.h b/TelepathyQt4/profile-manager.h index 807b4760..8ad8a297 100644 --- a/TelepathyQt4/profile-manager.h +++ b/TelepathyQt4/profile-manager.h @@ -40,7 +40,7 @@ namespace Tp class PendingOperation; -class TELEPATHY_QT4_EXPORT ProfileManager : public Object, public ReadyObject +class TP_QT_EXPORT ProfileManager : public Object, public ReadyObject { Q_OBJECT Q_DISABLE_COPY(ProfileManager); diff --git a/TelepathyQt4/profile.h b/TelepathyQt4/profile.h index 210ec33a..100752e8 100644 --- a/TelepathyQt4/profile.h +++ b/TelepathyQt4/profile.h @@ -40,7 +40,7 @@ namespace Tp class ProtocolInfo; -class TELEPATHY_QT4_EXPORT Profile : public RefCounted +class TP_QT_EXPORT Profile : public RefCounted { Q_DISABLE_COPY(Profile); diff --git a/TelepathyQt4/protocol-info.h b/TelepathyQt4/protocol-info.h index dcd432f4..8ba69307 100644 --- a/TelepathyQt4/protocol-info.h +++ b/TelepathyQt4/protocol-info.h @@ -42,7 +42,7 @@ namespace Tp class ConnectionCapabilities; -class TELEPATHY_QT4_EXPORT ProtocolInfo +class TP_QT_EXPORT ProtocolInfo { public: ProtocolInfo(); diff --git a/TelepathyQt4/protocol-parameter.h b/TelepathyQt4/protocol-parameter.h index 24bdb011..0775000d 100644 --- a/TelepathyQt4/protocol-parameter.h +++ b/TelepathyQt4/protocol-parameter.h @@ -38,7 +38,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT ProtocolParameter +class TP_QT_EXPORT ProtocolParameter { public: ProtocolParameter(); diff --git a/TelepathyQt4/readiness-helper.h b/TelepathyQt4/readiness-helper.h index 27ce4bcb..7bad2bb1 100644 --- a/TelepathyQt4/readiness-helper.h +++ b/TelepathyQt4/readiness-helper.h @@ -44,7 +44,7 @@ class PendingOperation; class PendingReady; class RefCounted; -class TELEPATHY_QT4_EXPORT ReadinessHelper : public QObject +class TP_QT_EXPORT ReadinessHelper : public QObject { Q_OBJECT Q_DISABLE_COPY(ReadinessHelper) diff --git a/TelepathyQt4/ready-object.h b/TelepathyQt4/ready-object.h index ccdd4742..607e994f 100644 --- a/TelepathyQt4/ready-object.h +++ b/TelepathyQt4/ready-object.h @@ -39,7 +39,7 @@ class PendingReady; class ReadinessHelper; class RefCounted; -class TELEPATHY_QT4_EXPORT ReadyObject +class TP_QT_EXPORT ReadyObject { Q_DISABLE_COPY(ReadyObject) diff --git a/TelepathyQt4/referenced-handles.h b/TelepathyQt4/referenced-handles.h index 369dc734..5606881e 100644 --- a/TelepathyQt4/referenced-handles.h +++ b/TelepathyQt4/referenced-handles.h @@ -44,7 +44,7 @@ namespace Tp class Connection; -class TELEPATHY_QT4_EXPORT ReferencedHandles +class TP_QT_EXPORT ReferencedHandles { public: typedef UIntList::const_iterator const_iterator; diff --git a/TelepathyQt4/requestable-channel-class-spec.h b/TelepathyQt4/requestable-channel-class-spec.h index 97a81f78..3d9a6a78 100644 --- a/TelepathyQt4/requestable-channel-class-spec.h +++ b/TelepathyQt4/requestable-channel-class-spec.h @@ -33,7 +33,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT RequestableChannelClassSpec +class TP_QT_EXPORT RequestableChannelClassSpec { public: RequestableChannelClassSpec(); @@ -92,7 +92,7 @@ private: QSharedDataPointer<Private> mPriv; }; -class TELEPATHY_QT4_EXPORT RequestableChannelClassSpecList : +class TP_QT_EXPORT RequestableChannelClassSpecList : public QList<RequestableChannelClassSpec> { public: diff --git a/TelepathyQt4/room-list-channel.h b/TelepathyQt4/room-list-channel.h index 88f8906f..c69d00c6 100644 --- a/TelepathyQt4/room-list-channel.h +++ b/TelepathyQt4/room-list-channel.h @@ -32,7 +32,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT RoomListChannel : public Channel +class TP_QT_EXPORT RoomListChannel : public Channel { Q_OBJECT Q_DISABLE_COPY(RoomListChannel) diff --git a/TelepathyQt4/shared-ptr.h b/TelepathyQt4/shared-ptr.h index a8067caf..ceb93902 100644 --- a/TelepathyQt4/shared-ptr.h +++ b/TelepathyQt4/shared-ptr.h @@ -38,7 +38,7 @@ namespace Tp class RefCounted; template <class T> class SharedPtr; -class TELEPATHY_QT4_EXPORT RefCounted +class TP_QT_EXPORT RefCounted { Q_DISABLE_COPY(RefCounted) diff --git a/TelepathyQt4/simple-call-observer.h b/TelepathyQt4/simple-call-observer.h index fb52161f..0d3ba983 100644 --- a/TelepathyQt4/simple-call-observer.h +++ b/TelepathyQt4/simple-call-observer.h @@ -33,7 +33,7 @@ namespace Tp class PendingOperation; -class TELEPATHY_QT4_EXPORT SimpleCallObserver : public QObject, +class TP_QT_EXPORT SimpleCallObserver : public QObject, public RefCounted { Q_OBJECT diff --git a/TelepathyQt4/simple-observer.h b/TelepathyQt4/simple-observer.h index 7f0c7c42..89025d16 100644 --- a/TelepathyQt4/simple-observer.h +++ b/TelepathyQt4/simple-observer.h @@ -34,7 +34,7 @@ namespace Tp class PendingOperation; -class TELEPATHY_QT4_EXPORT SimpleObserver : public QObject, public RefCounted +class TP_QT_EXPORT SimpleObserver : public QObject, public RefCounted { Q_OBJECT Q_DISABLE_COPY(SimpleObserver) diff --git a/TelepathyQt4/simple-pending-operations.h b/TelepathyQt4/simple-pending-operations.h index 14d36135..cfe3c486 100644 --- a/TelepathyQt4/simple-pending-operations.h +++ b/TelepathyQt4/simple-pending-operations.h @@ -34,7 +34,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT PendingSuccess : public PendingOperation +class TP_QT_EXPORT PendingSuccess : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingSuccess) @@ -47,7 +47,7 @@ public: } }; -class TELEPATHY_QT4_EXPORT PendingFailure : public PendingOperation +class TP_QT_EXPORT PendingFailure : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingFailure) @@ -68,7 +68,7 @@ public: } }; -class TELEPATHY_QT4_EXPORT PendingVoid : public PendingOperation +class TP_QT_EXPORT PendingVoid : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingVoid) @@ -85,7 +85,7 @@ private: Private *mPriv; }; -class TELEPATHY_QT4_EXPORT PendingComposite : public PendingOperation +class TP_QT_EXPORT PendingComposite : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingComposite) diff --git a/TelepathyQt4/simple-text-observer.h b/TelepathyQt4/simple-text-observer.h index e03665dc..cf5098e9 100644 --- a/TelepathyQt4/simple-text-observer.h +++ b/TelepathyQt4/simple-text-observer.h @@ -35,7 +35,7 @@ class Message; class PendingOperation; class ReceivedMessage; -class TELEPATHY_QT4_EXPORT SimpleTextObserver : public QObject, public RefCounted +class TP_QT_EXPORT SimpleTextObserver : public QObject, public RefCounted { Q_OBJECT Q_DISABLE_COPY(SimpleTextObserver) diff --git a/TelepathyQt4/stream-tube-channel.h b/TelepathyQt4/stream-tube-channel.h index c44b7635..16b50f9b 100644 --- a/TelepathyQt4/stream-tube-channel.h +++ b/TelepathyQt4/stream-tube-channel.h @@ -33,7 +33,7 @@ class QHostAddress; namespace Tp { -class TELEPATHY_QT4_EXPORT StreamTubeChannel : public TubeChannel +class TP_QT_EXPORT StreamTubeChannel : public TubeChannel { Q_OBJECT Q_DISABLE_COPY(StreamTubeChannel) diff --git a/TelepathyQt4/stream-tube-client.h b/TelepathyQt4/stream-tube-client.h index 297bcfb5..dcc89469 100644 --- a/TelepathyQt4/stream-tube-client.h +++ b/TelepathyQt4/stream-tube-client.h @@ -37,7 +37,7 @@ namespace Tp class PendingStreamTubeConnection; -class TELEPATHY_QT4_EXPORT StreamTubeClient : public QObject, public RefCounted +class TP_QT_EXPORT StreamTubeClient : public QObject, public RefCounted { Q_OBJECT Q_DISABLE_COPY(StreamTubeClient) diff --git a/TelepathyQt4/stream-tube-server.h b/TelepathyQt4/stream-tube-server.h index 39838cf4..2ce101b8 100644 --- a/TelepathyQt4/stream-tube-server.h +++ b/TelepathyQt4/stream-tube-server.h @@ -39,7 +39,7 @@ class QTcpServer; namespace Tp { -class TELEPATHY_QT4_EXPORT StreamTubeServer : public QObject, public RefCounted +class TP_QT_EXPORT StreamTubeServer : public QObject, public RefCounted { Q_OBJECT Q_DISABLE_COPY(StreamTubeServer) diff --git a/TelepathyQt4/streamed-media-channel.h b/TelepathyQt4/streamed-media-channel.h index edca8815..ae635320 100644 --- a/TelepathyQt4/streamed-media-channel.h +++ b/TelepathyQt4/streamed-media-channel.h @@ -40,7 +40,7 @@ class StreamedMediaChannel; typedef QList<StreamedMediaStreamPtr> StreamedMediaStreams; -class TELEPATHY_QT4_EXPORT PendingStreamedMediaStreams : public PendingOperation +class TP_QT_EXPORT PendingStreamedMediaStreams : public PendingOperation { Q_OBJECT Q_DISABLE_COPY(PendingStreamedMediaStreams) @@ -70,7 +70,7 @@ private: Private *mPriv; }; -class TELEPATHY_QT4_EXPORT StreamedMediaStream : public Object, private ReadyObject +class TP_QT_EXPORT StreamedMediaStream : public Object, private ReadyObject { Q_OBJECT Q_DISABLE_COPY(StreamedMediaStream) @@ -137,7 +137,7 @@ private: Private *mPriv; }; -class TELEPATHY_QT4_EXPORT StreamedMediaChannel : public Channel +class TP_QT_EXPORT StreamedMediaChannel : public Channel { Q_OBJECT Q_DISABLE_COPY(StreamedMediaChannel) diff --git a/TelepathyQt4/test-backdoors.h b/TelepathyQt4/test-backdoors.h index 27fabab5..4bb6de1b 100644 --- a/TelepathyQt4/test-backdoors.h +++ b/TelepathyQt4/test-backdoors.h @@ -42,7 +42,7 @@ class DBusProxy; // Exported so the tests can use it even if they link dynamically // The header is not installed though, so this should be considered private API -struct TELEPATHY_QT4_EXPORT TestBackdoors +struct TP_QT_EXPORT TestBackdoors { static void invalidateProxy(DBusProxy *proxy, const QString &reason, const QString &message); diff --git a/TelepathyQt4/text-channel.h b/TelepathyQt4/text-channel.h index 149825ae..c6ec290e 100644 --- a/TelepathyQt4/text-channel.h +++ b/TelepathyQt4/text-channel.h @@ -37,7 +37,7 @@ namespace Tp class Message; class ReceivedMessage; -class TELEPATHY_QT4_EXPORT TextChannel : public Channel +class TP_QT_EXPORT TextChannel : public Channel { Q_OBJECT Q_DISABLE_COPY(TextChannel) diff --git a/TelepathyQt4/tube-channel.h b/TelepathyQt4/tube-channel.h index 16c40262..99a8d0a1 100644 --- a/TelepathyQt4/tube-channel.h +++ b/TelepathyQt4/tube-channel.h @@ -31,7 +31,7 @@ namespace Tp { -class TELEPATHY_QT4_EXPORT TubeChannel : public Channel +class TP_QT_EXPORT TubeChannel : public Channel { Q_OBJECT Q_DISABLE_COPY(TubeChannel) diff --git a/TelepathyQt4/types-internal.h b/TelepathyQt4/types-internal.h index 88a1c429..cd7bce1c 100644 --- a/TelepathyQt4/types-internal.h +++ b/TelepathyQt4/types-internal.h @@ -32,7 +32,7 @@ namespace Tp /** * Private structure used to circumvent QtDBus' strict demarshalling */ -struct TELEPATHY_QT4_EXPORT SUSocketAddress +struct TP_QT_EXPORT SUSocketAddress { /** * A dotted-quad IPv4 address literal: four ASCII decimal numbers, each @@ -45,13 +45,13 @@ struct TELEPATHY_QT4_EXPORT SUSocketAddress uint port; }; -TELEPATHY_QT4_EXPORT bool operator==(const SUSocketAddress& v1, const SUSocketAddress& v2); -TELEPATHY_QT4_EXPORT inline bool operator!=(const SUSocketAddress& v1, const SUSocketAddress& v2) +TP_QT_EXPORT bool operator==(const SUSocketAddress& v1, const SUSocketAddress& v2); +TP_QT_EXPORT inline bool operator!=(const SUSocketAddress& v1, const SUSocketAddress& v2) { return !operator==(v1, v2); } -TELEPATHY_QT4_EXPORT QDBusArgument& operator<<(QDBusArgument& arg, const SUSocketAddress& val); -TELEPATHY_QT4_EXPORT const QDBusArgument& operator>>(const QDBusArgument& arg, SUSocketAddress& val); +TP_QT_EXPORT QDBusArgument& operator<<(QDBusArgument& arg, const SUSocketAddress& val); +TP_QT_EXPORT const QDBusArgument& operator>>(const QDBusArgument& arg, SUSocketAddress& val); } // Tp diff --git a/TelepathyQt4/types.h b/TelepathyQt4/types.h index 2f6c159b..c79abcd3 100644 --- a/TelepathyQt4/types.h +++ b/TelepathyQt4/types.h @@ -38,7 +38,7 @@ namespace Tp { -TELEPATHY_QT4_EXPORT void registerTypes(); +TP_QT_EXPORT void registerTypes(); template <typename T> class Filter; template <typename T> class GenericCapabilityFilter; diff --git a/TelepathyQt4/utils.h b/TelepathyQt4/utils.h index 84785226..4abd4e81 100644 --- a/TelepathyQt4/utils.h +++ b/TelepathyQt4/utils.h @@ -34,7 +34,7 @@ namespace Tp { -TELEPATHY_QT4_EXPORT QString escapeAsIdentifier(const QString &string); +TP_QT_EXPORT QString escapeAsIdentifier(const QString &string); } // Tp diff --git a/cmake/modules/TpQt4Macros.cmake b/cmake/modules/TpQt4Macros.cmake index 59dca7d1..cd67618b 100644 --- a/cmake/modules/TpQt4Macros.cmake +++ b/cmake/modules/TpQt4Macros.cmake @@ -199,7 +199,7 @@ function(tpqt4_client_generator spec group pretty_include namespace) --ifacexml=${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml --extraincludes=${TYPES_INCLUDE} --must-define=IN_TP_QT_HEADER - --visibility=TELEPATHY_QT4_EXPORT + --visibility=TP_QT_EXPORT ${client_generator_args}) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp COMMAND ${PYTHON_EXECUTABLE} diff --git a/doxygen.cfg.in b/doxygen.cfg.in index 1b01e976..defa0314 100644 --- a/doxygen.cfg.in +++ b/doxygen.cfg.in @@ -1468,7 +1468,7 @@ ALIASES = \ "qpl=<a href=\"http://www.trolltech.com/products/qt/licenses\">QPL</a>" PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \ - TELEPATHY_QT4_EXPORT="" \ + TP_QT_EXPORT="" \ TELEPATHY_QT4_NO_EXPORT="" \ Q_SLOTS="slots" \ Q_SIGNALS="signals" |