Commit 0b02df0a authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Cleanup.

Removing some copiler errors.
parent b4f8143e
......@@ -160,7 +160,7 @@ protected:
KisColorSelectorComboBox* parent = dynamic_cast<KisColorSelectorComboBox*>(this->parent());
Q_ASSERT(parent);
parent->setConfiguration(m_lastActiveConfiguration);
setList(parent->m_model);
//setList(parent->m_model);
}
//qDebug()<<"mousepress";
hide();
......@@ -173,8 +173,7 @@ protected:
KisColorSelectorComboBox::KisColorSelectorComboBox(QWidget* parent) :
QComboBox(parent),
m_private(new KisColorSelectorComboBoxPrivate(this)),
m_currentSelector(this),
m_model(0)
m_currentSelector(this)
{
QLayout* layout = new QGridLayout(this);
layout->addWidget(&m_currentSelector);
......@@ -239,6 +238,5 @@ void KisColorSelectorComboBox::setConfiguration(KisColorSelector::Configuration
void KisColorSelectorComboBox::setList(int model) {
m_model=model;
m_private->setList(m_model);
m_private->setList(model);
}
......@@ -34,7 +34,7 @@ public:
void hidePopup();
void showPopup();
KisColorSelector::Configuration configuration() const;
int m_model;
//int m_model;
protected:
void paintEvent(QPaintEvent *e);
public slots:
......
......@@ -48,14 +48,12 @@ public:
KisDisplayColorConverter* converter() const;
protected:
virtual void drawContents( QPainter* );
KoColorDisplayRendererInterface *m_displayRenderer;
KisCanvas2* m_canvas;
protected:
struct Private;
Private* const d;
private:
qreal R, G, B;
KoColorDisplayRendererInterface *m_displayRenderer;
KisCanvas2* m_canvas;
};
#endif
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