From f65cd27bdbf70644052dd43dac4bbe9403f4dfee Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Wed, 3 Dec 2014 22:23:36 +0000 Subject: [PATCH] Session: Renamed files to match class name --- CMakeLists.txt | 4 ++-- pv/data/decoderstack.cpp | 2 +- pv/devicemanager.cpp | 2 +- pv/mainwindow.hpp | 2 +- pv/popups/channels.cpp | 2 +- pv/{sigsession.cpp => session.cpp} | 2 +- pv/{sigsession.hpp => session.hpp} | 0 pv/storesession.cpp | 2 +- pv/toolbars/samplingbar.hpp | 2 +- pv/view/decodetrace.cpp | 2 +- pv/view/header.cpp | 2 +- pv/view/logicsignal.cpp | 2 +- pv/view/rowitemiterator.hpp | 2 +- pv/view/view.cpp | 2 +- pv/view/viewport.cpp | 2 +- test/CMakeLists.txt | 4 ++-- test/data/decoderstack.cpp | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) rename pv/{sigsession.cpp => session.cpp} (99%) rename pv/{sigsession.hpp => session.hpp} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1e71061..93021a64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,7 +149,7 @@ set(pulseview_SOURCES pv/application.cpp pv/devicemanager.cpp pv/mainwindow.cpp - pv/sigsession.cpp + pv/session.cpp pv/storesession.cpp pv/util.cpp pv/data/analog.cpp @@ -201,7 +201,7 @@ set(pulseview_SOURCES # This list includes only QObject derived class headers. set(pulseview_HEADERS pv/mainwindow.hpp - pv/sigsession.hpp + pv/session.hpp pv/storesession.hpp pv/dialogs/about.hpp pv/dialogs/connect.hpp diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 1c470160..c179b24a 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include using std::lock_guard; diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index 7a016d1b..9976d3e6 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -19,7 +19,7 @@ */ #include "devicemanager.hpp" -#include "sigsession.hpp" +#include "session.hpp" #include #include diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp index 8a67c615..35cad3ab 100644 --- a/pv/mainwindow.hpp +++ b/pv/mainwindow.hpp @@ -26,7 +26,7 @@ #include -#include "sigsession.hpp" +#include "session.hpp" struct srd_decoder; diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index f8061d9a..f30ce627 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -28,7 +28,7 @@ #include "channels.hpp" #include -#include +#include #include #include diff --git a/pv/sigsession.cpp b/pv/session.cpp similarity index 99% rename from pv/sigsession.cpp rename to pv/session.cpp index 84c75896..5e3b492c 100644 --- a/pv/sigsession.cpp +++ b/pv/session.cpp @@ -22,7 +22,7 @@ #include #endif -#include "sigsession.hpp" +#include "session.hpp" #include "devicemanager.hpp" diff --git a/pv/sigsession.hpp b/pv/session.hpp similarity index 100% rename from pv/sigsession.hpp rename to pv/session.hpp diff --git a/pv/storesession.cpp b/pv/storesession.cpp index 221804c4..2e90871c 100644 --- a/pv/storesession.cpp +++ b/pv/storesession.cpp @@ -22,7 +22,7 @@ #include "storesession.hpp" -#include +#include #include #include #include diff --git a/pv/toolbars/samplingbar.hpp b/pv/toolbars/samplingbar.hpp index 25ce23ae..436304bc 100644 --- a/pv/toolbars/samplingbar.hpp +++ b/pv/toolbars/samplingbar.hpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 79058956..0fbd16fd 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -41,7 +41,7 @@ extern "C" { #include "decodetrace.hpp" -#include +#include #include #include #include diff --git a/pv/view/header.cpp b/pv/view/header.cpp index 08b3fdd2..2269849c 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include using boost::make_filter_iterator; diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 22b39bbb..fc81a4a9 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -31,7 +31,7 @@ #include "logicsignal.hpp" #include "view.hpp" -#include +#include #include #include #include diff --git a/pv/view/rowitemiterator.hpp b/pv/view/rowitemiterator.hpp index 110dc574..577b4713 100644 --- a/pv/view/rowitemiterator.hpp +++ b/pv/view/rowitemiterator.hpp @@ -31,7 +31,7 @@ #include -#include +#include namespace pv { namespace view { diff --git a/pv/view/view.cpp b/pv/view/view.cpp index c9606353..a5114027 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -44,7 +44,7 @@ #include "view.hpp" #include "viewport.hpp" -#include "pv/sigsession.hpp" +#include "pv/session.hpp" #include "pv/data/logic.hpp" #include "pv/data/logicsnapshot.hpp" diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index fbbb52bf..a94ada93 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -26,7 +26,7 @@ #include "view.hpp" #include "viewport.hpp" -#include +#include #include diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c4d4e718..10f26ddc 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -20,7 +20,7 @@ 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/data/analog.cpp @@ -69,7 +69,7 @@ set(pulseview_TEST_SOURCES # 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/popups/channels.hpp ${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp diff --git a/test/data/decoderstack.cpp b/test/data/decoderstack.cpp index ceb5147f..c169e1ff 100644 --- a/test/data/decoderstack.cpp +++ b/test/data/decoderstack.cpp @@ -25,7 +25,7 @@ #include "../../pv/data/decoderstack.hpp" #include "../../pv/devicemanager.hpp" -#include "../../pv/sigsession.hpp" +#include "../../pv/session.hpp" #include "../../pv/view/decodetrace.hpp" using pv::data::DecoderStack; -- 2.30.2