X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.cpp;h=22e03836e2f3bf7f10e5a9c68099fffdf3ff3b20;hp=d1730103169d2265ad69bf7ed6ee2687fdf8efe6;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=9d54503555534a2c554f09a33df6afa33d6308ec diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp index d1730103..22e03836 100644 --- a/src/uisupport/colorbutton.cpp +++ b/src/uisupport/colorbutton.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,15 +20,11 @@ #include "colorbutton.h" +#include #include #include #include -#ifdef HAVE_KDE -# include -#else -# include -#endif ColorButton::ColorButton(QWidget *parent) : QToolButton(parent) { @@ -56,13 +52,7 @@ QColor ColorButton::color() const void ColorButton::chooseColor() { -#ifdef HAVE_KDE - QColor c = color(); - KColorDialog::getColor(c, this); -#else QColor c = QColorDialog::getColor(color(), this); -#endif - if (c.isValid()) { setColor(c); }