From: Uwe Hermann <redacted>
Date: Thu, 9 Mar 2017 23:34:10 +0000 (+0100)
Subject: Don't use deprecated headers.
X-Git-Tag: pulseview-0.4.0~163
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;p=pulseview.git

Don't use deprecated headers.

This patch was generated using clang-tidy:

  clang-tidy -checks="-*,modernize-deprecated-headers" -fix

(with some additional manual fixups)
---

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 2253e70d..8ef05f05 100644
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <QDebug>
 
diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index b3f310a1..7458a074 100644
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -19,9 +19,9 @@
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
 #include <cmath>
 
 #include <algorithm>
diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 61382e6f..1e66e364 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -19,9 +19,9 @@
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
 #include <cmath>
 
 #include "logic.hpp"
diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index 64d9cd66..a2a213af 100644
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -20,10 +20,9 @@
 
 #include "segment.hpp"
 
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
 #include <vector>
 
 using std::lock_guard;
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 2e08d6a4..eaaea089 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -17,14 +17,15 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cassert>
-
 #ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
+#include <cassert>
 #include <algorithm>
 #include <iterator>
+#include <cstdint>
+#include <cstdarg>
 
 #include <QAction>
 #include <QApplication>
@@ -48,8 +49,6 @@
 #include "view/view.hpp"
 #include "views/trace/standardbar.hpp"
 
-#include <stdint.h>
-#include <stdarg.h>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::dynamic_pointer_cast;
diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp
index 61b2f17a..9df12a0f 100644
--- a/pv/prop/bool.cpp
+++ b/pv/prop/bool.cpp
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include <QCheckBox>
 
diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
index f453cf17..eeb13fdd 100644
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include <QDoubleSpinBox>
 
diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index a4c542af..9e4fcd0e 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include <QComboBox>
 
diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index 7fd4aeef..789c26eb 100644
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <assert.h>
+#include <cstdint>
+#include <cassert>
 
 #include <QSpinBox>
 
diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index 1cba8e4a..a488e89a 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include <QLineEdit>
 #include <QSpinBox>
diff --git a/pv/util.cpp b/pv/util.cpp
index fdd954d5..c25c373b 100644
--- a/pv/util.cpp
+++ b/pv/util.cpp
@@ -21,8 +21,7 @@
 
 #include <extdef.h>
 
-#include <assert.h>
-
+#include <cassert>
 #include <algorithm>
 #include <sstream>
 
diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 0ee89a1f..a74831a6 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -19,7 +19,7 @@
 
 #include <extdef.h>
 
-#include <assert.h>
+#include <cassert>
 #include <cmath>
 
 #include <QApplication>
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 978f3dc8..0ca13591 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -19,7 +19,7 @@
 
 #include <extdef.h>
 
-#include <assert.h>
+#include <cassert>
 #include <cmath>
 
 #include <QApplication>
diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index e33bba4e..490f39c5 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -18,8 +18,8 @@
  */
 
 #include <extdef.h>
-#include <assert.h>
 
+#include <cassert>
 #include <algorithm>
 
 #include <QMenu>
diff --git a/pv/view/tracetreeitem.cpp b/pv/view/tracetreeitem.cpp
index 5b3cf587..1cc3dd6d 100644
--- a/pv/view/tracetreeitem.cpp
+++ b/pv/view/tracetreeitem.cpp
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include "view.hpp"
 
diff --git a/pv/widgets/colourbutton.cpp b/pv/widgets/colourbutton.cpp
index 6e991c7e..06c82c30 100644
--- a/pv/widgets/colourbutton.cpp
+++ b/pv/widgets/colourbutton.cpp
@@ -19,7 +19,7 @@
 
 #include "colourbutton.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 #include <QApplication>
 #include <QPainter>
diff --git a/pv/widgets/decodergroupbox.cpp b/pv/widgets/decodergroupbox.cpp
index 5827e28c..623ebdde 100644
--- a/pv/widgets/decodergroupbox.cpp
+++ b/pv/widgets/decodergroupbox.cpp
@@ -24,7 +24,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include <assert.h>
+#include <cassert>
 
 namespace pv {
 namespace widgets {
diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index f9713b18..f60e643a 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -18,8 +18,7 @@
  */
 
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 #include <QtGui>
 #include <QApplication>
diff --git a/pv/widgets/popuptoolbutton.cpp b/pv/widgets/popuptoolbutton.cpp
index eb33c383..8e443e43 100644
--- a/pv/widgets/popuptoolbutton.cpp
+++ b/pv/widgets/popuptoolbutton.cpp
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include "popuptoolbutton.hpp"
 
diff --git a/pv/widgets/sweeptimingwidget.cpp b/pv/widgets/sweeptimingwidget.cpp
index 9e78cae9..be2c8b89 100644
--- a/pv/widgets/sweeptimingwidget.cpp
+++ b/pv/widgets/sweeptimingwidget.cpp
@@ -20,10 +20,8 @@
 #include "sweeptimingwidget.hpp"
 
 #include <cstdlib>
-
 #include <vector>
-
-#include <assert.h>
+#include <cassert>
 
 #include <extdef.h>
 
diff --git a/signalhandler.cpp b/signalhandler.cpp
index 398114d5..f262d663 100644
--- a/signalhandler.cpp
+++ b/signalhandler.cpp
@@ -19,9 +19,10 @@
 
 #include "signalhandler.hpp"
 
-#include <assert.h>
-#include <signal.h>
-#include <stdlib.h>
+#include <cassert>
+#include <csignal>
+#include <cstdlib>
+
 #include <sys/socket.h>
 #include <unistd.h>
 
diff --git a/test/data/analogsegment.cpp b/test/data/analogsegment.cpp
index 5ecfe8a2..8a5e0f7d 100644
--- a/test/data/analogsegment.cpp
+++ b/test/data/analogsegment.cpp
@@ -19,7 +19,7 @@
 
 #include <extdef.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/data/logicsegment.cpp b/test/data/logicsegment.cpp
index 89972052..b634257c 100644
--- a/test/data/logicsegment.cpp
+++ b/test/data/logicsegment.cpp
@@ -19,7 +19,7 @@
 
 #include <extdef.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/data/segment.cpp b/test/data/segment.cpp
index ee03a8b5..9a47249e 100644
--- a/test/data/segment.cpp
+++ b/test/data/segment.cpp
@@ -20,7 +20,7 @@
 
 #include <extdef.h>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <boost/test/unit_test.hpp>