diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-02-14 14:47:59 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-15 11:26:14 +0100 |
commit | cf8ef1676b70d70f5e1d2725d0b24d7df5e8cfe4 (patch) | |
tree | 1664bf394cc055e5d1aa9f3e1d940f8040a0a9c3 /src | |
parent | e211fb349984f8b39c02057709efaa8ad16e8f59 (diff) |
Doc: Removed reference to deprecated \badcode command.
QDoc doesn't differentiate between \badcode and \code. They both
look the same in the output.
Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativerepeater.cpp | 11 | ||||
-rw-r--r-- | src/doc/src/declarative/anchor-layout.qdoc | 3 | ||||
-rw-r--r-- | src/doc/src/declarative/propertybinding.qdoc | 3 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativeintro.qdoc | 3 | ||||
-rw-r--r-- | src/doc/src/declarative/qtbinding.qdoc | 6 |
5 files changed, 14 insertions, 12 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 44721a9e..0e9a9be6 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -110,15 +110,16 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate() The Repeater element creates all of its delegate items when the repeater is first created. This can be inefficient if there are a large number of delegate items and not all of the items are required to be visible at the same time. If this is the case, - consider using other view elements like ListView (which only creates delegate items - when they are scrolled into view) or use the \l {Dynamic Object Creation} methods to + consider using other view elements like ListView (which only creates delegate items + when they are scrolled into view) or use the \l {Dynamic Object Creation} methods to create items as they are required. - Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. + Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. For example, it cannot be used to repeat QtObjects: - \badcode + \code + //bad code Item { - //XXX does not work! Can't repeat QtObject as it doesn't derive from Item. + //Can't repeat QtObject as it doesn't derive from Item. Repeater { model: 10 QtObject {} diff --git a/src/doc/src/declarative/anchor-layout.qdoc b/src/doc/src/declarative/anchor-layout.qdoc index a1c83cec..8aff358a 100644 --- a/src/doc/src/declarative/anchor-layout.qdoc +++ b/src/doc/src/declarative/anchor-layout.qdoc @@ -124,7 +124,8 @@ edge, the margin is not applied. For performance reasons, you can only anchor an item to its siblings and direct parent. For example, the following anchor is invalid and would produce a warning: -\badcode +\code +//bad code Item { id: group1 Rectangle { id: rect1; ... } diff --git a/src/doc/src/declarative/propertybinding.qdoc b/src/doc/src/declarative/propertybinding.qdoc index 60de77ce..450d2265 100644 --- a/src/doc/src/declarative/propertybinding.qdoc +++ b/src/doc/src/declarative/propertybinding.qdoc @@ -109,7 +109,8 @@ properties only allow you to assign a value that matches the property type. For example, if a property is a real, and if you try to assign a string to it you will get an error. -\badcode +\code +//bad code property real volume: "four" //generates an error \endcode diff --git a/src/doc/src/declarative/qdeclarativeintro.qdoc b/src/doc/src/declarative/qdeclarativeintro.qdoc index 8fdc03aa..e5e52407 100644 --- a/src/doc/src/declarative/qdeclarativeintro.qdoc +++ b/src/doc/src/declarative/qdeclarativeintro.qdoc @@ -212,7 +212,8 @@ QML properties are what is known as \e type-safe. That is, they only allow you t matches the property type. For example, the \c x property of item is a real, and if you try to assign a string to it you will get an error. -\badcode +\code +//bad code Item { x: "hello" // illegal! } diff --git a/src/doc/src/declarative/qtbinding.qdoc b/src/doc/src/declarative/qtbinding.qdoc index 58d28159..f173025c 100644 --- a/src/doc/src/declarative/qtbinding.qdoc +++ b/src/doc/src/declarative/qtbinding.qdoc @@ -391,8 +391,8 @@ say you have a custom element \c PushButton with a \c buttonText property that i the value of a \c m_buttonText member variable. Modifying the member variable directly like this is not a good idea: -\badcode -// BAD! +\code +//bad code QDeclarativeComponent component(engine, "MyButton.qml"); PushButton *button = qobject_cast<PushButton*>(component.create()); button->m_buttonText = "Click me"; @@ -665,5 +665,3 @@ be used to build the application resources: See \l {The Qt Resource System} for more information. */ - - |