diff options
author | Kevin Wright <kevin.wright@nokia.com> | 2010-07-27 07:22:24 (GMT) |
---|---|---|
committer | Kevin Wright <kevin.wright@nokia.com> | 2010-07-27 07:22:24 (GMT) |
commit | a02eba0de0fcf9a17d489ee1f92977c95d3afd76 (patch) | |
tree | d38c4c2d4f1358f4456c2364ad0ad2094745f463 /doc/src | |
parent | 64087b078f3767a2190f2b4a0d4aca2a6165ebda (diff) | |
download | Qt-a02eba0de0fcf9a17d489ee1f92977c95d3afd76.zip Qt-a02eba0de0fcf9a17d489ee1f92977c95d3afd76.tar.gz Qt-a02eba0de0fcf9a17d489ee1f92977c95d3afd76.tar.bz2 |
Modified file/directory names and text to remove disallowed terminology.
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/examples/fingerpaint.qdoc | 6 | ||||
-rw-r--r-- | doc/src/examples/multitouch-dials.qdoc | 36 | ||||
-rw-r--r-- | doc/src/examples/multitouch-knobs.qdoc | 36 | ||||
-rw-r--r-- | doc/src/examples/pinchzoom.qdoc | 6 | ||||
-rw-r--r-- | doc/src/getting-started/examples.qdoc | 16 | ||||
-rw-r--r-- | doc/src/images/multitouch-dials-example.png | bin | 17676 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/multitouch-examples.png | bin | 6691 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/multitouch-fingerpaint-example.png | bin | 17026 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/multitouch-knobs-example.png | bin | 1290 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/multitouch-pinchzoom-example.png | bin | 48154 -> 0 bytes | |||
-rw-r--r-- | doc/src/qt4-intro.qdoc | 8 |
11 files changed, 18 insertions, 90 deletions
diff --git a/doc/src/examples/fingerpaint.qdoc b/doc/src/examples/fingerpaint.qdoc index f438082..4b62570 100644 --- a/doc/src/examples/fingerpaint.qdoc +++ b/doc/src/examples/fingerpaint.qdoc @@ -26,11 +26,11 @@ ****************************************************************************/ /*! - \example multitouch/fingerpaint + \example touch/fingerpaint \title Finger Paint Example - The Finger Paint example shows the use of multi-touch with a custom widget + The Finger Paint example shows the use of touch with a custom widget to create a simple painting application. - \image multitouch-fingerpaint-example.png + \image touch-fingerpaint-example.png */ diff --git a/doc/src/examples/multitouch-dials.qdoc b/doc/src/examples/multitouch-dials.qdoc deleted file mode 100644 index 632c4f6..0000000 --- a/doc/src/examples/multitouch-dials.qdoc +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in a -** written agreement between you and Nokia. -** -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example multitouch/dials - \title Multi-Touch Dials Example - - The Multi-Touch Dials example shows how to apply multi-touch to a set of - standard Qt widgets. - - \image multitouch-dials-example.png -*/ diff --git a/doc/src/examples/multitouch-knobs.qdoc b/doc/src/examples/multitouch-knobs.qdoc deleted file mode 100644 index 14ee597..0000000 --- a/doc/src/examples/multitouch-knobs.qdoc +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in a -** written agreement between you and Nokia. -** -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of this -** file. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example multitouch/knobs - \title Multi-Touch Knobs Example - - The Multi-Touch Knobs example shows how to create custom controls that - accept multi-touch input. - - \image multitouch-knobs-example.png -*/ diff --git a/doc/src/examples/pinchzoom.qdoc b/doc/src/examples/pinchzoom.qdoc index e091230..198cbb3 100644 --- a/doc/src/examples/pinchzoom.qdoc +++ b/doc/src/examples/pinchzoom.qdoc @@ -26,11 +26,11 @@ ****************************************************************************/ /*! - \example multitouch/pinchzoom + \example touch/pinchzoom \title Pinch Zoom Example - The Pinch Zoom example shows how to use low-level multi-touch information + The Pinch Zoom example shows how to use low-level touch information to recognize a gesture. - \image multitouch-pinchzoom-example.png + \image touch-pinchzoom-example.png */ diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index a32d120..b2895ba 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -837,19 +837,19 @@ */ /*! - \page examples-multitouch.html + \page examples-touch.html \ingroup all-examples - \title Multi-Touch Examples - \brief Using Qt's multi-touch input capability + \title Touch Input Examples + \brief Using Qt's touch input capability - Support for multi-touch input makes it possible for developers to create + Support for touch input makes it possible for developers to create extensible and intuitive user interfaces. \list - \o \l{multitouch/dials}{Multi-Touch Dials} - \o \l{multitouch/fingerpaint}{Finger Paint} - \o \l{multitouch/knobs}{Multi-Touch Knobs} - \o \l{multitouch/pinchzoom}{Pinch Zoom} + \o \l{touch/dials}{Touch Dials} + \o \l{touch/fingerpaint}{Finger Paint} + \o \l{touch/knobs}{Touch Knobs} + \o \l{touch/pinchzoom}{Pinch Zoom} \endlist */ diff --git a/doc/src/images/multitouch-dials-example.png b/doc/src/images/multitouch-dials-example.png Binary files differdeleted file mode 100644 index 60e1776..0000000 --- a/doc/src/images/multitouch-dials-example.png +++ /dev/null diff --git a/doc/src/images/multitouch-examples.png b/doc/src/images/multitouch-examples.png Binary files differdeleted file mode 100644 index b053cf3..0000000 --- a/doc/src/images/multitouch-examples.png +++ /dev/null diff --git a/doc/src/images/multitouch-fingerpaint-example.png b/doc/src/images/multitouch-fingerpaint-example.png Binary files differdeleted file mode 100644 index c741b65..0000000 --- a/doc/src/images/multitouch-fingerpaint-example.png +++ /dev/null diff --git a/doc/src/images/multitouch-knobs-example.png b/doc/src/images/multitouch-knobs-example.png Binary files differdeleted file mode 100644 index 1cbd90d..0000000 --- a/doc/src/images/multitouch-knobs-example.png +++ /dev/null diff --git a/doc/src/images/multitouch-pinchzoom-example.png b/doc/src/images/multitouch-pinchzoom-example.png Binary files differdeleted file mode 100644 index 1079fb2..0000000 --- a/doc/src/images/multitouch-pinchzoom-example.png +++ /dev/null diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 052e1c9..8867fd9 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -597,9 +597,9 @@ See \l{The State Machine Framework} documentation for more information. - \section1 Multi-Touch and Gestures + \section1 Touch and Gestures - Support for multi-touch input enables users to interact with many + Support for touch input enables users to interact with many parts of a user interface at the same time, and provides the basis for gestures. Additional infrastructure for gesture recognition allows a sequence of touch inputs to be combined to create gestures @@ -613,12 +613,12 @@ \list \o Allows users to interact with applications in more natural ways. \o Simplifies finger-based interaction with UI components. - \o Combines support for common basic gestures and multi-touch gestures + \o Combines support for common basic gestures and touch gestures in a single general framework. \o Enables extensibility by design. \endlist - See the QTouchEvent class documentation for more information on multi-touch + See the QTouchEvent class documentation for more information on touch input and QGestureEvent for gestures. \section1 DOM access API |