qtmobility/src/multimedia/qvideowindowcontrol.cpp
changeset 14 6fbed849b4f4
parent 11 06b8e2af4411
--- a/qtmobility/src/multimedia/qvideowindowcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowindowcontrol.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -46,28 +46,29 @@
 /*!
     \class QVideoWindowControl
     \preliminary
-    \ingroup multimedia-serv
+    \ingroup multimedia
     \brief The QVideoWindowControl class provides a media control for rendering video to a window.
 
 
-    The winId() property QVideoWindowControl allows a platform specific
-    window ID to be set as the video render target of a QMediaService.  The
-    displayRect() property is used to set the region of the window the
-    video should be rendered to, and the aspectRatioMode() property
-    indicates how the video should be scaled to fit the displayRect().
+    The winId() property QVideoWindowControl allows a platform specific window
+    ID to be set as the video render target of a QMediaService.  The
+    displayRect() property is used to set the region of the window the video
+    should be rendered to, and the aspectRatioMode() property indicates how the
+    video should be scaled to fit the displayRect().
 
     \code
-    QVideoWindowControl *windowControl = mediaService->control<QVideoWindowControl *>();
+    QVideoWindowControl *windowControl = mediaService->requestControl<QVideoWindowControl *>();
     windowControl->setWinId(widget->winId());
     windowControl->setDisplayRect(widget->rect());
     windowControl->setAspectRatioMode(Qt::KeepAspectRatio);
     \endcode
 
-    QVideoWindowControl is one of number of possible video output controls,
-    in order to receive video it must be made the active video output
-    control by setting the output property of QVideoOutputControl to \l {QVideoOutputControl::WindowOutput}{WindowOutput}.
-    Consequently any QMediaService that implements QVideoWindowControl must
-    also implement QVideoOutputControl.
+    QVideoWindowControl is one of number of possible video output controls, in
+    order to receive video it must be made the active video output control by
+    setting the output property of QVideoOutputControl to \l
+    {QVideoOutputControl::WindowOutput}{WindowOutput}.  Consequently any
+    QMediaService that implements QVideoWindowControl must also implement
+    QVideoOutputControl.
 
     \code
     QVideoOutputControl *outputControl = mediaService->control<QVideoOutputControl *>();
@@ -77,7 +78,7 @@
     The interface name of QVideoWindowControl is \c com.nokia.Qt.QVideoWindowControl/1.0 as
     defined in QVideoWindowControl_iid.
 
-    \sa QMediaService::control(), QVideoOutputControl, QVideoWidget
+    \sa QMediaService::requestControl(), QVideoOutputControl, QVideoWidget
 */
 
 /*!