summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex.blasche@nokia.com>2011-10-20 17:20:56 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-20 09:22:46 +0200
commit2259aafbf85851ba9c74b8a592f755bf05ed07bb (patch)
tree026e82de1abac83b6b0f556c1ab18eb91234cccd
parent0ccbc8f4b5dd9cdfd1340fd6d01552f3f4ffadac (diff)
Remove obsolete \since flags.
Change-Id: I8485e438aa00d2213ca11d20cfbb418441f3ec64 Reviewed-by: Alex <alex.blasche@nokia.com>
-rw-r--r--src/publishsubscribe/qvaluespacesubscriber.cpp1
-rw-r--r--src/serviceframework/databasemanager.cpp1
-rw-r--r--src/serviceframework/ipc/instancemanager.cpp7
-rw-r--r--src/serviceframework/ipc/qmetaobjectbuilder.cpp1
-rw-r--r--src/serviceframework/ipc/qsignalintercepter.cpp8
-rw-r--r--src/serviceframework/ipc/qslotinvoker.cpp9
-rw-r--r--src/serviceframework/qremoteserviceregister.cpp21
-rw-r--r--src/serviceframework/qservicefilter.cpp19
-rw-r--r--src/serviceframework/qserviceinterfacedescriptor.cpp16
-rw-r--r--src/serviceframework/qservicemanager.cpp21
-rw-r--r--src/serviceframework/qserviceplugininterface.cpp6
-rw-r--r--src/serviceframework/servicemetadata.cpp1
12 files changed, 0 insertions, 111 deletions
diff --git a/src/publishsubscribe/qvaluespacesubscriber.cpp b/src/publishsubscribe/qvaluespacesubscriber.cpp
index bb46fb59..89ba7942 100644
--- a/src/publishsubscribe/qvaluespacesubscriber.cpp
+++ b/src/publishsubscribe/qvaluespacesubscriber.cpp
@@ -321,7 +321,6 @@ QValueSpaceSubscriber::~QValueSpaceSubscriber()
space with the new \a path.
Calling this function disconnects all signal/slot connections.
- \since 1.0
*/
void QValueSpaceSubscriber::setPath(const QString &path)
{
diff --git a/src/serviceframework/databasemanager.cpp b/src/serviceframework/databasemanager.cpp
index 6bf678a9..b6dcf0be 100644
--- a/src/serviceframework/databasemanager.cpp
+++ b/src/serviceframework/databasemanager.cpp
@@ -240,7 +240,6 @@ bool lessThan(const QServiceInterfaceDescriptor &d1,
When referring to a user scope database it means the
user database only.
- \since 1.0
*/
/*
diff --git a/src/serviceframework/ipc/instancemanager.cpp b/src/serviceframework/ipc/instancemanager.cpp
index f33a99f8..e79ce661 100644
--- a/src/serviceframework/ipc/instancemanager.cpp
+++ b/src/serviceframework/ipc/instancemanager.cpp
@@ -52,7 +52,6 @@ Q_GLOBAL_STATIC(InstanceManager, typeRegister);
\internal
Returns the instance manager for the service process
- \since 1.1
*/
InstanceManager* InstanceManager::instance()
{
@@ -87,7 +86,6 @@ InstanceManager::~InstanceManager()
\internal
Adds an entry to the map of service identifiers
- \since 1.1
*/
bool InstanceManager::addType(const QRemoteServiceRegister::Entry& e)
{
@@ -109,7 +107,6 @@ bool InstanceManager::addType(const QRemoteServiceRegister::Entry& e)
\internal
Returns the metaobject of a registered service object identified by its \a entry
- \since 1.1
*/
const QMetaObject* InstanceManager::metaObject(const QRemoteServiceRegister::Entry& entry) const
{
@@ -125,7 +122,6 @@ const QMetaObject* InstanceManager::metaObject(const QRemoteServiceRegister::Ent
\internal
Returns a list of all the registered entries
- \since 1.1
*/
QList<QRemoteServiceRegister::Entry> InstanceManager::allEntries() const
{
@@ -139,7 +135,6 @@ QList<QRemoteServiceRegister::Entry> InstanceManager::allEntries() const
Instance manager takes ownership of service instance. Returns a null pointer
if \a entry cannot be mapped to a known meta object. The \a instanceId will
contain the unique ID for the new service instance.
- \since 1.1
*/
QObject* InstanceManager::createObjectInstance(const QRemoteServiceRegister::Entry& entry, QUuid& instanceId)
{
@@ -184,7 +179,6 @@ QObject* InstanceManager::createObjectInstance(const QRemoteServiceRegister::Ent
using the \a entry as the key.
Emits instanceClosed() and allInstancesClosed() if no more instances are open
- \since 1.1
*/
void InstanceManager::removeObjectInstance(const QRemoteServiceRegister::Entry& entry, const QUuid& instanceId)
{
@@ -226,7 +220,6 @@ void InstanceManager::removeObjectInstance(const QRemoteServiceRegister::Entry&
\internal
Provides a count of how many global and private instances are currently open
- \since 1.1
*/
int InstanceManager::totalInstances() const
{
diff --git a/src/serviceframework/ipc/qmetaobjectbuilder.cpp b/src/serviceframework/ipc/qmetaobjectbuilder.cpp
index 516d2e07..b9a937b6 100644
--- a/src/serviceframework/ipc/qmetaobjectbuilder.cpp
+++ b/src/serviceframework/ipc/qmetaobjectbuilder.cpp
@@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE
\class QMetaObjectBuilder
\internal
\brief The QMetaObjectBuilder class supports building QMetaObject objects at runtime.
- \since 1.1
*/
diff --git a/src/serviceframework/ipc/qsignalintercepter.cpp b/src/serviceframework/ipc/qsignalintercepter.cpp
index 02370f03..653e7f88 100644
--- a/src/serviceframework/ipc/qsignalintercepter.cpp
+++ b/src/serviceframework/ipc/qsignalintercepter.cpp
@@ -50,7 +50,6 @@
\internal
\brief The QSignalIntercepter class provides an interface for intercepting signals as meta-calls
- \since 1.1
IPC mechanisms need to intercept signals and convert them into protocol
messages, but it is generally impractical to create a slot for every
@@ -89,7 +88,6 @@ public:
/*!
Create a new signal intercepter which traps \a signal on \a sender.
The object will be attached to \a parent, if present.
- \since 1.1
*/
QSignalIntercepter::QSignalIntercepter
( QObject *sender, const QByteArray& signal, QObject *parent )
@@ -161,7 +159,6 @@ QSignalIntercepter::~QSignalIntercepter()
/*!
Returns the sender that this signal interceptor is attached to.
- \since 1.1
*/
QObject *QSignalIntercepter::sender() const
{
@@ -170,7 +167,6 @@ QObject *QSignalIntercepter::sender() const
/*!
Returns the name of the signal that this signal interceptor is attached to.
- \since 1.1
*/
QByteArray QSignalIntercepter::signal() const
{
@@ -181,7 +177,6 @@ QByteArray QSignalIntercepter::signal() const
Returns true if this signal intercepter is valid; that is, there was
a signal present with the specified parameters when this object
was constructed.
- \since 1.1
*/
bool QSignalIntercepter::isValid() const
{
@@ -190,7 +185,6 @@ bool QSignalIntercepter::isValid() const
/*!
\internal
- \since 1.1
*/
int QSignalIntercepter::qt_metacall(QMetaObject::Call c, int id, void **a)
{
@@ -235,7 +229,6 @@ int QSignalIntercepter::qt_metacall(QMetaObject::Call c, int id, void **a)
Called when the signal that is being intercepted is activated.
The arguments to the signal are passed in the list \a args.
- \since 1.1
*/
// Get the QVariant type number for a type name.
@@ -259,7 +252,6 @@ int QSignalIntercepter::typeFromName( const QByteArray& type )
specification. The array of types is returned from this function,
and the number of arguments is returned in \a nargs. Returns null
if \a member is invalid. The return value must be freed with qFree().
- \since 1.1
*/
int *QSignalIntercepter::connectionTypes( const QByteArray& member, int& nargs )
{
diff --git a/src/serviceframework/ipc/qslotinvoker.cpp b/src/serviceframework/ipc/qslotinvoker.cpp
index 3d1db80a..a47afb9d 100644
--- a/src/serviceframework/ipc/qslotinvoker.cpp
+++ b/src/serviceframework/ipc/qslotinvoker.cpp
@@ -50,7 +50,6 @@
\internal
\brief The QSlotInvoker class provides an interface for invoking slots with explicit arguments
- \since 1.1
IPC mechanisms need to intercept protocol messages and convert them into
slot invocations, but it is generally impractical to create explicit code
@@ -89,7 +88,6 @@ public:
/*!
Create a slot invoker that can invoke \a member on \a receiver.
The object will be attached to \a parent, if present.
- \since 1.1
*/
QSlotInvoker::QSlotInvoker( QObject *receiver, const QByteArray &member,
QObject *parent )
@@ -144,7 +142,6 @@ QSlotInvoker::~QSlotInvoker()
/*!
Returns true if the member is present on the object.
- \since 1.1
*/
bool QSlotInvoker::memberPresent() const
{
@@ -155,7 +152,6 @@ bool QSlotInvoker::memberPresent() const
Returns true if the member can be invoked with \a numArgs arguments.
That is, the receiver has not been destroyed, the member is present,
and it requires \a numArgs or less arguments.
- \since 1.1
*/
bool QSlotInvoker::canInvoke( int numArgs ) const
{
@@ -166,7 +162,6 @@ bool QSlotInvoker::canInvoke( int numArgs ) const
/*!
Returns the object that will receive slot invocations.
- \since 1.1
*/
QObject *QSlotInvoker::receiver() const
{
@@ -175,7 +170,6 @@ QObject *QSlotInvoker::receiver() const
/*!
Returns the member that will receiver slot invocations.
- \since 1.1
*/
QByteArray QSlotInvoker::member() const
{
@@ -184,7 +178,6 @@ QByteArray QSlotInvoker::member() const
/*!
Returns the parameter types associated with this member.
- \since 1.1
*/
int *QSlotInvoker::parameterTypes() const
{
@@ -193,7 +186,6 @@ int *QSlotInvoker::parameterTypes() const
/*!
Returns the number of parameter types associated with this member.
- \since 1.1
*/
int QSlotInvoker::parameterTypesCount() const
{
@@ -209,7 +201,6 @@ int QSlotInvoker::parameterTypesCount() const
If it is possible that the slot may throw an exception,
it is the responsibility of the caller to catch and
handle the exception.
- \since 1.1
*/
QVariant QSlotInvoker::invoke( const QList<QVariant>& args )
{
diff --git a/src/serviceframework/qremoteserviceregister.cpp b/src/serviceframework/qremoteserviceregister.cpp
index 2b3bd19b..6cb34168 100644
--- a/src/serviceframework/qremoteserviceregister.cpp
+++ b/src/serviceframework/qremoteserviceregister.cpp
@@ -57,12 +57,10 @@ QT_BEGIN_NAMESPACE
A registration entry can then be published for discovery by remote clients.
- \since 1.1
*/
/*!
Constructs a null registration entry.
- \since 1.1
*/
QRemoteServiceRegister::Entry::Entry()
{
@@ -71,7 +69,6 @@ QRemoteServiceRegister::Entry::Entry()
/*!
Constructs the registration entry that is a copy of \a other.
- \since 1.1
*/
QRemoteServiceRegister::Entry::Entry(const Entry& other)
: d(other.d)
@@ -80,7 +77,6 @@ QRemoteServiceRegister::Entry::Entry(const Entry& other)
/*!
Destroys the registration entry.
- \since 1.1
*/
QRemoteServiceRegister::Entry::~Entry()
{
@@ -91,7 +87,6 @@ QRemoteServiceRegister::Entry::~Entry()
Returns true if the serviceName(), interfaceName() and version() point to
a valid QServiceInterfaceDescriptor, otherwise false.
- \since 1.1
*/
bool QRemoteServiceRegister::Entry::isValid() const
{
@@ -103,7 +98,6 @@ bool QRemoteServiceRegister::Entry::isValid() const
/*!
Returns true if this font is equal to \a other; otherwise false.
- \since 1.1
*/
bool QRemoteServiceRegister::Entry::operator==(const Entry& other) const
{
@@ -114,7 +108,6 @@ bool QRemoteServiceRegister::Entry::operator==(const Entry& other) const
/*!
Returns true if this font is different from \a other; otherwise false.
- \since 1.1
*/
bool QRemoteServiceRegister::Entry::operator!=(const Entry& other) const
{
@@ -123,7 +116,6 @@ bool QRemoteServiceRegister::Entry::operator!=(const Entry& other) const
/*!
Assigns \a other to this registration entry and returns a reference to it.
- \since 1.1
*/
QRemoteServiceRegister::Entry &QRemoteServiceRegister::Entry::operator=(const Entry& other)
{
@@ -137,7 +129,6 @@ QRemoteServiceRegister::Entry &QRemoteServiceRegister::Entry::operator=(const En
This should correspond to the interface name from the service XML description.
\sa serviceName(), version()
- \since 1.1
*/
QString QRemoteServiceRegister::Entry::interfaceName() const
{
@@ -150,7 +141,6 @@ QString QRemoteServiceRegister::Entry::interfaceName() const
This should correspond to the service name from the service XML description.
\sa interfaceName(), version()
- \since 1.1
*/
QString QRemoteServiceRegister::Entry::serviceName() const
{
@@ -163,7 +153,6 @@ QString QRemoteServiceRegister::Entry::serviceName() const
This should correspond to the interface version from the service XML description.
\sa interfaceName(), serviceName()
- \since 1.1
*/
QString QRemoteServiceRegister::Entry::version() const
{
@@ -180,7 +169,6 @@ const QMetaObject * QRemoteServiceRegister::Entry::metaObject() const
If this is not explicitly called, the default instance \a type for the registration entry
is QRemoteServiceRegister::PrivateInstance.
- \since 1.1
*/
void QRemoteServiceRegister::Entry::setInstantiationType(QRemoteServiceRegister::InstanceType type)
{
@@ -189,7 +177,6 @@ void QRemoteServiceRegister::Entry::setInstantiationType(QRemoteServiceRegister:
/*!
Returns the QRemoteServiceRegister::InstanceType of the registration entry.
- \since 1.1
*/
QRemoteServiceRegister::InstanceType QRemoteServiceRegister::Entry::instantiationType() const
{
@@ -201,7 +188,6 @@ QRemoteServiceRegister::InstanceType QRemoteServiceRegister::Entry::instantiatio
\inmodule QtServiceFramework
\ingroup servicefw
\brief The QRemoteServiceRegister class manages instances of remote service objects.
- \since 1.1
This class registers and publishes IPC based service objects. It owns the service's
objects and uess the platform specific IPC mechanism to publish the service.
@@ -276,7 +262,6 @@ QRemoteServiceRegister::InstanceType QRemoteServiceRegister::Entry::instantiatio
entry the closed instance belonged to.
\sa allInstancesClosed()
- \since 1.1
*/
/*!
@@ -286,7 +271,6 @@ QRemoteServiceRegister::InstanceType QRemoteServiceRegister::Entry::instantiatio
that the last connected client has either shutdown or released the loaded service object.
\sa instanceClosed()
- \since 1.1
*/
/*!
@@ -303,7 +287,6 @@ QRemoteServiceRegister::InstanceType QRemoteServiceRegister::Entry::instantiatio
/*!
Creates a service register instance with the given \a parent.
- \since 1.1
*/
QRemoteServiceRegister::QRemoteServiceRegister(QObject* parent)
: QObject(parent)
@@ -333,7 +316,6 @@ QRemoteServiceRegister::~QRemoteServiceRegister()
rendezvous feature to fail.
\sa createEntry()
- \since 1.1
*/
void QRemoteServiceRegister::publishEntries(const QString& ident)
{
@@ -344,7 +326,6 @@ void QRemoteServiceRegister::publishEntries(const QString& ident)
\property QRemoteServiceRegister::quitOnLastInstanceClosed
\brief Terminate the service when all clients have closed all objects. Default value is true.
- \since 1.1
*/
bool QRemoteServiceRegister::quitOnLastInstanceClosed() const
{
@@ -390,7 +371,6 @@ void QRemoteServiceRegister::setQuitOnLastInstanceClosed(bool quit)
}
\endcode
- \since 1.1
*/
QRemoteServiceRegister::SecurityFilter QRemoteServiceRegister::setSecurityFilter(QRemoteServiceRegister::SecurityFilter filter)
{
@@ -405,7 +385,6 @@ QRemoteServiceRegister::SecurityFilter QRemoteServiceRegister::setSecurityFilter
discoverable.
\sa publishEntries()
- \since 1.1
*/
QRemoteServiceRegister::Entry QRemoteServiceRegister::createEntry(const QString& serviceName, const QString& interfaceName, const QString& version, QRemoteServiceRegister::CreateServiceFunc cptr, const QMetaObject* meta)
{
diff --git a/src/serviceframework/qservicefilter.cpp b/src/serviceframework/qservicefilter.cpp
index 0156dcb7..5335dbd7 100644
--- a/src/serviceframework/qservicefilter.cpp
+++ b/src/serviceframework/qservicefilter.cpp
@@ -71,7 +71,6 @@ public:
\inmodule QtServiceFramework
\brief The QServiceFilter class defines criteria for defining a sub-set of
all available services.
- \since 1.0
A QServiceFilter can be used to constrain the number of services when searching
for services. Only those services that match all filter criteria are returned
@@ -164,7 +163,6 @@ QServiceFilter::QServiceFilter(const QServiceFilter& other)
Creates a new filter object that matches all service
implementations implementing \a interfaceName that match the specified
\a version using the given \a rule.
- \since 1.0
*/
QServiceFilter::QServiceFilter(const QString& interfaceName, const QString& version, QServiceFilter::VersionMatchRule rule)
{
@@ -189,7 +187,6 @@ QServiceFilter::~QServiceFilter()
Copies the content of the QServiceFilter object contained in
\a other into this one.
- \since 1.0
*/
QServiceFilter& QServiceFilter::operator=(const QServiceFilter& other)
{
@@ -212,7 +209,6 @@ QServiceFilter& QServiceFilter::operator=(const QServiceFilter& other)
specified by \a serviceName.
If the \a serviceName is empty the filter matches any service.
- \since 1.0
*/
void QServiceFilter::setServiceName(const QString& serviceName)
{
@@ -232,7 +228,6 @@ void QServiceFilter::setServiceName(const QString& serviceName)
A valid version string has the format x.y whereby x and y are positive integer
numbers.
- \since 1.0
*/
void QServiceFilter::setInterface(const QString &interfaceName, const QString& version, QServiceFilter::VersionMatchRule rule)
{
@@ -291,7 +286,6 @@ void QServiceFilter::setInterface(const QString &interfaceName, const QString& v
Returns the service name for this filter.
\sa setServiceName()
- \since 1.0
*/
QString QServiceFilter::serviceName() const
{
@@ -304,7 +298,6 @@ QString QServiceFilter::serviceName() const
Returns the interface name for this filter.
\sa setInterface()
- \since 1.0
*/
QString QServiceFilter::interfaceName() const
{
@@ -317,7 +310,6 @@ QString QServiceFilter::interfaceName() const
Returns the major interface version for this filter.
\sa setInterface()
- \since 1.0
*/
int QServiceFilter::majorVersion() const
{
@@ -330,7 +322,6 @@ int QServiceFilter::majorVersion() const
Returns the minor interface version for this filter.
\sa setInterface()
- \since 1.0
*/
int QServiceFilter::minorVersion() const
{
@@ -345,7 +336,6 @@ int QServiceFilter::minorVersion() const
\e{<customproperty>} tag within the service xml.
\sa customAttribute(), clearCustomAttribute()
- \since 1.0
*/
void QServiceFilter::setCustomAttribute(const QString& key, const QString& value)
{
@@ -359,7 +349,6 @@ void QServiceFilter::setCustomAttribute(const QString& key, const QString& value
returns a null string.
\sa setCustomAttribute(), clearCustomAttribute()
- \since 1.0
*/
QString QServiceFilter::customAttribute(const QString& key) const
{
@@ -373,7 +362,6 @@ QString QServiceFilter::customAttribute(const QString& key) const
If \a key is empty all custom attributes are cleared.
\sa setCustomAttribute()
- \since 1.0
*/
void QServiceFilter::clearCustomAttribute(const QString &key)
{
@@ -389,7 +377,6 @@ void QServiceFilter::clearCustomAttribute(const QString &key)
Returns the version match rule for this filter.
\sa setInterface()
- \since 1.0
*/
QServiceFilter::VersionMatchRule QServiceFilter::versionMatchRule() const
{
@@ -400,7 +387,6 @@ QServiceFilter::VersionMatchRule QServiceFilter::versionMatchRule() const
\fn QList<QString> QServiceFilter::customAttributes() const
Returns the list of custom keys which have been added to the filter.
- \since 1.0
*/
QStringList QServiceFilter::customAttributes() const
{
@@ -415,7 +401,6 @@ QStringList QServiceFilter::customAttributes() const
to the given \a rule.
\sa capabilities()
- \since 1.0
*/
void QServiceFilter::setCapabilities(QServiceFilter::CapabilityMatchRule rule, const QStringList& capabilities )
{
@@ -433,7 +418,6 @@ void QServiceFilter::setCapabilities(QServiceFilter::CapabilityMatchRule rule, c
for which they have the required capabilties.
\sa setCapabilities(), capabilityMatchRule()
- \since 1.0
*/
QStringList QServiceFilter::capabilities() const
{
@@ -444,7 +428,6 @@ QStringList QServiceFilter::capabilities() const
Returns the capability matching rule for this filter.
\sa setCapabilities(), capabilities()
- \since 1.0
*/
QServiceFilter::CapabilityMatchRule QServiceFilter::capabilityMatchRule() const
{
@@ -458,7 +441,6 @@ QServiceFilter::CapabilityMatchRule QServiceFilter::capabilityMatchRule() const
Writes service filter \a sf to the stream \a out and returns a reference
to the stream.
- \since 1.0
*/
QDataStream &operator<<(QDataStream &out, const QServiceFilter &sf)
{
@@ -490,7 +472,6 @@ QDataStream &operator<<(QDataStream &out, const QServiceFilter &sf)
Reads a service filter into \a sf from the stream \a in and returns a
reference to the stream.
- \since 1.0
*/
QDataStream &operator>>(QDataStream &in, QServiceFilter &sf)
{
diff --git a/src/serviceframework/qserviceinterfacedescriptor.cpp b/src/serviceframework/qserviceinterfacedescriptor.cpp
index af83d480..455fcc68 100644
--- a/src/serviceframework/qserviceinterfacedescriptor.cpp
+++ b/src/serviceframework/qserviceinterfacedescriptor.cpp
@@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
\ingroup servicefw
\inmodule QtServiceFramework
\brief The QServiceInterfaceDescriptor class identifies a service implementation.
- \since 1.0
A service can implement multiple interfaces and each interface can have multiple implementations.
The QServiceInterfaceDescriptor class enscapsulates this information, as illustrated
@@ -129,7 +128,6 @@ QServiceInterfaceDescriptor::~QServiceInterfaceDescriptor()
/*!
Creates a copy of QServiceInterfaceDescriptor contained in \a other.
- \since 1.0
*/
QServiceInterfaceDescriptor::QServiceInterfaceDescriptor(const QServiceInterfaceDescriptor& other)
: d(0)
@@ -142,7 +140,6 @@ QServiceInterfaceDescriptor::QServiceInterfaceDescriptor(const QServiceInterface
Copies the content of the QServiceInterfaceDescriptor object contained
in \a other into this one.
- \since 1.0
*/
QServiceInterfaceDescriptor& QServiceInterfaceDescriptor::operator=(const QServiceInterfaceDescriptor& other)
{
@@ -165,7 +162,6 @@ QServiceInterfaceDescriptor& QServiceInterfaceDescriptor::operator=(const QServi
Compares a QServiceInterfaceDescriptor to \a other. Returns true if they
are equal and false otherwise.
- \since 1.0
*/
bool QServiceInterfaceDescriptor::operator==(const QServiceInterfaceDescriptor& other) const
{
@@ -185,14 +181,12 @@ bool QServiceInterfaceDescriptor::operator==(const QServiceInterfaceDescriptor&
Compares a QServiceInterfaceDescriptor to \a other. Returns true
if they are not equal and false otherwise.
- \since 1.0
*/
/*!
\fn bool QServiceInterfaceDescriptor::isValid() const
Returns true if this descriptor is valid; otherwise returns false.
- \since 1.0
*/
bool QServiceInterfaceDescriptor::isValid() const
{
@@ -205,7 +199,6 @@ bool QServiceInterfaceDescriptor::isValid() const
Returns true if this implementation is provided for all users on the system.
\sa QService::Scope
- \since 1.0
*/
QService::Scope QServiceInterfaceDescriptor::scope() const
{
@@ -216,7 +209,6 @@ QService::Scope QServiceInterfaceDescriptor::scope() const
\fn QString QServiceInterfaceDescriptor::serviceName() const
Returns the name of service that provides this implementation.
- \since 1.0
*/
QString QServiceInterfaceDescriptor::serviceName() const
{
@@ -227,7 +219,6 @@ QString QServiceInterfaceDescriptor::serviceName() const
\fn QString QServiceInterfaceDescriptor::interfaceName() const
Returns the name of the interface that is implemented.
- \since 1.0
*/
QString QServiceInterfaceDescriptor::interfaceName() const
{
@@ -242,7 +233,6 @@ QString QServiceInterfaceDescriptor::interfaceName() const
Subsequent versions of an interface are binary compatible
to previous versions of the same interface. If an interface
is broken it must use a new interface name.
- \since 1.0
*/
int QServiceInterfaceDescriptor::majorVersion() const
{
@@ -253,7 +243,6 @@ int QServiceInterfaceDescriptor::majorVersion() const
\fn int QServiceInterfaceDescriptor::minorVersion() const
Returns the version of the implementation.
- \since 1.0
*/
int QServiceInterfaceDescriptor::minorVersion() const
{
@@ -265,7 +254,6 @@ int QServiceInterfaceDescriptor::minorVersion() const
Returns the value for the attribute \a which; otherwise returns
an invalid QVariant.
- \since 1.0
*/
QVariant QServiceInterfaceDescriptor::attribute(QServiceInterfaceDescriptor::Attribute which) const
{
@@ -279,7 +267,6 @@ QVariant QServiceInterfaceDescriptor::attribute(QServiceInterfaceDescriptor::Att
Returns the value for the custom attribute \a which; otherwise
returns a null string.
- \since 1.0
*/
QString QServiceInterfaceDescriptor::customAttribute(const QString& which) const
{
@@ -290,7 +277,6 @@ QString QServiceInterfaceDescriptor::customAttribute(const QString& which) const
/*!
Returns a list of custom attributes attached to the service.
- \since 1.0
*/
QStringList QServiceInterfaceDescriptor::customAttributes() const
{
@@ -338,7 +324,6 @@ QDataStream &operator>>(QDataStream &in, QServiceInterfaceDescriptor::Attribute
Writes service interface descriptor \a dc to the stream \a out and returns a reference
to the stream.
- \since 1.0
*/
QDataStream &operator<<(QDataStream &out, const QServiceInterfaceDescriptor &dc)
@@ -367,7 +352,6 @@ QDataStream &operator<<(QDataStream &out, const QServiceInterfaceDescriptor &dc)
Reads a service interface descriptor into \a dc from the stream \a in and returns a
reference to the stream.
- \since 1.0
*/
QDataStream &operator>>(QDataStream &in, QServiceInterfaceDescriptor &dc)
{
diff --git a/src/serviceframework/qservicemanager.cpp b/src/serviceframework/qservicemanager.cpp
index 52c6df2e..ef13923f 100644
--- a/src/serviceframework/qservicemanager.cpp
+++ b/src/serviceframework/qservicemanager.cpp
@@ -206,7 +206,6 @@ private slots:
\inmodule QtServiceFramework
\brief The QServiceManager class enables the loading of service plugins
and the (de)registration of services.
- \since 1.0
A service is a stand-alone component that can be used by multiple clients.
Each service implementation must derive from QObject. Clients request a
@@ -253,7 +252,6 @@ private slots:
notifications about services added in the user scope.
\sa addService()
- \since 1.0
*/
/*!
@@ -267,7 +265,6 @@ private slots:
notifications about services removed in the user scope.
\sa removeService()
- \since 1.0
*/
/*!
@@ -285,7 +282,6 @@ QServiceManager::QServiceManager(QObject *parent)
/*!
Creates a service manager with the given \a scope and \a parent.
- \since 1.0
*/
QServiceManager::QServiceManager(QService::Scope scope, QObject *parent)
: QObject(parent),
@@ -304,7 +300,6 @@ QServiceManager::~QServiceManager()
/*!
Returns the scope used for registering and searching of services.
- \since 1.0
*/
QService::Scope QServiceManager::scope() const
{
@@ -315,7 +310,6 @@ QService::Scope QServiceManager::scope() const
Returns a list of the services that provide the interface specified by
\a interfaceName. If \a interfaceName is empty, this function returns
a list of all available services in this manager's scope.
- \since 1.0
*/
QStringList QServiceManager::findServices(const QString& interfaceName) const
{
@@ -329,7 +323,6 @@ QStringList QServiceManager::findServices(const QString& interfaceName) const
/*!
Returns a list of the interfaces that match the specified \a filter.
- \since 1.0
*/
QList<QServiceInterfaceDescriptor> QServiceManager::findInterfaces(const QServiceFilter& filter) const
{
@@ -347,7 +340,6 @@ QList<QServiceInterfaceDescriptor> QServiceManager::findInterfaces(const QServic
Returns a list of the interfaces provided by the service named
\a serviceName. If \a serviceName is empty, this function returns
a list of all available interfaces in this manager's scope.
- \since 1.0
*/
QList<QServiceInterfaceDescriptor> QServiceManager::findInterfaces(const QString& serviceName) const
{
@@ -365,7 +357,6 @@ QList<QServiceInterfaceDescriptor> QServiceManager::findInterfaces(const QString
This function returns a null pointer if the requested service cannot be found.
\sa setInterfaceDefault(), interfaceDefault()
- \since 1.0
*/
QObject* QServiceManager::loadInterface(const QString& interfaceName)
{
@@ -379,7 +370,6 @@ QObject* QServiceManager::loadInterface(const QString& interfaceName)
This function returns a null pointer if the requested service cannot be found.
- \since 1.0
*/
QObject* QServiceManager::loadInterface(const QServiceInterfaceDescriptor& descriptor)
{
@@ -489,7 +479,6 @@ QObject* QServiceManager::loadInterface(const QServiceInterfaceDescriptor& descr
The caller takes ownership of the returned pointer.
\sa setInterfaceDefault(), interfaceDefault()
- \since 1.0
*/
@@ -508,7 +497,6 @@ QObject* QServiceManager::loadInterface(const QServiceInterfaceDescriptor& descr
The caller takes ownership of the returned pointer.
- \since 1.0
*/
/*!
@@ -524,7 +512,6 @@ QObject* QServiceManager::loadInterface(const QServiceInterfaceDescriptor& descr
versions that the new plugin implements.
\sa removeService(), setInterfaceDefault()
- \since 1.0
*/
bool QServiceManager::addService(const QString& xmlFilePath)
{
@@ -556,7 +543,6 @@ bool QServiceManager::addService(const QString& xmlFilePath)
service manager instance.
\sa removeService(), setInterfaceDefault()
- \since 1.0
*/
bool QServiceManager::addService(QIODevice *device)
{
@@ -617,7 +603,6 @@ bool QServiceManager::addService(QIODevice *device)
service manager instance.
\sa addService()
- \since 1.0
*/
bool QServiceManager::removeService(const QString& serviceName)
{
@@ -672,7 +657,6 @@ bool QServiceManager::removeService(const QString& serviceName)
\bold {Note:} When in system scope, the \a service must be a system-wide
service rather than a user-specific service; otherwise, this will fail.
- \since 1.0
*/
bool QServiceManager::setInterfaceDefault(const QString &service, const QString &interfaceName)
{
@@ -702,7 +686,6 @@ bool QServiceManager::setInterfaceDefault(const QString &service, const QString
\bold {Note:} When in system scope, the \a descriptor must refer to a
system-wide service rather than a user-specific service; otherwise, this
will fail.
- \since 1.0
*/
bool QServiceManager::setInterfaceDefault(const QServiceInterfaceDescriptor& descriptor)
{
@@ -718,7 +701,6 @@ bool QServiceManager::setInterfaceDefault(const QServiceInterfaceDescriptor& des
/*!
Returns the default interface implementation for the given \a interfaceName.
- \since 1.0
*/
QServiceInterfaceDescriptor QServiceManager::interfaceDefault(const QString& interfaceName) const
{
@@ -735,7 +717,6 @@ QServiceInterfaceDescriptor QServiceManager::interfaceDefault(const QString& int
/*!
Returns the type of error that last occurred.
- \since 1.0
*/
QServiceManager::Error QServiceManager::error() const
{
@@ -744,7 +725,6 @@ QServiceManager::Error QServiceManager::error() const
/*!
\internal
- \since 1.0
*/
void QServiceManager::connectNotify(const char *signal)
{
@@ -758,7 +738,6 @@ void QServiceManager::connectNotify(const char *signal)
/*!
\internal
- \since 1.0
*/
void QServiceManager::disconnectNotify(const char *signal)
{
diff --git a/src/serviceframework/qserviceplugininterface.cpp b/src/serviceframework/qserviceplugininterface.cpp
index a2a8eae1..0ac39101 100644
--- a/src/serviceframework/qserviceplugininterface.cpp
+++ b/src/serviceframework/qserviceplugininterface.cpp
@@ -48,12 +48,10 @@ QT_BEGIN_NAMESPACE
\inmodule QtServiceFramework
\brief The QServicePluginInterface class defines the interface
that every plug-in based service must implement.
- \since 1.0
*/
/*!
\internal
- \since 1.0
*/
QServicePluginInterface::QServicePluginInterface()
{
@@ -61,7 +59,6 @@ QServicePluginInterface::QServicePluginInterface()
/*!
\internal
- \since 1.0
*/
QServicePluginInterface::~QServicePluginInterface()
{
@@ -74,7 +71,6 @@ QServicePluginInterface::~QServicePluginInterface()
This function returns a null pointer if the plug-in doesn't
support the given \a descriptor.
- \since 1.0
*/
/*!
@@ -87,7 +83,6 @@ QServicePluginInterface::~QServicePluginInterface()
The default implementation for this function does nothing.
\sa QServiceManager::addService()
- \since 1.0
*/
void QServicePluginInterface::installService()
{
@@ -103,7 +98,6 @@ void QServicePluginInterface::installService()
The default implementation for this function does nothing.
\sa QServiceManager::removeService()
- \since 1.0
*/
void QServicePluginInterface::uninstallService()
diff --git a/src/serviceframework/servicemetadata.cpp b/src/serviceframework/servicemetadata.cpp
index d709a94c..10435d08 100644
--- a/src/serviceframework/servicemetadata.cpp
+++ b/src/serviceframework/servicemetadata.cpp
@@ -88,7 +88,6 @@ SERVICEMETADATA_EXPORT QDataStream &operator>>(QDataStream &in, ServiceMetaDataR
/*
\class ServiceMetaData
- \since 1.0
Utility class (used by service database) that offers support for
parsing metadata service xml registry file during service registration. \n