Renamed pv::binding::DeviceOptions and DecoderOptions to Device and Decoder

[pulseview.git] / test / CMakeLists.txt

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c4d4e718482e879bd87b3a8904263765e3c60620..98b02999695526b9bb59a47922bcd570aa77224a 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,57 +20,61 @@
 
 set(pulseview_TEST_SOURCES
        ${PROJECT_SOURCE_DIR}/pv/devicemanager.cpp
-       ${PROJECT_SOURCE_DIR}/pv/sigsession.cpp
+       ${PROJECT_SOURCE_DIR}/pv/session.cpp
        ${PROJECT_SOURCE_DIR}/pv/storesession.cpp
        ${PROJECT_SOURCE_DIR}/pv/util.cpp
+       ${PROJECT_SOURCE_DIR}/pv/binding/binding.cpp
+       ${PROJECT_SOURCE_DIR}/pv/binding/device.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
-       ${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp
+       ${PROJECT_SOURCE_DIR}/pv/data/analogsegment.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/logic.cpp
-       ${PROJECT_SOURCE_DIR}/pv/data/logicsnapshot.cpp
+       ${PROJECT_SOURCE_DIR}/pv/data/logicsegment.cpp
+       ${PROJECT_SOURCE_DIR}/pv/data/segment.cpp
        ${PROJECT_SOURCE_DIR}/pv/data/signaldata.cpp
-       ${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/bool.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/int.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/property.cpp
        ${PROJECT_SOURCE_DIR}/pv/prop/string.cpp
-       ${PROJECT_SOURCE_DIR}/pv/prop/binding/binding.cpp
-       ${PROJECT_SOURCE_DIR}/pv/prop/binding/deviceoptions.cpp
        ${PROJECT_SOURCE_DIR}/pv/popups/channels.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp
-       ${PROJECT_SOURCE_DIR}/pv/view/cursorheader.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
+       ${PROJECT_SOURCE_DIR}/pv/view/flag.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/header.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/rowitem.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/rowitemowner.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/ruler.cpp
-       ${PROJECT_SOURCE_DIR}/pv/view/selectableitem.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/signal.cpp
+       ${PROJECT_SOURCE_DIR}/pv/view/timeitem.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/timemarker.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/trace.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/tracegroup.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/tracepalette.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/view.cpp
+       ${PROJECT_SOURCE_DIR}/pv/view/viewitem.cpp
+       ${PROJECT_SOURCE_DIR}/pv/view/viewitempaintparams.cpp
        ${PROJECT_SOURCE_DIR}/pv/view/viewport.cpp
+       ${PROJECT_SOURCE_DIR}/pv/view/viewwidget.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/popuptoolbutton.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/sweeptimingwidget.cpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp
-       data/analogsnapshot.cpp
-       data/logicsnapshot.cpp
+       data/analogsegment.cpp
+       data/logicsegment.cpp
        test.cpp
 )
 
 # This list includes only QObject derived class headers.
 set(pulseview_TEST_HEADERS
-       ${PROJECT_SOURCE_DIR}/pv/sigsession.hpp
+       ${PROJECT_SOURCE_DIR}/pv/session.hpp
        ${PROJECT_SOURCE_DIR}/pv/storesession.hpp
+       ${PROJECT_SOURCE_DIR}/pv/binding/device.hpp
        ${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
        ${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
        ${PROJECT_SOURCE_DIR}/pv/prop/bool.hpp
@@ -79,21 +83,22 @@ set(pulseview_TEST_HEADERS
        ${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/flag.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/rowitem.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/timeitem.hpp
        ${PROJECT_SOURCE_DIR}/pv/view/timemarker.hpp
        ${PROJECT_SOURCE_DIR}/pv/view/trace.hpp
        ${PROJECT_SOURCE_DIR}/pv/view/tracegroup.hpp
        ${PROJECT_SOURCE_DIR}/pv/view/view.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/viewitem.hpp
        ${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp
+       ${PROJECT_SOURCE_DIR}/pv/view/viewwidget.hpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp
        ${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp
@@ -104,12 +109,12 @@ set(pulseview_TEST_HEADERS
 
 if(ENABLE_DECODE)
        list(APPEND pulseview_TEST_SOURCES
+               ${PROJECT_SOURCE_DIR}/pv/binding/decoder.cpp
                ${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
                ${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp
                ${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
                ${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp
                ${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp
-               ${PROJECT_SOURCE_DIR}/pv/prop/binding/decoderoptions.cpp
                ${PROJECT_SOURCE_DIR}/pv/view/decodetrace.cpp
                ${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp
                ${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp