aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2015-10-12 01:35:18 -0700
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2015-10-12 08:37:16 +0000
commit0f27ed7ed7d7717852413026b65e155c5126a72b (patch)
treea7e6371a0a52971ec1d5cf942ffb06816256cd56
parenta342d1f3b9030a5c8df4d6b0ecac37fa971d4194 (diff)
Try to fix OS X buildbot but using a different QBrush constructor in the cases that were failing (where implicit conversion seems to be failing)
Change-Id: Id0393c2403ed953579c7d571e9880849b7dff8b3 Reviewed-on: https://code.wireshark.org/review/10952 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-rw-r--r--ui/qt/lte_rlc_graph_dialog.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/ui/qt/lte_rlc_graph_dialog.cpp b/ui/qt/lte_rlc_graph_dialog.cpp
index 8b60df7e22..712e00c26a 100644
--- a/ui/qt/lte_rlc_graph_dialog.cpp
+++ b/ui/qt/lte_rlc_graph_dialog.cpp
@@ -52,10 +52,8 @@
// - how to avoid panning or zooming out to -ve (x or y axis)
// - goto packet functionality when click on segments
-const QRgb graph_color_seq = 0x000000; // Black.
const QRgb graph_color_ack = tango_sky_blue_4; // Blue for ACK lines
const QRgb graph_color_nack = tango_scarlet_red_3; // Red for NACKs
-const QRgb graph_color_resegmented = 0x888888; // Grey for resegmentations
// Size of selectable packet points in the base graph
const double pkt_point_size_ = 3.0;
@@ -123,10 +121,10 @@ LteRlcGraphDialog::LteRlcGraphDialog(QWidget &parent, CaptureFile &cf) :
// Set colours/styles for each of the traces on the graph.
QCustomPlot *sp = ui->rlcPlot;
base_graph_ = sp->addGraph(); // All: Selectable segments
- base_graph_->setPen(QPen(QBrush(graph_color_seq), 0.25));
+ base_graph_->setPen(QPen(QBrush(Qt::black), 0.25));
reseg_graph_ = sp->addGraph();
- reseg_graph_->setPen(QPen(QBrush(graph_color_resegmented), 0.25));
+ reseg_graph_->setPen(QPen(QBrush(Qt::lightGray), 0.25));
acks_graph_ = sp->addGraph();
acks_graph_->setPen(QPen(QBrush(graph_color_ack), 1.0));