diff options
author | Andy Nichols <andy.nichols@nokia.com> | 2012-08-21 16:13:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-23 11:20:37 +0200 |
commit | fc924ae47e73a5b41e274a723d8f7cdefe921c4f (patch) | |
tree | 560b0969b970c262c5ebbc9eaa4d23157f103e19 /src | |
parent | 8e0bac89d4b0f01b71c57f79a3b98a6ecb7f20ae (diff) |
Doc: Fix snippet and example referencing widget examples
Widget examples were moved into a widgets subfolder, but
qdoc references were not updated.
Change-Id: Id2a4573e723745b9827c664c852807d6116f8f6d
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/doc/src/plugins-howto.qdoc | 4 | ||||
-rw-r--r-- | src/corelib/doc/src/resource-system.qdoc | 6 | ||||
-rw-r--r-- | src/corelib/itemmodels/qabstractitemmodel.cpp | 2 | ||||
-rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.cpp | 4 | ||||
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 | ||||
-rw-r--r-- | src/corelib/kernel/qtimer.cpp | 6 | ||||
-rw-r--r-- | src/widgets/doc/src/model-view-programming.qdoc | 10 | ||||
-rw-r--r-- | src/widgets/itemviews/qitemdelegate.cpp | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/src/corelib/doc/src/plugins-howto.qdoc b/src/corelib/doc/src/plugins-howto.qdoc index 22a450d6a8..83a4a8b29e 100644 --- a/src/corelib/doc/src/plugins-howto.qdoc +++ b/src/corelib/doc/src/plugins-howto.qdoc @@ -183,12 +183,12 @@ For example, here's the definition of an interface class: - \snippet examples/tools/plugandpaint/interfaces.h 2 + \snippet tools/plugandpaint/interfaces.h 2 Here's the definition of a plugin class that implements that interface: - \snippet examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h 0 + \snippet tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h 0 The \l{tools/plugandpaint}{Plug & Paint} example documentation explains this process in detail. See also \l{Creating Custom diff --git a/src/corelib/doc/src/resource-system.qdoc b/src/corelib/doc/src/resource-system.qdoc index 5736e01806..487c44e62d 100644 --- a/src/corelib/doc/src/resource-system.qdoc +++ b/src/corelib/doc/src/resource-system.qdoc @@ -53,7 +53,7 @@ Here's an example \c .qrc file: - \quotefile mainwindows/application/application.qrc + \quotefile widgets/mainwindows/application/application.qrc The resource files listed in the \c .qrc file are files that are part of the application's source tree. The specified paths are @@ -125,7 +125,7 @@ mentioned in the application's \c .pro file so that \c qmake knows about it. For example: - \snippet mainwindows/application/application.pro 0 + \snippet widgets/mainwindows/application/application.pro 0 \c qmake will produce make rules to generate a file called \c qrc_application.cpp that is linked into the application. This @@ -170,7 +170,7 @@ pass a resource path instead of a file name to the QIcon, QImage, or QPixmap constructor: - \snippet mainwindows/application/mainwindow.cpp 21 + \snippet widgets/mainwindows/application/mainwindow.cpp 21 See the \l{mainwindows/application}{Application} example for an actual application that uses Qt's resource system to store its diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index 4b82b2bb8e..eb8b96541f 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -1426,7 +1426,7 @@ QAbstractItemModel::~QAbstractItemModel() For example: - \snippet itemviews/simpledommodel/dommodel.cpp 2 + \snippet widgets/itemviews/simpledommodel/dommodel.cpp 2 \note When implementing a table based model, columnCount() should return 0 when the parent is valid. diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 7863dc6f4f..251228fed0 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -1604,7 +1604,7 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsMoved( QSortFilterProxyModel and reimplementing lessThan(), which is used to compare items. For example: - \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 5 + \snippet widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 5 (This code snippet comes from the \l{itemviews/customsortfiltermodel}{Custom Sort/Filter Model} @@ -1647,7 +1647,7 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsMoved( the \l{QSortFilterProxyModel::filterKeyColumn}{filterKeyColumn} property and performs filtering on columns 0, 1, and 2: - \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 3 + \snippet widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 3 (This code snippet comes from the \l{itemviews/customsortfiltermodel}{Custom Sort/Filter Model} diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 61604c66b0..194ea4883a 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1944,7 +1944,7 @@ void QObject::deleteLater() is available. Example: - \snippet mainwindows/sdi/mainwindow.cpp implicit tr context + \snippet widgets/mainwindows/sdi/mainwindow.cpp implicit tr context \dots If the same \a sourceText is used in different roles within the diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index cef9dd9815..2a8efad381 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -61,9 +61,9 @@ QT_BEGIN_NAMESPACE Example for a one second (1000 millisecond) timer (from the \l{widgets/analogclock}{Analog Clock} example): - \snippet widgets/analogclock/analogclock.cpp 4 - \snippet widgets/analogclock/analogclock.cpp 5 - \snippet widgets/analogclock/analogclock.cpp 6 + \snippet widgets/widgets/analogclock/analogclock.cpp 4 + \snippet widgets/widgets/analogclock/analogclock.cpp 5 + \snippet widgets/widgets/analogclock/analogclock.cpp 6 From then on, the \c update() slot is called every second. diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc index f3b94e31aa..59a75114d7 100644 --- a/src/widgets/doc/src/model-view-programming.qdoc +++ b/src/widgets/doc/src/model-view-programming.qdoc @@ -749,7 +749,7 @@ to write custom display functions. However, we must still provide functions to manage the editor widget: - \snippet itemviews/spinboxdelegate/delegate.h 0 + \snippet widgets/itemviews/spinboxdelegate/delegate.h 0 Note that no editor widgets are set up when the delegate is constructed. We only construct an editor widget when it is needed. @@ -763,7 +763,7 @@ supplied with everything that the delegate needs to be able to set up a suitable widget: - \snippet itemviews/spinboxdelegate/delegate.cpp 1 + \snippet widgets/itemviews/spinboxdelegate/delegate.cpp 1 Note that we do not need to keep a pointer to the editor widget because the view takes responsibility for destroying it when it is no longer @@ -787,7 +787,7 @@ \l{Qt::ItemDataRole}{display role}, and set the value in the spin box accordingly. - \snippet itemviews/spinboxdelegate/delegate.cpp 2 + \snippet widgets/itemviews/spinboxdelegate/delegate.cpp 2 In this example, we know that the editor widget is a spin box, but we could have provided different editors for different types of data in @@ -800,7 +800,7 @@ asks the delegate to store the edited value in the model by calling the \l{QAbstractItemDelegate::setModelData()}{setModelData()} function. - \snippet itemviews/spinboxdelegate/delegate.cpp 3 + \snippet widgets/itemviews/spinboxdelegate/delegate.cpp 3 Since the view manages the editor widgets for the delegate, we only need to update the model with the contents of the editor supplied. @@ -831,7 +831,7 @@ the view provides all the necessary geometry information inside a \l{QStyleOptionViewItem}{view option} object. - \snippet itemviews/spinboxdelegate/delegate.cpp 4 + \snippet widgets/itemviews/spinboxdelegate/delegate.cpp 4 In this case, we just use the geometry information provided by the view option in the item rectangle. A delegate that renders items with diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index f5700746b8..e3ecc68fdf 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -401,7 +401,7 @@ QString QItemDelegatePrivate::valueToText(const QVariant &value, const QStyleOpt For example, a selected item may need to be displayed differently to unselected items, as shown in the following code: - \snippet itemviews/pixelator/pixeldelegate.cpp 2 + \snippet widgets/itemviews/pixelator/pixeldelegate.cpp 2 \dots After painting, you should ensure that the painter is returned to its |