diff options
author | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-12 15:35:28 +0100 |
---|---|---|
committer | Artem Dyomin <artem.dyomin@qt.io> | 2022-12-13 12:01:50 +0000 |
commit | d06e0782bbc0a7d6b5d6dbd08b262f10a2e72d68 (patch) | |
tree | 67a096fd3e3fcabc8584fe0bdbb72e94790e30f4 /examples | |
parent | 49e1615c98816d8e19fd364a493478d1d6e42eb1 (diff) | |
download | qtmultimedia-d06e0782bbc0a7d6b5d6dbd08b262f10a2e72d68.tar.gz |
Include moc_*.cpp files in QtMM examples
The reason of the refactoring is following the common approach
that leads to reducing compilation time and binary size.
- logic hasn't been touched
- some headers have been decoupled into
header and cpp or renamed
- the same refactorings of main QtMM code, tests, plugins
are coming in the next commits
Task-number: QTBUG-103290
Pick-to: 6.5 6.4
Change-Id: I5ec4c7b651ebb81879b8a7be8659e66d52af0d90
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'examples')
33 files changed, 139 insertions, 63 deletions
diff --git a/examples/multimedia/audiodecoder/audiodecoder.cpp b/examples/multimedia/audiodecoder/audiodecoder.cpp index c8420804b..40c613708 100644 --- a/examples/multimedia/audiodecoder/audiodecoder.cpp +++ b/examples/multimedia/audiodecoder/audiodecoder.cpp @@ -159,3 +159,5 @@ void AudioDecoder::updateProgress() m_progress = progress; } } + +#include "moc_audiodecoder.cpp" diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp index 049185701..018983e92 100644 --- a/examples/multimedia/audiodevices/audiodevices.cpp +++ b/examples/multimedia/audiodevices/audiodevices.cpp @@ -171,3 +171,5 @@ void AudioTest::sampleFormatChanged(int idx) auto formats = m_deviceInfo.supportedSampleFormats(); m_settings.setSampleFormat(formats.at(idx)); } + +#include "moc_audiodevices.cpp" diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index fb99af499..809b79293 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -235,3 +235,5 @@ void AudioTest::toggleSuspendResume() // no-op } } + +#include "moc_audiooutput.cpp" diff --git a/examples/multimedia/audiorecorder/audiolevel.cpp b/examples/multimedia/audiorecorder/audiolevel.cpp index be17ef2e1..2a84ff287 100644 --- a/examples/multimedia/audiorecorder/audiolevel.cpp +++ b/examples/multimedia/audiorecorder/audiolevel.cpp @@ -30,3 +30,5 @@ void AudioLevel::paintEvent(QPaintEvent *event) // clear the rest of the control painter.fillRect(widthLevel, 0, width(), height(), Qt::black); } + +#include "moc_audiolevel.cpp" diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp index cde21aa12..f96a925b8 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.cpp +++ b/examples/multimedia/audiorecorder/audiorecorder.cpp @@ -270,3 +270,5 @@ void AudioRecorder::processBuffer(const QAudioBuffer &buffer) for (int i = 0; i < levels.count(); ++i) m_audioLevels.at(i)->setLevel(levels.at(i)); } + +#include "moc_audiorecorder.cpp" diff --git a/examples/multimedia/audiosource/audiosource.cpp b/examples/multimedia/audiosource/audiosource.cpp index 545b8c5fa..39a7f3b32 100644 --- a/examples/multimedia/audiosource/audiosource.cpp +++ b/examples/multimedia/audiosource/audiosource.cpp @@ -213,3 +213,5 @@ void InputTest::sliderChanged(int value) m_audioInput->setVolume(linearVolume); } + +#include "moc_audiosource.cpp" diff --git a/examples/multimedia/camera/camera.cpp b/examples/multimedia/camera/camera.cpp index be9ae6259..221dd58e0 100644 --- a/examples/multimedia/camera/camera.cpp +++ b/examples/multimedia/camera/camera.cpp @@ -385,3 +385,5 @@ void Camera::saveMetaData() } m_mediaRecorder->setMetaData(data); } + +#include "moc_camera.cpp" diff --git a/examples/multimedia/camera/imagesettings.cpp b/examples/multimedia/camera/imagesettings.cpp index 0a6c6a138..0b8d9704a 100644 --- a/examples/multimedia/camera/imagesettings.cpp +++ b/examples/multimedia/camera/imagesettings.cpp @@ -82,3 +82,5 @@ void ImageSettings::selectComboBoxItem(QComboBox *box, const QVariant &value) } } } + +#include "moc_imagesettings.cpp" diff --git a/examples/multimedia/camera/metadatadialog.cpp b/examples/multimedia/camera/metadatadialog.cpp index 82977de1b..244b5c6f5 100644 --- a/examples/multimedia/camera/metadatadialog.cpp +++ b/examples/multimedia/camera/metadatadialog.cpp @@ -83,3 +83,5 @@ void MetaDataDialog::openCoverArtImage() if (!fileName.isEmpty()) m_metaDataFields[QMediaMetaData::CoverArtImage]->setText(fileName); } + +#include "moc_metadatadialog.cpp" diff --git a/examples/multimedia/camera/videosettings.cpp b/examples/multimedia/camera/videosettings.cpp index d3f59fa2c..55ed31e71 100644 --- a/examples/multimedia/camera/videosettings.cpp +++ b/examples/multimedia/camera/videosettings.cpp @@ -205,3 +205,5 @@ void VideoSettings::selectComboBoxItem(QComboBox *box, const QVariant &value) } } } + +#include "moc_videosettings.cpp" diff --git a/examples/multimedia/player/CMakeLists.txt b/examples/multimedia/player/CMakeLists.txt index bd6631899..8582c2dd2 100644 --- a/examples/multimedia/player/CMakeLists.txt +++ b/examples/multimedia/player/CMakeLists.txt @@ -20,8 +20,9 @@ qt_add_executable(player playercontrols.cpp playercontrols.h playlistmodel.cpp playlistmodel.h videowidget.cpp videowidget.h - qmediaplaylist.cpp qmediaplaylist.h qmediaplaylist_p.h - qplaylistfileparser.cpp qplaylistfileparser_p.h + qmediaplaylist.cpp qmediaplaylist.h + qmediaplaylist_p.cpp qmediaplaylist_p.h + qplaylistfileparser.cpp qplaylistfileparser.h ) set_target_properties(player PROPERTIES diff --git a/examples/multimedia/player/player.cpp b/examples/multimedia/player/player.cpp index 5028cead1..68b23ce34 100644 --- a/examples/multimedia/player/player.cpp +++ b/examples/multimedia/player/player.cpp @@ -523,3 +523,5 @@ void Player::audioOutputChanged(int index) auto device = m_audioOutputCombo->itemData(index).value<QAudioDevice>(); m_player->audioOutput()->setDevice(device); } + +#include "moc_player.cpp" diff --git a/examples/multimedia/player/player.pro b/examples/multimedia/player/player.pro index 703942441..6d9383692 100644 --- a/examples/multimedia/player/player.pro +++ b/examples/multimedia/player/player.pro @@ -13,7 +13,7 @@ HEADERS = \ videowidget.h \ qmediaplaylist.h \ qmediaplaylist_p.h \ - qplaylistfileparser_p.h + qplaylistfileparser.h SOURCES = main.cpp \ player.cpp \ @@ -21,6 +21,7 @@ SOURCES = main.cpp \ playlistmodel.cpp \ videowidget.cpp \ qmediaplaylist.cpp \ + qmediaplaylist_p.cpp \ qplaylistfileparser.cpp target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/player diff --git a/examples/multimedia/player/playercontrols.cpp b/examples/multimedia/player/playercontrols.cpp index ff4ec3c0d..67db0c76b 100644 --- a/examples/multimedia/player/playercontrols.cpp +++ b/examples/multimedia/player/playercontrols.cpp @@ -169,3 +169,5 @@ void PlayerControls::onVolumeSliderValueChanged() { emit changeVolume(volume()); } + +#include "moc_playercontrols.cpp" diff --git a/examples/multimedia/player/playlistmodel.cpp b/examples/multimedia/player/playlistmodel.cpp index ad5cec9f4..7ae76bcac 100644 --- a/examples/multimedia/player/playlistmodel.cpp +++ b/examples/multimedia/player/playlistmodel.cpp @@ -101,3 +101,5 @@ void PlaylistModel::changeItems(int start, int end) m_data.clear(); emit dataChanged(index(start, 0), index(end, ColumnCount)); } + +#include "moc_playlistmodel.cpp" diff --git a/examples/multimedia/player/qmediaplaylist.cpp b/examples/multimedia/player/qmediaplaylist.cpp index d4fa1f842..0b8cf1ab8 100644 --- a/examples/multimedia/player/qmediaplaylist.cpp +++ b/examples/multimedia/player/qmediaplaylist.cpp @@ -3,7 +3,7 @@ #include "qmediaplaylist.h" #include "qmediaplaylist_p.h" -#include "qplaylistfileparser_p.h" +#include "qplaylistfileparser.h" #include <QCoreApplication> #include <QFile> diff --git a/examples/multimedia/player/qmediaplaylist_p.cpp b/examples/multimedia/player/qmediaplaylist_p.cpp new file mode 100644 index 000000000..c34b00be9 --- /dev/null +++ b/examples/multimedia/player/qmediaplaylist_p.cpp @@ -0,0 +1,65 @@ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include "qmediaplaylist_p.h" + +QT_BEGIN_NAMESPACE + +QMediaPlaylistPrivate::QMediaPlaylistPrivate() : error(QMediaPlaylist::NoError) { } + +QMediaPlaylistPrivate::~QMediaPlaylistPrivate() +{ + delete parser; +} + +void QMediaPlaylistPrivate::loadFailed(QMediaPlaylist::Error error, const QString &errorString) +{ + this->error = error; + this->errorString = errorString; + + emit q_ptr->loadFailed(); +} + +void QMediaPlaylistPrivate::loadFinished() +{ + q_ptr->addMedia(parser->playlist); + + emit q_ptr->loaded(); +} + +bool QMediaPlaylistPrivate::checkFormat(const char *format) const +{ + QLatin1String f(format); + QPlaylistFileParser::FileType type = + format ? QPlaylistFileParser::UNKNOWN : QPlaylistFileParser::M3U8; + if (format) { + if (f == QLatin1String("m3u") || f == QLatin1String("text/uri-list") + || f == QLatin1String("audio/x-mpegurl") || f == QLatin1String("audio/mpegurl")) + type = QPlaylistFileParser::M3U; + else if (f == QLatin1String("m3u8") || f == QLatin1String("application/x-mpegURL") + || f == QLatin1String("application/vnd.apple.mpegurl")) + type = QPlaylistFileParser::M3U8; + } + + if (type == QPlaylistFileParser::UNKNOWN || type == QPlaylistFileParser::PLS) { + error = QMediaPlaylist::FormatNotSupportedError; + errorString = QMediaPlaylist::tr("This file format is not supported."); + return false; + } + return true; +} + +void QMediaPlaylistPrivate::ensureParser() +{ + if (parser) + return; + + parser = new QPlaylistFileParser(q_ptr); + QObject::connect(parser, &QPlaylistFileParser::finished, [this]() { loadFinished(); }); + QObject::connect(parser, &QPlaylistFileParser::error, + [this](QMediaPlaylist::Error err, const QString &errorMsg) { + loadFailed(err, errorMsg); + }); +} + +QT_END_NAMESPACE diff --git a/examples/multimedia/player/qmediaplaylist_p.h b/examples/multimedia/player/qmediaplaylist_p.h index bc1ec1c20..aad27ef57 100644 --- a/examples/multimedia/player/qmediaplaylist_p.h +++ b/examples/multimedia/player/qmediaplaylist_p.h @@ -16,7 +16,9 @@ // #include "qmediaplaylist.h" -#include "qplaylistfileparser_p.h" +#include "qplaylistfileparser.h" + +#include <QUrl> #include <QDebug> @@ -32,63 +34,17 @@ class QMediaPlaylistPrivate { Q_DECLARE_PUBLIC(QMediaPlaylist) public: - QMediaPlaylistPrivate() : error(QMediaPlaylist::NoError) { } - - virtual ~QMediaPlaylistPrivate() - { - if (parser) - delete parser; - } - - void loadFailed(QMediaPlaylist::Error error, const QString &errorString) - { - this->error = error; - this->errorString = errorString; - - emit q_ptr->loadFailed(); - } - - void loadFinished() - { - q_ptr->addMedia(parser->playlist); - - emit q_ptr->loaded(); - } - - bool checkFormat(const char *format) const - { - QLatin1String f(format); - QPlaylistFileParser::FileType type = - format ? QPlaylistFileParser::UNKNOWN : QPlaylistFileParser::M3U8; - if (format) { - if (f == QLatin1String("m3u") || f == QLatin1String("text/uri-list") - || f == QLatin1String("audio/x-mpegurl") || f == QLatin1String("audio/mpegurl")) - type = QPlaylistFileParser::M3U; - else if (f == QLatin1String("m3u8") || f == QLatin1String("application/x-mpegURL") - || f == QLatin1String("application/vnd.apple.mpegurl")) - type = QPlaylistFileParser::M3U8; - } - - if (type == QPlaylistFileParser::UNKNOWN || type == QPlaylistFileParser::PLS) { - error = QMediaPlaylist::FormatNotSupportedError; - errorString = QMediaPlaylist::tr("This file format is not supported."); - return false; - } - return true; - } - - void ensureParser() - { - if (parser) - return; - - parser = new QPlaylistFileParser(q_ptr); - QObject::connect(parser, &QPlaylistFileParser::finished, [this]() { loadFinished(); }); - QObject::connect(parser, &QPlaylistFileParser::error, - [this](QMediaPlaylist::Error err, const QString &errorMsg) { - loadFailed(err, errorMsg); - }); - } + QMediaPlaylistPrivate(); + + virtual ~QMediaPlaylistPrivate(); + + void loadFailed(QMediaPlaylist::Error error, const QString &errorString); + + void loadFinished(); + + bool checkFormat(const char *format) const; + + void ensureParser(); int nextPosition(int steps) const; int prevPosition(int steps) const; diff --git a/examples/multimedia/player/qplaylistfileparser.cpp b/examples/multimedia/player/qplaylistfileparser.cpp index 7823f9907..0a0be9d56 100644 --- a/examples/multimedia/player/qplaylistfileparser.cpp +++ b/examples/multimedia/player/qplaylistfileparser.cpp @@ -3,7 +3,7 @@ #include "qmediametadata.h" #include "qmediaplayer.h" -#include "qplaylistfileparser_p.h" +#include "qplaylistfileparser.h" #include <QDebug> #include <QFileInfo> @@ -617,3 +617,5 @@ void QPlaylistFileParser::handleError() } QT_END_NAMESPACE + +#include "moc_qplaylistfileparser.cpp" diff --git a/examples/multimedia/player/qplaylistfileparser_p.h b/examples/multimedia/player/qplaylistfileparser.h index 88e5bf19e..88e5bf19e 100644 --- a/examples/multimedia/player/qplaylistfileparser_p.h +++ b/examples/multimedia/player/qplaylistfileparser.h diff --git a/examples/multimedia/player/videowidget.cpp b/examples/multimedia/player/videowidget.cpp index 3fbbd4f72..c09d90f37 100644 --- a/examples/multimedia/player/videowidget.cpp +++ b/examples/multimedia/player/videowidget.cpp @@ -42,3 +42,5 @@ void VideoWidget::mousePressEvent(QMouseEvent *event) { QVideoWidget::mousePressEvent(event); } + +#include "moc_videowidget.cpp" diff --git a/examples/multimedia/spectrum/engine.cpp b/examples/multimedia/spectrum/engine.cpp index 4e44db06b..296d4e4dd 100644 --- a/examples/multimedia/spectrum/engine.cpp +++ b/examples/multimedia/spectrum/engine.cpp @@ -723,3 +723,5 @@ void Engine::dumpData() pcmFile.write(m_buffer.constData(), m_dataLength); } #endif // DUMP_AUDIO + +#include "moc_engine.cpp" diff --git a/examples/multimedia/spectrum/levelmeter.cpp b/examples/multimedia/spectrum/levelmeter.cpp index 25bfdc494..2c889c34d 100644 --- a/examples/multimedia/spectrum/levelmeter.cpp +++ b/examples/multimedia/spectrum/levelmeter.cpp @@ -99,3 +99,5 @@ void LevelMeter::paintEvent(QPaintEvent *event) bar.setTop(rect().top() + (1.0 - m_rmsLevel) * rect().height()); painter.fillRect(bar, m_rmsColor); } + +#include "moc_levelmeter.cpp" diff --git a/examples/multimedia/spectrum/mainwidget.cpp b/examples/multimedia/spectrum/mainwidget.cpp index f3583c7ad..214d317d9 100644 --- a/examples/multimedia/spectrum/mainwidget.cpp +++ b/examples/multimedia/spectrum/mainwidget.cpp @@ -396,3 +396,5 @@ void MainWidget::updateModeMenu() m_generateToneAction->setChecked(GenerateToneMode == m_mode); m_recordAction->setChecked(RecordMode == m_mode); } + +#include "moc_mainwidget.cpp" diff --git a/examples/multimedia/spectrum/progressbar.cpp b/examples/multimedia/spectrum/progressbar.cpp index 701359abc..1806097e2 100644 --- a/examples/multimedia/spectrum/progressbar.cpp +++ b/examples/multimedia/spectrum/progressbar.cpp @@ -97,3 +97,5 @@ void ProgressBar::windowChanged(qint64 position, qint64 length) m_windowLength = length; repaint(); } + +#include "moc_progressbar.cpp" diff --git a/examples/multimedia/spectrum/settingsdialog.cpp b/examples/multimedia/spectrum/settingsdialog.cpp index 9acd641f9..bdd52e123 100644 --- a/examples/multimedia/spectrum/settingsdialog.cpp +++ b/examples/multimedia/spectrum/settingsdialog.cpp @@ -98,3 +98,5 @@ void SettingsDialog::outputDeviceChanged(int index) { m_outputDevice = m_outputDeviceComboBox->itemData(index).value<QAudioDevice>(); } + +#include "moc_settingsdialog.cpp" diff --git a/examples/multimedia/spectrum/spectrograph.cpp b/examples/multimedia/spectrum/spectrograph.cpp index d6b76b1df..5a0584d9a 100644 --- a/examples/multimedia/spectrum/spectrograph.cpp +++ b/examples/multimedia/spectrum/spectrograph.cpp @@ -198,3 +198,5 @@ void Spectrograph::selectBar(int index) m_barSelected = index; update(); } + +#include "moc_spectrograph.cpp" diff --git a/examples/multimedia/spectrum/spectrumanalyser.cpp b/examples/multimedia/spectrum/spectrumanalyser.cpp index 07d6a6a6e..d4c767e5e 100644 --- a/examples/multimedia/spectrum/spectrumanalyser.cpp +++ b/examples/multimedia/spectrum/spectrumanalyser.cpp @@ -229,3 +229,5 @@ void SpectrumAnalyser::calculationComplete(const FrequencySpectrum &spectrum) emit spectrumChanged(spectrum); m_state = Idle; } + +#include "moc_spectrumanalyser.cpp" diff --git a/examples/multimedia/spectrum/tonegeneratordialog.cpp b/examples/multimedia/spectrum/tonegeneratordialog.cpp index c0ca107d5..51ad8dc49 100644 --- a/examples/multimedia/spectrum/tonegeneratordialog.cpp +++ b/examples/multimedia/spectrum/tonegeneratordialog.cpp @@ -102,3 +102,5 @@ void ToneGeneratorDialog::frequencySweepEnabled(bool enabled) m_frequencySweepEnabled = enabled; m_toneGeneratorFrequencyControl->setEnabled(!enabled); } + +#include "moc_tonegeneratordialog.cpp" diff --git a/examples/multimedia/spectrum/waveform.cpp b/examples/multimedia/spectrum/waveform.cpp index 814b5b36a..a3727a2a6 100644 --- a/examples/multimedia/spectrum/waveform.cpp +++ b/examples/multimedia/spectrum/waveform.cpp @@ -396,3 +396,5 @@ void Waveform::resetTiles(qint64 newStartPos) m_tileArrayStart = newStartPos; } + +#include "moc_waveform.cpp" diff --git a/examples/multimedia/video/qmlvideo/frequencymonitor.cpp b/examples/multimedia/video/qmlvideo/frequencymonitor.cpp index 61be58167..715f1c8ec 100644 --- a/examples/multimedia/video/qmlvideo/frequencymonitor.cpp +++ b/examples/multimedia/video/qmlvideo/frequencymonitor.cpp @@ -213,3 +213,4 @@ void FrequencyMonitor::setTraceInterval(int value) } #include "frequencymonitor.moc" +#include "moc_frequencymonitor.cpp" diff --git a/examples/multimedia/videographicsitem/videoplayer.cpp b/examples/multimedia/videographicsitem/videoplayer.cpp index 534391c66..744a35469 100644 --- a/examples/multimedia/videographicsitem/videoplayer.cpp +++ b/examples/multimedia/videographicsitem/videoplayer.cpp @@ -144,3 +144,5 @@ void VideoPlayer::rotateVideo(int angle) qreal y = m_videoItem->boundingRect().height() / 2.0; m_videoItem->setTransform(QTransform().translate(x, y).rotate(angle).translate(-x, -y)); } + +#include "moc_videoplayer.cpp" diff --git a/examples/multimedia/videowidget/videoplayer.cpp b/examples/multimedia/videowidget/videoplayer.cpp index a87264834..1a778d2fb 100644 --- a/examples/multimedia/videowidget/videoplayer.cpp +++ b/examples/multimedia/videowidget/videoplayer.cpp @@ -133,3 +133,5 @@ void VideoPlayer::handleError() message += errorString; m_errorLabel->setText(message); } + +#include "moc_videoplayer.cpp" |