Skip to content

Commit 92d64dc

Browse files
authored
Normalize line endings (#140)
* Force lf line endings * Normalize line endings
1 parent e0dfa25 commit 92d64dc

40 files changed

+6025
-6024
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ include/ linguist-vendored
22
ffmpeg/ linguist-vendored
33
*.h linguist-language=c++
44

5+
* text=auto

src/About.cpp

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
// src/About.cpp
2-
//----------------------------------
3-
// RP Soundboard Source Code
4-
// Copyright (c) 2015 Marius Graefe
5-
// All rights reserved
6-
// Contact: rp_soundboard@mgraefe.de
7-
//----------------------------------
8-
9-
10-
#include "About.h"
11-
#include "buildinfo.h"
12-
13-
// Import from ffmpeg
14-
extern "C" const char *av_version_info();
15-
16-
17-
AboutQt::AboutQt(QWidget *parent) :
18-
QWidget(parent, Qt::Window | Qt::WindowTitleHint /*| Qt::CustomizeWindowHint*/ | Qt::WindowCloseButtonHint),
19-
ui(new Ui::AboutQt)
20-
{
21-
const char *ffmpeg_version = av_version_info();
22-
ui->setupUi(this);
23-
ui->l_version->setText(QString(buildinfo_getPluginVersion()) +
24-
"\nBuild on " + buildinfo_getBuildDate() + " " + buildinfo_getBuildTime() +
25-
"\nFFmpeg Version: " + (ffmpeg_version ? ffmpeg_version : "unknown") +
26-
"\nLinked against Qt " QT_VERSION_STR);
27-
setFixedSize(size());
28-
}
29-
30-
31-
AboutQt::~AboutQt()
32-
{
33-
delete ui;
34-
}
1+
// src/About.cpp
2+
//----------------------------------
3+
// RP Soundboard Source Code
4+
// Copyright (c) 2015 Marius Graefe
5+
// All rights reserved
6+
// Contact: rp_soundboard@mgraefe.de
7+
//----------------------------------
8+
9+
10+
#include "About.h"
11+
#include "buildinfo.h"
12+
13+
// Import from ffmpeg
14+
extern "C" const char *av_version_info();
15+
16+
17+
AboutQt::AboutQt(QWidget *parent) :
18+
QWidget(parent, Qt::Window | Qt::WindowTitleHint /*| Qt::CustomizeWindowHint*/ | Qt::WindowCloseButtonHint),
19+
ui(new Ui::AboutQt)
20+
{
21+
const char *ffmpeg_version = av_version_info();
22+
ui->setupUi(this);
23+
ui->l_version->setText(QString(buildinfo_getPluginVersion()) +
24+
"\nBuild on " + buildinfo_getBuildDate() + " " + buildinfo_getBuildTime() +
25+
"\nFFmpeg Version: " + (ffmpeg_version ? ffmpeg_version : "unknown") +
26+
"\nLinked against Qt " QT_VERSION_STR);
27+
setFixedSize(size());
28+
}
29+
30+
31+
AboutQt::~AboutQt()
32+
{
33+
delete ui;
34+
}

src/About.h

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
// src/About.h
2-
//----------------------------------
3-
// RP Soundboard Source Code
4-
// Copyright (c) 2015 Marius Graefe
5-
// All rights reserved
6-
// Contact: rp_soundboard@mgraefe.de
7-
//----------------------------------
8-
9-
#pragma once
10-
11-
#include <QWidget>
12-
13-
#include "ui_About.h"
14-
15-
namespace Ui {
16-
class AboutQt;
17-
}
18-
19-
20-
class AboutQt : public QWidget
21-
{
22-
Q_OBJECT
23-
24-
public:
25-
explicit AboutQt(QWidget *parent = 0);
26-
~AboutQt();
27-
28-
private:
29-
Ui::AboutQt *ui;
30-
};
31-
1+
// src/About.h
2+
//----------------------------------
3+
// RP Soundboard Source Code
4+
// Copyright (c) 2015 Marius Graefe
5+
// All rights reserved
6+
// Contact: rp_soundboard@mgraefe.de
7+
//----------------------------------
8+
9+
#pragma once
10+
11+
#include <QWidget>
12+
13+
#include "ui_About.h"
14+
15+
namespace Ui {
16+
class AboutQt;
17+
}
18+
19+
20+
class AboutQt : public QWidget
21+
{
22+
Q_OBJECT
23+
24+
public:
25+
explicit AboutQt(QWidget *parent = 0);
26+
~AboutQt();
27+
28+
private:
29+
Ui::AboutQt *ui;
30+
};
31+

0 commit comments

Comments
 (0)