# HG changeset patch # User Teemu Piippo # Date 1545858249 -7200 # Node ID 4c06435bd87f74b91808ba8d39a7a0982ba0accd # Parent bd3a9e237ef58071702863427bdfbb378fee5863 removed unneeded stuff diff -r bd3a9e237ef5 -r 4c06435bd87f src/glcompiler.cpp --- a/src/glcompiler.cpp Wed Dec 26 23:01:45 2018 +0200 +++ b/src/glcompiler.cpp Wed Dec 26 23:04:09 2018 +0200 @@ -185,7 +185,7 @@ if (polygonOwner->color() == MainColor) { // If that also is the main color, then we whatever the user has configured the main color to look like. - color = guiUtilities()->mainColorRepresentation(); + color = mainColorRepresentation(); } else { @@ -228,7 +228,7 @@ { // The color was unknown. Use main color to make the polygon at least not appear pitch-black. if (polygon.type != LDPolygon::Type::EdgeLine and polygon.type != LDPolygon::Type::ConditionalEdge) - color = guiUtilities()->mainColorRepresentation(); + color = mainColorRepresentation(); else color = Qt::black; diff -r bd3a9e237ef5 -r 4c06435bd87f src/guiutilities.cpp --- a/src/guiutilities.cpp Wed Dec 26 23:01:45 2018 +0200 +++ b/src/guiutilities.cpp Wed Dec 26 23:04:09 2018 +0200 @@ -110,11 +110,9 @@ } /* - * mainColorRepresentation - * * Returns the user-preferred appearance for the main color. */ -QColor GuiUtilities::mainColorRepresentation() +QColor mainColorRepresentation() { QColor result = {config::mainColor()}; @@ -129,17 +127,6 @@ } } -/* - * loadQuickColorList - * - * Returns a list of contents for the color toolbar, based on configuration. - */ -QVector GuiUtilities::loadQuickColorList() -{ - return config::quickColorToolbar(); -} - - void setColorButton(QPushButton* button, LDColor color) { if (color.isValid()) diff -r bd3a9e237ef5 -r 4c06435bd87f src/guiutilities.h --- a/src/guiutilities.h Wed Dec 26 23:01:45 2018 +0200 +++ b/src/guiutilities.h Wed Dec 26 23:04:09 2018 +0200 @@ -33,10 +33,9 @@ explicit GuiUtilities (QObject* parent); void fillUsedColorsToComboBox (class QComboBox* box); - QColor mainColorRepresentation(); - QVector loadQuickColorList(); }; +QColor mainColorRepresentation(); QIcon makeColorIcon(LDColor color, int size); void setColorButton(class QPushButton* button, LDColor color); void editObject(MainWindow* parent, LDObject* object);