From 0334e01186cbb1d2a4d5f5d5ad2dabb173d87dc6 Mon Sep 17 00:00:00 2001
From: Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>
Date: Thu, 25 Feb 2010 13:56:08 +0200
Subject: Fixed ResourceSet signals QList<ResourcePolicy::ResourceType> to list
 namespace, so the users don't have to use namecpace ResourcePolicy

---
 resourceqt-client/client.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'resourceqt-client/client.h')

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);
 };
 
-- 
cgit v1.2.3