X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcolorbutton.cpp;h=454693dfe9e9bc77b9b7be2cc6262c212da24d37;hp=15e9de471a8ecde884c86991bfa8a591bcabe514;hb=efee441a243efb88929e1e275d71ee27991bf074;hpb=2ca0005bfda1c2eb1bb4bcd6b0abe5382f0979f1

diff --git a/src/uisupport/colorbutton.cpp b/src/uisupport/colorbutton.cpp
index 15e9de47..454693df 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-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   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"
@@ -24,39 +24,46 @@
 #include <QStyle>
 #include <QStyleOptionFrame>
 
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
 #  include <KColorDialog>
 #else
 #  include <QColorDialog>
 #endif
 
-ColorButton::ColorButton(QWidget *parent) : QToolButton(parent) {
-  setText("");
-  connect(this, SIGNAL(clicked()), SLOT(chooseColor()));
+ColorButton::ColorButton(QWidget *parent) : QToolButton(parent)
+{
+    setText("");
+    connect(this, SIGNAL(clicked()), SLOT(chooseColor()));
 }
 
-void ColorButton::setColor(const QColor &color) {
-  _color = color;
-  QPixmap pixmap(QSize(32,32));
-  pixmap.fill(color);
-  setIcon(pixmap);
 
-  emit colorChanged(color);
+void ColorButton::setColor(const QColor &color)
+{
+    _color = color;
+    QPixmap pixmap(QSize(32, 32));
+    pixmap.fill(color);
+    setIcon(pixmap);
+
+    emit colorChanged(color);
 }
 
-QColor ColorButton::color() const {
-  return _color;
+
+QColor ColorButton::color() const
+{
+    return _color;
 }
 
-void ColorButton::chooseColor() {
-#ifdef HAVE_KDE
-  QColor c;
-  KColorDialog::getColor(c, this);
+
+void ColorButton::chooseColor()
+{
+#ifdef HAVE_KDE4
+    QColor c = color();
+    KColorDialog::getColor(c, this);
 #else
-  QColor c = QColorDialog::getColor(color(), this);
+    QColor c = QColorDialog::getColor(color(), this);
 #endif
 
-  if(c.isValid()) {
-    setColor(c);
-  }
+    if (c.isValid()) {
+        setColor(c);
+    }
 }