From 13b60351a633214da27cfa5f824cf1568f854421 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 14 Jun 2020 23:54:18 +0200
Subject: [PATCH] Replace use of deprecated C++ headers

---
 3rdparty/singleapplication/singleapplication.cpp     | 2 +-
 3rdparty/singleapplication/singlecoreapplication.cpp | 2 +-
 3rdparty/taglib/mpc/mpcproperties.cpp                | 2 +-
 3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp   | 3 ++-
 3rdparty/taglib/toolkit/tbytevectorstream.cpp        | 9 ++++-----
 3rdparty/taglib/toolkit/tfile.cpp                    | 2 +-
 3rdparty/taglib/toolkit/tfilestream.cpp              | 2 +-
 3rdparty/taglib/toolkit/tutils.h                     | 2 +-
 3rdparty/taglib/xm/xmfile.cpp                        | 2 +-
 ext/libstrawberry-common/core/arraysize.h            | 2 +-
 ext/libstrawberry-common/core/logging.cpp            | 6 +++---
 ext/libstrawberry-common/core/workerpool.h           | 2 +-
 src/collection/collectionbackend.cpp                 | 2 +-
 src/collection/collectionwatcher.cpp                 | 2 +-
 src/core/database.cpp                                | 4 ++--
 src/core/mpris2.cpp                                  | 2 +-
 src/core/networkproxyfactory.cpp                     | 2 +-
 src/core/songloader.cpp                              | 2 +-
 src/core/tagreaderclient.cpp                         | 2 +-
 src/core/utilities.cpp                               | 4 ++--
 src/device/afcfile.h                                 | 2 +-
 src/device/cddasongloader.cpp                        | 2 +-
 src/device/devicedatabasebackend.cpp                 | 2 +-
 src/device/filesystemdevice.cpp                      | 2 +-
 src/device/mtpconnection.cpp                         | 4 ++--
 src/device/mtpdevice.cpp                             | 4 ++--
 src/engine/alsadevicefinder.cpp                      | 4 ++--
 src/engine/gstengine.cpp                             | 2 +-
 src/engine/gstenginepipeline.cpp                     | 6 +++---
 src/engine/xineengine.cpp                            | 6 +++---
 src/engine/xineengine.h                              | 2 +-
 src/main.cpp                                         | 4 ++--
 src/moodbar/moodbarpipeline.cpp                      | 2 +-
 src/musicbrainz/chromaprinter.cpp                    | 6 +++---
 src/playlist/playlist.cpp                            | 2 +-
 src/playlist/playlistbackend.cpp                     | 2 +-
 src/playlist/playlistview.cpp                        | 2 +-
 src/transcoder/transcoder.cpp                        | 2 +-
 38 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/3rdparty/singleapplication/singleapplication.cpp b/3rdparty/singleapplication/singleapplication.cpp
index 41048a61b..3634199b6 100644
--- a/3rdparty/singleapplication/singleapplication.cpp
+++ b/3rdparty/singleapplication/singleapplication.cpp
@@ -31,7 +31,7 @@
 //
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <limits>
 
 #include <QtGlobal>
diff --git a/3rdparty/singleapplication/singlecoreapplication.cpp b/3rdparty/singleapplication/singlecoreapplication.cpp
index fcc7a6052..b565423b8 100644
--- a/3rdparty/singleapplication/singlecoreapplication.cpp
+++ b/3rdparty/singleapplication/singlecoreapplication.cpp
@@ -31,7 +31,7 @@
 //
 //
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <limits>
 
 #include <QtGlobal>
diff --git a/3rdparty/taglib/mpc/mpcproperties.cpp b/3rdparty/taglib/mpc/mpcproperties.cpp
index d0c2161c4..9706a3090 100644
--- a/3rdparty/taglib/mpc/mpcproperties.cpp
+++ b/3rdparty/taglib/mpc/mpcproperties.cpp
@@ -26,7 +26,7 @@
 #include <tstring.h>
 #include <tdebug.h>
 #include <bitset>
-#include <math.h>
+#include <cmath>
 
 #include "mpcproperties.h"
 #include "mpcfile.h"
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp
index facd0defd..ab0f6f3f4 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp
@@ -23,10 +23,11 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#include <cstdio>
+
 #include <tbytevectorlist.h>
 #include <tpropertymap.h>
 #include <tdebug.h>
-#include <stdio.h>
 
 #include "chapterframe.h"
 
diff --git a/3rdparty/taglib/toolkit/tbytevectorstream.cpp b/3rdparty/taglib/toolkit/tbytevectorstream.cpp
index b2f512612..8641d54b1 100644
--- a/3rdparty/taglib/toolkit/tbytevectorstream.cpp
+++ b/3rdparty/taglib/toolkit/tbytevectorstream.cpp
@@ -23,15 +23,14 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+
 #include "tbytevectorstream.h"
 #include "tstring.h"
 #include "tdebug.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <stdlib.h>
-
 using namespace Strawberry_TagLib::TagLib;
 
 class ByteVectorStream::ByteVectorStreamPrivate {
diff --git a/3rdparty/taglib/toolkit/tfile.cpp b/3rdparty/taglib/toolkit/tfile.cpp
index 8aad965ac..8989fd8b6 100644
--- a/3rdparty/taglib/toolkit/tfile.cpp
+++ b/3rdparty/taglib/toolkit/tfile.cpp
@@ -33,7 +33,7 @@
 #  include <windows.h>
 #  include <io.h>
 #else
-#  include <stdio.h>
+#  include <cstdio>
 #  include <unistd.h>
 #endif
 
diff --git a/3rdparty/taglib/toolkit/tfilestream.cpp b/3rdparty/taglib/toolkit/tfilestream.cpp
index b677db727..1209378eb 100644
--- a/3rdparty/taglib/toolkit/tfilestream.cpp
+++ b/3rdparty/taglib/toolkit/tfilestream.cpp
@@ -30,7 +30,7 @@
 #ifdef _WIN32
 #  include <windows.h>
 #else
-#  include <stdio.h>
+#  include <cstdio>
 #  include <unistd.h>
 #endif
 
diff --git a/3rdparty/taglib/toolkit/tutils.h b/3rdparty/taglib/toolkit/tutils.h
index 7cd97c2f2..236c9c150 100644
--- a/3rdparty/taglib/toolkit/tutils.h
+++ b/3rdparty/taglib/toolkit/tutils.h
@@ -35,7 +35,7 @@
 #  endif
 
 #  if defined(HAVE_MSC_BYTESWAP)
-#    include <stdlib.h>
+#    include <cstdlib>
 #  elif defined(HAVE_GLIBC_BYTESWAP)
 #    include <byteswap.h>
 #  elif defined(HAVE_MAC_BYTESWAP)
diff --git a/3rdparty/taglib/xm/xmfile.cpp b/3rdparty/taglib/xm/xmfile.cpp
index 1b0e6510b..80ea360b6 100644
--- a/3rdparty/taglib/xm/xmfile.cpp
+++ b/3rdparty/taglib/xm/xmfile.cpp
@@ -29,7 +29,7 @@
 #include "modfileprivate.h"
 #include "tpropertymap.h"
 
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 
 using namespace Strawberry_TagLib::TagLib;
diff --git a/ext/libstrawberry-common/core/arraysize.h b/ext/libstrawberry-common/core/arraysize.h
index ff43e200b..f66402ce6 100644
--- a/ext/libstrawberry-common/core/arraysize.h
+++ b/ext/libstrawberry-common/core/arraysize.h
@@ -4,7 +4,7 @@
 
 // From Chromium src/base/macros.h
 
-#include <stddef.h>  // For size_t.
+#include <cstddef>  // For size_t.
 
 // The arraysize(arr) macro returns the # of elements in an array arr.
 // The expression is a compile-time constant, and therefore can be
diff --git a/ext/libstrawberry-common/core/logging.cpp b/ext/libstrawberry-common/core/logging.cpp
index 9c9760f9c..801bc3983 100644
--- a/ext/libstrawberry-common/core/logging.cpp
+++ b/ext/libstrawberry-common/core/logging.cpp
@@ -18,9 +18,9 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <memory>
 #include <cxxabi.h>
diff --git a/ext/libstrawberry-common/core/workerpool.h b/ext/libstrawberry-common/core/workerpool.h
index e5b9600bb..01d5082de 100644
--- a/ext/libstrawberry-common/core/workerpool.h
+++ b/ext/libstrawberry-common/core/workerpool.h
@@ -18,7 +18,7 @@
 #ifndef WORKERPOOL_H
 #define WORKERPOOL_H
 
-#include <stddef.h>
+#include <cstddef>
 
 #include <QtGlobal>
 #include <QObject>
diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp
index afaa49643..37b6cb738 100644
--- a/src/collection/collectionbackend.cpp
+++ b/src/collection/collectionbackend.cpp
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
 
 #include <QtGlobal>
 #include <QObject>
diff --git a/src/collection/collectionwatcher.cpp b/src/collection/collectionwatcher.cpp
index 762d8130b..ee0098cfc 100644
--- a/src/collection/collectionwatcher.cpp
+++ b/src/collection/collectionwatcher.cpp
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
 
 #include <QObject>
 #include <QThread>
diff --git a/src/core/database.cpp b/src/core/database.cpp
index 2ddee1674..58e55769b 100644
--- a/src/core/database.cpp
+++ b/src/core/database.cpp
@@ -21,8 +21,8 @@
 
 #include "config.h"
 
-#include <stddef.h>
-#include <assert.h>
+#include <cstddef>
+#include <cassert>
 #include <sqlite3.h>
 #include <boost/scope_exit.hpp>
 
diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp
index 58e45c11f..b35c43f42 100644
--- a/src/core/mpris2.cpp
+++ b/src/core/mpris2.cpp
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>
 #include <algorithm>
 
diff --git a/src/core/networkproxyfactory.cpp b/src/core/networkproxyfactory.cpp
index f9dc6fcf5..40a2ea396 100644
--- a/src/core/networkproxyfactory.cpp
+++ b/src/core/networkproxyfactory.cpp
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <QtGlobal>
 #include <QMutex>
diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp
index 27026091b..ccb57ad59 100644
--- a/src/core/songloader.cpp
+++ b/src/core/songloader.cpp
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>
 #include <algorithm>
 
diff --git a/src/core/tagreaderclient.cpp b/src/core/tagreaderclient.cpp
index be9d5d13f..dd91712ac 100644
--- a/src/core/tagreaderclient.cpp
+++ b/src/core/tagreaderclient.cpp
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string>
-#include <assert.h>
+#include <cassert>
 
 #include <QtGlobal>
 #include <QObject>
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 997dcb92c..1309f6549 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <memory>
-#include <stdlib.h>
+#include <cstdlib>
 #include <iconv.h>
 
 #include <QtGlobal>
@@ -68,7 +68,7 @@
 #  include <QRandomGenerator>
 #endif
 
-#include <stdio.h>
+#include <cstdio>
 
 #ifdef Q_OS_LINUX
 #  include <unistd.h>
diff --git a/src/device/afcfile.h b/src/device/afcfile.h
index dd41c88e1..8ff034a6b 100644
--- a/src/device/afcfile.h
+++ b/src/device/afcfile.h
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include <stdint.h>
+#include <cstdint>
 #include <libimobiledevice/afc.h>
 
 #include <QtGlobal>
diff --git a/src/device/cddasongloader.cpp b/src/device/cddasongloader.cpp
index a86cd872b..b4064206b 100644
--- a/src/device/cddasongloader.cpp
+++ b/src/device/cddasongloader.cpp
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <stddef.h>
+#include <cstddef>
 #include <glib.h>
 #include <glib/gtypes.h>
 #include <glib-object.h>
diff --git a/src/device/devicedatabasebackend.cpp b/src/device/devicedatabasebackend.cpp
index 2fa921e44..0dd409044 100644
--- a/src/device/devicedatabasebackend.cpp
+++ b/src/device/devicedatabasebackend.cpp
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
 
 #include <QObject>
 #include <QThread>
diff --git a/src/device/filesystemdevice.cpp b/src/device/filesystemdevice.cpp
index 95c8091f4..9a43dacb7 100644
--- a/src/device/filesystemdevice.cpp
+++ b/src/device/filesystemdevice.cpp
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <assert.h>
+#include <cassert>
 
 #include <QThread>
 #include <QString>
diff --git a/src/device/mtpconnection.cpp b/src/device/mtpconnection.cpp
index 97cc14f74..f199c6919 100644
--- a/src/device/mtpconnection.cpp
+++ b/src/device/mtpconnection.cpp
@@ -21,8 +21,8 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdint.h>
+#include <cstdlib>
+#include <cstdint>
 
 #include <QList>
 #include <QByteArray>
diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp
index 05bb0b1da..5893cda07 100644
--- a/src/device/mtpdevice.cpp
+++ b/src/device/mtpdevice.cpp
@@ -22,8 +22,8 @@
 #include "config.h"
 
 #include <libmtp.h>
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
 
 #include <QThread>
 #include <QMutex>
diff --git a/src/engine/alsadevicefinder.cpp b/src/engine/alsadevicefinder.cpp
index f9058e70d..89492f38e 100644
--- a/src/engine/alsadevicefinder.cpp
+++ b/src/engine/alsadevicefinder.cpp
@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <errno.h>
+#include <cstdio>
+#include <cerrno>
 #include <alsa/asoundlib.h>
 #include <boost/scope_exit.hpp>
 
diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp
index 79b77b9a3..fc61381c4 100644
--- a/src/engine/gstengine.cpp
+++ b/src/engine/gstengine.cpp
@@ -27,7 +27,7 @@
 #include <gio/gio.h>
 #include <memory>
 #include <vector>
-#include <math.h>
+#include <cmath>
 #include <string>
 
 #include <gst/gst.h>
diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp
index d0beed38d..e5b5d67e1 100644
--- a/src/engine/gstenginepipeline.cpp
+++ b/src/engine/gstenginepipeline.cpp
@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
 #include <glib.h>
 #include <glib-object.h>
 #include <gst/gst.h>
diff --git a/src/engine/xineengine.cpp b/src/engine/xineengine.cpp
index 35ce21b32..49d743b13 100644
--- a/src/engine/xineengine.cpp
+++ b/src/engine/xineengine.cpp
@@ -23,11 +23,11 @@
 #  define METRONOM_INTERNAL
 #endif
 
-#include <stdint.h>
+#include <cstdint>
 #include <sys/types.h>
-#include <time.h>
+#include <ctime>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <xine.h>
 #ifdef XINE_ANALYZER
 #  include <xine/metronom.h>
diff --git a/src/engine/xineengine.h b/src/engine/xineengine.h
index bef08b83d..cf03779f7 100644
--- a/src/engine/xineengine.h
+++ b/src/engine/xineengine.h
@@ -23,7 +23,7 @@
 #endif
 
 #include <memory>
-#include <stdint.h>
+#include <cstdint>
 #include <sys/types.h>
 #include <xine.h>
 
diff --git a/src/main.cpp b/src/main.cpp
index 2054b8add..d7d5dd27b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,9 +25,9 @@
 #include <QtGlobal>
 
 #include <glib.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>
-#include <time.h>
+#include <ctime>
 
 #ifdef Q_OS_UNIX
 #  include <unistd.h>
diff --git a/src/moodbar/moodbarpipeline.cpp b/src/moodbar/moodbarpipeline.cpp
index 1eede8ad4..fe5da3c80 100644
--- a/src/moodbar/moodbarpipeline.cpp
+++ b/src/moodbar/moodbarpipeline.cpp
@@ -17,7 +17,7 @@
 
 #include "moodbarpipeline.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <glib-object.h>
 
 #include <QObject>
diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
index 47b5ef630..69d110ca3 100644
--- a/src/musicbrainz/chromaprinter.cpp
+++ b/src/musicbrainz/chromaprinter.cpp
@@ -21,9 +21,9 @@
 #include "config.h"
 
 #include <glib-object.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 #include <chromaprint.h>
 #include <gst/gst.h>
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 76a9b2e20..1a435079f 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>
 #include <utility>
 #include <algorithm>
diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp
index be56d2443..c600a1d60 100644
--- a/src/playlist/playlistbackend.cpp
+++ b/src/playlist/playlistbackend.cpp
@@ -23,7 +23,7 @@
 
 #include <memory>
 #include <functional>
-#include <assert.h>
+#include <cassert>
 
 #include <QObject>
 #include <QApplication>
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index af3c0d9dc..13b2c7c4a 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <math.h>
+#include <cmath>
 #include <algorithm>
 
 #include <QApplication>
diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp
index 7f8abe828..0ae703013 100644
--- a/src/transcoder/transcoder.cpp
+++ b/src/transcoder/transcoder.cpp
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <glib/gtypes.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>
 #include <algorithm>
 #include <gst/gst.h>