From a9a7bd0fd121fc3767ba4790972d9625e611106a Mon Sep 17 00:00:00 2001 From: rouille Date: Tue, 8 Oct 2019 17:35:10 -0400 Subject: [PATCH] Fix clang warkings --- c_plus_plus/src/steno/main.cpp | 2 +- c_plus_plus/src/steno/model/i_media_player.h | 35 +++++++++---------- c_plus_plus/src/steno/model/media_player.cpp | 5 --- c_plus_plus/src/steno/model/media_player.h | 27 +++++++------- .../src/steno/view/components/sidebar.cpp | 8 ++--- .../src/steno/view/components/sidebar.h | 14 ++++---- c_plus_plus/src/steno/view/mainwindow.cpp | 9 ++--- c_plus_plus/src/steno/view/mainwindow.h | 33 +++++++++-------- .../src/steno/view/views/abstract_view.h | 21 +++++------ .../src/steno/view/views/conference_view.cpp | 5 --- .../src/steno/view/views/conference_view.h | 9 +++-- .../steno/view/views/media_player_view.cpp | 17 ++++----- .../src/steno/view/views/media_player_view.h | 35 ++++++++++--------- .../src/steno/view/views/recording_view.cpp | 5 --- .../src/steno/view/views/recording_view.h | 9 +++-- .../src/steno/view/views/settings_view.cpp | 5 --- .../src/steno/view/views/settings_view.h | 9 +++-- .../steno/view/views/transcription_view.cpp | 5 --- .../src/steno/view/views/transcription_view.h | 9 +++-- 19 files changed, 112 insertions(+), 150 deletions(-) diff --git a/c_plus_plus/src/steno/main.cpp b/c_plus_plus/src/steno/main.cpp index cdd9fae2..fa6e0261 100644 --- a/c_plus_plus/src/steno/main.cpp +++ b/c_plus_plus/src/steno/main.cpp @@ -7,5 +7,5 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); MainWindow w; w.show(); - return a.exec(); + return QApplication::exec(); } diff --git a/c_plus_plus/src/steno/model/i_media_player.h b/c_plus_plus/src/steno/model/i_media_player.h index d69c083b..c1818c74 100644 --- a/c_plus_plus/src/steno/model/i_media_player.h +++ b/c_plus_plus/src/steno/model/i_media_player.h @@ -11,24 +11,23 @@ namespace Model class IMediaPlayer : public QWidget { - Q_OBJECT - - public: - IMediaPlayer(QWidget *parent = nullptr) : QWidget(parent) {} - virtual ~IMediaPlayer() {} - virtual void setMedia(const QUrl &url) = 0; - virtual void play() = 0; - virtual void setPosition(int position) = 0; - virtual void setVideoOutput(QVideoWidget *videoOutput) = 0; - virtual void setVolume(int volume) = 0; - virtual int volume() const = 0; - - signals: - void stateChanged(QMediaPlayer::State state); - void positionChanged(qint64 position); - void durationChanged(qint64 duration); - void volumeChanged(int volume); - void errorOccured(QString error); +Q_OBJECT + +public: + IMediaPlayer(QWidget *parent = nullptr) : QWidget(parent) {} + virtual void setMedia(const QUrl &url) = 0; + virtual void play() = 0; + virtual void setPosition(int position) = 0; + virtual void setVideoOutput(QVideoWidget *videoOutput) = 0; + virtual void setVolume(int volume) = 0; + virtual int volume() const = 0; + +signals: + void stateChanged(QMediaPlayer::State state); + void positionChanged(qint64 position); + void durationChanged(qint64 duration); + void volumeChanged(int volume); + void errorOccured(const QString& error); }; } // Model diff --git a/c_plus_plus/src/steno/model/media_player.cpp b/c_plus_plus/src/steno/model/media_player.cpp index 118a6a8d..86c135a2 100644 --- a/c_plus_plus/src/steno/model/media_player.cpp +++ b/c_plus_plus/src/steno/model/media_player.cpp @@ -17,11 +17,6 @@ MediaPlayer::MediaPlayer(QWidget *parent) connect(m_mediaPlayer, QOverload::of(&QMediaPlayer::error), [=]{ onErrorOccured(); }); } -MediaPlayer::~MediaPlayer() -{ - delete m_mediaPlayer; -} - void MediaPlayer::setVideoOutput(QVideoWidget *videoOutput) { m_mediaPlayer->setVideoOutput(videoOutput); diff --git a/c_plus_plus/src/steno/model/media_player.h b/c_plus_plus/src/steno/model/media_player.h index 8d5e537f..7cbc0be4 100644 --- a/c_plus_plus/src/steno/model/media_player.h +++ b/c_plus_plus/src/steno/model/media_player.h @@ -13,20 +13,19 @@ namespace Model class MediaPlayer : public IMediaPlayer { - public: - explicit MediaPlayer(QWidget *parent = nullptr); - virtual ~MediaPlayer() override; - virtual void setMedia(const QUrl &url) override; - virtual void play() override; - virtual void setPosition(int position) override; - virtual void setVideoOutput(QVideoWidget *videoOutput) override; - virtual void setVolume(int volume) override; - virtual int volume() const override; - - private: - void onErrorOccured(); - - QMediaPlayer* m_mediaPlayer; +public: + explicit MediaPlayer(QWidget *parent = nullptr); + void setMedia(const QUrl &url) override; + void play() override; + void setPosition(int position) override; + void setVideoOutput(QVideoWidget *videoOutput) override; + void setVolume(int volume) override; + int volume() const override; + +private: + void onErrorOccured(); + + QMediaPlayer* m_mediaPlayer; }; } // Model diff --git a/c_plus_plus/src/steno/view/components/sidebar.cpp b/c_plus_plus/src/steno/view/components/sidebar.cpp index d6dd7c1e..54c5dbda 100644 --- a/c_plus_plus/src/steno/view/components/sidebar.cpp +++ b/c_plus_plus/src/steno/view/components/sidebar.cpp @@ -5,18 +5,18 @@ namespace View SideBar::SideBar(QWidget *parent) : QListWidget(parent) - , itemSize(QSize(0, 40)) + , m_itemSize(0, m_itemHeight) { - setFixedWidth(150); + setFixedWidth(m_itemWidth); } -void SideBar::add(QString name) +void SideBar::add(const QString& name) { addItem(name); for (int i = 0; i < count(); i++) { - item(i)->setSizeHint(itemSize); + item(i)->setSizeHint(m_itemSize); } } diff --git a/c_plus_plus/src/steno/view/components/sidebar.h b/c_plus_plus/src/steno/view/components/sidebar.h index 9d405803..14eb5ee4 100644 --- a/c_plus_plus/src/steno/view/components/sidebar.h +++ b/c_plus_plus/src/steno/view/components/sidebar.h @@ -8,15 +8,17 @@ namespace View class SideBar : public QListWidget { - Q_OBJECT +Q_OBJECT - public: - SideBar(QWidget *parent = nullptr); +public: + SideBar(QWidget *parent = nullptr); - void add(QString name); + void add(const QString& name); - private: - const QSize itemSize; +private: + const uint8_t m_itemHeight = 40; + const uint8_t m_itemWidth = 150; + const QSize m_itemSize; }; } // View diff --git a/c_plus_plus/src/steno/view/mainwindow.cpp b/c_plus_plus/src/steno/view/mainwindow.cpp index bd90d8b9..6e323014 100644 --- a/c_plus_plus/src/steno/view/mainwindow.cpp +++ b/c_plus_plus/src/steno/view/mainwindow.cpp @@ -27,12 +27,12 @@ MainWindow::MainWindow(QWidget *parent) { ui->setupUi(this); - Model::MediaPlayer *mediaPlayer = new Model::MediaPlayer(); + auto mediaPlayer = new Model::MediaPlayer(); mediaPlayerView = new View::MediaPlayerView(*mediaPlayer); QFile File("view/stylesheets/globalStylesheet.qss"); File.open(QFile::ReadOnly); - qApp->setStyleSheet(QLatin1String(File.readAll())); + this->setStyleSheet(QLatin1String(File.readAll())); addView(conferenceView); addView(recordingView); @@ -54,8 +54,3 @@ void MainWindow::addView(View::AbstractView *view) sideBar->add(view->getName()); views->addWidget(view); } - -MainWindow::~MainWindow() -{ - delete ui; -} diff --git a/c_plus_plus/src/steno/view/mainwindow.h b/c_plus_plus/src/steno/view/mainwindow.h index 4ce66fac..073bc1b8 100644 --- a/c_plus_plus/src/steno/view/mainwindow.h +++ b/c_plus_plus/src/steno/view/mainwindow.h @@ -12,23 +12,22 @@ namespace View { class SideBar; class MainWindow : public QMainWindow { - Q_OBJECT - - public: - MainWindow(QWidget *parent = nullptr); - virtual ~MainWindow(); - - private: - void addView(View::AbstractView *view); - - Ui::MainWindow *ui; - View::SideBar *sideBar; - QStackedWidget *views; - View::AbstractView *conferenceView; - View::AbstractView *recordingView; - View::AbstractView *mediaPlayerView; - View::AbstractView *transcriptionView; - View::AbstractView *settingsView; +Q_OBJECT + +public: + MainWindow(QWidget *parent = nullptr); + +private: + void addView(View::AbstractView *view); + + Ui::MainWindow *ui; + View::SideBar *sideBar; + QStackedWidget *views; + View::AbstractView *conferenceView; + View::AbstractView *recordingView; + View::AbstractView *mediaPlayerView; + View::AbstractView *transcriptionView; + View::AbstractView *settingsView; }; #endif // MAINWINDOW_H diff --git a/c_plus_plus/src/steno/view/views/abstract_view.h b/c_plus_plus/src/steno/view/views/abstract_view.h index 6771d63e..f779bdea 100644 --- a/c_plus_plus/src/steno/view/views/abstract_view.h +++ b/c_plus_plus/src/steno/view/views/abstract_view.h @@ -1,6 +1,8 @@ #ifndef ABSTRACT_VIEW_H #define ABSTRACT_VIEW_H +#include + #include namespace View @@ -8,19 +10,18 @@ namespace View class AbstractView : public QWidget { - Q_OBJECT - - public: +Q_OBJECT - explicit AbstractView(const QString &name, QWidget *parent) - : QWidget(parent) - , name(name) - {} +public: + explicit AbstractView(QString name, QWidget *parent) + : QWidget(parent) + , name(std::move(name)) + {} - const QString& getName() {return name;} + const QString& getName() {return name;} - private: - QString name; +private: + QString name; }; } // View diff --git a/c_plus_plus/src/steno/view/views/conference_view.cpp b/c_plus_plus/src/steno/view/views/conference_view.cpp index 68d8fdde..e14a5478 100644 --- a/c_plus_plus/src/steno/view/views/conference_view.cpp +++ b/c_plus_plus/src/steno/view/views/conference_view.cpp @@ -11,9 +11,4 @@ ConferenceView::ConferenceView(QWidget *parent) ui->setupUi(this); } -ConferenceView::~ConferenceView() -{ - delete ui; -} - } // View diff --git a/c_plus_plus/src/steno/view/views/conference_view.h b/c_plus_plus/src/steno/view/views/conference_view.h index 79205b7f..1f6925c8 100644 --- a/c_plus_plus/src/steno/view/views/conference_view.h +++ b/c_plus_plus/src/steno/view/views/conference_view.h @@ -10,12 +10,11 @@ namespace View class ConferenceView : public AbstractView { - public: - explicit ConferenceView(QWidget *parent = nullptr); - virtual ~ConferenceView(); +public: + explicit ConferenceView(QWidget *parent = nullptr); - private: - Ui::ConferenceView *ui; +private: + Ui::ConferenceView *ui; }; } // View diff --git a/c_plus_plus/src/steno/view/views/media_player_view.cpp b/c_plus_plus/src/steno/view/views/media_player_view.cpp index 50c42d82..2784227e 100644 --- a/c_plus_plus/src/steno/view/views/media_player_view.cpp +++ b/c_plus_plus/src/steno/view/views/media_player_view.cpp @@ -31,12 +31,7 @@ MediaPlayerView::MediaPlayerView(Model::IMediaPlayer &videoPlayer, QWidget *pare connect(&m_videoPlayer, &Model::IMediaPlayer::positionChanged, [=](qint64 position){ onPositionChanged(position); }); connect(&m_videoPlayer, &Model::IMediaPlayer::durationChanged, [=](qint64 duration){ onDurationChanged(duration); }); connect(&m_videoPlayer, &Model::IMediaPlayer::volumeChanged, [=](int volume){ setVolume(volume); }); - connect(&m_videoPlayer, &Model::IMediaPlayer::errorOccured, [=](QString error){ onErrorOccured(error); }); -} - -MediaPlayerView::~MediaPlayerView() -{ - delete m_ui; + connect(&m_videoPlayer, &Model::IMediaPlayer::errorOccured, [=](const QString& error){ onErrorOccured(error); }); } void MediaPlayerView::onMediaStateChanged(QMediaPlayer::State state) @@ -62,7 +57,7 @@ void MediaPlayerView::onDurationChanged(qint64 duration) m_ui->positionSlider->setRange(0, static_cast(duration)); } -void MediaPlayerView::onErrorOccured(QString error) +void MediaPlayerView::onErrorOccured(const QString& error) { m_ui->playButton->setEnabled(false); m_ui->errorLabel->setText(error); @@ -85,20 +80,20 @@ void MediaPlayerView::openFile() int MediaPlayerView::volume() const { - qreal linearVolume = QAudio::convertVolume(m_ui->volumeSlider->value() / qreal(100), + qreal linearVolume = QAudio::convertVolume(m_ui->volumeSlider->value() / qreal(m_maxVolume), QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale); - return qRound(linearVolume * 100); + return qRound(linearVolume * m_maxVolume); } void MediaPlayerView::setVolume(int volume) { - qreal logarithmicVolume = QAudio::convertVolume(volume / qreal(100), + qreal logarithmicVolume = QAudio::convertVolume(volume / qreal(m_maxVolume), QAudio::LinearVolumeScale, QAudio::LogarithmicVolumeScale); - m_ui->volumeSlider->setValue(qRound(logarithmicVolume * 100)); + m_ui->volumeSlider->setValue(qRound(logarithmicVolume * m_maxVolume)); } } // View diff --git a/c_plus_plus/src/steno/view/views/media_player_view.h b/c_plus_plus/src/steno/view/views/media_player_view.h index b7a01b86..d84529dd 100644 --- a/c_plus_plus/src/steno/view/views/media_player_view.h +++ b/c_plus_plus/src/steno/view/views/media_player_view.h @@ -13,23 +13,24 @@ namespace View class MediaPlayerView : public AbstractView { - public: - explicit MediaPlayerView(Model::IMediaPlayer& videoPlayer, QWidget *parent = nullptr); - virtual ~MediaPlayerView(); - - public slots: - void onMediaStateChanged(QMediaPlayer::State state); - void onPositionChanged(qint64 position); - void onDurationChanged(qint64 duration); - void onErrorOccured(QString error); - - private: - void openFile(); - int volume() const; - void setVolume(int); - - Ui::MediaPlayerView *m_ui; - Model::IMediaPlayer &m_videoPlayer; +public: + explicit MediaPlayerView(Model::IMediaPlayer& videoPlayer, QWidget *parent = nullptr); + +public slots: + void onMediaStateChanged(QMediaPlayer::State state); + void onPositionChanged(qint64 position); + void onDurationChanged(qint64 duration); + void onErrorOccured(const QString &error); + +private: + void openFile(); + void setVolume(int); + int volume() const; + + Ui::MediaPlayerView *m_ui; + Model::IMediaPlayer &m_videoPlayer; + + const uint8_t m_maxVolume = 100; }; } // View diff --git a/c_plus_plus/src/steno/view/views/recording_view.cpp b/c_plus_plus/src/steno/view/views/recording_view.cpp index 366ca11c..c686cf32 100644 --- a/c_plus_plus/src/steno/view/views/recording_view.cpp +++ b/c_plus_plus/src/steno/view/views/recording_view.cpp @@ -11,9 +11,4 @@ RecordingView::RecordingView(QWidget *parent) ui->setupUi(this); } -RecordingView::~RecordingView() -{ - delete ui; -} - } // View diff --git a/c_plus_plus/src/steno/view/views/recording_view.h b/c_plus_plus/src/steno/view/views/recording_view.h index c4228861..d0af31ff 100644 --- a/c_plus_plus/src/steno/view/views/recording_view.h +++ b/c_plus_plus/src/steno/view/views/recording_view.h @@ -10,12 +10,11 @@ namespace View class RecordingView : public AbstractView { - public: - explicit RecordingView(QWidget *parent = nullptr); - virtual ~RecordingView(); +public: + explicit RecordingView(QWidget *parent = nullptr); - private: - Ui::RecordingView *ui; +private: + Ui::RecordingView *ui; }; } // View diff --git a/c_plus_plus/src/steno/view/views/settings_view.cpp b/c_plus_plus/src/steno/view/views/settings_view.cpp index 6adc6361..6edbe7e4 100644 --- a/c_plus_plus/src/steno/view/views/settings_view.cpp +++ b/c_plus_plus/src/steno/view/views/settings_view.cpp @@ -11,9 +11,4 @@ SettingsView::SettingsView(QWidget *parent) ui->setupUi(this); } -SettingsView::~SettingsView() -{ - delete ui; -} - } // View diff --git a/c_plus_plus/src/steno/view/views/settings_view.h b/c_plus_plus/src/steno/view/views/settings_view.h index 27db3f40..68c28f30 100644 --- a/c_plus_plus/src/steno/view/views/settings_view.h +++ b/c_plus_plus/src/steno/view/views/settings_view.h @@ -10,12 +10,11 @@ namespace View class SettingsView : public AbstractView { - public: - explicit SettingsView(QWidget *parent = nullptr); - virtual ~SettingsView(); +public: + explicit SettingsView(QWidget *parent = nullptr); - private: - Ui::SettingsView *ui; +private: + Ui::SettingsView *ui; }; } // View diff --git a/c_plus_plus/src/steno/view/views/transcription_view.cpp b/c_plus_plus/src/steno/view/views/transcription_view.cpp index c16c6ef5..5619e1d1 100644 --- a/c_plus_plus/src/steno/view/views/transcription_view.cpp +++ b/c_plus_plus/src/steno/view/views/transcription_view.cpp @@ -11,9 +11,4 @@ TranscriptionView::TranscriptionView(QWidget *parent) ui->setupUi(this); } -TranscriptionView::~TranscriptionView() -{ - delete ui; -} - } // View diff --git a/c_plus_plus/src/steno/view/views/transcription_view.h b/c_plus_plus/src/steno/view/views/transcription_view.h index 760fd89e..46d8faeb 100644 --- a/c_plus_plus/src/steno/view/views/transcription_view.h +++ b/c_plus_plus/src/steno/view/views/transcription_view.h @@ -10,12 +10,11 @@ namespace View class TranscriptionView : public AbstractView { - public: - explicit TranscriptionView(QWidget *parent = nullptr); - virtual ~TranscriptionView(); +public: + explicit TranscriptionView(QWidget *parent = nullptr); - private: - Ui::TranscriptionView *ui; +private: + Ui::TranscriptionView *ui; }; } // View