projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'select-account-from-cli' of https://github.com/justjanne/quassel
[quassel.git]
/
src
/
uisupport
/
colorbutton.cpp
diff --git
a/src/uisupport/colorbutton.cpp
b/src/uisupport/colorbutton.cpp
index
29327e8
..
c4e0c71
100644
(file)
--- a/
src/uisupport/colorbutton.cpp
+++ b/
src/uisupport/colorbutton.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,24
+20,19
@@
#include "colorbutton.h"
#include "colorbutton.h"
+#include <QColorDialog>
#include <QPainter>
#include <QStyle>
#include <QStyleOptionFrame>
#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("");
{
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));
{
_color = color;
QPixmap pixmap(QSize(32, 32));
@@
-47,22
+42,14
@@
void ColorButton::setColor(const QColor &color)
emit colorChanged(color);
}
emit colorChanged(color);
}
-
QColor ColorButton::color() const
{
return _color;
}
QColor ColorButton::color() const
{
return _color;
}
-
void ColorButton::chooseColor()
{
void ColorButton::chooseColor()
{
-#ifdef HAVE_KDE
- 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);
}