projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Autogenerate most of the .qrc resource files
[quassel.git]
/
src
/
uisupport
/
colorbutton.cpp
diff --git
a/src/uisupport/colorbutton.cpp
b/src/uisupport/colorbutton.cpp
index
fae6170
..
22e0383
100644
(file)
--- a/
src/uisupport/colorbutton.cpp
+++ b/
src/uisupport/colorbutton.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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,15
+20,11
@@
#include "colorbutton.h"
#include "colorbutton.h"
+#include <QColorDialog>
#include <QPainter>
#include <QStyle>
#include <QStyleOptionFrame>
#include <QPainter>
#include <QStyle>
#include <QStyleOptionFrame>
-#ifdef HAVE_KDE4
-# include <KColorDialog>
-#else
-# include <QColorDialog>
-#endif
ColorButton::ColorButton(QWidget *parent) : QToolButton(parent)
{
ColorButton::ColorButton(QWidget *parent) : QToolButton(parent)
{
@@
-56,13
+52,7
@@
QColor ColorButton::color() const
void ColorButton::chooseColor()
{
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);
}