Commit 297d71d2 authored by Mathieu Faverge's avatar Mathieu Faverge

Merge branch '14-qt4-build-failure' into 'master'

Resolve "Qt4 build failure"

Closes #14

See merge request !10
parents 954372e4 a666a8b9
......@@ -307,14 +307,8 @@ Palette *Session::get_palette(const std::string &type, const std::string &palett
p = new Palette(string(type+"/"+palette_name));
*where_from = p;
#if defined(USE_QT5)
for(QMap<QString, QVariant>::const_iterator it = qmap.cbegin() ;
it != qmap.cend() ; ++ it)
#else
for(QMap<QString, QVariant>::const_iterator it = qmap.begin() ;
it != qmap.end() ; ++ it)
#endif
{
for(QMap<QString, QVariant>::const_iterator it = qmap.constBegin() ;
it != qmap.constEnd() ; ++ it) {
const QColor qc = it.value().value<QColor>();
Color c = Color(qc.red()/255., qc.green()/255., qc.blue()/255.);
p->add_state(it.key().toStdString(), c, qc.alpha()==255.);
......
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