Remove PredefinedColorRepresentation

7 files changed, 0 insertions, 85 deletions

diff --git a/src/skin/skincontext.h b/src/skin/skincontext.h
index 7a81d29631..9c3f86f191 100644
--- a/src/skin/skincontext.h
+++ b/src/skin/skincontext.h
@@ -12,7 +12,6 @@
 #include <QSharedPointer>
 #include <QRegExp>
 
-#include "../util/color/predefinedcolorsrepresentation.h"
 #include "preferences/usersettings.h"
 #include "skin/pixmapsource.h"
 #include "util/color/color.h"
@@ -247,20 +246,6 @@ class SkinContext {
         return m_scaleFactor;
     }
 
-    PredefinedColorsRepresentation getCueColorRepresentation(const QDomNode& node, QColor defaultColor) const {
-        PredefinedColorsRepresentation colorRepresentation = Color::kPredefinedColorsSet.defaultRepresentation();
-        for (PredefinedColorPointer color : Color::kPredefinedColorsSet.allColors) {
-            QString sColorName(color->m_sName);
-            QColor skinRgba = selectColor(node, "Cue" + sColorName);
-            if (skinRgba.isValid()) {
-                PredefinedColorPointer originalColor = Color::kPredefinedColorsSet.predefinedColorFromName(sColorName);
-                colorRepresentation.setCustomRgba(originalColor, skinRgba);
-            }
-        }
-        colorRepresentation.setCustomRgba(Color::kPredefinedColorsSet.noColor, defaultColor);
-        return colorRepresentation;
-    }
-
   private:
     PixmapSource getPixmapSourceInner(const QString& filename) const;
 
diff --git a/src/util/color/predefinedcolorsrepresentation.h b/src/util/color/predefinedcolorsrepresentation.h
deleted file mode 100644
index 83f1640544..0000000000
--- a/src/util/color/predefinedcolorsrepresentation.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef PREDEFINEDCOLORSREPRESENTATION_H
-#define PREDEFINEDCOLORSREPRESENTATION_H
-
-#include <QColor>
-#include <QHash>
-
-#include "util/color/predefinedcolor.h"
-
-// PredefinedColorsRepresentation defines a particular way to render Mixxx PredefinedColors.
-//
-// PredefinedColorsRepresentation maps a PredefinedColor to a custom Rgba color.
-// Initially no color has a custom Rgba set.
-// Call setCustomRgba(PredefinedColorPointer, QColor) to add a custom Rgba for a predefined color
-// and customize the color map.
-//
-// This class uses the color's name() property as key, e.g. "#A9A9A9"
-// Since QHash has copy-on-write, making a copy of PredefinedColorsRepresentation is fast.
-// A deep copy of the QHash will be made when a copy is modified.
-class PredefinedColorsRepresentation final {
-  public:
-    // Set a custom Rgba for a given color
-    void setCustomRgba(PredefinedColorPointer color, QColor cutomizedRgba) {
-        m_colorNameMap[color->m_defaultRgba.name()] = cutomizedRgba.name();
-    }
-
-    // Returns the custom Rgba of a color.
-    // If no custom Rgba is set for color, returns color->m_defaultRgba.
-    QColor representationFor(PredefinedColorPointer color) const {
-        QColor defaultRgba = color->m_defaultRgba;
-        if (m_colorNameMap.contains(defaultRgba.name())) {
-            return QColor(m_colorNameMap[defaultRgba.name()]);
-        }
-        return defaultRgba;
-    }
-
-
-  private:
-    QHash<QString, QString> m_colorNameMap;
-};
-
-#endif /* PREDEFINEDCOLORSREPRESENTATION_H */
diff --git a/src/util/color/predefinedcolorsset.h b/src/util/color/predefinedcolorsset.h
index f2dbff29ee..b68d6b89c1 100644
--- a/src/util/color/predefinedcolorsset.h
+++ b/src/util/color/predefinedcolorsset.h
@@ -3,7 +3,6 @@
 #include <QColor>
 #include <QObject>
 
-#include "predefinedcolorsrepresentation.h"
 #include "util/color/predefinedcolor.h"
 
 // This class defines a set of predefined colors and provides some handy functions to work with them.
@@ -70,13 +69,6 @@ class PredefinedColorsSet final {
             white,
     };
 
-    PredefinedColorsSet()
-            : m_defaultRepresentation() {
-        for (PredefinedColorPointer color : allColors) {
-            m_defaultRepresentation.setCustomRgba(color, color->m_defaultRgba);
-        }
-    }
-
     // Returns the position of a PredefinedColor in the allColors list.
     int predefinedColorIndex(PredefinedColorPointer searchedColor) const {
         for (int position = 0; position < allColors.count(); ++position) {
@@ -109,12 +101,4 @@ class PredefinedColorsSet final {
         }
         return noColor;
     };
-
-    // The default color representation, i.e. maps each predefined color to its default Rgba.
-    PredefinedColorsRepresentation defaultRepresentation() const {
-        return m_defaultRepresentation;
-    };
-
-  private:
-    PredefinedColorsRepresentation m_defaultRepresentation;
 };
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index d7ef8c90bd..034363e2cd 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -27,11 +27,6 @@ WaveformRenderMark::WaveformRenderMark(
 void WaveformRenderMark::setup(const QDomNode& node, const SkinContext& context) {
     WaveformSignalColors signalColors = *m_waveformRenderer->getWaveformSignalColors();
     m_marks.setup(m_waveformRenderer->getGroup(), node, context, signalColors);
-    WaveformMarkPointer defaultMark(m_marks.getDefaultMark());
-    QColor defaultColor = defaultMark
-            ? defaultMark->fillColor()
-            : signalColors.getAxesColor();
-    m_predefinedColorsRepresentation = context.getCueColorRepresentation(node, defaultColor);
 }
 
 void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
diff --git a/src/waveform/renderers/waveformrendermark.h b/src/waveform/renderers/waveformrendermark.h
index 01c975fe3c..b3b0cafbaa 100644
--- a/src/waveform/renderers/waveformrendermark.h
+++ b/src/waveform/renderers/waveformrendermark.h
@@ -35,8 +35,6 @@ class WaveformRenderMark : public QObject, public WaveformRendererAbstract {
   private:
     void generateMarkImage(WaveformMarkPointer pMark);
 
-    PredefinedColorsRepresentation m_predefinedColorsRepresentation;
-
     WaveformMarkSet m_marks;
     DISALLOW_COPY_AND_ASSIGN(WaveformRenderMark);
 };
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index 996fce3069..396dcaff77 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -133,11 +133,6 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
 
     // setup hotcues and cue and loop(s)
     m_marks.setup(m_group, node, context, m_signalColors);
-    WaveformMarkPointer defaultMark(m_marks.getDefaultMark());
-    QColor defaultColor = defaultMark
-            ? defaultMark->fillColor()
-            : m_signalColors.getAxesColor();
-    m_predefinedColorsRepresentation = context.getCueColorRepresentation(node, defaultColor);
     HotcueColorPaletteSettings colorPaletteSettings(m_pConfig);
     auto colorPalette = colorPaletteSettings.getHotcueColorPalette();
     m_pCueMenu->useColorSet(colorPalette);
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index 9df3e48829..a2d11dde43 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -168,7 +168,6 @@ class WOverview : public WWidget, public TrackDropTarget {
     QColor m_labelBackgroundColor;
     QColor m_endOfTrackColor;
 
-    PredefinedColorsRepresentation m_predefinedColorsRepresentation;
     // All WaveformMarks
     WaveformMarkSet m_marks;
     // List of visible WaveformMarks sorted by the order they appear in the track