comparison widgets/ColourNameDialog.cpp @ 1324:13d9b422f7fe zoom

Merge from default branch
author Chris Cannam
date Mon, 17 Sep 2018 13:51:31 +0100
parents a34a2a25907c
children
comparison
equal deleted inserted replaced
1183:57d192e26331 1324:13d9b422f7fe
23 #include <QCheckBox> 23 #include <QCheckBox>
24 #include <QPainter> 24 #include <QPainter>
25 #include <QPushButton> 25 #include <QPushButton>
26 26
27 ColourNameDialog::ColourNameDialog(QString title, QString message, 27 ColourNameDialog::ColourNameDialog(QString title, QString message,
28 QColor colour, QString defaultName, 28 QColor colour, QString defaultName,
29 QWidget *parent) : 29 QWidget *parent) :
30 QDialog(parent), 30 QDialog(parent),
31 m_colour(colour) 31 m_colour(colour)
32 { 32 {
33 setWindowTitle(title); 33 setWindowTitle(title);
34 34