diff options
-rw-r--r-- | libresourceqt/include/qt4/policy/resource-set.h | 14 | ||||
-rw-r--r-- | libresourceqt/src/resource-set.cpp | 6 | ||||
-rw-r--r-- | tests/test-resource-set/test-resource-set.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libresourceqt/include/qt4/policy/resource-set.h b/libresourceqt/include/qt4/policy/resource-set.h index 3e9bc24..4442f94 100644 --- a/libresourceqt/include/qt4/policy/resource-set.h +++ b/libresourceqt/include/qt4/policy/resource-set.h @@ -101,7 +101,7 @@ public: * This method removes the resource of the given type * \param type The type of the resource to remove from the set. */ - void delResource(ResourceType type); + void deleteResource(ResourceType type); /** * This method returns a list of all resource in the set. @@ -166,18 +166,18 @@ public: */ void setAutoRelease(); /** - * see \ref setAutoRelease(). + * Resets the auto reselease flag to false (see \ref setAutoRelease()). */ - void unsetAutoRelease(); + void resetAutoRelease(); /** * Sets that the resourcesGranted() signal is emited even if we already * have the requested resources granted. By default this feature is off. */ void setAlwaysReply(); /** - * Unsets the always reply flag (see \ref setAlwaysReply()) + * Resets the always reply flag (see \ref setAlwaysReply()) to false. */ - void unsetAlwaysReply(); + void resetAlwaysReply(); signals: /** @@ -186,13 +186,13 @@ signals: * \param availableResources A list of available resources. The list of * available resources contains only available resource which we have in the set. */ - void resourcesBecameAvailable(QList<ResourceType> availableResources); + void resourcesBecameAvailable(const QList<ResourceType> &availableResources); /** * This signal is emited as a response to the acquire() request. * \param grantedOptionalResources The list of granted optional resources. * All the mandatory resources have also been aquired. */ - void resourcesGranted(QList<ResourceType> grantedOptionalResources); + void resourcesGranted(const QList<ResourceType> &grantedOptionalResources); /** * This signal is emited as a response to the acquire() request, in the * case where one or more of the mandatroy resources were not availalble. diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp index 93af954..7f4792f 100644 --- a/libresourceqt/src/resource-set.cpp +++ b/libresourceqt/src/resource-set.cpp @@ -38,7 +38,7 @@ void ResourceSet::addResources(const QList<Resource *>resources) } } -void ResourceSet::delResource(ResourceType type) +void ResourceSet::deleteResource(ResourceType type) { if (contains(type)) { delete resourceSet[type]; @@ -116,7 +116,7 @@ void ResourceSet::setAutoRelease() autoRelease = true; } -void ResourceSet::unsetAutoRelease() +void ResourceSet::resetAutoRelease() { autoRelease = false; } @@ -126,7 +126,7 @@ void ResourceSet::setAlwaysReply() alwaysReply = true; } -void ResourceSet::unsetAlwaysReply() +void ResourceSet::resetAlwaysReply() { alwaysReply = false; } diff --git a/tests/test-resource-set/test-resource-set.cpp b/tests/test-resource-set/test-resource-set.cpp index 529d9e0..7fbf692 100644 --- a/tests/test-resource-set/test-resource-set.cpp +++ b/tests/test-resource-set/test-resource-set.cpp @@ -117,7 +117,7 @@ void TestResourceSet::testDelResource() { resourceSet->addResource(audioResource); resourceSet->addResource(vibraResource); - resourceSet->delResource(AudioPlaybackType); + resourceSet->deleteResource(AudioPlaybackType); bool setDoesNotContainAudioResource = !resourceSet->contains(AudioPlaybackType); QVERIFY(setDoesNotContainAudioResource); |