# HG changeset patch # User Teemu Piippo # Date 1488753400 -7200 # Node ID fead30e6c557ee3fe5e69b0e981d28d2535ed8d6 # Parent 99085cfaeabdaab66c5ff336cdf049397521117e ColorSelector is no longer a HierarchyElement. diff -r 99085cfaeabd -r fead30e6c557 src/dialogs/colorselector.cpp --- a/src/dialogs/colorselector.cpp Mon Mar 06 00:35:47 2017 +0200 +++ b/src/dialogs/colorselector.cpp Mon Mar 06 00:36:40 2017 +0200 @@ -34,7 +34,6 @@ */ ColorSelector::ColorSelector(QWidget* parent, LDColor defaultColor) : QDialog {parent}, - HierarchyElement {parent}, ui {*new Ui_ColorSelUi}, m_selectedColor {LDColor::nullColor} { diff -r 99085cfaeabd -r fead30e6c557 src/dialogs/colorselector.h --- a/src/dialogs/colorselector.h Mon Mar 06 00:35:47 2017 +0200 +++ b/src/dialogs/colorselector.h Mon Mar 06 00:36:40 2017 +0200 @@ -20,12 +20,11 @@ #include #include "../main.h" #include "../colors.h" -#include "../hierarchyelement.h" /* * Implements a dialog that asks the user to choose an LDraw color from a grid of available colors. Direct colors are also supported. */ -class ColorSelector : public QDialog, public HierarchyElement +class ColorSelector : public QDialog { Q_OBJECT