X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.cpp;h=ac20f379c31eb67980768c55b95a695178202992;hb=2c8434f74c68194d56f2084f637419123e61d18b;hp=8dad56846338b79d99bb356eea7cdb73ae1a4198;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf;p=quassel.git diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp index 8dad5684..ac20f379 100644 --- a/src/uisupport/colorbutton.cpp +++ b/src/uisupport/colorbutton.cpp @@ -20,20 +20,16 @@ #include "colorbutton.h" +#include #include #include #include -#ifdef HAVE_KDE4 -# include -#else -# include -#endif ColorButton::ColorButton(QWidget *parent) : QToolButton(parent) { setText(""); - connect(this, SIGNAL(clicked()), SLOT(chooseColor())); + connect(this, &QAbstractButton::clicked, this, &ColorButton::chooseColor); } @@ -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); }