Replace C compatibility headers with C++

OpenShot · Aug 7, 2020 · 6b94dbb · 6b94dbb
1 parent 9f4cdd4
commit 6b94dbb
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 32 deletions.
diff --git a/include/ChunkReader.h b/include/ChunkReader.h
@@ -37,10 +37,10 @@
 #include <iostream>
 #include <fstream>
 #include <omp.h>
-#include <QtCore/qdir.h>
-#include <stdio.h>
+#include <cstdio>
 #include <cstdlib>
 #include <memory>
+#include <QtCore/QDir>
 #include "Json.h"
 #include "CacheMemory.h"
 #include "Exceptions.h"

diff --git a/include/ChunkWriter.h b/include/ChunkWriter.h
@@ -34,19 +34,19 @@
 #include "ReaderBase.h"
 #include "WriterBase.h"
 #include "FFmpegWriter.h"
+#include "CacheMemory.h"
+#include "Exceptions.h"
+#include "Json.h"
 
 #include <cmath>
 #include <ctime>
 #include <iostream>
 #include <fstream>
-#include <omp.h>
-#include <QtCore/qdir.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sstream>
 #include <unistd.h>
-#include "CacheMemory.h"
-#include "Exceptions.h"
-#include "Json.h"
+#include <omp.h>
+#include <QtCore/QDir>
 
 
 namespace openshot

diff --git a/include/OpenMPUtilities.h b/include/OpenMPUtilities.h
@@ -32,8 +32,8 @@
 #define OPENSHOT_OPENMP_UTILITIES_H
 
 #include <omp.h>
-#include <stdlib.h>
-#include <string.h>
+#include <algorithm>
+#include <string>
 
 #include "Settings.h"
 

diff --git a/include/Profiles.h b/include/Profiles.h
@@ -35,12 +35,12 @@
 #include <string>
 #include <sstream>
 #include <fstream>
-#include <QtCore/qstring.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qfile.h>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QFile>
 #include <QTextStream>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include "Exceptions.h"
 #include "Fraction.h"
 #include "Json.h"

diff --git a/include/Qt/PlayerDemo.h b/include/Qt/PlayerDemo.h
@@ -31,12 +31,12 @@
 #ifndef OPENSHOT_PLAYER_DEMO_H
 #define OPENSHOT_PLAYER_DEMO_H
 
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QBoxLayout>
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QMenu>
-#include <QtGui/qevent.h>
-#include <QApplication>
+#include <QObject>
+#include <QWidget>
+#include <QKeyEvent>
+#include <QCloseEvent>
+#include <QVBoxLayout>
+#include <QMenuBar>
 
 #include "VideoRenderWidget.h"
 

diff --git a/include/ReaderBase.h b/include/ReaderBase.h
@@ -43,7 +43,7 @@
 #include "Frame.h"
 #include "Json.h"
 #include "ZmqLogger.h"
-#include <QtCore/qstring.h>
+#include <QString>
 #include <QGraphicsItem>
 #include <QGraphicsScene>
 #include <QGraphicsPixmapItem>

diff --git a/include/RendererBase.h b/include/RendererBase.h
@@ -32,7 +32,7 @@
 #define OPENSHOT_RENDERER_BASE_H
 
 #include "Frame.h"
-#include <stdlib.h> // for realloc
+#include <cstdlib> // for realloc
 #include <memory>
 
 namespace openshot

diff --git a/include/Settings.h b/include/Settings.h
@@ -35,11 +35,11 @@
 #include <iostream>
 #include <iomanip>
 #include <fstream>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string>
 #include <sstream>
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include <zmq.hpp>
 #include <unistd.h>
 #include "JuceHeader.h"

diff --git a/include/ZmqLogger.h b/include/ZmqLogger.h
@@ -35,11 +35,11 @@
 #include <iostream>
 #include <iomanip>
 #include <fstream>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string>
 #include <sstream>
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include <zmq.hpp>
 #include <unistd.h>
 #include "JuceHeader.h"

diff --git a/src/Qt/PlayerDemo.cpp b/src/Qt/PlayerDemo.cpp
@@ -28,11 +28,18 @@
  * along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "stdio.h"
+#include <cstdio>
 #include "../../include/QtPlayer.h"
 #include "../../include/Qt/PlayerDemo.h"
 #include <QMessageBox>
 #include <QFileDialog>
+#include <QWidget>
+#include <QBoxLayout>
+#include <QMenuBar>
+#include <QMenu>
+#include <QKeyEvent>
+#include <QCloseEvent>
+#include <QApplication>
 
 PlayerDemo::PlayerDemo(QWidget *parent)
     : QWidget(parent)

diff --git a/src/examples/ExampleHtml.cpp b/src/examples/ExampleHtml.cpp
@@ -32,11 +32,12 @@
 #include <fstream>
 #include <iostream>
 #include <memory>
-#include "../../include/OpenShot.h"
-//#include "../../include/CrashHandler.h"
 #include <QGuiApplication>
 #include <QTimer>
 
+#include "../../include/OpenShot.h"
+#include "../../include/CrashHandler.h"
+
 using namespace openshot;
 
 int main(int argc, char* argv[]) {