Skip to content

Commit 6b94dbb

Browse files
committed
Replace C compatibility headers with C++
1 parent 9f4cdd4 commit 6b94dbb

File tree

11 files changed

+40
-32
lines changed

11 files changed

+40
-32
lines changed

include/ChunkReader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
#include <iostream>
3838
#include <fstream>
3939
#include <omp.h>
40-
#include <QtCore/qdir.h>
41-
#include <stdio.h>
40+
#include <cstdio>
4241
#include <cstdlib>
4342
#include <memory>
43+
#include <QtCore/QDir>
4444
#include "Json.h"
4545
#include "CacheMemory.h"
4646
#include "Exceptions.h"

include/ChunkWriter.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@
3434
#include "ReaderBase.h"
3535
#include "WriterBase.h"
3636
#include "FFmpegWriter.h"
37+
#include "CacheMemory.h"
38+
#include "Exceptions.h"
39+
#include "Json.h"
3740

3841
#include <cmath>
3942
#include <ctime>
4043
#include <iostream>
4144
#include <fstream>
42-
#include <omp.h>
43-
#include <QtCore/qdir.h>
44-
#include <stdio.h>
45+
#include <cstdio>
4546
#include <sstream>
4647
#include <unistd.h>
47-
#include "CacheMemory.h"
48-
#include "Exceptions.h"
49-
#include "Json.h"
48+
#include <omp.h>
49+
#include <QtCore/QDir>
5050

5151

5252
namespace openshot

include/OpenMPUtilities.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#define OPENSHOT_OPENMP_UTILITIES_H
3333

3434
#include <omp.h>
35-
#include <stdlib.h>
36-
#include <string.h>
35+
#include <algorithm>
36+
#include <string>
3737

3838
#include "Settings.h"
3939

include/Profiles.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
#include <string>
3636
#include <sstream>
3737
#include <fstream>
38-
#include <QtCore/qstring.h>
39-
#include <QtCore/qstringlist.h>
40-
#include <QtCore/qfile.h>
38+
#include <QtCore/QString>
39+
#include <QtCore/QStringList>
40+
#include <QtCore/QFile>
4141
#include <QTextStream>
42-
#include <stdio.h>
43-
#include <stdlib.h>
42+
#include <cstdio>
43+
#include <cstdlib>
4444
#include "Exceptions.h"
4545
#include "Fraction.h"
4646
#include "Json.h"

include/Qt/PlayerDemo.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
#ifndef OPENSHOT_PLAYER_DEMO_H
3232
#define OPENSHOT_PLAYER_DEMO_H
3333

34-
#include <QtWidgets/QWidget>
35-
#include <QtWidgets/QBoxLayout>
36-
#include <QtWidgets/QMenuBar>
37-
#include <QtWidgets/QMenu>
38-
#include <QtGui/qevent.h>
39-
#include <QApplication>
34+
#include <QObject>
35+
#include <QWidget>
36+
#include <QKeyEvent>
37+
#include <QCloseEvent>
38+
#include <QVBoxLayout>
39+
#include <QMenuBar>
4040

4141
#include "VideoRenderWidget.h"
4242

include/ReaderBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include "Frame.h"
4444
#include "Json.h"
4545
#include "ZmqLogger.h"
46-
#include <QtCore/qstring.h>
46+
#include <QString>
4747
#include <QGraphicsItem>
4848
#include <QGraphicsScene>
4949
#include <QGraphicsPixmapItem>

include/RendererBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define OPENSHOT_RENDERER_BASE_H
3333

3434
#include "Frame.h"
35-
#include <stdlib.h> // for realloc
35+
#include <cstdlib> // for realloc
3636
#include <memory>
3737

3838
namespace openshot

include/Settings.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
#include <iostream>
3636
#include <iomanip>
3737
#include <fstream>
38-
#include <stdlib.h>
38+
#include <cstdlib>
3939
#include <string>
4040
#include <sstream>
41-
#include <stdio.h>
42-
#include <time.h>
41+
#include <cstdio>
42+
#include <ctime>
4343
#include <zmq.hpp>
4444
#include <unistd.h>
4545
#include "JuceHeader.h"

include/ZmqLogger.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
#include <iostream>
3636
#include <iomanip>
3737
#include <fstream>
38-
#include <stdlib.h>
38+
#include <cstdlib>
3939
#include <string>
4040
#include <sstream>
41-
#include <stdio.h>
42-
#include <time.h>
41+
#include <cstdio>
42+
#include <ctime>
4343
#include <zmq.hpp>
4444
#include <unistd.h>
4545
#include "JuceHeader.h"

src/Qt/PlayerDemo.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,18 @@
2828
* along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
2929
*/
3030

31-
#include "stdio.h"
31+
#include <cstdio>
3232
#include "../../include/QtPlayer.h"
3333
#include "../../include/Qt/PlayerDemo.h"
3434
#include <QMessageBox>
3535
#include <QFileDialog>
36+
#include <QWidget>
37+
#include <QBoxLayout>
38+
#include <QMenuBar>
39+
#include <QMenu>
40+
#include <QKeyEvent>
41+
#include <QCloseEvent>
42+
#include <QApplication>
3643

3744
PlayerDemo::PlayerDemo(QWidget *parent)
3845
: QWidget(parent)

0 commit comments

Comments
 (0)