summaryrefslogtreecommitdiff
path: root/libresourceqt/include
diff options
context:
space:
mode:
authorWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-09 12:07:31 +0200
committerWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-02-09 12:14:46 +0200
commit381719b9a0adb8553a041633aed943f5ef48a1ff (patch)
tree6c5db8b6a7342dee77b1e1a010a6618fd824714f /libresourceqt/include
parent6751c585385f017d08540bbe121606d642afb220 (diff)
downloadlibresourceqt-381719b9a0adb8553a041633aed943f5ef48a1ff.tar.gz
Restructured libresourceqt includes, updated debianpackages to soversion=1.
Fixed ResourceEngine to work with the new Resource object.
Diffstat (limited to 'libresourceqt/include')
-rw-r--r--libresourceqt/include/qt4/policy/resource-set.h (renamed from libresourceqt/include/resource-set.h)17
-rw-r--r--libresourceqt/include/qt4/policy/resource.h (renamed from libresourceqt/include/resource.h)0
-rw-r--r--libresourceqt/include/qt4/policy/resources.h (renamed from libresourceqt/include/resources.h)2
3 files changed, 10 insertions, 9 deletions
diff --git a/libresourceqt/include/resource-set.h b/libresourceqt/include/qt4/policy/resource-set.h
index 1f515ee..632ed71 100644
--- a/libresourceqt/include/resource-set.h
+++ b/libresourceqt/include/qt4/policy/resource-set.h
@@ -1,7 +1,7 @@
#ifndef RESOURCE_SET_H
#define RESOURCE_SET_H
-#include "resources.h"
+#include <policy/resources.h>
#include <QString>
#include <QObject>
#include <QVector>
@@ -18,12 +18,12 @@
*
* \section library_use_section Library Usage
*
- * To use the Resource Policy Library, you first need to create a set of
+ * To use the Resource Policy Library, you first need to create a number of
* \ref Resource objects like this (given as an example of what a media player
* might want/need):
* \code
* ResourcePolicy::AudioResource *audioResource = new ResourcePolicy::AudioResource();
- * ResourcePolicy::VideoResource *audioResource = new ResourcePolicy::AudioResource();
+ * ResourcePolicy::VideoResource *audioResource = new ResourcePolicy::VideoResource();
* videoResource->setOptional();
* \endcode
* Then you need to create a \ref ResourcePolicy::ResourceSet like this:
@@ -106,7 +106,7 @@ namespace ResourcePolicy
* This method returns a list of all resource in the set.
* \return a QList of all resources in the set.
*/
- QList<Resource *> resources();
+ QList<Resource *> resources() const;
/**
* This method returns a const pointer to a resource of a specific type.
* \type The type of resource we are interested in.
@@ -128,6 +128,7 @@ namespace ResourcePolicy
bool contains(const QList<ResourceType> &types) const;
quint32 id() const;
+ QString applicationClass();
/**
* Connects to the Resource Policy Manager. The connected() signal is sent
@@ -168,12 +169,12 @@ namespace ResourcePolicy
* the given resources have become available.
* \param availableResources A list of available resources.
*/
- void resourcesBecameAvailable(QList<Resource *> availableResources);
+ void resourcesBecameAvailable(QList<ResourceType> availableResources);
/**
* This signal is emited as a response to the acquire() request.
- * \param grantedResources The list of granted optional resources.
+ * \param grantedOptionalResources The list of granted optional resources.
*/
- void resourcesGranted(QList<Resource *> grantedOptionalResources);
+ void resourcesGranted(QList<ResourceType> grantedOptionalResources);
/**
* This signal is emited as a response to the acquire() request, in the
* case where we are not granted any requests.
@@ -197,7 +198,7 @@ namespace ResourcePolicy
private:
quint32 identifier;
- const QString applicationClass;
+ const QString resourceClass;
Resource* resourceSet[NumberOfTypes];
};
}
diff --git a/libresourceqt/include/resource.h b/libresourceqt/include/qt4/policy/resource.h
index 13265d5..13265d5 100644
--- a/libresourceqt/include/resource.h
+++ b/libresourceqt/include/qt4/policy/resource.h
diff --git a/libresourceqt/include/resources.h b/libresourceqt/include/qt4/policy/resources.h
index 8e3da70..47002d7 100644
--- a/libresourceqt/include/resources.h
+++ b/libresourceqt/include/qt4/policy/resources.h
@@ -1,7 +1,7 @@
#ifndef RESOURCES_H
#define RESOURCES_H
-#include "resource.h"
+#include <policy/resource.h>
#include <QObject>
#include <QString>