From c3189a0a229cf6ac0e9ea93854b0273551e119d0 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 1 Aug 2012 14:44:51 +0200 Subject: change \img to \image in docs \img was a macro defined in macros.qdocconf. This collection of macros is being phased out. Use the full command instead. Change-Id: Ia55212f87bb46349d61359d40568e0aa33882596 Reviewed-by: Casper van Donderen --- src/concurrent/qfuture.cpp | 2 +- src/dbus/doc/src/dbus-intro.qdoc | 2 +- src/gui/image/qicon.cpp | 2 +- src/gui/kernel/qevent.cpp | 2 +- src/gui/kernel/qpalette.cpp | 2 +- src/gui/painting/qcolor.cpp | 4 ++-- src/gui/painting/qregion.cpp | 8 ++++---- src/gui/text/qfontmetrics.cpp | 4 ++-- src/gui/text/qtextformat.cpp | 2 +- src/gui/text/qtextobject.cpp | 4 ++-- src/widgets/dialogs/qerrormessage.cpp | 2 +- src/widgets/dialogs/qinputdialog.cpp | 2 +- src/widgets/dialogs/qmessagebox.cpp | 8 ++++---- src/widgets/doc/src/widgets-and-layouts/layout.qdoc | 4 ++-- .../doc/src/windows-and-dialogs/mainwindow.qdoc | 2 +- src/widgets/effects/qgraphicseffect.cpp | 20 ++++++++++---------- src/widgets/graphicsview/qgraphicsitem.cpp | 8 ++++---- src/widgets/graphicsview/qgraphicsview.cpp | 2 +- src/widgets/kernel/qactiongroup.cpp | 2 +- src/widgets/kernel/qwhatsthis.cpp | 2 +- src/widgets/styles/qcdestyle.cpp | 2 +- src/widgets/styles/qmacstyle.qdoc | 2 +- src/widgets/styles/qmotifstyle.cpp | 2 +- src/widgets/styles/qplastiquestyle.cpp | 2 +- src/widgets/styles/qstyle.cpp | 2 +- src/widgets/styles/qwindowsstyle.cpp | 2 +- src/widgets/styles/qwindowsxpstyle.cpp | 2 +- 27 files changed, 49 insertions(+), 49 deletions(-) (limited to 'src') diff --git a/src/concurrent/qfuture.cpp b/src/concurrent/qfuture.cpp index 79226c5a67..90b54cad7b 100644 --- a/src/concurrent/qfuture.cpp +++ b/src/concurrent/qfuture.cpp @@ -566,7 +566,7 @@ between the second and third result, and returns the second result; and so on. - \img javaiterators1.png + \image javaiterators1.png Here's how to iterate over the elements in reverse order: diff --git a/src/dbus/doc/src/dbus-intro.qdoc b/src/dbus/doc/src/dbus-intro.qdoc index b3cf29e129..6304c8f075 100644 --- a/src/dbus/doc/src/dbus-intro.qdoc +++ b/src/dbus/doc/src/dbus-intro.qdoc @@ -143,7 +143,7 @@ If we continue our analogy with Web services, object paths equate to the path part of a URL: - \img qurl-ftppath.png + \image qurl-ftppath.png Like them, object paths in D-Bus are formed resembling path names on the filesystem: they are slash-separated labels, each diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 3916672c85..9a2db6b79c 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -507,7 +507,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, selected item. If the widget can be toggled, the "On" mode might be used to draw a different icon. - \img icon.png QIcon + \image icon.png QIcon \sa {fowler}{GUI Design Handbook: Iconic Label}, {Icons Example} */ diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index a0ea261034..5abe8a3934 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -1977,7 +1977,7 @@ QTabletEvent::~QTabletEvent() Positive values are towards the tablet's physical right. The angle is in the range -60 to +60 degrees. - \img qtabletevent-tilt.png + \image qtabletevent-tilt.png \sa yTilt() */ diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 7d0bc8c0c5..2ff37a2c24 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -404,7 +404,7 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button) /*! \enum QPalette::ColorRole - \img palette.png Color Roles + \image palette.png Color Roles The ColorRole enum defines the different symbolic color roles used in current GUIs. diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 61a218df83..f496769cac 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -153,7 +153,7 @@ QT_BEGIN_NAMESPACE The code above produces the following output: - \img alphafill.png + \image alphafill.png The alpha channel of a color can be retrieved and set using the alpha() and setAlpha() functions if its value is an integer, and @@ -170,7 +170,7 @@ QT_BEGIN_NAMESPACE variety of color names; the static colorNames() function returns a QStringList color names that QColor knows about. - \img qt-colors.png Qt Colors + \image qt-colors.png Qt Colors Additionally, the Qt::color0, Qt::color1 and Qt::transparent colors are used for special purposes. diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index cea9f74d90..5d3eb60ce3 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -775,7 +775,7 @@ QRegion QRegion::intersect(const QRect &r) const Returns a region which is the union of this region and \a r. - \img runion.png Region Union + \image runion.png Region Union The figure shows the union of two elliptical regions. @@ -812,7 +812,7 @@ QRegion QRegion::intersect(const QRect &r) const Returns a region which is the intersection of this region and \a r. - \img rintersect.png Region Intersection + \image rintersect.png Region Intersection The figure shows the intersection of two elliptical regions. @@ -832,7 +832,7 @@ QRegion QRegion::intersect(const QRect &r) const Returns a region which is \a r subtracted from this region. - \img rsubtract.png Region Subtraction + \image rsubtract.png Region Subtraction The figure shows the result when the ellipse on the right is subtracted from the ellipse on the left (\c {left - right}). @@ -854,7 +854,7 @@ QRegion QRegion::intersect(const QRect &r) const Returns a region which is the exclusive or (XOR) of this region and \a r. - \img rxor.png Region XORed + \image rxor.png Region XORed The figure shows the exclusive or of two elliptical regions. diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index d135b2a44b..488bb68ec4 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -551,7 +551,7 @@ int QFontMetrics::width(const QString &text, int len, int flags) const /*! \overload - \img bearings.png Bearings + \image bearings.png Bearings Returns the logical width of character \a ch in pixels. This is a distance appropriate for drawing a subsequent character after \a @@ -1391,7 +1391,7 @@ qreal QFontMetricsF::width(const QString &text) const /*! \overload - \img bearings.png Bearings + \image bearings.png Bearings Returns the logical width of character \a ch in pixels. This is a distance appropriate for drawing a subsequent character after \a diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 4dd7b285c9..cb1e81bba2 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -2446,7 +2446,7 @@ QTextListFormat::QTextListFormat(const QTextFormat &fmt) frame's padding(). This scheme is similar to the box model used by Cascading Style Sheets for HTML pages. - \img qtextframe-style.png + \image qtextframe-style.png The position() of a frame is set using setPosition() and determines how it is located relative to the surrounding text. diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 5643233994..a7cd76c51b 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -868,7 +868,7 @@ QTextBlockUserData::~QTextBlockUserData() compares two blocks for inequality, and \l operator<() determines whether a block precedes another in the same document. - \img qtextblock-sequence.png + \image qtextblock-sequence.png \sa QTextBlockFormat, QTextCharFormat, QTextFragment */ @@ -1602,7 +1602,7 @@ QTextBlock::iterator &QTextBlock::iterator::operator--() of the sentence, the second will contain the text from the middle, and the third takes the text from the end of the sentence. - \img qtextfragment-split.png + \image qtextfragment-split.png A fragment's text and character format can be obtained with the text() and charFormat() functions. The length() function gives the length of diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp index 094c35b107..47f79e17aa 100644 --- a/src/widgets/dialogs/qerrormessage.cpp +++ b/src/widgets/dialogs/qerrormessage.cpp @@ -167,7 +167,7 @@ QSize QErrorMessageTextView::sizeHint() const The \l{dialogs/standarddialogs}{Standard Dialogs} example shows how to use QErrorMessage as well as other built-in Qt dialogs. - \img qerrormessage.png + \image qerrormessage.png \sa QMessageBox, QStatusBar::showMessage(), {Standard Dialogs Example} */ diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 13be3fcbe4..828763541b 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -447,7 +447,7 @@ void QInputDialogPrivate::_q_currentRowChanged(const QModelIndex &newIndex, The \c ok variable is set to true if the user clicks \uicontrol OK; otherwise it is set to false. - \img inputdialogs.png Input Dialogs + \image inputdialogs.png Input Dialogs The \l{dialogs/standarddialogs}{Standard Dialogs} example shows how to use QInputDialog as well as other built-in Qt dialogs. diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index ba70d4dd60..e43b464e5f 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -575,19 +575,19 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button) \table \row - \li \img qmessagebox-quest.png + \li \image qmessagebox-quest.png \li \l Question \li For asking a question during normal operations. \row - \li \img qmessagebox-info.png + \li \image qmessagebox-info.png \li \l Information \li For reporting information about normal operations. \row - \li \img qmessagebox-warn.png + \li \image qmessagebox-warn.png \li \l Warning \li For reporting non-critical errors. \row - \li \img qmessagebox-crit.png + \li \image qmessagebox-crit.png \li \l Critical \li For reporting critical errors. \endtable diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc index cc3c438173..7389a2dad1 100644 --- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc @@ -214,12 +214,12 @@ If we have three widgets laid out using a QHBoxLayout with no stretch factors set we will get a layout like this: - \img layout1.png Three widgets in a row + \image layout1.png Three widgets in a row If we apply stretch factors to each widget, they will be laid out in proportion (but never less than their minimum size hint), e.g. - \img layout2.png Three widgets with different stretch factors in a row + \image layout2.png Three widgets with different stretch factors in a row \section1 Custom Widgets in Layouts diff --git a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc index 99acb2e5d0..8e9ea93f34 100644 --- a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc +++ b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc @@ -113,7 +113,7 @@ widget's client geometry. This diagram shows most of the functions in use: - \img geometry.png Geometry diagram + \image geometry.png Geometry diagram \section2 X11 Peculiarities diff --git a/src/widgets/effects/qgraphicseffect.cpp b/src/widgets/effects/qgraphicseffect.cpp index 5bfa8cc5e5..7377e02c54 100644 --- a/src/widgets/effects/qgraphicseffect.cpp +++ b/src/widgets/effects/qgraphicseffect.cpp @@ -70,16 +70,16 @@ \table \row - \li{2,1} \img graphicseffect-plain.png + \li{2,1} \image graphicseffect-plain.png \row - \li \img graphicseffect-blur.png - \li \img graphicseffect-colorize.png + \li \image graphicseffect-blur.png + \li \image graphicseffect-colorize.png \row - \li \img graphicseffect-opacity.png - \li \img graphicseffect-drop-shadow.png + \li \image graphicseffect-opacity.png + \li \image graphicseffect-drop-shadow.png \endtable - \img graphicseffect-widget.png + \image graphicseffect-widget.png For more information on how to use each effect, refer to the specific effect's documentation. @@ -600,7 +600,7 @@ void QGraphicsEffect::sourceChanged(ChangeFlags flags) By default, the color is light blue (QColor(0, 0, 192)). - \img graphicseffect-colorize.png + \image graphicseffect-colorize.png \sa QGraphicsDropShadowEffect, QGraphicsBlurEffect, QGraphicsOpacityEffect */ @@ -729,7 +729,7 @@ void QGraphicsColorizeEffect::draw(QPainter *painter) By default, the blur radius is 5 pixels. The blur radius is specified in device coordinates. - \img graphicseffect-blur.png + \image graphicseffect-blur.png \sa QGraphicsDropShadowEffect, QGraphicsColorizeEffect, QGraphicsOpacityEffect */ @@ -892,7 +892,7 @@ void QGraphicsBlurEffect::draw(QPainter *painter) of 8 pixels towards the lower right. The drop shadow offset is specified in device coordinates. - \img graphicseffect-drop-shadow.png + \image graphicseffect-drop-shadow.png \sa QGraphicsBlurEffect, QGraphicsColorizeEffect, QGraphicsOpacityEffect */ @@ -1084,7 +1084,7 @@ void QGraphicsDropShadowEffect::draw(QPainter *painter) By default, the opacity is 0.7. - \img graphicseffect-opacity.png + \image graphicseffect-opacity.png \sa QGraphicsDropShadowEffect, QGraphicsBlurEffect, QGraphicsColorizeEffect */ diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index 35519de041..9a014807dc 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -132,7 +132,7 @@ local coordinates). Parent items propagate both their position and their transformation to all children. - \img graphicsview-parentchild.png + \image graphicsview-parentchild.png \target Transformations \section1 Transformations @@ -9134,7 +9134,7 @@ QVariant QGraphicsPolygonItem::extension(const QVariant &variant) const returns the current line. By default the line is black with a width of 0, but you can change this by calling setPen(). - \img graphicsview-lineitem.png + \image graphicsview-lineitem.png QGraphicsLineItem uses the line and the pen width to provide a reasonable implementation of boundingRect(), shape(), and contains(). The paint() @@ -9779,7 +9779,7 @@ QVariant QGraphicsPixmapItem::extension(const QVariant &variant) const \note In order to align HTML text in the center, the item's text width must be set. - \img graphicsview-textitem.png + \image graphicsview-textitem.png \note QGraphicsTextItem accepts \l{QGraphicsItem::acceptHoverEvents()}{hover events} by default. You can change this with \l{QGraphicsItem::}{setAcceptHoverEvents()}. @@ -10696,7 +10696,7 @@ void QGraphicsSimpleTextItemPrivate::updateBoundingRect() QGraphicsSimpleText does not display rich text; instead, you can use QGraphicsTextItem, which provides full text control capabilities. - \img graphicsview-simpletextitem.png + \image graphicsview-simpletextitem.png \sa QGraphicsTextItem, QGraphicsPathItem, QGraphicsRectItem, QGraphicsEllipseItem, QGraphicsPixmapItem, QGraphicsPolygonItem, diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp index 633e92744b..cb9ed3661f 100644 --- a/src/widgets/graphicsview/qgraphicsview.cpp +++ b/src/widgets/graphicsview/qgraphicsview.cpp @@ -123,7 +123,7 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime < view coordinates and scene coordinates, and to find items on the scene using view coordinates. - \img graphicsview-view.png + \image graphicsview-view.png \sa QGraphicsScene, QGraphicsItem, QGraphicsSceneEvent */ diff --git a/src/widgets/kernel/qactiongroup.cpp b/src/widgets/kernel/qactiongroup.cpp index 2cf8932859..e1d01290c6 100644 --- a/src/widgets/kernel/qactiongroup.cpp +++ b/src/widgets/kernel/qactiongroup.cpp @@ -123,7 +123,7 @@ void QActionGroupPrivate::_q_actionHovered() exclusive by default, only one of the actions in the group is checked at any one time. - \img qactiongroup-align.png Alignment options in a QMenu + \image qactiongroup-align.png Alignment options in a QMenu A QActionGroup emits an triggered() signal when one of its actions is chosen. Each action in an action group emits its diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 9e98767ab7..38f52534d8 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -112,7 +112,7 @@ QT_BEGIN_NAMESPACE the appropriate help text is shown. The mode is left when help is given or when the user presses Esc. - \img whatsthis.png + \image whatsthis.png You can enter "What's This?" mode programmatically with enterWhatsThisMode(), check the mode with inWhatsThisMode(), and diff --git a/src/widgets/styles/qcdestyle.cpp b/src/widgets/styles/qcdestyle.cpp index f7cf3b2fba..dda0aea148 100644 --- a/src/widgets/styles/qcdestyle.cpp +++ b/src/widgets/styles/qcdestyle.cpp @@ -87,7 +87,7 @@ QT_BEGIN_NAMESPACE documentation. QCDEStyle provides overloads for drawControl() and drawPrimitive() which are documented here. - \img qcdestyle.png + \image qcdestyle.png \sa QWindowsXPStyle, QMacStyle, QWindowsStyle, QPlastiqueStyle, QMotifStyle */ diff --git a/src/widgets/styles/qmacstyle.qdoc b/src/widgets/styles/qmacstyle.qdoc index d951894c35..840b22322a 100644 --- a/src/widgets/styles/qmacstyle.qdoc +++ b/src/widgets/styles/qmacstyle.qdoc @@ -80,7 +80,7 @@ reimplementations of QStyle functions; see QStyle for their documentation. - \img qmacstyle.png + \image qmacstyle.png \sa QWindowsXPStyle, QWindowsStyle, QPlastiqueStyle, QCDEStyle, QMotifStyle */ diff --git a/src/widgets/styles/qmotifstyle.cpp b/src/widgets/styles/qmotifstyle.cpp index f02771ab61..5492632cde 100644 --- a/src/widgets/styles/qmotifstyle.cpp +++ b/src/widgets/styles/qmotifstyle.cpp @@ -97,7 +97,7 @@ static const int motifCheckMarkSpace = 16; but with some minor improvements. The Motif style is Qt's default GUI style on Unix platforms. - \img qmotifstyle.png + \image qmotifstyle.png \sa QWindowsXPStyle, QMacStyle, QWindowsStyle, QPlastiqueStyle, QCDEStyle */ diff --git a/src/widgets/styles/qplastiquestyle.cpp b/src/widgets/styles/qplastiquestyle.cpp index c2b4d4c12c..5abf669a48 100644 --- a/src/widgets/styles/qplastiquestyle.cpp +++ b/src/widgets/styles/qplastiquestyle.cpp @@ -1024,7 +1024,7 @@ QPlastiqueStylePrivate::~QPlastiqueStylePrivate() that closely resembles the Plastik style, introduced by Sandro Giessl in KDE 3.2. - \img qplastiquestyle.png + \image qplastiquestyle.png \sa QWindowsXPStyle, QMacStyle, QWindowsStyle, QCDEStyle, QMotifStyle */ diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index ba70dafd90..836f697442 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -161,7 +161,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C native widgets. The diagram below shows a QComboBox in eight different styles. - \img qstyle-comboboxes.png Eight combo boxes + \image qstyle-comboboxes.png Eight combo boxes Topics: diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 97721da297..51f93fb292 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -260,7 +260,7 @@ bool QWindowsStyle::eventFilter(QObject *o, QEvent *e) This style is Qt's default GUI style on Windows. - \img qwindowsstyle.png + \image qwindowsstyle.png \sa QWindowsXPStyle, QMacStyle, QPlastiqueStyle, QCDEStyle, QMotifStyle */ diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp index 18a28bc556..599d93e99a 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -1169,7 +1169,7 @@ void QWindowsXPStylePrivate::drawBackgroundThruNativeBuffer(XPThemeData &themeDa drawControlMask(), drawPrimitive(), proxy()->subControlRect(), and sizeFromContents(), are documented here. - \img qwindowsxpstyle.png + \image qwindowsxpstyle.png \sa QMacStyle, QWindowsStyle, QPlastiqueStyle, QCDEStyle, QMotifStyle */ -- cgit v1.2.3