X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.cpp;h=c4e0c715c4fb58af54d756aa38844213cee9364e;hp=aaddc985f976a6a9a83897aa9f2577f6daac3c4e;hb=edc55b1f86cf613a332eeeb5d85537a54120dfa5;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp
index aaddc985..c4e0c715 100644
--- a/src/uisupport/colorbutton.cpp
+++ b/src/uisupport/colorbutton.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,29 +15,24 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "colorbutton.h"
 
+#include <QColorDialog>
 #include <QPainter>
 #include <QStyle>
 #include <QStyleOptionFrame>
 
-#ifdef HAVE_KDE
-#  include <KColorDialog>
-#else
-#  include <QColorDialog>
-#endif
-
-ColorButton::ColorButton(QWidget *parent) : QToolButton(parent)
+ColorButton::ColorButton(QWidget* parent)
+    : QToolButton(parent)
 {
     setText("");
-    connect(this, SIGNAL(clicked()), SLOT(chooseColor()));
+    connect(this, &QAbstractButton::clicked, this, &ColorButton::chooseColor);
 }
 
-
-void ColorButton::setColor(const QColor &color)
+void ColorButton::setColor(const QColor& color)
 {
     _color = color;
     QPixmap pixmap(QSize(32, 32));
@@ -47,22 +42,14 @@ void ColorButton::setColor(const QColor &color)
     emit colorChanged(color);
 }
 
-
 QColor ColorButton::color() const
 {
     return _color;
 }
 
-
 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);
     }