Skip to content

Commit a9a7bd0

Browse files
committed
Fix clang warkings
1 parent be53832 commit a9a7bd0

19 files changed

+112
-150
lines changed

c_plus_plus/src/steno/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ int main(int argc, char *argv[])
77
QApplication a(argc, argv);
88
MainWindow w;
99
w.show();
10-
return a.exec();
10+
return QApplication::exec();
1111
}

c_plus_plus/src/steno/model/i_media_player.h

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,23 @@ namespace Model
1111

1212
class IMediaPlayer : public QWidget
1313
{
14-
Q_OBJECT
15-
16-
public:
17-
IMediaPlayer(QWidget *parent = nullptr) : QWidget(parent) {}
18-
virtual ~IMediaPlayer() {}
19-
virtual void setMedia(const QUrl &url) = 0;
20-
virtual void play() = 0;
21-
virtual void setPosition(int position) = 0;
22-
virtual void setVideoOutput(QVideoWidget *videoOutput) = 0;
23-
virtual void setVolume(int volume) = 0;
24-
virtual int volume() const = 0;
25-
26-
signals:
27-
void stateChanged(QMediaPlayer::State state);
28-
void positionChanged(qint64 position);
29-
void durationChanged(qint64 duration);
30-
void volumeChanged(int volume);
31-
void errorOccured(QString error);
14+
Q_OBJECT
15+
16+
public:
17+
IMediaPlayer(QWidget *parent = nullptr) : QWidget(parent) {}
18+
virtual void setMedia(const QUrl &url) = 0;
19+
virtual void play() = 0;
20+
virtual void setPosition(int position) = 0;
21+
virtual void setVideoOutput(QVideoWidget *videoOutput) = 0;
22+
virtual void setVolume(int volume) = 0;
23+
virtual int volume() const = 0;
24+
25+
signals:
26+
void stateChanged(QMediaPlayer::State state);
27+
void positionChanged(qint64 position);
28+
void durationChanged(qint64 duration);
29+
void volumeChanged(int volume);
30+
void errorOccured(const QString& error);
3231
};
3332

3433
} // Model

c_plus_plus/src/steno/model/media_player.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ MediaPlayer::MediaPlayer(QWidget *parent)
1717
connect(m_mediaPlayer, QOverload<QMediaPlayer::Error>::of(&QMediaPlayer::error), [=]{ onErrorOccured(); });
1818
}
1919

20-
MediaPlayer::~MediaPlayer()
21-
{
22-
delete m_mediaPlayer;
23-
}
24-
2520
void MediaPlayer::setVideoOutput(QVideoWidget *videoOutput)
2621
{
2722
m_mediaPlayer->setVideoOutput(videoOutput);

c_plus_plus/src/steno/model/media_player.h

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,19 @@ namespace Model
1313

1414
class MediaPlayer : public IMediaPlayer
1515
{
16-
public:
17-
explicit MediaPlayer(QWidget *parent = nullptr);
18-
virtual ~MediaPlayer() override;
19-
virtual void setMedia(const QUrl &url) override;
20-
virtual void play() override;
21-
virtual void setPosition(int position) override;
22-
virtual void setVideoOutput(QVideoWidget *videoOutput) override;
23-
virtual void setVolume(int volume) override;
24-
virtual int volume() const override;
25-
26-
private:
27-
void onErrorOccured();
28-
29-
QMediaPlayer* m_mediaPlayer;
16+
public:
17+
explicit MediaPlayer(QWidget *parent = nullptr);
18+
void setMedia(const QUrl &url) override;
19+
void play() override;
20+
void setPosition(int position) override;
21+
void setVideoOutput(QVideoWidget *videoOutput) override;
22+
void setVolume(int volume) override;
23+
int volume() const override;
24+
25+
private:
26+
void onErrorOccured();
27+
28+
QMediaPlayer* m_mediaPlayer;
3029
};
3130

3231
} // Model

c_plus_plus/src/steno/view/components/sidebar.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ namespace View
55

66
SideBar::SideBar(QWidget *parent)
77
: QListWidget(parent)
8-
, itemSize(QSize(0, 40))
8+
, m_itemSize(0, m_itemHeight)
99
{
10-
setFixedWidth(150);
10+
setFixedWidth(m_itemWidth);
1111
}
1212

13-
void SideBar::add(QString name)
13+
void SideBar::add(const QString& name)
1414
{
1515
addItem(name);
1616

1717
for (int i = 0; i < count(); i++)
1818
{
19-
item(i)->setSizeHint(itemSize);
19+
item(i)->setSizeHint(m_itemSize);
2020
}
2121
}
2222

c_plus_plus/src/steno/view/components/sidebar.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ namespace View
88

99
class SideBar : public QListWidget
1010
{
11-
Q_OBJECT
11+
Q_OBJECT
1212

13-
public:
14-
SideBar(QWidget *parent = nullptr);
13+
public:
14+
SideBar(QWidget *parent = nullptr);
1515

16-
void add(QString name);
16+
void add(const QString& name);
1717

18-
private:
19-
const QSize itemSize;
18+
private:
19+
const uint8_t m_itemHeight = 40;
20+
const uint8_t m_itemWidth = 150;
21+
const QSize m_itemSize;
2022
};
2123

2224
} // View

c_plus_plus/src/steno/view/mainwindow.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ MainWindow::MainWindow(QWidget *parent)
2727
{
2828
ui->setupUi(this);
2929

30-
Model::MediaPlayer *mediaPlayer = new Model::MediaPlayer();
30+
auto mediaPlayer = new Model::MediaPlayer();
3131
mediaPlayerView = new View::MediaPlayerView(*mediaPlayer);
3232

3333
QFile File("view/stylesheets/globalStylesheet.qss");
3434
File.open(QFile::ReadOnly);
35-
qApp->setStyleSheet(QLatin1String(File.readAll()));
35+
this->setStyleSheet(QLatin1String(File.readAll()));
3636

3737
addView(conferenceView);
3838
addView(recordingView);
@@ -54,8 +54,3 @@ void MainWindow::addView(View::AbstractView *view)
5454
sideBar->add(view->getName());
5555
views->addWidget(view);
5656
}
57-
58-
MainWindow::~MainWindow()
59-
{
60-
delete ui;
61-
}

c_plus_plus/src/steno/view/mainwindow.h

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,22 @@ namespace View { class SideBar;
1212

1313
class MainWindow : public QMainWindow
1414
{
15-
Q_OBJECT
16-
17-
public:
18-
MainWindow(QWidget *parent = nullptr);
19-
virtual ~MainWindow();
20-
21-
private:
22-
void addView(View::AbstractView *view);
23-
24-
Ui::MainWindow *ui;
25-
View::SideBar *sideBar;
26-
QStackedWidget *views;
27-
View::AbstractView *conferenceView;
28-
View::AbstractView *recordingView;
29-
View::AbstractView *mediaPlayerView;
30-
View::AbstractView *transcriptionView;
31-
View::AbstractView *settingsView;
15+
Q_OBJECT
16+
17+
public:
18+
MainWindow(QWidget *parent = nullptr);
19+
20+
private:
21+
void addView(View::AbstractView *view);
22+
23+
Ui::MainWindow *ui;
24+
View::SideBar *sideBar;
25+
QStackedWidget *views;
26+
View::AbstractView *conferenceView;
27+
View::AbstractView *recordingView;
28+
View::AbstractView *mediaPlayerView;
29+
View::AbstractView *transcriptionView;
30+
View::AbstractView *settingsView;
3231
};
3332

3433
#endif // MAINWINDOW_H

c_plus_plus/src/steno/view/views/abstract_view.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
#ifndef ABSTRACT_VIEW_H
22
#define ABSTRACT_VIEW_H
33

4+
#include <utility>
5+
46
#include <QWidget>
57

68
namespace View
79
{
810

911
class AbstractView : public QWidget
1012
{
11-
Q_OBJECT
12-
13-
public:
13+
Q_OBJECT
1414

15-
explicit AbstractView(const QString &name, QWidget *parent)
16-
: QWidget(parent)
17-
, name(name)
18-
{}
15+
public:
16+
explicit AbstractView(QString name, QWidget *parent)
17+
: QWidget(parent)
18+
, name(std::move(name))
19+
{}
1920

20-
const QString& getName() {return name;}
21+
const QString& getName() {return name;}
2122

22-
private:
23-
QString name;
23+
private:
24+
QString name;
2425
};
2526

2627
} // View

c_plus_plus/src/steno/view/views/conference_view.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,4 @@ ConferenceView::ConferenceView(QWidget *parent)
1111
ui->setupUi(this);
1212
}
1313

14-
ConferenceView::~ConferenceView()
15-
{
16-
delete ui;
17-
}
18-
1914
} // View

0 commit comments

Comments
 (0)