Merge branch 'master' into meego

1 files changed, 3 insertions, 0 deletions

diff --git a/resourceqt-client/client.h b/resourceqt-client/client.h
index 3967fee..6d92a30 100644
--- a/resourceqt-client/client.h
+++ b/resourceqt-client/client.h
@@ -59,9 +59,11 @@ private slots:
     void resourceDeniedHandler();
     void resourceLostHandler();
     void resourceReleasedHandler();
+    void resourceReleasedByManagerHandler();
     void resourcesBecameAvailableHandler(const QList<ResourcePolicy::ResourceType> &availableResources);
     void readLine(int);
     void doExit();
+    void stopConnectTimerHandler();
 
 private:
     QTextStream standardInput;
@@ -81,6 +83,7 @@ private:
     void showPrompt();
     void showResources(const QList<ResourcePolicy::ResourceType> &resList);
     void showResources(const QList<ResourcePolicy::Resource*> &resList);
+    void modifyResources(const QString &resString);
     inline void startTimer();
     inline void stopTimer();
 };