From 481edea88f83120d3cfb5b519e356bc47ded86bd Mon Sep 17 00:00:00 2001 From: Bryant Date: Mon, 10 Jun 2013 17:55:06 -0700 Subject: [PATCH] Renamed slot in ChartPlot to match connect() calls elsewhere. --- src/ui/linechart/ChartPlot.cc | 4 ++-- src/ui/linechart/ChartPlot.h | 2 +- src/ui/linechart/LinechartWidget.cc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/linechart/ChartPlot.cc b/src/ui/linechart/ChartPlot.cc index 3ec8f9226..665ff5233 100644 --- a/src/ui/linechart/ChartPlot.cc +++ b/src/ui/linechart/ChartPlot.cc @@ -53,7 +53,7 @@ ChartPlot::ChartPlot(QWidget *parent): } // Now that all objects have been initialized, color everything. - applyColorScheme(MainWindow::instance()->getStyle()); + styleChanged(MainWindow::instance()->getStyle()); } ChartPlot::~ChartPlot() @@ -87,7 +87,7 @@ void ChartPlot::shuffleColors() } } -void ChartPlot::applyColorScheme(MainWindow::QGC_MAINWINDOW_STYLE style) +void ChartPlot::styleChanged(MainWindow::QGC_MAINWINDOW_STYLE style) { // Generate a new color list for curves and recolor them. for (int i = 0; i < numColors; ++i) diff --git a/src/ui/linechart/ChartPlot.h b/src/ui/linechart/ChartPlot.h index fad515190..74a232039 100644 --- a/src/ui/linechart/ChartPlot.h +++ b/src/ui/linechart/ChartPlot.h @@ -25,7 +25,7 @@ public: public slots: /** @brief Generate coloring for this plot canvas based on current window theme */ - void applyColorScheme(MainWindow::QGC_MAINWINDOW_STYLE style); + void styleChanged(MainWindow::QGC_MAINWINDOW_STYLE style); protected: const static int numColors = 20; diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index 2a11f5c29..e29b65532 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -144,7 +144,7 @@ LinechartWidget::LinechartWidget(int systemid, QWidget *parent) : QWidget(parent // And make sure we're listening for future style changes connect(MainWindow::instance(), SIGNAL(styleChanged(MainWindow::QGC_MAINWINDOW_STYLE)), - this, SLOT(applyColorScheme(MainWindow::QGC_MAINWINDOW_STYLE))); + this, SLOT(styleChanged(MainWindow::QGC_MAINWINDOW_STYLE))); connect(MainWindow::instance(), SIGNAL(styleChanged()), this, SLOT(recolor())); updateTimer->setInterval(updateInterval); @@ -777,7 +777,7 @@ void LinechartWidget::removeCurve(QString curve) void LinechartWidget::recolor() { - activePlot->applyColorScheme(MainWindow::instance()->getStyle()); + activePlot->styleChanged(MainWindow::instance()->getStyle()); foreach (QString key, colorIcons.keys()) { QWidget* colorIcon = colorIcons.value(key, 0); -- 2.22.0