From 28ee5b12ff800ff25dd646730011f2d8d4ad9699 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sun, 27 Jan 2013 12:25:02 +0800 Subject: Doc: Fix module name format Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtMultimedia -> Qt Multimedia (Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5) Change-Id: I3c23435d5eceb946ea320756b835da937726db24 Reviewed-by: Laszlo Papp Reviewed-by: Jerome Pasion --- examples/multimedia/spectrum/README.txt | 4 ++-- examples/multimedia/spectrum/app/engine.h | 2 +- examples/multimedia/spectrum/app/main.cpp | 2 +- examples/multimedia/spectrum/doc/src/spectrum.qdoc | 2 +- examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml | 4 ++-- examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml | 4 ++-- examples/multimediawidgets/camera/doc/src/camera.qdoc | 2 +- .../videographicsitem/doc/src/videographicsitem.qdoc | 2 +- examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'examples') diff --git a/examples/multimedia/spectrum/README.txt b/examples/multimedia/spectrum/README.txt index c39d4a709..b4f3b982a 100644 --- a/examples/multimedia/spectrum/README.txt +++ b/examples/multimedia/spectrum/README.txt @@ -4,7 +4,7 @@ Spectrum analyser demo app Introduction ------------ -This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window. +This application is a demo which uses the Qt Multimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window. Acknowledgments @@ -96,7 +96,7 @@ If you don't like the combination of the waveform and progress bar in a single w The spectrum.h file defines a number of parameters which can be played with. These control things such as the number of audio samples analysed per FFT calculation, the range and number of bands displayed by the spectrograph, and so on. -The part of the application which interacts with QtMultimedia is in the Engine class. +The part of the application which interacts with Qt Multimedia is in the Engine class. Some ideas for enhancements to the app are listed in TODO.txt. Feel free to start work on any of them :) diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h index 7508c0e6a..014492869 100644 --- a/examples/multimedia/spectrum/app/engine.h +++ b/examples/multimedia/spectrum/app/engine.h @@ -68,7 +68,7 @@ class QAudioOutput; QT_END_NAMESPACE /** - * This class interfaces with the QtMultimedia audio classes, and also with + * This class interfaces with the Qt Multimedia audio classes, and also with * the SpectrumAnalyser class. Its role is to manage the capture and playback * of audio data, meanwhile performing real-time analysis of the audio level * and frequency spectrum. diff --git a/examples/multimedia/spectrum/app/main.cpp b/examples/multimedia/spectrum/app/main.cpp index a4bc76b5d..adb2b604c 100644 --- a/examples/multimedia/spectrum/app/main.cpp +++ b/examples/multimedia/spectrum/app/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - app.setApplicationName("QtMultimedia spectrum analyzer"); + app.setApplicationName("Qt Multimedia spectrum analyzer"); MainWidget w; w.show(); diff --git a/examples/multimedia/spectrum/doc/src/spectrum.qdoc b/examples/multimedia/spectrum/doc/src/spectrum.qdoc index 9760ac392..4c9ce60e8 100644 --- a/examples/multimedia/spectrum/doc/src/spectrum.qdoc +++ b/examples/multimedia/spectrum/doc/src/spectrum.qdoc @@ -36,7 +36,7 @@ \image spectrum-demo.png - Because QtMultimedia allows the application to access the raw audio + Because Qt Multimedia allows the application to access the raw audio stream, the data can either be inspected or modified by the application. The Spectrum Analyzer example displays three pieces of information while audio is being either captured or played back: diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml index f23fd01e5..baf69b706 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 -// Item which is loaded by CameraItem if QtMultimediaKit is not available +// Item which is loaded by CameraItem if Qt Multimedia is not available Rectangle { id: root color: "grey" @@ -56,7 +56,7 @@ Rectangle { anchors.margins: 10 color: "white" horizontalAlignment: Text.AlignHCenter - text: "Failed to create Camera item\n\nCheck that QtMultimediaKit is installed" + text: "Failed to create Camera item\n\nCheck that Qt Multimedia is installed" verticalAlignment: Text.AlignVCenter wrapMode: Text.Wrap } diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml index 0c7619119..cb71b9368 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 -// Item which is loaded by VideoItem if QtMultimediaKit is not available +// Item which is loaded by VideoItem if Qt Multimedia is not available Rectangle { id: root color: "grey" @@ -61,7 +61,7 @@ Rectangle { anchors.margins: 10 color: "white" horizontalAlignment: Text.AlignHCenter - text: "Failed to create Video item\n\nCheck that QtMultimediaKit is installed" + text: "Failed to create Video item\n\nCheck that Qt Multimedia is installed" verticalAlignment: Text.AlignVCenter wrapMode: Text.Wrap } diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc index ac4e9b2ea..a7bbf38cc 100644 --- a/examples/multimediawidgets/camera/doc/src/camera.qdoc +++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc @@ -35,7 +35,7 @@ \brief The Camera Example shows how to use the API to capture a still image or video. -The Camera Example demonstrates how you can use QtMultimedia to implement +The Camera Example demonstrates how you can use Qt Multimedia to implement some basic Camera functionality to take still images and record video clips with audio. diff --git a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc index 0aa5acbf2..2b1e44df0 100644 --- a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc +++ b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc @@ -32,7 +32,7 @@ \brief This example demonstrates how to stream video on a graphics scene. The Video Graphics Item example shows how to implement a QGraphicsItem that displays video on a - graphics scene using QtMultimedia's QAbstractVideoSurface. + graphics scene using Qt Multimedia's QAbstractVideoSurface. \image video-videographicsitem.png diff --git a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc index 790779423..765eb6b04 100644 --- a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc +++ b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc @@ -32,7 +32,7 @@ \brief This example is a simple video player The Video Widget example denonstrates how to implement a video widget using - QtMultimedia's QAbstractVideoSurface. + Qt Multimedia's QAbstractVideoSurface. \image video-videowidget.png */ -- cgit v1.2.3