From 5763f5c9f3a0ebe435c8a715795052359d19b3a3 Mon Sep 17 00:00:00 2001 From: Thomas Flueeli Date: Thu, 28 Oct 2010 14:09:19 +0200 Subject: [PATCH 1/5] remove redundant export macros The hole class is exported, thus exporting individual methods is redundant and leads to the following errors on MSVC9: account.h(375) : error C2487: 'Tp::Account::{ctor}' : member of dll interface class may not be declared with dll interface account.h(376) : error C2487: 'Tp::Account::{ctor}' : member of dll interface class may not be declared with dll interface account.h(384) : error C2487: 'baseInterface' : member of dll interface class may not be declared with dll interface --- TelepathyQt4/account.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TelepathyQt4/account.h b/TelepathyQt4/account.h index ef7b2d9..ff88b33 100644 --- a/TelepathyQt4/account.h +++ b/TelepathyQt4/account.h @@ -372,8 +372,8 @@ Q_SIGNALS: void propertyChanged(const QString &propertyName); protected: - TELEPATHY_QT4_EXPORT Account(const QString &busName, const QString &objectPath); - TELEPATHY_QT4_EXPORT Account(const QDBusConnection &bus, + Account(const QString &busName, const QString &objectPath); + Account(const QDBusConnection &bus, const QString &busName, const QString &objectPath); Account(const QDBusConnection &bus, const QString &busName, const QString &objectPath, @@ -381,7 +381,7 @@ protected: const ChannelFactoryConstPtr &channelFactory, const ContactFactoryConstPtr &contactFactory); - TELEPATHY_QT4_EXPORT Client::AccountInterface *baseInterface() const; + Client::AccountInterface *baseInterface() const; private Q_SLOTS: void gotMainProperties(QDBusPendingCallWatcher *); -- 1.7.2.3