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

diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp
index aaddc985..ac20f379 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-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,25 +15,21 @@
  *   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)
 {
     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);
     }