Commit 65cc12ce authored by Christoph Feck's avatar Christoph Feck

KColorDialog -> QColorDialog

parent 0b0861c6
......@@ -31,11 +31,11 @@
#include <kpColorCells.h>
#include <QColorDialog>
#include <QContextMenuEvent>
#include <QMouseEvent>
#include <QScrollBar>
#include <KColorDialog>
#include <KDebug>
#include <KLocale>
......@@ -561,12 +561,11 @@ void kpColorCells::slotColorSelected (int cell, const QColor &color,
// protected slot
void kpColorCells::slotColorDoubleClicked (int cell, const QColor &)
{
KColorDialog dialog(this);
dialog.setColor(kpColorCellsBase::color(cell));
dialog.setAlphaChannelEnabled(true);
dialog.setButtons(KDialog::Ok | KDialog::Cancel);
QColorDialog dialog(this);
dialog.setCurrentColor(kpColorCellsBase::color(cell));
dialog.setOptions(QColorDialog::ShowAlphaChannel);
if ( dialog.exec() == QDialog::Accepted )
setColor (cell, dialog.color());
setColor (cell, dialog.currentColor());
}
//---------------------------------------------------------------------
......
......@@ -33,12 +33,12 @@
#include <QApplication>
#include <QBitmap>
#include <QColorDialog>
#include <QDrag>
#include <QMouseEvent>
#include <QPainter>
#include <qdrawutil.h>
#include <KColorDialog>
#include <KColorMimeData>
#include <KDebug>
#include <KIconLoader>
......@@ -358,12 +358,11 @@ void kpDualColorButton::mouseDoubleClickEvent (QMouseEvent *e)
if (whichColor == 0 || whichColor == 1)
{
KColorDialog dialog(this);
dialog.setColor(color(whichColor).toQColor());
dialog.setAlphaChannelEnabled(true);
dialog.setButtons(KDialog::Ok | KDialog::Cancel);
QColorDialog dialog(this);
dialog.setCurrentColor(color(whichColor).toQColor());
dialog.setOptions(QColorDialog::ShowAlphaChannel);
if ( dialog.exec() == QDialog::Accepted )
setColor(whichColor, kpColor(dialog.color().rgba()));
setColor(whichColor, kpColor(dialog.currentColor().rgba()));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment