projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced using namespace with using class directives
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index b1d0037adf949516d0ec5fcdef64c96eebe615e0..e240ebad751307e15cfcc926e9f2481f2a092f22 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-33,8
+33,12
@@
#include "pv/data/logicsnapshot.h"
#include "pv/view/view.h"
#include "pv/data/logicsnapshot.h"
#include "pv/view/view.h"
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::deque;
+using std::max;
+using std::min;
+using std::pair;
+using std::vector;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-76,7
+80,12
@@
LogicSignal::~LogicSignal()
{
}
{
}
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+ return _data;
+}
+
+boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
return _data;
}
{
return _data;
}
@@
-121,7
+130,7
@@
void LogicSignal::paint_mid(QPainter &p, int left, int right)
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
- double samplerate = _data->
get_
samplerate();
+ double samplerate = _data->samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)