slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolving some warnings in qtmultimedia docs

Browse Source 
Change-Id: I9df926f64548a5d53382448ca4eef8d428339aa3
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Angus Cummings
2012-03-19 17:32:31 +10:00
committed by Qt by Nokia
parent 8477d735c9
commit 5d6494f248
14 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/examples/qmlvideo.qdoc
View File

@@ -128,7 +128,7 @@ element, the embedded
\section1 Calculating and displaying QML painting rate \section1 Calculating and displaying QML painting rate
\include examples/video-qml-paint-rate.qdocinc \input examples/video-qml-paint-rate.qdocinc
All that remains is to connect the afterRendering() signal of the QQuickView All that remains is to connect the afterRendering() signal of the QQuickView
object to a JavaScript function, which will eventually call frequencyItem.notify(): object to a JavaScript function, which will eventually call frequencyItem.notify():

4
doc/src/examples/qmlvideofx.qdoc
View File

@@ -151,7 +151,7 @@ The abstraction of source item type is achieved by the
\printuntil } \printuntil }
\skipto function openVideo \skipto function openVideo
\printuntil "ContentVideo.qml" \printuntil "ContentVideo.qml"
\skipto contentLoader.item.source \skipto contentLoader.item.mediaSource
\printuntil path \printuntil path
\skipto } \skipto }
\printuntil } \printuntil }
@@ -202,7 +202,7 @@ And here is the effect selection menu:
\section1 Calculating and displaying QML painting rate \section1 Calculating and displaying QML painting rate
\include examples/video-qml-paint-rate.qdocinc \input examples/video-qml-paint-rate.qdocinc
All that remains is to connect the afterRendering() signal of the QQuickView All that remains is to connect the afterRendering() signal of the QQuickView
object to a JavaScript function, which will eventually call frequencyItem.notify(): object to a JavaScript function, which will eventually call frequencyItem.notify():

2
doc/src/examples/video-qml-paint-rate.qdocinc
View File

@@ -33,7 +33,7 @@ and its data is displayed by defining a QML item called FrequencyItem, like this
\printuntil id: monitor \printuntil id: monitor
\skipto onAverageFrequencyChanged \skipto onAverageFrequencyChanged
\printuntil { \printuntil {
\skipto instantaneousFrequencyText \skipto averageFrequencyText
\printuntil /^\}/ \printuntil /^\}/
The result looks like this: The result looks like this:

2
doc/src/snippets/multimedia-snippets/camera.cpp
View File

@@ -110,7 +110,7 @@ void overview_still()
//on shutter button released //on shutter button released
camera->unlock(); camera->unlock();
//! [Camera overview surface] //! [Camera overview capture]
} }
void overview_movie() void overview_movie()

2
src/gsttools/qgstreamerbushelper.cpp
View File

@@ -139,7 +139,7 @@ static GstBusSyncReply syncGstBusFilter(GstBus* bus, GstMessage* message, QGstre
/*! /*!
\class gstreamer::QGstreamerBusHelper \class QGstreamerBusHelper
\internal \internal
*/ */

2
src/gsttools/qgstreamermessage.cpp
View File

@@ -49,7 +49,7 @@ static int wuchi = qRegisterMetaType<QGstreamerMessage>();
/*! /*!
\class gstreamer::QGstreamerMessage \class QGstreamerMessage
\internal \internal
*/ */

2
src/imports/audioengine/qdeclarative_audiosample_p.cpp
View File

@@ -158,7 +158,7 @@ bool QDeclarativeAudioSample::isLoaded() const
} }
/*! /*!
\qmlproperty QtAudioEngine1::AudioSample::load() \qmlmethod void QtAudioEngine1::AudioSample::load()
Starts loading the sample into memory if not loaded. Starts loading the sample into memory if not loaded.
*/ */

4
src/imports/multimedia/qdeclarativecameraexposure.cpp
View File

@@ -80,13 +80,13 @@ QT_BEGIN_NAMESPACE
For example, to select automatic shutter speed selection: For example, to select automatic shutter speed selection:
\qml \qml
camera.exposure.setAutoShutterSpeed(); camera.exposure.setAutoShutterSpeed()
\endqml \endqml
Or for a specific shutter speed: Or for a specific shutter speed:
\qml \qml
camera.exposure.manualShutterSpeed = 0.01; // 10ms camera.exposure.manualShutterSpeed = 0.01 // 10ms
\endqml \endqml
You can only choose one or the other mode. You can only choose one or the other mode.

16
src/imports/multimedia/qdeclarativevideooutput.cpp
View File

@@ -550,7 +550,7 @@ QRectF QDeclarativeVideoOutput::sourceRect() const
} }
/*! /*!
\qmlmethod QtMultimedia5::VideoOutput::mapNormalizedPointToItem \qmlmethod QPointF QtMultimedia5::VideoOutput::mapNormalizedPointToItem (const QPointF &point) const
Given normalized coordinates \a point (that is, each Given normalized coordinates \a point (that is, each
component in the range of 0 to 1.0), return the mapped point component in the range of 0 to 1.0), return the mapped point
@@ -587,7 +587,7 @@ QPointF QDeclarativeVideoOutput::mapNormalizedPointToItem(const QPointF &point)
} }
/*! /*!
\qmlmethod QtMultimedia5::VideoOutput::mapNormalizedRectToItem \qmlmethod QRectF QtMultimedia5::VideoOutput::mapNormalizedRectToItem(const QRectF &rectangle) const
Given a rectangle \a rectangle in normalized Given a rectangle \a rectangle in normalized
coordinates (that is, each component in the range of 0 to 1.0), coordinates (that is, each component in the range of 0 to 1.0),
@@ -604,7 +604,7 @@ QRectF QDeclarativeVideoOutput::mapNormalizedRectToItem(const QRectF &rectangle)
} }
/*! /*!
\qmlmethod QtMultimedia5::VideoOutput::mapPointToItem \qmlmethod QPointF QtMultimedia5::VideoOutput::mapPointToItem(const QPointF &point) const
Given a point \a point in item coordinates, return the Given a point \a point in item coordinates, return the
corresponding point in source coordinates. This mapping is corresponding point in source coordinates. This mapping is
@@ -624,7 +624,7 @@ QPointF QDeclarativeVideoOutput::mapPointToSource(const QPointF &point) const
} }
/*! /*!
\qmlmethod QtMultimedia5::VideoOutput::mapRectToSource \qmlmethod QRectF QtMultimedia5::VideoOutput::mapRectToSource(const QRectF &rectangle) const
Given a rectangle \a rectangle in item coordinates, return the Given a rectangle \a rectangle in item coordinates, return the
corresponding rectangle in source coordinates. This mapping is corresponding rectangle in source coordinates. This mapping is
@@ -642,7 +642,7 @@ QRectF QDeclarativeVideoOutput::mapRectToSource(const QRectF &rectangle) const
} }
/*! /*!
\qmlmethod QtMultimedia5::VideoOutput::mapPointToItemNormalized \qmlmethod QPointF QtMultimedia5::VideoOutput::mapPointToItemNormalized(const QPointF &point) const
Given a point \a point in item coordinates, return the Given a point \a point in item coordinates, return the
corresponding point in normalized source coordinates. This mapping is corresponding point in normalized source coordinates. This mapping is
@@ -677,7 +677,7 @@ QPointF QDeclarativeVideoOutput::mapPointToSourceNormalized(const QPointF &point
} }
/*! /*!
\qmlmethod QtMultimedia5::VideoOutput::mapRectToSourceNormalized \qmlmethod QRectF QtMultimedia5::VideoOutput::mapRectToSourceNormalized(const QRectF &rectangle) const
Given a rectangle \a rectangle in item coordinates, return the Given a rectangle \a rectangle in item coordinates, return the
corresponding rectangle in normalized source coordinates. This mapping is corresponding rectangle in normalized source coordinates. This mapping is
@@ -695,7 +695,7 @@ QRectF QDeclarativeVideoOutput::mapRectToSourceNormalized(const QRectF &rectangl
} }
/*! /*!
\qmlmethod QtMultimedia5::VideoOutput::mapPointToItem \qmlmethod QPointF QtMultimedia5::VideoOutput::mapPointToItem(const QPointF &point) const
Given a point \a point in source coordinates, return the Given a point \a point in source coordinates, return the
corresponding point in item coordinates. This mapping is corresponding point in item coordinates. This mapping is
@@ -718,7 +718,7 @@ QPointF QDeclarativeVideoOutput::mapPointToItem(const QPointF &point) const
} }
/*! /*!
\qmlmethod QtMultimedia5::VideoOutput::mapRectToItem \qmlmethod QRectF QtMultimedia5::VideoOutput::mapRectToItem(const QRectF &rectangle) const
Given a rectangle \a rectangle in source coordinates, return the Given a rectangle \a rectangle in source coordinates, return the
corresponding rectangle in item coordinates. This mapping is corresponding rectangle in item coordinates. This mapping is

6
src/multimedia/controls/qcamerafocuscontrol.cpp
View File

@@ -167,7 +167,7 @@ QCameraFocusControl::~QCameraFocusControl()
*/ */
/*! /*!
\fn QCameraFocusControl::focusModeChanged \fn void QCameraFocusControl::focusModeChanged(QCameraFocus::FocusModes mode)
Signal is emitted when the focus mode is chaged, Signal is emitted when the focus mode is chaged,
usually in result of QCameraFocusControl::setFocusMode call or capture mode changes. usually in result of QCameraFocusControl::setFocusMode call or capture mode changes.
@@ -176,7 +176,7 @@ QCameraFocusControl::~QCameraFocusControl()
*/ */
/*! /*!
\fn QCameraFocusControl::focusPointModeChanged \fn void QCameraFocusControl::focusPointModeChanged(QCameraFocus::FocusPointMode mode)
Signal is emitted when the focus point mode is chaged, Signal is emitted when the focus point mode is chaged,
usually in result of QCameraFocusControl::setFocusPointMode call or capture mode changes. usually in result of QCameraFocusControl::setFocusPointMode call or capture mode changes.
@@ -185,7 +185,7 @@ QCameraFocusControl::~QCameraFocusControl()
*/ */
/*! /*!
\fn QCameraFocusControl::customFocusPointChanged \fn void QCameraFocusControl::customFocusPointChanged(const QPointF &point)
Signal is emitted when the custom focus point is changed. Signal is emitted when the custom focus point is changed.

12
src/multimedia/controls/qradiodatacontrol.cpp
View File

@@ -112,31 +112,31 @@ QRadioDataControl::~QRadioDataControl()
*/ */
/*! /*!
\fn int QRadioDataControl::stationId() \fn QString QRadioDataControl::stationId() const
Returns the current Program Identification Returns the current Program Identification
*/ */
/*! /*!
\fn QRadioData::ProgramType QRadioDataControl::programType() \fn QRadioData::ProgramType QRadioDataControl::programType() const
Returns the current Program Type Returns the current Program Type
*/ */
/*! /*!
\fn QString QRadioDataControl::programTypeName() \fn QString QRadioDataControl::programTypeName() const
Returns the current Program Type Name Returns the current Program Type Name
*/ */
/*! /*!
\fn QString QRadioDataControl::stationName() \fn QString QRadioDataControl::stationName() const
Returns the current Program Service Returns the current Program Service
*/ */
/*! /*!
\fn QString QRadioDataControl::radioText() \fn QString QRadioDataControl::radioText() const
Returns the current Radio Text Returns the current Radio Text
*/ */
@@ -148,7 +148,7 @@ QRadioDataControl::~QRadioDataControl()
*/ */
/*! /*!
\fn bool QRadioDataControl::isAlternativeFrequenciesEnabled() \fn bool QRadioDataControl::isAlternativeFrequenciesEnabled() const
Returns true if Alternative Frequency is currently enabled Returns true if Alternative Frequency is currently enabled
*/ */

2
src/multimedia/recording/qmediarecorder.cpp
View File

@@ -887,7 +887,7 @@ void QMediaRecorder::stop()
*/ */
/*! /*!
\fn QMediaRecorder::availableChanged(bool available) \fn QMediaRecorder::availabilityChanged(bool available)
Signals that the media recorder is now available (if \a available is true), or not. Signals that the media recorder is now available (if \a available is true), or not.
*/ */

4
src/multimediawidgets/qeglimagetexturesurface.cpp
View File

@@ -58,7 +58,7 @@ const QAbstractVideoBuffer::HandleType EGLImageTextureHandle =
QAbstractVideoBuffer::HandleType(QAbstractVideoBuffer::UserHandle+3434); QAbstractVideoBuffer::HandleType(QAbstractVideoBuffer::UserHandle+3434);
/*! /*!
\class QOmapFbVideoSurface \class QEglImageTextureSurface
\internal \internal
*/ */
@@ -491,7 +491,7 @@ void QEglImageTextureSurface::paint(QPainter *painter, const QRectF &target, con
} }
/*! /*!
\fn QOmapFbVideoSurface::frameChanged() \fn QEglImageTextureSurface::frameChanged()
*/ */
/*! /*!

1
src/multimediawidgets/qvideowidget.cpp
View File

@@ -1001,7 +1001,6 @@ void QVideoWidget::paintEvent(QPaintEvent *event)
#if defined(Q_WS_WIN) #if defined(Q_WS_WIN)
/*! /*!
\reimp
\internal \internal
*/ */
bool QVideoWidget::winEvent(MSG *message, long *result) bool QVideoWidget::winEvent(MSG *message, long *result)