projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9a0cd29
)
Renamed SignalData::clear_snapshots to clear
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 2 Dec 2013 20:53:18 +0000
(20:53 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 2 Dec 2013 20:53:18 +0000
(20:53 +0000)
pv/data/analog.cpp
patch
|
blob
|
history
pv/data/analog.h
patch
|
blob
|
history
pv/data/decoderstack.cpp
patch
|
blob
|
history
pv/data/decoderstack.h
patch
|
blob
|
history
pv/data/logic.cpp
patch
|
blob
|
history
pv/data/logic.h
patch
|
blob
|
history
pv/data/signaldata.cpp
patch
|
blob
|
history
pv/data/signaldata.h
patch
|
blob
|
history
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index fadd5c696331ce95a0c79ee057b1d81b40d6434c..6e2f2db8413a2b9917f246aa59ad539dda574f29 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-42,7
+42,7
@@
deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
return _snapshots;
}
return _snapshots;
}
-void Analog::clear
_snapshots
()
+void Analog::clear()
{
_snapshots.clear();
}
{
_snapshots.clear();
}
diff --git
a/pv/data/analog.h
b/pv/data/analog.h
index 3a755159a59a8d66382770d6b5113abfee4f6ae8..47514ad9246d50c1b3f5077db9ca22bc5bc53f23 100644
(file)
--- a/
pv/data/analog.h
+++ b/
pv/data/analog.h
@@
-42,7
+42,7
@@
public:
std::deque< boost::shared_ptr<AnalogSnapshot> >&
get_snapshots();
std::deque< boost::shared_ptr<AnalogSnapshot> >&
get_snapshots();
- void clear
_snapshots
();
+ void clear();
private:
std::deque< boost::shared_ptr<AnalogSnapshot> > _snapshots;
private:
std::deque< boost::shared_ptr<AnalogSnapshot> > _snapshots;
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 7bd5e6e6c2431d4e182fbfe051aa2dc08357a577..760d336e14c4dcb65628b2ebb9a8bff31849754e 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-141,7
+141,7
@@
void DecoderStack::begin_decode()
data);
}
data);
}
-void DecoderStack::clear
_snapshots
()
+void DecoderStack::clear()
{
}
{
}
diff --git
a/pv/data/decoderstack.h
b/pv/data/decoderstack.h
index 4de7ae4c24ab85cdfd9e93e52c465f8d3ed6d105..029ca25c21c91350c7709074aacd6c7a758ff88d 100644
(file)
--- a/
pv/data/decoderstack.h
+++ b/
pv/data/decoderstack.h
@@
-83,7
+83,7
@@
public:
QString error_message();
QString error_message();
- void clear
_snapshots
();
+ void clear();
void begin_decode();
void begin_decode();
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index c62a2f2e3ad693833b1a55dbac3977d72c62deb5..4317d44d5922b71a76aa598aa4af2b2530e8fc1d 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-50,7
+50,7
@@
deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
return _snapshots;
}
return _snapshots;
}
-void Logic::clear
_snapshots
()
+void Logic::clear()
{
_snapshots.clear();
}
{
_snapshots.clear();
}
diff --git
a/pv/data/logic.h
b/pv/data/logic.h
index 4fe4c42e6b4a30280f8256503ad27924e6abd7e8..739b52e86327caf42f788c46972cf28b680d0926 100644
(file)
--- a/
pv/data/logic.h
+++ b/
pv/data/logic.h
@@
-44,7
+44,7
@@
public:
std::deque< boost::shared_ptr<LogicSnapshot> >&
get_snapshots();
std::deque< boost::shared_ptr<LogicSnapshot> >&
get_snapshots();
- void clear
_snapshots
();
+ void clear();
private:
const unsigned int _num_probes;
private:
const unsigned int _num_probes;
diff --git
a/pv/data/signaldata.cpp
b/pv/data/signaldata.cpp
index 78e5e91d1544b14f4f06a7da7dc5c85522efb3c2..f7bfe1f00ae548061a54c88e5ab8b8a1e68724f2 100644
(file)
--- a/
pv/data/signaldata.cpp
+++ b/
pv/data/signaldata.cpp
@@
-37,7
+37,7
@@
double SignalData::get_samplerate() const
void SignalData::set_samplerate(double samplerate)
{
_samplerate = samplerate;
void SignalData::set_samplerate(double samplerate)
{
_samplerate = samplerate;
- clear
_snapshots
();
+ clear();
}
double SignalData::get_start_time() const
}
double SignalData::get_start_time() const
diff --git
a/pv/data/signaldata.h
b/pv/data/signaldata.h
index c5ed6bd3fa97967bd675cc0928ae6e53e3bb8219..eb9d14c67b421124fd7319cdc38dab14d32d1d4c 100644
(file)
--- a/
pv/data/signaldata.h
+++ b/
pv/data/signaldata.h
@@
-37,7
+37,7
@@
public:
double get_start_time() const;
double get_start_time() const;
- virtual void clear
_snapshots
() = 0;
+ virtual void clear() = 0;
protected:
double _start_time;
protected:
double _start_time;