aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Vollmer <marius.vollmer@nokia.com>2009-06-26 15:43:10 +0300
committerMarius Vollmer <marius.vollmer@nokia.com>2009-06-26 15:43:10 +0300
commit78519bcdea971ce5d93f2e2375ce11615743a908 (patch)
tree1ad5a494f8667e9a94df392bd2fbbb7ee236c21a
parent0e75469afcbaab7dad606f5b38bb1d0089caa95b (diff)
Minor doc updates.
Conflicts: libcontextsubscriber/src/contextproperty.cpp
-rw-r--r--libcontextsubscriber/src/contextproperty.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libcontextsubscriber/src/contextproperty.cpp b/libcontextsubscriber/src/contextproperty.cpp
index 70f8e772..8944c3a6 100644
--- a/libcontextsubscriber/src/contextproperty.cpp
+++ b/libcontextsubscriber/src/contextproperty.cpp
@@ -189,8 +189,7 @@ struct ContextPropertyPrivate
for more details.
*/
-/// Constructs a new ContextProperty for \a key (e.g. Screen.TopEdge)
-/// and subscribes to it.
+/// Constructs a new ContextProperty for \a key and subscribes to it.
ContextProperty::ContextProperty(const QString &key, QObject* parent)
: QObject(parent), priv(0)
{
@@ -287,9 +286,10 @@ void ContextProperty::waitForSubscription() const
}
}
-/// Sets all of the ContextProperty instaces immune to 'commanding'
-/// (overriding values done by Context Commander). If you use this
-/// method, you have to use it before starting any threads.
+/// Sets all of the ContextProperty instances immune to 'external
+/// commanding'. This is only intended to be used by the Context
+/// Commander itself, so that it can use ContextProperties without
+/// tripping over itself. Don't use this.
void ContextProperty::ignoreCommander()
{
PropertyHandle::ignoreCommander();