diff options
author | Janos Kovacs <janos.f.kovacs@nokia.com> | 2010-06-28 14:08:00 +0300 |
---|---|---|
committer | Janos Kovacs <janos.f.kovacs@nokia.com> | 2010-06-28 14:08:00 +0300 |
commit | 3f7ebe2f161b0d18f55d547b530f5a999488e03f (patch) | |
tree | 012b4edfcee65785ca752f4bc0a8e90f881f8170 /libresourceqt/include/qt4 | |
parent | 5e7214d0fce9b9214a076d01b9e318d097aa41b4 (diff) |
merging with the swp.plcy-357-harmattan branch
Diffstat (limited to 'libresourceqt/include/qt4')
-rw-r--r-- | libresourceqt/include/qt4/policy/resource-set.h | 1 | ||||
-rw-r--r-- | libresourceqt/include/qt4/policy/resource.h | 1 | ||||
-rw-r--r-- | libresourceqt/include/qt4/policy/resources.h | 11 |
3 files changed, 13 insertions, 0 deletions
diff --git a/libresourceqt/include/qt4/policy/resource-set.h b/libresourceqt/include/qt4/policy/resource-set.h index ad5aa44..b3da922 100644 --- a/libresourceqt/include/qt4/policy/resource-set.h +++ b/libresourceqt/include/qt4/policy/resource-set.h @@ -242,6 +242,7 @@ private: bool pendingAcquire; bool pendingUpdate; bool pendingAudioProperties; + bool haveAudioProperties; void registerAudioProperties(); diff --git a/libresourceqt/include/qt4/policy/resource.h b/libresourceqt/include/qt4/policy/resource.h index 4f9b02e..7f10b97 100644 --- a/libresourceqt/include/qt4/policy/resource.h +++ b/libresourceqt/include/qt4/policy/resource.h @@ -23,6 +23,7 @@ enum ResourceType { ScaleButtonType, ///< The scale (zoom) button SnapButtonType, ///< Use this if you are a camera application LensCoverType, + HeadsetButtonsType, ///< Use this to reserve the headset buttons NumberOfTypes }; diff --git a/libresourceqt/include/qt4/policy/resources.h b/libresourceqt/include/qt4/policy/resources.h index c0d0eab..acd816f 100644 --- a/libresourceqt/include/qt4/policy/resources.h +++ b/libresourceqt/include/qt4/policy/resources.h @@ -120,6 +120,17 @@ public: virtual ResourceType type() const; }; + +class HeadsetButtonsResource: public Resource +{ +public: + HeadsetButtonsResource(); + HeadsetButtonsResource(const HeadsetButtonsResource &other); + virtual ~HeadsetButtonsResource(); + + virtual ResourceType type() const; +}; + } #endif |