X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.cpp;h=ac20f379c31eb67980768c55b95a695178202992;hp=fae61703c7cee680913ccf6764f0490b5a6a42ed;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=b65b9f7615165e8700a44d59b7275a55558dd45b

diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp
index fae61703..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 <QColorDialog>
 #include <QPainter>
 #include <QStyle>
 #include <QStyleOptionFrame>
 
-#ifdef HAVE_KDE4
-#  include <KColorDialog>
-#else
-#  include <QColorDialog>
-#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);
     }