summaryrefslogtreecommitdiff
path: root/resourceqt-client
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 /resourceqt-client
parent67649bb4c02c471ac394d490851c7c3ae5126c41 (diff)
Fixed ResourceSet signals QList<ResourcePolicy::ResourceType> to list
namespace, so the users don't have to use namecpace ResourcePolicy
Diffstat (limited to 'resourceqt-client')
-rw-r--r--resourceqt-client/client.cpp2
-rw-r--r--resourceqt-client/client.h14
2 files changed, 8 insertions, 8 deletions
diff --git a/resourceqt-client/client.cpp b/resourceqt-client/client.cpp
index 1c4ce34..27583fe 100644
--- a/resourceqt-client/client.cpp
+++ b/resourceqt-client/client.cpp
@@ -7,6 +7,8 @@
#include "client.h"
+using namespace ResourcePolicy;
+
Client::Client(QString appClass) : QObject()
{
applicationClass = appClass;
diff --git a/resourceqt-client/client.h b/resourceqt-client/client.h
index 81461c5..ed32538 100644
--- a/resourceqt-client/client.h
+++ b/resourceqt-client/client.h
@@ -6,8 +6,6 @@
#include <policy/resource-set.h>
-using namespace ResourcePolicy;
-
#define RES_AUDIO_PLAYBACK (1<<0)
#define RES_VIDEO_PLAYBACK (1<<1)
#define RES_AUDIO_RECORDING (1<<2)
@@ -33,7 +31,7 @@ public:
static uint32_t parseResourceList(QString resourceListStr);
private slots:
- void resourceAcquiredHandler(const QList<ResourceType>& grantedResList);
+ void resourceAcquiredHandler(const QList<ResourcePolicy::ResourceType>& grantedResList);
void resourceDeniedHandler();
void resourceLostHandler();
void resourceReleasedHandler();
@@ -49,14 +47,14 @@ private:
uint32_t resourcesOptional;
QString applicationClass;
- ResourceSet* resourceSet;
+ ResourcePolicy::ResourceSet* resourceSet;
- Resource* allocateResource(ResourceType resource, bool optional);
- ResourceType getResourceType(uint32_t resource);
+ ResourcePolicy::Resource* allocateResource(ResourcePolicy::ResourceType resource, bool optional);
+ ResourcePolicy::ResourceType getResourceType(uint32_t resource);
void showPrompt();
- void showResources(const QList<ResourceType> resList);
- void showResources(const QList<Resource*> resList);
+ void showResources(const QList<ResourcePolicy::ResourceType> resList);
+ void showResources(const QList<ResourcePolicy::Resource*> resList);
void updateSet(uint32_t list, uint32_t optional, bool remove);
};