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 2253e70dc4fe97261267dee8411a5bb43e95f18b..8ef05f05bcfa20baaf608e9975a6beeadaa666cc 100644 (file)
--- 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 b3f310a144c5cd7ce2e18fb83ed242bd10526b6c..7458a074fff8c229650a16279fa785945faef067 100644 (file)
--- 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 61382e6f0212a5e2591fe5863bebb2fe3dd87b14..1e66e364c7f6cfe2f71a3f6ea5ae64a1d5b17dc0 100644 (file)
--- 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 64d9cd66081a414aa1dc5460e64ec4cdc94d868e..a2a213afcdcbca59a6c0bba9a66632bdc78af7d8 100644 (file)
--- 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 2e08d6a471476d9785702c794816b908a89983b3..eaaea089964c9ba32c245e6d8641c6c592997a02 100644 (file)
--- 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 61b2f17adaa9848cc28d6735a49cbff3d024001a..9df12a0ff48208f734c78d38314d3a5bcc28acd9 100644 (file)
--- 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 f453cf178a7fb3e8034022f6d575e667dd3d2575..eeb13fdd37e8e366011a0da1fafe14fd72cef77f 100644 (file)
--- 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 a4c542af55fb9f05caaccd5043b0d7b098bbdaf2..9e4fcd0e35dd706baf15bb65e463a5e5e5bdb8da 100644 (file)
--- 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 7fd4aeeffa2af3ceeb536a29f1365e5427f4484a..789c26eb0236c9efb89c3c2291cd92e1a5d0e421 100644 (file)
--- 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 1cba8e4a7c2341103be17cfe7b2d214ad2aecaf7..a488e89a3b1fd5d7e30dd615e619ee248f8d908b 100644 (file)
--- 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 fdd954d5d90824a05fb13b0dd6ad34b6ccf96aad..c25c373b3c23e15ff8178f06615087e0659cfd18 100644 (file)
--- 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 0ee89a1f23a403df763ae56a33319fb07fc439a7..a74831a6b7c2c1e404e21e0b10b4a0788177c71c 100644 (file)
--- 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 978f3dc84137d467fcc0d0dee4288710fb280838..0ca1359138d89317f4c630f6cda71d242c50bc34 100644 (file)
--- 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 e33bba4ea7aeb7aaad9d68abf0194ffb3768331c..490f39c5457187a0c808cc32684abb25f8fcb3d9 100644 (file)
--- 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 5b3cf58735e4ae17e690bc74342b76806c5ab202..1cc3dd6d95e1a5d20acf62d385254bf791edfc75 100644 (file)
--- 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 6e991c7e8cf562960a9de62220ebd81d406bc0ba..06c82c30f496842cf4ff6754cdc29d351cb4dcf9 100644 (file)
--- 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 5827e28ce29f615f330c51bd4b6b12785f326785..623ebddef6d4992102d50571c47c35be451df921 100644 (file)
--- 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 f9713b18c7163c6bf58672fa6743707dce5cc839..f60e643a794e3b0f5493ca1802c046afe2b8dea9 100644 (file)
--- 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 eb33c383accce52af1ea8118535106b19a3cb4f7..8e443e4370985b78e1961e9ef5efb1762585ed40 100644 (file)
--- 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 9e78cae9fbc0f7fb5aca83f430c96ad7a696363a..be2c8b895496eb0d2fa5994e1605533ad45c91d7 100644 (file)
--- 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 398114d5b96f610954f5c86f8d6b833407a9812b..f262d6639fe6dc6582de6f7251c4cad58cc69e6b 100644 (file)
--- 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 5ecfe8a2977130b6ccaa0562febbda70d66387f8..8a5e0f7d80a37f84c3851e5c7f43f5fc8444e371 100644 (file)
--- 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 899720521cd26c50134fb1f385903e0d906026ca..b634257c17eaa278d261e560f7fb6a5c776c5cc6 100644 (file)
--- 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 ee03a8b51033ee809b997e70e52565d893dbfaf4..9a47249e4b5881a173cdf5c1d8a35f2b5963654b 100644 (file)
--- 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>