diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp')
-rw-r--r-- | examples/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp b/examples/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp index 75d809a44f..0b65c53477 100644 --- a/examples/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp +++ b/examples/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp @@ -48,10 +48,10 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "colorlisteditor.h" +#include <QtWidgets> + ColorListEditor::ColorListEditor(QWidget *widget) : QComboBox(widget) { populateList(); @@ -65,16 +65,16 @@ QColor ColorListEditor::color() const //! [0] //! [1] -void ColorListEditor::setColor(QColor color) +void ColorListEditor::setColor(const QColor &color) { - setCurrentIndex(findData(color, int(Qt::DecorationRole))); + setCurrentIndex(findData(color, Qt::DecorationRole)); } //! [1] //! [2] void ColorListEditor::populateList() { - QStringList colorNames = QColor::colorNames(); + const QStringList colorNames = QColor::colorNames(); for (int i = 0; i < colorNames.size(); ++i) { QColor color(colorNames[i]); |