summaryrefslogtreecommitdiff
path: root/libresourceqt
diff options
context:
space:
mode:
authorWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-25 13:56:08 +0200
committerWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-25 14:00:02 +0200
commit0334e01186cbb1d2a4d5f5d5ad2dabb173d87dc6 (patch)
treeb92e7466d956a8e37a8a63af24b1e3e31a556cb2 /libresourceqt
parent67649bb4c02c471ac394d490851c7c3ae5126c41 (diff)
Fixed ResourceSet signals QList<ResourcePolicy::ResourceType> to list
namespace, so the users don't have to use namecpace ResourcePolicy
Diffstat (limited to 'libresourceqt')
-rw-r--r--libresourceqt/include/qt4/policy/resource-set.h4
-rw-r--r--libresourceqt/src/resource-engine.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/libresourceqt/include/qt4/policy/resource-set.h b/libresourceqt/include/qt4/policy/resource-set.h
index bc81b89..e190cd0 100644
--- a/libresourceqt/include/qt4/policy/resource-set.h
+++ b/libresourceqt/include/qt4/policy/resource-set.h
@@ -195,13 +195,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(const QList<ResourceType> &availableResources);
+ void resourcesBecameAvailable(const QList<ResourcePolicy::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(const QList<ResourceType> &grantedOptionalResources);
+ void resourcesGranted(const QList<ResourcePolicy::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-engine.h b/libresourceqt/src/resource-engine.h
index 6caaef7..897c27e 100644
--- a/libresourceqt/src/resource-engine.h
+++ b/libresourceqt/src/resource-engine.h
@@ -17,8 +17,8 @@ class ResourceEngine: public QObject
{
Q_OBJECT
Q_DISABLE_COPY( ResourceEngine )
-#ifndef QT_NO_DEBUG
- friend class TestResourceEngine;
+#ifdef TEST_RESOURCE_ENGINE_H
+ friend class ::TestResourceEngine;
#endif
public: