From 2acdb232d6bb452cfdfaea3ef5218fb4da592329 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 22 Nov 2014 08:53:27 +0000 Subject: [PATCH] Renamed C++ headers to .hpp --- CMakeLists.txt | 82 +++++++++---------- android/loghandler.cpp | 2 +- android/{loghandler.h => loghandler.hpp} | 0 main.cpp | 10 +-- pv/application.cpp | 2 +- pv/{application.h => application.hpp} | 0 pv/data/analog.cpp | 4 +- pv/data/{analog.h => analog.hpp} | 2 +- pv/data/analogsnapshot.cpp | 2 +- .../{analogsnapshot.h => analogsnapshot.hpp} | 2 +- pv/data/decode/annotation.cpp | 2 +- .../decode/{annotation.h => annotation.hpp} | 0 pv/data/decode/decoder.cpp | 4 +- pv/data/decode/{decoder.h => decoder.hpp} | 0 pv/data/decode/row.cpp | 2 +- pv/data/decode/{row.h => row.hpp} | 2 +- pv/data/decode/rowdata.cpp | 2 +- pv/data/decode/{rowdata.h => rowdata.hpp} | 2 +- pv/data/decoderstack.cpp | 16 ++-- pv/data/{decoderstack.h => decoderstack.hpp} | 6 +- pv/data/logic.cpp | 4 +- pv/data/{logic.h => logic.hpp} | 2 +- pv/data/logicsnapshot.cpp | 3 +- .../{logicsnapshot.h => logicsnapshot.hpp} | 2 +- pv/data/signaldata.cpp | 2 +- pv/data/{signaldata.h => signaldata.hpp} | 0 pv/data/snapshot.cpp | 2 +- pv/data/{snapshot.h => snapshot.hpp} | 0 pv/devicemanager.cpp | 4 +- pv/{devicemanager.h => devicemanager.hpp} | 0 pv/dialogs/about.cpp | 2 +- pv/dialogs/{about.h => about.hpp} | 0 pv/dialogs/connect.cpp | 4 +- pv/dialogs/{connect.h => connect.hpp} | 0 pv/dialogs/storeprogress.cpp | 2 +- .../{storeprogress.h => storeprogress.hpp} | 2 +- pv/mainwindow.cpp | 20 ++--- pv/{mainwindow.h => mainwindow.hpp} | 2 +- pv/popups/channels.cpp | 8 +- pv/popups/{channels.h => channels.hpp} | 2 +- pv/popups/deviceoptions.cpp | 4 +- .../{deviceoptions.h => deviceoptions.hpp} | 4 +- pv/prop/binding/binding.cpp | 4 +- pv/prop/binding/{binding.h => binding.hpp} | 0 pv/prop/binding/decoderoptions.cpp | 14 ++-- .../{decoderoptions.h => decoderoptions.hpp} | 4 +- pv/prop/binding/deviceoptions.cpp | 10 +-- .../{deviceoptions.h => deviceoptions.hpp} | 4 +- pv/prop/bool.cpp | 2 +- pv/prop/{bool.h => bool.hpp} | 2 +- pv/prop/double.cpp | 2 +- pv/prop/{double.h => double.hpp} | 2 +- pv/prop/enum.cpp | 2 +- pv/prop/{enum.h => enum.hpp} | 2 +- pv/prop/int.cpp | 2 +- pv/prop/{int.h => int.hpp} | 2 +- pv/prop/property.cpp | 2 +- pv/prop/{property.h => property.hpp} | 0 pv/prop/string.cpp | 2 +- pv/prop/{string.h => string.hpp} | 2 +- pv/sigsession.cpp | 22 ++--- pv/{sigsession.h => sigsession.hpp} | 0 pv/storesession.cpp | 10 +-- pv/{storesession.h => storesession.hpp} | 0 pv/toolbars/samplingbar.cpp | 10 +-- .../{samplingbar.h => samplingbar.hpp} | 6 +- pv/util.cpp | 2 +- pv/{util.h => util.hpp} | 0 pv/view/analogsignal.cpp | 8 +- pv/view/{analogsignal.h => analogsignal.hpp} | 2 +- pv/view/cursor.cpp | 6 +- pv/view/{cursor.h => cursor.hpp} | 2 +- pv/view/cursorheader.cpp | 8 +- pv/view/{cursorheader.h => cursorheader.hpp} | 2 +- pv/view/cursorpair.cpp | 6 +- pv/view/{cursorpair.h => cursorpair.hpp} | 2 +- pv/view/decodetrace.cpp | 26 +++--- pv/view/{decodetrace.h => decodetrace.hpp} | 6 +- pv/view/header.cpp | 12 +-- pv/view/{header.h => header.hpp} | 2 +- pv/view/logicsignal.cpp | 16 ++-- pv/view/{logicsignal.h => logicsignal.hpp} | 2 +- pv/view/marginwidget.cpp | 4 +- pv/view/{marginwidget.h => marginwidget.hpp} | 0 pv/view/rowitem.cpp | 4 +- pv/view/{rowitem.h => rowitem.hpp} | 2 +- ...{rowitemiterator.h => rowitemiterator.hpp} | 2 +- pv/view/rowitemowner.cpp | 4 +- pv/view/{rowitemowner.h => rowitemowner.hpp} | 2 +- pv/view/ruler.cpp | 6 +- pv/view/{ruler.h => ruler.hpp} | 2 +- pv/view/selectableitem.cpp | 2 +- .../{selectableitem.h => selectableitem.hpp} | 0 pv/view/signal.cpp | 4 +- pv/view/{signal.h => signal.hpp} | 2 +- pv/view/timemarker.cpp | 6 +- pv/view/{timemarker.h => timemarker.hpp} | 2 +- pv/view/trace.cpp | 10 +-- pv/view/{trace.h => trace.hpp} | 2 +- pv/view/tracegroup.cpp | 2 +- pv/view/{tracegroup.h => tracegroup.hpp} | 4 +- pv/view/tracepalette.cpp | 2 +- pv/view/{tracepalette.h => tracepalette.hpp} | 0 pv/view/view.cpp | 26 +++--- pv/view/{view.h => view.hpp} | 6 +- pv/view/viewport.cpp | 8 +- pv/view/{viewport.h => viewport.hpp} | 0 pv/widgets/colourbutton.cpp | 2 +- .../{colourbutton.h => colourbutton.hpp} | 2 +- pv/widgets/colourpopup.cpp | 2 +- pv/widgets/{colourpopup.h => colourpopup.hpp} | 4 +- pv/widgets/decodergroupbox.cpp | 2 +- ...{decodergroupbox.h => decodergroupbox.hpp} | 0 pv/widgets/decodermenu.cpp | 2 +- pv/widgets/{decodermenu.h => decodermenu.hpp} | 0 pv/widgets/popup.cpp | 2 +- pv/widgets/{popup.h => popup.hpp} | 0 pv/widgets/popuptoolbutton.cpp | 2 +- ...{popuptoolbutton.h => popuptoolbutton.hpp} | 2 +- pv/widgets/sweeptimingwidget.cpp | 2 +- ...eptimingwidget.h => sweeptimingwidget.hpp} | 0 pv/widgets/wellarray.cpp | 2 +- pv/widgets/{wellarray.h => wellarray.hpp} | 0 signalhandler.cpp | 2 +- signalhandler.h => signalhandler.hpp | 0 test/CMakeLists.txt | 54 ++++++------ test/data/analogsnapshot.cpp | 2 +- test/data/logicsnapshot.cpp | 2 +- 128 files changed, 302 insertions(+), 303 deletions(-) rename android/{loghandler.h => loghandler.hpp} (100%) rename pv/{application.h => application.hpp} (100%) rename pv/data/{analog.h => analog.hpp} (98%) rename pv/data/{analogsnapshot.h => analogsnapshot.hpp} (98%) rename pv/data/decode/{annotation.h => annotation.hpp} (100%) rename pv/data/decode/{decoder.h => decoder.hpp} (100%) rename pv/data/decode/{row.h => row.hpp} (98%) rename pv/data/decode/{rowdata.h => rowdata.hpp} (98%) rename pv/data/{decoderstack.h => decoderstack.hpp} (97%) rename pv/data/{logic.h => logic.hpp} (98%) rename pv/data/{logicsnapshot.h => logicsnapshot.hpp} (99%) rename pv/data/{signaldata.h => signaldata.hpp} (100%) rename pv/data/{snapshot.h => snapshot.hpp} (100%) rename pv/{devicemanager.h => devicemanager.hpp} (100%) rename pv/dialogs/{about.h => about.hpp} (100%) rename pv/dialogs/{connect.h => connect.hpp} (100%) rename pv/dialogs/{storeprogress.h => storeprogress.hpp} (97%) rename pv/{mainwindow.h => mainwindow.hpp} (99%) rename pv/popups/{channels.h => channels.hpp} (98%) rename pv/popups/{deviceoptions.h => deviceoptions.hpp} (94%) rename pv/prop/binding/{binding.h => binding.hpp} (100%) rename pv/prop/binding/{decoderoptions.h => decoderoptions.hpp} (96%) rename pv/prop/binding/{deviceoptions.h => deviceoptions.hpp} (97%) rename pv/prop/{bool.h => bool.hpp} (98%) rename pv/prop/{double.h => double.hpp} (98%) rename pv/prop/{enum.h => enum.hpp} (98%) rename pv/prop/{int.h => int.hpp} (98%) rename pv/prop/{property.h => property.hpp} (100%) rename pv/prop/{string.h => string.hpp} (98%) rename pv/{sigsession.h => sigsession.hpp} (100%) rename pv/{storesession.h => storesession.hpp} (100%) rename pv/toolbars/{samplingbar.h => samplingbar.hpp} (96%) rename pv/{util.h => util.hpp} (100%) rename pv/view/{analogsignal.h => analogsignal.hpp} (99%) rename pv/view/{cursor.h => cursor.hpp} (98%) rename pv/view/{cursorheader.h => cursorheader.hpp} (98%) rename pv/view/{cursorpair.h => cursorpair.hpp} (98%) rename pv/view/{decodetrace.h => decodetrace.hpp} (98%) rename pv/view/{header.h => header.hpp} (98%) rename pv/view/{logicsignal.h => logicsignal.hpp} (99%) rename pv/view/{marginwidget.h => marginwidget.hpp} (100%) rename pv/view/{rowitem.h => rowitem.hpp} (99%) rename pv/view/{rowitemiterator.h => rowitemiterator.hpp} (99%) rename pv/view/{rowitemowner.h => rowitemowner.hpp} (99%) rename pv/view/{ruler.h => ruler.hpp} (98%) rename pv/view/{selectableitem.h => selectableitem.hpp} (100%) rename pv/view/{signal.h => signal.hpp} (98%) rename pv/view/{timemarker.h => timemarker.hpp} (98%) rename pv/view/{trace.h => trace.hpp} (99%) rename pv/view/{tracegroup.h => tracegroup.hpp} (98%) rename pv/view/{tracepalette.h => tracepalette.hpp} (100%) rename pv/view/{view.h => view.hpp} (98%) rename pv/view/{viewport.h => viewport.hpp} (100%) rename pv/widgets/{colourbutton.h => colourbutton.hpp} (98%) rename pv/widgets/{colourpopup.h => colourpopup.hpp} (96%) rename pv/widgets/{decodergroupbox.h => decodergroupbox.hpp} (100%) rename pv/widgets/{decodermenu.h => decodermenu.hpp} (100%) rename pv/widgets/{popup.h => popup.hpp} (100%) rename pv/widgets/{popuptoolbutton.h => popuptoolbutton.hpp} (98%) rename pv/widgets/{sweeptimingwidget.h => sweeptimingwidget.hpp} (100%) rename pv/widgets/{wellarray.h => wellarray.hpp} (100%) rename signalhandler.h => signalhandler.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 136880e0..05c6270c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,42 +193,42 @@ set(pulseview_SOURCES # This list includes only QObject derived class headers. set(pulseview_HEADERS - pv/mainwindow.h - pv/sigsession.h - pv/storesession.h - pv/dialogs/about.h - pv/dialogs/connect.h - pv/dialogs/storeprogress.h - pv/popups/channels.h - pv/popups/deviceoptions.h - pv/prop/bool.h - pv/prop/double.h - pv/prop/enum.h - pv/prop/int.h - pv/prop/property.h - pv/prop/string.h - pv/prop/binding/deviceoptions.h - pv/toolbars/samplingbar.h - pv/view/cursor.h - pv/view/cursorheader.h - pv/view/header.h - pv/view/logicsignal.h - pv/view/marginwidget.h - pv/view/rowitem.h - pv/view/ruler.h - pv/view/selectableitem.h - pv/view/signal.h - pv/view/timemarker.h - pv/view/trace.h - pv/view/tracegroup.h - pv/view/view.h - pv/view/viewport.h - pv/widgets/colourbutton.h - pv/widgets/colourpopup.h - pv/widgets/popup.h - pv/widgets/popuptoolbutton.h - pv/widgets/sweeptimingwidget.h - pv/widgets/wellarray.h + pv/mainwindow.hpp + pv/sigsession.hpp + pv/storesession.hpp + pv/dialogs/about.hpp + pv/dialogs/connect.hpp + pv/dialogs/storeprogress.hpp + pv/popups/channels.hpp + pv/popups/deviceoptions.hpp + pv/prop/bool.hpp + pv/prop/double.hpp + pv/prop/enum.hpp + pv/prop/int.hpp + pv/prop/property.hpp + pv/prop/string.hpp + pv/prop/binding/deviceoptions.hpp + pv/toolbars/samplingbar.hpp + pv/view/cursor.hpp + pv/view/cursorheader.hpp + pv/view/header.hpp + pv/view/logicsignal.hpp + pv/view/marginwidget.hpp + pv/view/rowitem.hpp + pv/view/ruler.hpp + pv/view/selectableitem.hpp + pv/view/signal.hpp + pv/view/timemarker.hpp + pv/view/trace.hpp + pv/view/tracegroup.hpp + pv/view/view.hpp + pv/view/viewport.hpp + pv/widgets/colourbutton.hpp + pv/widgets/colourpopup.hpp + pv/widgets/popup.hpp + pv/widgets/popuptoolbutton.hpp + pv/widgets/sweeptimingwidget.hpp + pv/widgets/wellarray.hpp ) set(pulseview_FORMS @@ -241,7 +241,7 @@ set(pulseview_RESOURCES if(ENABLE_SIGNALS) list(APPEND pulseview_SOURCES signalhandler.cpp) - list(APPEND pulseview_HEADERS signalhandler.h) + list(APPEND pulseview_HEADERS signalhandler.hpp) endif() if(ENABLE_DECODE) @@ -258,10 +258,10 @@ if(ENABLE_DECODE) ) list(APPEND pulseview_HEADERS - pv/data/decoderstack.h - pv/view/decodetrace.h - pv/widgets/decodergroupbox.h - pv/widgets/decodermenu.h + pv/data/decoderstack.hpp + pv/view/decodetrace.hpp + pv/widgets/decodergroupbox.hpp + pv/widgets/decodermenu.hpp ) endif() diff --git a/android/loghandler.cpp b/android/loghandler.cpp index 3cd2e3b7..8e7806c8 100644 --- a/android/loghandler.cpp +++ b/android/loghandler.cpp @@ -26,7 +26,7 @@ #include #include -#include "android/loghandler.h" +#include "android/loghandler.hpp" namespace pv { diff --git a/android/loghandler.h b/android/loghandler.hpp similarity index 100% rename from android/loghandler.h rename to android/loghandler.hpp diff --git a/main.cpp b/main.cpp index c0ac04b4..8fac9234 100644 --- a/main.cpp +++ b/main.cpp @@ -30,15 +30,15 @@ #include #ifdef ENABLE_SIGNALS -#include "signalhandler.h" +#include "signalhandler.hpp" #endif -#include "pv/application.h" -#include "pv/devicemanager.h" -#include "pv/mainwindow.h" +#include "pv/application.hpp" +#include "pv/devicemanager.hpp" +#include "pv/mainwindow.hpp" #ifdef ANDROID #include -#include "android/loghandler.h" +#include "android/loghandler.hpp" #endif #include "config.h" diff --git a/pv/application.cpp b/pv/application.cpp index 66991dd9..41f00f8c 100644 --- a/pv/application.cpp +++ b/pv/application.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "application.h" +#include "application.hpp" #include "config.h" #include diff --git a/pv/application.h b/pv/application.hpp similarity index 100% rename from pv/application.h rename to pv/application.hpp diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index eb25629f..30cf5013 100644 --- a/pv/data/analog.cpp +++ b/pv/data/analog.cpp @@ -20,8 +20,8 @@ #include -#include "analog.h" -#include "analogsnapshot.h" +#include "analog.hpp" +#include "analogsnapshot.hpp" using std::deque; using std::max; diff --git a/pv/data/analog.h b/pv/data/analog.hpp similarity index 98% rename from pv/data/analog.h rename to pv/data/analog.hpp index b89dd22f..cfc964e1 100644 --- a/pv/data/analog.h +++ b/pv/data/analog.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_DATA_ANALOG_H #define PULSEVIEW_PV_DATA_ANALOG_H -#include "signaldata.h" +#include "signaldata.hpp" #include #include diff --git a/pv/data/analogsnapshot.cpp b/pv/data/analogsnapshot.cpp index df3cb42d..589b1aa4 100644 --- a/pv/data/analogsnapshot.cpp +++ b/pv/data/analogsnapshot.cpp @@ -27,7 +27,7 @@ #include -#include "analogsnapshot.h" +#include "analogsnapshot.hpp" using std::lock_guard; using std::recursive_mutex; diff --git a/pv/data/analogsnapshot.h b/pv/data/analogsnapshot.hpp similarity index 98% rename from pv/data/analogsnapshot.h rename to pv/data/analogsnapshot.hpp index 9e2e782a..3c6f99c2 100644 --- a/pv/data/analogsnapshot.h +++ b/pv/data/analogsnapshot.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_H #define PULSEVIEW_PV_DATA_ANALOGSNAPSHOT_H -#include "snapshot.h" +#include "snapshot.hpp" #include #include diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp index 9b07efbc..6287edce 100644 --- a/pv/data/decode/annotation.cpp +++ b/pv/data/decode/annotation.cpp @@ -25,7 +25,7 @@ extern "C" { #include #include -#include "annotation.h" +#include "annotation.hpp" namespace pv { namespace data { diff --git a/pv/data/decode/annotation.h b/pv/data/decode/annotation.hpp similarity index 100% rename from pv/data/decode/annotation.h rename to pv/data/decode/annotation.hpp diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp index e2db7742..c5fffa67 100644 --- a/pv/data/decode/decoder.cpp +++ b/pv/data/decode/decoder.cpp @@ -23,9 +23,9 @@ #include #include -#include "decoder.h" +#include "decoder.hpp" -#include +#include using std::set; using std::map; diff --git a/pv/data/decode/decoder.h b/pv/data/decode/decoder.hpp similarity index 100% rename from pv/data/decode/decoder.h rename to pv/data/decode/decoder.hpp diff --git a/pv/data/decode/row.cpp b/pv/data/decode/row.cpp index 8e3a6512..e36051c3 100644 --- a/pv/data/decode/row.cpp +++ b/pv/data/decode/row.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "row.h" +#include "row.hpp" #include diff --git a/pv/data/decode/row.h b/pv/data/decode/row.hpp similarity index 98% rename from pv/data/decode/row.h rename to pv/data/decode/row.hpp index 221d9c9b..3a163fb3 100644 --- a/pv/data/decode/row.h +++ b/pv/data/decode/row.hpp @@ -23,7 +23,7 @@ #include -#include "annotation.h" +#include "annotation.hpp" struct srd_decoder; struct srd_decoder_annotation_row; diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp index b4ccd64d..9402e707 100644 --- a/pv/data/decode/rowdata.cpp +++ b/pv/data/decode/rowdata.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "rowdata.h" +#include "rowdata.hpp" using std::vector; diff --git a/pv/data/decode/rowdata.h b/pv/data/decode/rowdata.hpp similarity index 98% rename from pv/data/decode/rowdata.h rename to pv/data/decode/rowdata.hpp index 265c4e37..568b1bb0 100644 --- a/pv/data/decode/rowdata.h +++ b/pv/data/decode/rowdata.hpp @@ -23,7 +23,7 @@ #include -#include "annotation.h" +#include "annotation.hpp" namespace pv { namespace data { diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 3d734126..5e30faa7 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -24,14 +24,14 @@ #include -#include "decoderstack.h" - -#include -#include -#include -#include -#include -#include +#include "decoderstack.hpp" + +#include +#include +#include +#include +#include +#include using std::lock_guard; using std::mutex; diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.hpp similarity index 97% rename from pv/data/decoderstack.h rename to pv/data/decoderstack.hpp index c50f3859..979a56fa 100644 --- a/pv/data/decoderstack.h +++ b/pv/data/decoderstack.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_DATA_DECODERSTACK_H #define PULSEVIEW_PV_DATA_DECODERSTACK_H -#include "signaldata.h" +#include "signaldata.hpp" #include #include @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include struct srd_decoder; struct srd_decoder_annotation_row; diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp index b7b6cace..8f1d294d 100644 --- a/pv/data/logic.cpp +++ b/pv/data/logic.cpp @@ -20,8 +20,8 @@ #include -#include "logic.h" -#include "logicsnapshot.h" +#include "logic.hpp" +#include "logicsnapshot.hpp" using std::deque; using std::max; diff --git a/pv/data/logic.h b/pv/data/logic.hpp similarity index 98% rename from pv/data/logic.h rename to pv/data/logic.hpp index d8ee5305..51e12cb9 100644 --- a/pv/data/logic.h +++ b/pv/data/logic.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_DATA_LOGIC_H #define PULSEVIEW_PV_DATA_LOGIC_H -#include "signaldata.h" +#include "signaldata.hpp" #include #include diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp index 31093c27..82d90074 100644 --- a/pv/data/logicsnapshot.cpp +++ b/pv/data/logicsnapshot.cpp @@ -25,8 +25,7 @@ #include #include -#include "config.h" -#include "logicsnapshot.h" +#include "logicsnapshot.hpp" #include diff --git a/pv/data/logicsnapshot.h b/pv/data/logicsnapshot.hpp similarity index 99% rename from pv/data/logicsnapshot.h rename to pv/data/logicsnapshot.hpp index db4d97b3..619048d8 100644 --- a/pv/data/logicsnapshot.h +++ b/pv/data/logicsnapshot.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_DATA_LOGICSNAPSHOT_H #define PULSEVIEW_PV_DATA_LOGICSNAPSHOT_H -#include "snapshot.h" +#include "snapshot.hpp" #include #include diff --git a/pv/data/signaldata.cpp b/pv/data/signaldata.cpp index 456edf14..42409b82 100644 --- a/pv/data/signaldata.cpp +++ b/pv/data/signaldata.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "signaldata.h" +#include "signaldata.hpp" namespace pv { namespace data { diff --git a/pv/data/signaldata.h b/pv/data/signaldata.hpp similarity index 100% rename from pv/data/signaldata.h rename to pv/data/signaldata.hpp diff --git a/pv/data/snapshot.cpp b/pv/data/snapshot.cpp index 80b9fb37..58da4dbd 100644 --- a/pv/data/snapshot.cpp +++ b/pv/data/snapshot.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "snapshot.h" +#include "snapshot.hpp" #include #include diff --git a/pv/data/snapshot.h b/pv/data/snapshot.hpp similarity index 100% rename from pv/data/snapshot.h rename to pv/data/snapshot.hpp diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index 2f446c45..7a016d1b 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "devicemanager.h" -#include "sigsession.h" +#include "devicemanager.hpp" +#include "sigsession.hpp" #include #include diff --git a/pv/devicemanager.h b/pv/devicemanager.hpp similarity index 100% rename from pv/devicemanager.h rename to pv/devicemanager.hpp diff --git a/pv/dialogs/about.cpp b/pv/dialogs/about.cpp index 05daff8a..5517beb3 100644 --- a/pv/dialogs/about.cpp +++ b/pv/dialogs/about.cpp @@ -24,7 +24,7 @@ #include -#include "about.h" +#include "about.hpp" #include #include diff --git a/pv/dialogs/about.h b/pv/dialogs/about.hpp similarity index 100% rename from pv/dialogs/about.h rename to pv/dialogs/about.hpp diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp index 5535f46d..2700672a 100644 --- a/pv/dialogs/connect.cpp +++ b/pv/dialogs/connect.cpp @@ -22,9 +22,9 @@ #include -#include "connect.h" +#include "connect.hpp" -#include "pv/devicemanager.h" +#include "pv/devicemanager.hpp" using std::list; using std::map; diff --git a/pv/dialogs/connect.h b/pv/dialogs/connect.hpp similarity index 100% rename from pv/dialogs/connect.h rename to pv/dialogs/connect.hpp diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp index 6c264096..7cc40a75 100644 --- a/pv/dialogs/storeprogress.cpp +++ b/pv/dialogs/storeprogress.cpp @@ -22,7 +22,7 @@ #include -#include "storeprogress.h" +#include "storeprogress.hpp" namespace pv { namespace dialogs { diff --git a/pv/dialogs/storeprogress.h b/pv/dialogs/storeprogress.hpp similarity index 97% rename from pv/dialogs/storeprogress.h rename to pv/dialogs/storeprogress.hpp index 497099e9..ca14dfb2 100644 --- a/pv/dialogs/storeprogress.h +++ b/pv/dialogs/storeprogress.hpp @@ -26,7 +26,7 @@ #include -#include +#include namespace pv { diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index d1418b59..a43b575a 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -40,17 +40,17 @@ #include #include -#include "mainwindow.h" - -#include "devicemanager.h" -#include "dialogs/about.h" -#include "dialogs/connect.h" -#include "dialogs/storeprogress.h" -#include "toolbars/samplingbar.h" -#include "view/logicsignal.h" -#include "view/view.h" +#include "mainwindow.hpp" + +#include "devicemanager.hpp" +#include "dialogs/about.hpp" +#include "dialogs/connect.hpp" +#include "dialogs/storeprogress.hpp" +#include "toolbars/samplingbar.hpp" +#include "view/logicsignal.hpp" +#include "view/view.hpp" #ifdef ENABLE_DECODE -#include "widgets/decodermenu.h" +#include "widgets/decodermenu.hpp" #endif #include diff --git a/pv/mainwindow.h b/pv/mainwindow.hpp similarity index 99% rename from pv/mainwindow.h rename to pv/mainwindow.hpp index 94a6c42e..9a000c2a 100644 --- a/pv/mainwindow.h +++ b/pv/mainwindow.hpp @@ -26,7 +26,7 @@ #include -#include "sigsession.h" +#include "sigsession.hpp" struct srd_decoder; diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index beacfb43..4598f123 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -25,11 +25,11 @@ #include #include -#include "channels.h" +#include "channels.hpp" -#include -#include -#include +#include +#include +#include #include diff --git a/pv/popups/channels.h b/pv/popups/channels.hpp similarity index 98% rename from pv/popups/channels.h rename to pv/popups/channels.hpp index 667db937..e472fdff 100644 --- a/pv/popups/channels.h +++ b/pv/popups/channels.hpp @@ -30,7 +30,7 @@ #include #include -#include +#include class QCheckBox; class QGridLayout; diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp index bdc0ab23..a92b0aea 100644 --- a/pv/popups/deviceoptions.cpp +++ b/pv/popups/deviceoptions.cpp @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "deviceoptions.h" +#include "deviceoptions.hpp" #include #include -#include +#include #include diff --git a/pv/popups/deviceoptions.h b/pv/popups/deviceoptions.hpp similarity index 94% rename from pv/popups/deviceoptions.h rename to pv/popups/deviceoptions.hpp index 5fb60fc7..d43ab607 100644 --- a/pv/popups/deviceoptions.h +++ b/pv/popups/deviceoptions.hpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include namespace sigrok { class Device; diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp index 0bc9854c..062ce667 100644 --- a/pv/prop/binding/binding.cpp +++ b/pv/prop/binding/binding.cpp @@ -22,9 +22,9 @@ #include -#include +#include -#include "binding.h" +#include "binding.hpp" using std::shared_ptr; diff --git a/pv/prop/binding/binding.h b/pv/prop/binding/binding.hpp similarity index 100% rename from pv/prop/binding/binding.h rename to pv/prop/binding/binding.hpp diff --git a/pv/prop/binding/decoderoptions.cpp b/pv/prop/binding/decoderoptions.cpp index a46f0df1..d9b4b88d 100644 --- a/pv/prop/binding/decoderoptions.cpp +++ b/pv/prop/binding/decoderoptions.cpp @@ -20,16 +20,16 @@ #include -#include "decoderoptions.h" +#include "decoderoptions.hpp" #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using boost::none; using std::make_pair; diff --git a/pv/prop/binding/decoderoptions.h b/pv/prop/binding/decoderoptions.hpp similarity index 96% rename from pv/prop/binding/decoderoptions.h rename to pv/prop/binding/decoderoptions.hpp index 7f14d0fd..680bc42f 100644 --- a/pv/prop/binding/decoderoptions.h +++ b/pv/prop/binding/decoderoptions.hpp @@ -21,9 +21,9 @@ #ifndef PULSEVIEW_PV_PROP_BINDING_DECODEROPTIONS_H #define PULSEVIEW_PV_PROP_BINDING_DECODEROPTIONS_H -#include "binding.h" +#include "binding.hpp" -#include +#include struct srd_decoder_option; diff --git a/pv/prop/binding/deviceoptions.cpp b/pv/prop/binding/deviceoptions.cpp index e112bb12..68e3237f 100644 --- a/pv/prop/binding/deviceoptions.cpp +++ b/pv/prop/binding/deviceoptions.cpp @@ -22,12 +22,12 @@ #include -#include "deviceoptions.h" +#include "deviceoptions.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/pv/prop/binding/deviceoptions.h b/pv/prop/binding/deviceoptions.hpp similarity index 97% rename from pv/prop/binding/deviceoptions.h rename to pv/prop/binding/deviceoptions.hpp index 0ca55e0e..d027cccb 100644 --- a/pv/prop/binding/deviceoptions.h +++ b/pv/prop/binding/deviceoptions.hpp @@ -26,9 +26,9 @@ #include #include -#include "binding.h" +#include "binding.hpp" -#include +#include namespace sigrok { class Configurable; diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp index c057d61e..e3e0ebd5 100644 --- a/pv/prop/bool.cpp +++ b/pv/prop/bool.cpp @@ -22,7 +22,7 @@ #include -#include "bool.h" +#include "bool.hpp" namespace pv { namespace prop { diff --git a/pv/prop/bool.h b/pv/prop/bool.hpp similarity index 98% rename from pv/prop/bool.h rename to pv/prop/bool.hpp index d7f8877b..965efc19 100644 --- a/pv/prop/bool.h +++ b/pv/prop/bool.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_PROP_BOOL_H #define PULSEVIEW_PV_PROP_BOOL_H -#include "property.h" +#include "property.hpp" class QCheckBox; diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp index d8a7a292..d0597558 100644 --- a/pv/prop/double.cpp +++ b/pv/prop/double.cpp @@ -22,7 +22,7 @@ #include -#include "double.h" +#include "double.hpp" using boost::optional; using std::pair; diff --git a/pv/prop/double.h b/pv/prop/double.hpp similarity index 98% rename from pv/prop/double.h rename to pv/prop/double.hpp index dc4c6ec9..89b74cca 100644 --- a/pv/prop/double.h +++ b/pv/prop/double.hpp @@ -25,7 +25,7 @@ #include -#include "property.h" +#include "property.hpp" class QDoubleSpinBox; diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp index 473e3d5f..6717101b 100644 --- a/pv/prop/enum.cpp +++ b/pv/prop/enum.cpp @@ -22,7 +22,7 @@ #include -#include "enum.h" +#include "enum.hpp" using std::pair; using std::vector; diff --git a/pv/prop/enum.h b/pv/prop/enum.hpp similarity index 98% rename from pv/prop/enum.h rename to pv/prop/enum.hpp index 45454fde..7b7fcc5d 100644 --- a/pv/prop/enum.h +++ b/pv/prop/enum.hpp @@ -24,7 +24,7 @@ #include #include -#include "property.h" +#include "property.hpp" #include diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp index ef962e5a..0edba420 100644 --- a/pv/prop/int.cpp +++ b/pv/prop/int.cpp @@ -23,7 +23,7 @@ #include -#include "int.h" +#include "int.hpp" using boost::optional; using std::max; diff --git a/pv/prop/int.h b/pv/prop/int.hpp similarity index 98% rename from pv/prop/int.h rename to pv/prop/int.hpp index 5779b37b..a1c529fd 100644 --- a/pv/prop/int.h +++ b/pv/prop/int.hpp @@ -25,7 +25,7 @@ #include -#include "property.h" +#include "property.hpp" class QSpinBox; diff --git a/pv/prop/property.cpp b/pv/prop/property.cpp index 26740ba0..c513d51e 100644 --- a/pv/prop/property.cpp +++ b/pv/prop/property.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "property.h" +#include "property.hpp" namespace pv { namespace prop { diff --git a/pv/prop/property.h b/pv/prop/property.hpp similarity index 100% rename from pv/prop/property.h rename to pv/prop/property.hpp diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp index ebad62ba..b8ecf738 100644 --- a/pv/prop/string.cpp +++ b/pv/prop/string.cpp @@ -23,7 +23,7 @@ #include #include -#include "string.h" +#include "string.hpp" using std::string; diff --git a/pv/prop/string.h b/pv/prop/string.hpp similarity index 98% rename from pv/prop/string.h rename to pv/prop/string.hpp index 793a23cb..db57f7cd 100644 --- a/pv/prop/string.h +++ b/pv/prop/string.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_PROP_STRING_H #define PULSEVIEW_PV_PROP_STRING_H -#include "property.h" +#include "property.hpp" class QLineEdit; diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index a2eba967..f3eb1946 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -22,20 +22,20 @@ #include #endif -#include "sigsession.h" +#include "sigsession.hpp" -#include "devicemanager.h" +#include "devicemanager.hpp" -#include "data/analog.h" -#include "data/analogsnapshot.h" -#include "data/decoderstack.h" -#include "data/logic.h" -#include "data/logicsnapshot.h" -#include "data/decode/decoder.h" +#include "data/analog.hpp" +#include "data/analogsnapshot.hpp" +#include "data/decoderstack.hpp" +#include "data/logic.hpp" +#include "data/logicsnapshot.hpp" +#include "data/decode/decoder.hpp" -#include "view/analogsignal.h" -#include "view/decodetrace.h" -#include "view/logicsignal.h" +#include "view/analogsignal.hpp" +#include "view/decodetrace.hpp" +#include "view/logicsignal.hpp" #include #include diff --git a/pv/sigsession.h b/pv/sigsession.hpp similarity index 100% rename from pv/sigsession.h rename to pv/sigsession.hpp diff --git a/pv/storesession.cpp b/pv/storesession.cpp index dbe04b2c..058b46a9 100644 --- a/pv/storesession.cpp +++ b/pv/storesession.cpp @@ -20,12 +20,12 @@ #include -#include "storesession.h" +#include "storesession.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/pv/storesession.h b/pv/storesession.hpp similarity index 100% rename from pv/storesession.h rename to pv/storesession.hpp diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 13c57d6c..2749e0ee 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -27,12 +27,12 @@ #include #include -#include "samplingbar.h" +#include "samplingbar.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.hpp similarity index 96% rename from pv/toolbars/samplingbar.h rename to pv/toolbars/samplingbar.hpp index 2397e2aa..d027d60e 100644 --- a/pv/toolbars/samplingbar.h +++ b/pv/toolbars/samplingbar.hpp @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace sigrok { class Device; diff --git a/pv/util.cpp b/pv/util.cpp index a54bdcaf..62f0ee1f 100644 --- a/pv/util.cpp +++ b/pv/util.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "util.h" +#include "util.hpp" #include diff --git a/pv/util.h b/pv/util.hpp similarity index 100% rename from pv/util.h rename to pv/util.hpp diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index 3509a040..abbb94c5 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -23,10 +23,10 @@ #include #include -#include "analogsignal.h" -#include "pv/data/analog.h" -#include "pv/data/analogsnapshot.h" -#include "pv/view/view.h" +#include "analogsignal.hpp" +#include "pv/data/analog.hpp" +#include "pv/data/analogsnapshot.hpp" +#include "pv/view/view.hpp" #include diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.hpp similarity index 99% rename from pv/view/analogsignal.h rename to pv/view/analogsignal.hpp index 326e6fbc..91a8e5c2 100644 --- a/pv/view/analogsignal.h +++ b/pv/view/analogsignal.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H #define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H -#include "signal.h" +#include "signal.hpp" #include diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp index 0cc63142..03df0543 100644 --- a/pv/view/cursor.cpp +++ b/pv/view/cursor.cpp @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "cursor.h" +#include "cursor.hpp" -#include "view.h" -#include "pv/util.h" +#include "view.hpp" +#include "pv/util.hpp" #include #include diff --git a/pv/view/cursor.h b/pv/view/cursor.hpp similarity index 98% rename from pv/view/cursor.h rename to pv/view/cursor.hpp index 649230ce..8679a286 100644 --- a/pv/view/cursor.h +++ b/pv/view/cursor.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_VIEW_CURSOR_H #define PULSEVIEW_PV_VIEW_CURSOR_H -#include "timemarker.h" +#include "timemarker.hpp" #include diff --git a/pv/view/cursorheader.cpp b/pv/view/cursorheader.cpp index 3f25e212..3fa0b0c5 100644 --- a/pv/view/cursorheader.cpp +++ b/pv/view/cursorheader.cpp @@ -18,16 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "cursorheader.h" +#include "cursorheader.hpp" -#include "ruler.h" -#include "view.h" +#include "ruler.hpp" +#include "view.hpp" #include #include #include -#include +#include using std::shared_ptr; diff --git a/pv/view/cursorheader.h b/pv/view/cursorheader.hpp similarity index 98% rename from pv/view/cursorheader.h rename to pv/view/cursorheader.hpp index e6552265..90a000f1 100644 --- a/pv/view/cursorheader.h +++ b/pv/view/cursorheader.hpp @@ -23,7 +23,7 @@ #include -#include "marginwidget.h" +#include "marginwidget.hpp" namespace pv { namespace view { diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index 0b5363f1..0fb0d8d1 100644 --- a/pv/view/cursorpair.cpp +++ b/pv/view/cursorpair.cpp @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "cursorpair.h" +#include "cursorpair.hpp" -#include "view.h" -#include "pv/util.h" +#include "view.hpp" +#include "pv/util.hpp" #include #include diff --git a/pv/view/cursorpair.h b/pv/view/cursorpair.hpp similarity index 98% rename from pv/view/cursorpair.h rename to pv/view/cursorpair.hpp index f7eb51ca..dd37b0ed 100644 --- a/pv/view/cursorpair.h +++ b/pv/view/cursorpair.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_VIEW_CURSORPAIR_H #define PULSEVIEW_PV_VIEW_CURSORPAIR_H -#include "cursor.h" +#include "cursor.hpp" #include diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 005d98b8..01bf934c 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -39,19 +39,19 @@ extern "C" { #include #include -#include "decodetrace.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "decodetrace.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using boost::shared_lock; using boost::shared_mutex; diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.hpp similarity index 98% rename from pv/view/decodetrace.h rename to pv/view/decodetrace.hpp index 9704f69a..0e2ce146 100644 --- a/pv/view/decodetrace.h +++ b/pv/view/decodetrace.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_VIEW_DECODETRACE_H #define PULSEVIEW_PV_VIEW_DECODETRACE_H -#include "trace.h" +#include "trace.hpp" #include #include @@ -29,8 +29,8 @@ #include -#include -#include +#include +#include struct srd_channel; struct srd_decoder; diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 1dee05f4..08b3fdd2 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -18,12 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "header.h" -#include "view.h" +#include "header.hpp" +#include "view.hpp" -#include "signal.h" -#include "tracegroup.h" -#include "../sigsession.h" +#include "signal.hpp" +#include "tracegroup.hpp" #include #include @@ -36,7 +35,8 @@ #include #include -#include +#include +#include using boost::make_filter_iterator; using std::dynamic_pointer_cast; diff --git a/pv/view/header.h b/pv/view/header.hpp similarity index 98% rename from pv/view/header.h rename to pv/view/header.hpp index 49a95bb7..662e19f2 100644 --- a/pv/view/header.h +++ b/pv/view/header.hpp @@ -25,7 +25,7 @@ #include #include -#include "marginwidget.h" +#include "marginwidget.hpp" namespace pv { namespace view { diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 1b873e24..5beb39df 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -28,14 +28,14 @@ #include #include -#include "logicsignal.h" -#include "view.h" - -#include -#include -#include -#include -#include +#include "logicsignal.hpp" +#include "view.hpp" + +#include +#include +#include +#include +#include #include diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.hpp similarity index 99% rename from pv/view/logicsignal.h rename to pv/view/logicsignal.hpp index 79bbe396..a4f64e6b 100644 --- a/pv/view/logicsignal.h +++ b/pv/view/logicsignal.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H #define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H -#include "signal.h" +#include "signal.hpp" #include diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp index 179e82b9..f3abe361 100644 --- a/pv/view/marginwidget.cpp +++ b/pv/view/marginwidget.cpp @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "view.h" +#include "view.hpp" -#include "marginwidget.h" +#include "marginwidget.hpp" namespace pv { namespace view { diff --git a/pv/view/marginwidget.h b/pv/view/marginwidget.hpp similarity index 100% rename from pv/view/marginwidget.h rename to pv/view/marginwidget.hpp diff --git a/pv/view/rowitem.cpp b/pv/view/rowitem.cpp index 29346023..6e87de10 100644 --- a/pv/view/rowitem.cpp +++ b/pv/view/rowitem.cpp @@ -20,9 +20,9 @@ #include -#include "view.h" +#include "view.hpp" -#include "rowitem.h" +#include "rowitem.hpp" namespace pv { namespace view { diff --git a/pv/view/rowitem.h b/pv/view/rowitem.hpp similarity index 99% rename from pv/view/rowitem.h rename to pv/view/rowitem.hpp index db6e580d..d6233e8c 100644 --- a/pv/view/rowitem.h +++ b/pv/view/rowitem.hpp @@ -25,7 +25,7 @@ #include -#include "selectableitem.h" +#include "selectableitem.hpp" namespace pv { namespace view { diff --git a/pv/view/rowitemiterator.h b/pv/view/rowitemiterator.hpp similarity index 99% rename from pv/view/rowitemiterator.h rename to pv/view/rowitemiterator.hpp index 178677a2..110dc574 100644 --- a/pv/view/rowitemiterator.h +++ b/pv/view/rowitemiterator.hpp @@ -31,7 +31,7 @@ #include -#include +#include namespace pv { namespace view { diff --git a/pv/view/rowitemowner.cpp b/pv/view/rowitemowner.cpp index 6f7cbb26..625620ed 100644 --- a/pv/view/rowitemowner.cpp +++ b/pv/view/rowitemowner.cpp @@ -20,8 +20,8 @@ #include -#include "rowitem.h" -#include "rowitemowner.h" +#include "rowitem.hpp" +#include "rowitemowner.hpp" using std::max; using std::make_pair; diff --git a/pv/view/rowitemowner.h b/pv/view/rowitemowner.hpp similarity index 99% rename from pv/view/rowitemowner.h rename to pv/view/rowitemowner.hpp index 3c568da4..8c63aa56 100644 --- a/pv/view/rowitemowner.h +++ b/pv/view/rowitemowner.hpp @@ -24,7 +24,7 @@ #include #include -#include "rowitemiterator.h" +#include "rowitemiterator.hpp" namespace pv { diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index d3e42df6..56651169 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "ruler.h" +#include "ruler.hpp" -#include "view.h" -#include "pv/util.h" +#include "view.hpp" +#include "pv/util.hpp" #include diff --git a/pv/view/ruler.h b/pv/view/ruler.hpp similarity index 98% rename from pv/view/ruler.h rename to pv/view/ruler.hpp index 00fac244..438b862c 100644 --- a/pv/view/ruler.h +++ b/pv/view/ruler.hpp @@ -23,7 +23,7 @@ #include -#include "marginwidget.h" +#include "marginwidget.hpp" namespace pv { namespace view { diff --git a/pv/view/selectableitem.cpp b/pv/view/selectableitem.cpp index 5987b3ec..b699005f 100644 --- a/pv/view/selectableitem.cpp +++ b/pv/view/selectableitem.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "selectableitem.h" +#include "selectableitem.hpp" #include diff --git a/pv/view/selectableitem.h b/pv/view/selectableitem.hpp similarity index 100% rename from pv/view/selectableitem.h rename to pv/view/selectableitem.hpp diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp index 916801c9..35e1cdbf 100644 --- a/pv/view/signal.cpp +++ b/pv/view/signal.cpp @@ -31,8 +31,8 @@ #include -#include "signal.h" -#include "view.h" +#include "signal.hpp" +#include "view.hpp" using std::shared_ptr; diff --git a/pv/view/signal.h b/pv/view/signal.hpp similarity index 98% rename from pv/view/signal.h rename to pv/view/signal.hpp index b3b591b2..dd3af0b3 100644 --- a/pv/view/signal.h +++ b/pv/view/signal.hpp @@ -28,7 +28,7 @@ #include -#include "trace.h" +#include "trace.hpp" namespace sigrok { class Channel; diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp index 105bbc14..5196613b 100644 --- a/pv/view/timemarker.cpp +++ b/pv/view/timemarker.cpp @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "timemarker.h" +#include "timemarker.hpp" -#include "view.h" +#include "view.hpp" #include #include -#include +#include namespace pv { namespace view { diff --git a/pv/view/timemarker.h b/pv/view/timemarker.hpp similarity index 98% rename from pv/view/timemarker.h rename to pv/view/timemarker.hpp index d57b4dd1..0103fb04 100644 --- a/pv/view/timemarker.h +++ b/pv/view/timemarker.hpp @@ -27,7 +27,7 @@ #include #include -#include "selectableitem.h" +#include "selectableitem.hpp" class QPainter; class QRect; diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index ebd3dc36..1734921a 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -28,12 +28,12 @@ #include #include -#include "trace.h" -#include "tracepalette.h" -#include "view.h" +#include "trace.hpp" +#include "tracepalette.hpp" +#include "view.hpp" -#include -#include +#include +#include namespace pv { namespace view { diff --git a/pv/view/trace.h b/pv/view/trace.hpp similarity index 99% rename from pv/view/trace.h rename to pv/view/trace.hpp index f99e01aa..88df33ea 100644 --- a/pv/view/trace.h +++ b/pv/view/trace.hpp @@ -29,7 +29,7 @@ #include -#include "rowitem.h" +#include "rowitem.hpp" class QFormLayout; diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp index 16b9d0cc..665b4ad1 100644 --- a/pv/view/tracegroup.cpp +++ b/pv/view/tracegroup.cpp @@ -26,7 +26,7 @@ #include #include -#include "tracegroup.h" +#include "tracegroup.hpp" using std::pair; using std::shared_ptr; diff --git a/pv/view/tracegroup.h b/pv/view/tracegroup.hpp similarity index 98% rename from pv/view/tracegroup.h rename to pv/view/tracegroup.hpp index d2464764..960a15d9 100644 --- a/pv/view/tracegroup.h +++ b/pv/view/tracegroup.hpp @@ -21,8 +21,8 @@ #ifndef PULSEVIEW_PV_VIEW_TRACEGROUP_H #define PULSEVIEW_PV_VIEW_TRACEGROUP_H -#include "rowitem.h" -#include "rowitemowner.h" +#include "rowitem.hpp" +#include "rowitemowner.hpp" namespace pv { namespace view { diff --git a/pv/view/tracepalette.cpp b/pv/view/tracepalette.cpp index cefb952d..3dcb63d1 100644 --- a/pv/view/tracepalette.cpp +++ b/pv/view/tracepalette.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "tracepalette.h" +#include "tracepalette.hpp" namespace pv { namespace view { diff --git a/pv/view/tracepalette.h b/pv/view/tracepalette.hpp similarity index 100% rename from pv/view/tracepalette.h rename to pv/view/tracepalette.hpp diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 5af8d28c..d621e714 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -34,19 +34,19 @@ #include -#include "cursorheader.h" -#include "decodetrace.h" -#include "header.h" -#include "logicsignal.h" -#include "ruler.h" -#include "signal.h" -#include "tracegroup.h" -#include "view.h" -#include "viewport.h" - -#include "pv/sigsession.h" -#include "pv/data/logic.h" -#include "pv/data/logicsnapshot.h" +#include "cursorheader.hpp" +#include "decodetrace.hpp" +#include "header.hpp" +#include "logicsignal.hpp" +#include "ruler.hpp" +#include "signal.hpp" +#include "tracegroup.hpp" +#include "view.hpp" +#include "viewport.hpp" + +#include "pv/sigsession.hpp" +#include "pv/data/logic.hpp" +#include "pv/data/logicsnapshot.hpp" using boost::shared_lock; using boost::shared_mutex; diff --git a/pv/view/view.h b/pv/view/view.hpp similarity index 98% rename from pv/view/view.h rename to pv/view/view.hpp index dec317cc..c6e585b7 100644 --- a/pv/view/view.h +++ b/pv/view/view.hpp @@ -32,10 +32,10 @@ #include #include -#include +#include -#include "cursorpair.h" -#include "rowitemowner.h" +#include "cursorpair.hpp" +#include "rowitemowner.hpp" namespace pv { diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 220a10aa..fbbb52bf 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -22,11 +22,11 @@ #include #include -#include "view.h" -#include "viewport.h" +#include "signal.hpp" +#include "view.hpp" +#include "viewport.hpp" -#include "signal.h" -#include "../sigsession.h" +#include #include diff --git a/pv/view/viewport.h b/pv/view/viewport.hpp similarity index 100% rename from pv/view/viewport.h rename to pv/view/viewport.hpp diff --git a/pv/widgets/colourbutton.cpp b/pv/widgets/colourbutton.cpp index cf930f65..1f503462 100644 --- a/pv/widgets/colourbutton.cpp +++ b/pv/widgets/colourbutton.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "colourbutton.h" +#include "colourbutton.hpp" #include diff --git a/pv/widgets/colourbutton.h b/pv/widgets/colourbutton.hpp similarity index 98% rename from pv/widgets/colourbutton.h rename to pv/widgets/colourbutton.hpp index a3551486..d7f019a6 100644 --- a/pv/widgets/colourbutton.h +++ b/pv/widgets/colourbutton.hpp @@ -23,7 +23,7 @@ #include -#include "colourpopup.h" +#include "colourpopup.hpp" namespace pv { namespace widgets { diff --git a/pv/widgets/colourpopup.cpp b/pv/widgets/colourpopup.cpp index 285e9a05..bd87c888 100644 --- a/pv/widgets/colourpopup.cpp +++ b/pv/widgets/colourpopup.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "colourpopup.h" +#include "colourpopup.hpp" namespace pv { namespace widgets { diff --git a/pv/widgets/colourpopup.h b/pv/widgets/colourpopup.hpp similarity index 96% rename from pv/widgets/colourpopup.h rename to pv/widgets/colourpopup.hpp index d0441d3c..a1ee251c 100644 --- a/pv/widgets/colourpopup.h +++ b/pv/widgets/colourpopup.hpp @@ -21,8 +21,8 @@ #ifndef PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H #define PULSEVIEW_PV_WIDGETS_COLOURPOPUP_H -#include "popup.h" -#include "wellarray.h" +#include "popup.hpp" +#include "wellarray.hpp" #include diff --git a/pv/widgets/decodergroupbox.cpp b/pv/widgets/decodergroupbox.cpp index e8723e43..7127ba13 100644 --- a/pv/widgets/decodergroupbox.cpp +++ b/pv/widgets/decodergroupbox.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "decodergroupbox.h" +#include "decodergroupbox.hpp" #include #include diff --git a/pv/widgets/decodergroupbox.h b/pv/widgets/decodergroupbox.hpp similarity index 100% rename from pv/widgets/decodergroupbox.h rename to pv/widgets/decodergroupbox.hpp diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp index 2a1e8395..f3c4e06a 100644 --- a/pv/widgets/decodermenu.cpp +++ b/pv/widgets/decodermenu.cpp @@ -22,7 +22,7 @@ #include -#include "decodermenu.h" +#include "decodermenu.hpp" namespace pv { namespace widgets { diff --git a/pv/widgets/decodermenu.h b/pv/widgets/decodermenu.hpp similarity index 100% rename from pv/widgets/decodermenu.h rename to pv/widgets/decodermenu.hpp diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp index 47280d1f..7143c24a 100644 --- a/pv/widgets/popup.cpp +++ b/pv/widgets/popup.cpp @@ -27,7 +27,7 @@ #include #include -#include "popup.h" +#include "popup.hpp" using std::max; using std::min; diff --git a/pv/widgets/popup.h b/pv/widgets/popup.hpp similarity index 100% rename from pv/widgets/popup.h rename to pv/widgets/popup.hpp diff --git a/pv/widgets/popuptoolbutton.cpp b/pv/widgets/popuptoolbutton.cpp index a5886aaf..75aa76a5 100644 --- a/pv/widgets/popuptoolbutton.cpp +++ b/pv/widgets/popuptoolbutton.cpp @@ -20,7 +20,7 @@ #include -#include "popuptoolbutton.h" +#include "popuptoolbutton.hpp" namespace pv { namespace widgets { diff --git a/pv/widgets/popuptoolbutton.h b/pv/widgets/popuptoolbutton.hpp similarity index 98% rename from pv/widgets/popuptoolbutton.h rename to pv/widgets/popuptoolbutton.hpp index 3a3fc63b..6f6111d5 100644 --- a/pv/widgets/popuptoolbutton.h +++ b/pv/widgets/popuptoolbutton.hpp @@ -21,7 +21,7 @@ #ifndef PULSEVIEW_PV_WIDGETS_POPUPTOOLBUTTON_H #define PULSEVIEW_PV_WIDGETS_POPUPTOOLBUTTON_H -#include "popup.h" +#include "popup.hpp" #include diff --git a/pv/widgets/sweeptimingwidget.cpp b/pv/widgets/sweeptimingwidget.cpp index 1c1581bb..b2c0e637 100644 --- a/pv/widgets/sweeptimingwidget.cpp +++ b/pv/widgets/sweeptimingwidget.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "sweeptimingwidget.h" +#include "sweeptimingwidget.hpp" #include diff --git a/pv/widgets/sweeptimingwidget.h b/pv/widgets/sweeptimingwidget.hpp similarity index 100% rename from pv/widgets/sweeptimingwidget.h rename to pv/widgets/sweeptimingwidget.hpp diff --git a/pv/widgets/wellarray.cpp b/pv/widgets/wellarray.cpp index fb674431..26c257ac 100644 --- a/pv/widgets/wellarray.cpp +++ b/pv/widgets/wellarray.cpp @@ -44,7 +44,7 @@ #include #include -#include "wellarray.h" +#include "wellarray.hpp" void QWellArray::paintEvent(QPaintEvent *e) { diff --git a/pv/widgets/wellarray.h b/pv/widgets/wellarray.hpp similarity index 100% rename from pv/widgets/wellarray.h rename to pv/widgets/wellarray.hpp diff --git a/signalhandler.cpp b/signalhandler.cpp index 475f49b0..66acc1fd 100644 --- a/signalhandler.cpp +++ b/signalhandler.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "signalhandler.h" +#include "signalhandler.hpp" #include #include diff --git a/signalhandler.h b/signalhandler.hpp similarity index 100% rename from signalhandler.h rename to signalhandler.hpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4bac48bb..7c454c02 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -87,29 +87,29 @@ set(pulseview_TEST_SOURCES # This list includes only QObject derived class headers. set(pulseview_TEST_HEADERS - ${PROJECT_SOURCE_DIR}/pv/sigsession.h - ${PROJECT_SOURCE_DIR}/pv/prop/double.h - ${PROJECT_SOURCE_DIR}/pv/prop/enum.h - ${PROJECT_SOURCE_DIR}/pv/prop/int.h - ${PROJECT_SOURCE_DIR}/pv/prop/property.h - ${PROJECT_SOURCE_DIR}/pv/prop/string.h - ${PROJECT_SOURCE_DIR}/pv/prop/binding/deviceoptions.h - ${PROJECT_SOURCE_DIR}/pv/view/cursor.h - ${PROJECT_SOURCE_DIR}/pv/view/cursorheader.h - ${PROJECT_SOURCE_DIR}/pv/view/header.h - ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h - ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h - ${PROJECT_SOURCE_DIR}/pv/view/ruler.h - ${PROJECT_SOURCE_DIR}/pv/view/selectableitem.h - ${PROJECT_SOURCE_DIR}/pv/view/signal.h - ${PROJECT_SOURCE_DIR}/pv/view/timemarker.h - ${PROJECT_SOURCE_DIR}/pv/view/trace.h - ${PROJECT_SOURCE_DIR}/pv/view/view.h - ${PROJECT_SOURCE_DIR}/pv/view/viewport.h - ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.h - ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.h - ${PROJECT_SOURCE_DIR}/pv/widgets/popup.h - ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h + ${PROJECT_SOURCE_DIR}/pv/sigsession.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/double.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/enum.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/int.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/property.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/string.hpp + ${PROJECT_SOURCE_DIR}/pv/prop/binding/deviceoptions.hpp + ${PROJECT_SOURCE_DIR}/pv/view/cursor.hpp + ${PROJECT_SOURCE_DIR}/pv/view/cursorheader.hpp + ${PROJECT_SOURCE_DIR}/pv/view/header.hpp + ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.hpp + ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.hpp + ${PROJECT_SOURCE_DIR}/pv/view/ruler.hpp + ${PROJECT_SOURCE_DIR}/pv/view/selectableitem.hpp + ${PROJECT_SOURCE_DIR}/pv/view/signal.hpp + ${PROJECT_SOURCE_DIR}/pv/view/timemarker.hpp + ${PROJECT_SOURCE_DIR}/pv/view/trace.hpp + ${PROJECT_SOURCE_DIR}/pv/view/view.hpp + ${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.hpp ) if(ENABLE_DECODE) @@ -127,10 +127,10 @@ if(ENABLE_DECODE) ) list(APPEND pulseview_TEST_HEADERS - ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.h - ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.h - ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.h - ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.h + ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.hpp + ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp + ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp ) endif() diff --git a/test/data/analogsnapshot.cpp b/test/data/analogsnapshot.cpp index 159050aa..3dd04ed6 100644 --- a/test/data/analogsnapshot.cpp +++ b/test/data/analogsnapshot.cpp @@ -24,7 +24,7 @@ #include -#include "../../pv/data/analogsnapshot.h" +#include using pv::data::AnalogSnapshot; diff --git a/test/data/logicsnapshot.cpp b/test/data/logicsnapshot.cpp index 1b5eb24a..4ad23aa4 100644 --- a/test/data/logicsnapshot.cpp +++ b/test/data/logicsnapshot.cpp @@ -24,7 +24,7 @@ #include -#include "../../pv/data/logicsnapshot.h" +#include using pv::data::LogicSnapshot; using std::vector; -- 2.30.2