From 3d3c2285635201f19fe2f418f9e1154d2a9bf6de 2012-05-29 14:22:35 From: sauimone Date: 2012-05-29 14:22:35 Subject: [PATCH] Removed signals from barset. Using only signals in series from now on. --- diff --git a/src/barchart/bar.cpp b/src/barchart/bar.cpp index e9b6847..b5fa86d 100644 --- a/src/barchart/bar.cpp +++ b/src/barchart/bar.cpp @@ -36,21 +36,18 @@ Bar::Bar(QBarSet *barset, QString category, QGraphicsItem *parent) : QGraphicsRe void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) - emit clicked(m_category); emit clicked(m_barset, m_category); } void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { Q_UNUSED(event) - emit hovered(true); emit hovered(m_barset, true); } void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { Q_UNUSED(event) - emit hovered(false); emit hovered(m_barset, false); } diff --git a/src/barchart/barchartitem.cpp b/src/barchart/barchartitem.cpp index 1620c5c..d4a8e45 100644 --- a/src/barchart/barchartitem.cpp +++ b/src/barchart/barchartitem.cpp @@ -81,9 +81,7 @@ void BarChartItem::dataChanged() // Bars Bar *bar = new Bar(set,category,this); m_bars.append(bar); - connect(bar, SIGNAL(clicked(QString)), set, SIGNAL(clicked(QString))); connect(bar, SIGNAL(clicked(QBarSet*,QString)), m_series, SIGNAL(clicked(QBarSet*,QString))); - connect(bar, SIGNAL(hovered(bool)), set, SIGNAL(hovered(bool))); connect(bar, SIGNAL(hovered(QBarSet*,bool)), m_series, SIGNAL(hovered(QBarSet*,bool))); m_layout.append(QRectF(0, 0, 0, 0)); diff --git a/src/barchart/qbarset.h b/src/barchart/qbarset.h index c070917..98569bf 100644 --- a/src/barchart/qbarset.h +++ b/src/barchart/qbarset.h @@ -72,9 +72,9 @@ public: void setLabelFont(const QFont &font); QFont labelFont() const; -Q_SIGNALS: - void clicked(QString category); - void hovered(bool status); +//Q_SIGNALS: +// void clicked(QString category); +// void hovered(bool status); private: QScopedPointer d_ptr;