projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a55c544
)
Made TimeMarker::_view a non-const reference
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 18 May 2013 17:33:05 +0000
(18:33 +0100)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 19 May 2013 08:46:00 +0000
(09:46 +0100)
pv/view/cursor.cpp
patch
|
blob
|
history
pv/view/cursor.h
patch
|
blob
|
history
pv/view/cursorpair.cpp
patch
|
blob
|
history
pv/view/cursorpair.h
patch
|
blob
|
history
pv/view/timemarker.cpp
patch
|
blob
|
history
pv/view/timemarker.h
patch
|
blob
|
history
diff --git
a/pv/view/cursor.cpp
b/pv/view/cursor.cpp
index 6eb575e3175cc5128c6af17fbef0279a416a041f..1b30518e04024225586f8e7dbfcc073a57891989 100644
(file)
--- a/
pv/view/cursor.cpp
+++ b/
pv/view/cursor.cpp
@@
-47,7
+47,7
@@
const int Cursor::Offset = 1;
const int Cursor::ArrowSize = 4;
const int Cursor::ArrowSize = 4;
-Cursor::Cursor(
const
View &view, double time) :
+Cursor::Cursor(View &view, double time) :
TimeMarker(view, LineColour, time)
{
}
TimeMarker(view, LineColour, time)
{
}
diff --git
a/pv/view/cursor.h
b/pv/view/cursor.h
index 89ea1e715e3f1a0c83dc4b2de32056cd32f98bfa..290365e8ff3e28f9a5ee9b00f4237d8785b29130 100644
(file)
--- a/
pv/view/cursor.h
+++ b/
pv/view/cursor.h
@@
-52,7
+52,7
@@
public:
* @param view A reference to the view that owns this cursor pair.
* @param time The time to set the flag to.
*/
* @param view A reference to the view that owns this cursor pair.
* @param time The time to set the flag to.
*/
- Cursor(
const
View &view, double time);
+ Cursor(View &view, double time);
public:
/**
public:
/**
diff --git
a/pv/view/cursorpair.cpp
b/pv/view/cursorpair.cpp
index 70c7bac9235b41d203b74054036c36dbcd8f8fa9..83e6f7334cbd907a370265f6e18589fe9c572948 100644
(file)
--- a/
pv/view/cursorpair.cpp
+++ b/
pv/view/cursorpair.cpp
@@
-33,7
+33,7
@@
namespace view {
const int CursorPair::DeltaPadding = 8;
const int CursorPair::DeltaPadding = 8;
-CursorPair::CursorPair(
const
View &view) :
+CursorPair::CursorPair(View &view) :
_first(new Cursor(view, 0.0)),
_second(new Cursor(view, 1.0)),
_view(view)
_first(new Cursor(view, 0.0)),
_second(new Cursor(view, 1.0)),
_view(view)
diff --git
a/pv/view/cursorpair.h
b/pv/view/cursorpair.h
index 2e70f7da92b9dca7dec6770713624aefa8cf8b8c..815276e24c0ca997faf2af5e780da632cb6108eb 100644
(file)
--- a/
pv/view/cursorpair.h
+++ b/
pv/view/cursorpair.h
@@
-42,7
+42,7
@@
public:
* Constructor.
* @param view A reference to the view that owns this cursor pair.
*/
* Constructor.
* @param view A reference to the view that owns this cursor pair.
*/
- CursorPair(
const
View &view);
+ CursorPair(View &view);
/**
* Returns a pointer to the first cursor.
/**
* Returns a pointer to the first cursor.
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 9d4c43c21d2321f0ad20526075b1ace4dbeb5be7..5db9e9fe77ae3c0fa4ec2e4e069c9364e704ffbb 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-29,8
+29,7
@@
using namespace std;
namespace pv {
namespace view {
namespace pv {
namespace view {
-TimeMarker::TimeMarker(const View &view, const QColor &colour,
- double time) :
+TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
_view(view),
_colour(colour),
_time(time)
_view(view),
_colour(colour),
_time(time)
diff --git
a/pv/view/timemarker.h
b/pv/view/timemarker.h
index 8d8ae162e909c3738e628477fbdc327b77f59bc0..f12fa2965693b7d7580b3b8638c8c9174f5f8561 100644
(file)
--- a/
pv/view/timemarker.h
+++ b/
pv/view/timemarker.h
@@
-46,7
+46,7
@@
protected:
* @param colour A reference to the colour of this cursor.
* @param time The time to set the flag to.
*/
* @param colour A reference to the colour of this cursor.
* @param time The time to set the flag to.
*/
- TimeMarker(
const
View &view, const QColor &colour, double time);
+ TimeMarker(View &view, const QColor &colour, double time);
public:
/**
public:
/**
@@
-92,7
+92,7
@@
signals:
void time_changed();
protected:
void time_changed();
protected:
-
const
View &_view;
+ View &_view;
const QColor &_colour;
double _time;
const QColor &_colour;
double _time;