X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.cpp;h=ac20f379c31eb67980768c55b95a695178202992;hp=52e8e16fd847bbb168aabd2e9aa694d48231dda0;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=921e54680da16fcf2adb7a90506875aceb6633a4 diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp index 52e8e16f..ac20f379 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,20 +20,16 @@ #include "colorbutton.h" +#include #include #include #include -#ifdef HAVE_KDE -# 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_KDE - QColor c = color(); - KColorDialog::getColor(c, this); -#else QColor c = QColorDialog::getColor(color(), this); -#endif - if (c.isValid()) { setColor(c); }