From 4ecf82795de54fba530ac9c386f3afff2174edbd Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 9 Jan 2012 08:53:17 +0100 Subject: Remove use of QT_MODULE from library These defines were there to aid in the commercial licensing scheme we used long ago, and are no longer needed. Keep a QT_MODULE(x) define so other modules continue compiling. Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7 Reviewed-by: Lars Knoll --- src/dbus/qdbusabstractadaptor.h | 1 - src/dbus/qdbusabstractinterface.h | 1 - src/dbus/qdbusargument.h | 1 - src/dbus/qdbusconnection.h | 1 - src/dbus/qdbusconnectioninterface.h | 1 - src/dbus/qdbuscontext.h | 1 - src/dbus/qdbuserror.h | 1 - src/dbus/qdbusextratypes.h | 1 - src/dbus/qdbusinterface.h | 1 - src/dbus/qdbusmacros.h | 1 - src/dbus/qdbusmessage.h | 1 - src/dbus/qdbusmetatype.h | 1 - src/dbus/qdbuspendingcall.h | 1 - src/dbus/qdbuspendingreply.h | 1 - src/dbus/qdbusreply.h | 1 - src/dbus/qdbusserver.h | 1 - src/dbus/qdbusservicewatcher.h | 1 - src/dbus/qdbusunixfiledescriptor.h | 1 - src/dbus/qdbusvirtualobject.h | 1 - 19 files changed, 19 deletions(-) (limited to 'src/dbus') diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h index 4c72d67cf5..986ee2e0ec 100644 --- a/src/dbus/qdbusabstractadaptor.h +++ b/src/dbus/qdbusabstractadaptor.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusAbstractAdaptorPrivate; class Q_DBUS_EXPORT QDBusAbstractAdaptor: public QObject diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index 9deeaed5c0..4adc59290d 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusError; class QDBusPendingCall; diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 00f4174037..87b80baa20 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusUnixFileDescriptor; diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 9279c01f06..3c0455598d 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) namespace QDBus { diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index 1311153dca..4b523cfbf8 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnection; class QString; diff --git a/src/dbus/qdbuscontext.h b/src/dbus/qdbuscontext.h index 17161c482f..412e2bdce3 100644 --- a/src/dbus/qdbuscontext.h +++ b/src/dbus/qdbuscontext.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnection; class QDBusMessage; diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index 9323ecb501..7e71a2b54f 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -53,7 +53,6 @@ struct DBusError; QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusMessage; diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 656487483c..74286afd43 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) // defined in qhash.cpp Q_CORE_EXPORT uint qHash(const QString &key); diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index 59879ad806..a6612756eb 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusInterfacePrivate; class Q_DBUS_EXPORT QDBusInterface: public QDBusAbstractInterface diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h index aabc53ed59..6dd2a5609d 100644 --- a/src/dbus/qdbusmacros.h +++ b/src/dbus/qdbusmacros.h @@ -62,7 +62,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) QT_END_NAMESPACE QT_END_HEADER diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index bd075b6916..95db6591db 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusMessagePrivate; class Q_DBUS_EXPORT QDBusMessage diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index 9d89af541e..e4d7cb4860 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class Q_DBUS_EXPORT QDBusMetaType { diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index 386714fd85..03e454a995 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -55,7 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnection; class QDBusError; diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index cb330d20a8..47fe211fcb 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class Q_DBUS_EXPORT QDBusPendingReplyData: public QDBusPendingCall { diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index d47e1c27a0..f4f250b035 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) Q_DBUS_EXPORT void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data); diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index bfefe652cb..c0e6146d55 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnectionPrivate; class QDBusError; diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h index e9dd5596af..ea319206b7 100644 --- a/src/dbus/qdbusservicewatcher.h +++ b/src/dbus/qdbusservicewatcher.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnection; diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h index e62cd875f4..c8155a6419 100644 --- a/src/dbus/qdbusunixfiledescriptor.h +++ b/src/dbus/qdbusunixfiledescriptor.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusUnixFileDescriptorPrivate; template<> QExplicitlySharedDataPointer::~QExplicitlySharedDataPointer(); diff --git a/src/dbus/qdbusvirtualobject.h b/src/dbus/qdbusvirtualobject.h index a8f3e24fd2..5fa2dcc507 100644 --- a/src/dbus/qdbusvirtualobject.h +++ b/src/dbus/qdbusvirtualobject.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusMessage; class QDBusConnection; -- cgit v1.2.3