diff options
| author | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2019-11-04 09:50:15 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-28 23:47:05 +0100 |
| commit | bbc45039679110475e85ce06f0ec61416f0a6d10 (patch) | |
| tree | 84308c628491e6f72ad1bc04f28d30310d5f27ee /src/widget | |
| parent | 0ef7da41f6a2765e1817c58b4432bf02bf530a31 (diff) | |
Rename some color related classes
Diffstat (limited to 'src/widget')
| -rw-r--r-- | src/widget/wcolorpicker.cpp | 4 | ||||
| -rw-r--r-- | src/widget/wcolorpicker.h | 6 | ||||
| -rw-r--r-- | src/widget/wcuemenupopup.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/widget/wcolorpicker.cpp b/src/widget/wcolorpicker.cpp index 10e2257f76..717ea97a27 100644 --- a/src/widget/wcolorpicker.cpp +++ b/src/widget/wcolorpicker.cpp @@ -14,7 +14,7 @@ namespace { WColorPicker::WColorPicker(ColorOption colorOption, QWidget* parent) : QWidget(parent), m_colorOption(colorOption), - m_palette(HotcueColorPalette::mixxxPalette) { + m_palette(ColorPalette::mixxxPalette) { QGridLayout* pLayout = new QGridLayout(); pLayout->setMargin(0); pLayout->setContentsMargins(0, 0, 0, 0); @@ -139,7 +139,7 @@ void WColorPicker::setSelectedColor(const QColor& color) { pButton->style()->polish(pButton); } -void WColorPicker::useColorSet(const HotcueColorPalette& palette) { +void WColorPicker::useColorSet(const ColorPalette& palette) { for (int i = 0; i < m_colorButtons.size(); ++i) { int j = i; if (m_colorOption == ColorOption::AllowNoColor) { diff --git a/src/widget/wcolorpicker.h b/src/widget/wcolorpicker.h index 0e7befac1b..cb3d45e6b3 100644 --- a/src/widget/wcolorpicker.h +++ b/src/widget/wcolorpicker.h @@ -7,7 +7,7 @@ #include <QStyleFactory> #include "util/color/color.h" -#include "util/color/hotcuecolorpalette.h" +#include "util/color/colorpalette.h" class WColorPicker : public QWidget { Q_OBJECT @@ -21,7 +21,7 @@ class WColorPicker : public QWidget { void resetSelectedColor(); void setSelectedColor(const QColor& color); - void useColorSet(const HotcueColorPalette& palette); + void useColorSet(const ColorPalette& palette); signals: void colorPicked(QColor color); @@ -33,7 +33,7 @@ class WColorPicker : public QWidget { void addColorButton(const QColor& color, QGridLayout* pLayout, int row, int column); ColorOption m_colorOption; QColor m_selectedColor; - HotcueColorPalette m_palette; + ColorPalette m_palette; QList<QPushButton*> m_colorButtons; QStyle* m_pStyle; }; diff --git a/src/widget/wcuemenupopup.h b/src/widget/wcuemenupopup.h index e9d7a93274..1861a82203 100644 --- a/src/widget/wcuemenupopup.h +++ b/src/widget/wcuemenupopup.h @@ -23,7 +23,7 @@ class WCueMenuPopup : public QWidget { void setTrackAndCue(TrackPointer pTrack, CuePointer pCue); - void useColorSet(const HotcueColorPalette& palette) { + void useColorSet(const ColorPalette& palette) { if (m_pColorPicker != nullptr) { m_pColorPicker->useColorSet(palette); } |