projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version for release 0.14-rc2
[quassel.git]
/
src
/
uisupport
/
colorbutton.cpp
diff --git
a/src/uisupport/colorbutton.cpp
b/src/uisupport/colorbutton.cpp
index
ac20f37
..
f287ea6
100644
(file)
--- a/
src/uisupport/colorbutton.cpp
+++ b/
src/uisupport/colorbutton.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
20
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 *
@@
-25,15
+25,14
@@
#include <QStyle>
#include <QStyleOptionFrame>
#include <QStyle>
#include <QStyleOptionFrame>
-
-
ColorButton::ColorButton(QWidget *parent)
: QToolButton(parent)
+ColorButton::ColorButton(QWidget* parent)
+
: QToolButton(parent)
{
setText("");
connect(this, &QAbstractButton::clicked, this, &ColorButton::chooseColor);
}
{
setText("");
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));
@@
-43,13
+42,11
@@
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()
{
QColor c = QColorDialog::getColor(color(), this);
void ColorButton::chooseColor()
{
QColor c = QColorDialog::getColor(color(), this);