Remove "All rights reserved" line from license headers.

[profile/ivi/qtdeclarative.git] / doc / src / declarative / focus.qdoc

diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index d75bd11..66579fd 100644 (file)
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -21,6 +20,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -28,6 +28,7 @@
 /*!
 \target qmlfocus
 \page qdeclarativefocus.html
+\inqmlmodule QtQuick 2
 \ingroup qml-features
 \contentspage QML Features
 \previouspage {QML Text Handling and Validators}{Text Handling and Validators}
@@ -38,7 +39,7 @@
 When a key is pressed or released, a key event is generated and delivered to the
 focused QML \l Item. To facilitate the construction of reusable components
 and to address some of the cases unique to fluid user interfaces, the QML items add aged
-\e scope based extension to Qt's traditional keyboard focus model.
+\i scope based extension to Qt's traditional keyboard focus model.
 
 \tableofcontents
 
@@ -50,7 +51,7 @@ When the user presses or releases a key, the following occurs:
 \o If the Qt widget containing the \l QDeclarativeView has focus, the key event
 is delivered to it. Otherwise, regular Qt key handling continues.
 \o The key event is delivered by the scene to the QML \l Item with
-\e {active focus}. If no Item has active focus, the key event is
+\i {active focus}. If no Item has active focus, the key event is
 \l {QEvent::ignore()}{ignored} and regular Qt key handling continues.
 \o If the QML Item with active focus accepts the key event, propagation
 stops. Otherwise the event is "bubbled up", by recursively passing it to each
@@ -102,7 +103,7 @@ The code that imports and creates two MyWidget instances:
 \snippet doc/src/snippets/declarative/focus/widget.qml window
 
 The MyWidget code:
-\snippet doc/src/snippets/declarative/focus/mywidget.qml mywidget
+\snippet doc/src/snippets/declarative/focus/MyWidget.qml mywidget
 
 We would like to have the first MyWidget object to have the focus by setting its
 \c focus property to \c true. However, by running the code, we can confirm that
@@ -123,7 +124,7 @@ the focus, but it cannot control the focus when it is imported or reused.
 Likewise, the \c window component does not have the ability to know if its
 imported components are requesting the focus.
 
-To solve this problem, the QML introduces a concept known as a \e {focus scope}.
+To solve this problem, the QML introduces a concept known as a \i {focus scope}.
 For existing Qt users, a focus scope is like an automatic focus proxy.
 A focus scope is created by declaring the \l FocusScope element.
 
@@ -135,7 +136,7 @@ visual result shown.
 \image declarative-qmlfocus3.png
 
 
-Conceptually \e {focus scopes} are quite simple.
+Conceptually \i {focus scopes} are quite simple.
 \list
 \o Within each focus scope one element may have \c {Item::focus} set to
 \c true. If more than one \l Item has the \c focus property set, the
@@ -165,7 +166,7 @@ The code that imports and creates two MyClickableWidget instances:
 \snippet doc/src/snippets/declarative/focus/clickablewidget.qml clickable window
 
 The MyClickableWidget code:
-\snippet doc/src/snippets/declarative/focus/myclickablewidget.qml clickable in focusscope
+\snippet doc/src/snippets/declarative/focus/MyClickableWidget.qml clickable in focusscope
 
 \image declarative-qmlfocus4.png