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
/
decodetrace.cpp
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index e275a112ba82d889c0f5b0a51613e2f6b4c91d5d..37beed98779d73fb8043567cb48d5beeff18e25c 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-47,8
+47,13
@@
extern "C" {
#include <pv/widgets/decodergroupbox.h>
#include <pv/widgets/decodermenu.h>
#include <pv/widgets/decodergroupbox.h>
#include <pv/widgets/decodermenu.h>
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::shared_ptr;
+using std::list;
+using std::max;
+using std::map;
+using std::min;
+using std::vector;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-78,7
+83,8
@@
const QColor DecodeTrace::Colours[7] = {
DecodeTrace::DecodeTrace(pv::SigSession &session,
boost::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
DecodeTrace::DecodeTrace(pv::SigSession &session,
boost::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
- Trace(session, QString(decoder_stack->stack().front()->decoder()->name)),
+ Trace(session, QString::fromUtf8(
+ decoder_stack->stack().front()->decoder()->name)),
_decoder_stack(decoder_stack),
_delete_mapper(this)
{
_decoder_stack(decoder_stack),
_delete_mapper(this)
{
@@
-403,7
+409,8
@@
void DecodeTrace::create_decoder_form(int index,
assert(decoder);
pv::widgets::DecoderGroupBox *const group =
assert(decoder);
pv::widgets::DecoderGroupBox *const group =
- new pv::widgets::DecoderGroupBox(decoder->name);
+ new pv::widgets::DecoderGroupBox(
+ QString::fromUtf8(decoder->name));
_delete_mapper.setMapping(group, index);
connect(group, SIGNAL(delete_decoder()), &_delete_mapper, SLOT(map()));
_delete_mapper.setMapping(group, index);
connect(group, SIGNAL(delete_decoder()), &_delete_mapper, SLOT(map()));