X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.cpp;h=22e03836e2f3bf7f10e5a9c68099fffdf3ff3b20;hp=fae61703c7cee680913ccf6764f0490b5a6a42ed;hb=1a45f16a9734820fba42fe1db3f38dd1eee49df6;hpb=1cb02004ee5973b89368bd84f234d4652794690d diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp index fae61703..22e03836 100644 --- a/src/uisupport/colorbutton.cpp +++ b/src/uisupport/colorbutton.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 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_KDE4 -# include -#else -# include -#endif ColorButton::ColorButton(QWidget *parent) : QToolButton(parent) { @@ -56,13 +52,7 @@ QColor ColorButton::color() const void ColorButton::chooseColor() { -#ifdef HAVE_KDE4 - QColor c = color(); - KColorDialog::getColor(c, this); -#else QColor c = QColorDialog::getColor(color(), this); -#endif - if (c.isValid()) { setColor(c); }