Commit 3a97d7bb authored by Mathieu Faverge's avatar Mathieu Faverge

Fix issue #14 introduced by moving to more modern C++

parent f96665f2
...@@ -307,8 +307,14 @@ Palette *Session::get_palette(const std::string &type, const std::string &palett ...@@ -307,8 +307,14 @@ Palette *Session::get_palette(const std::string &type, const std::string &palett
p = new Palette(string(type+"/"+palette_name)); p = new Palette(string(type+"/"+palette_name));
*where_from = p; *where_from = p;
#if defined(USE_QT5)
for(QMap<QString, QVariant>::const_iterator it = qmap.cbegin() ; for(QMap<QString, QVariant>::const_iterator it = qmap.cbegin() ;
it != qmap.cend() ; ++ it) { it != qmap.cend() ; ++ it)
#else
for(QMap<QString, QVariant>::const_iterator it = qmap.begin() ;
it != qmap.end() ; ++ it)
#endif
{
const QColor qc = it.value().value<QColor>(); const QColor qc = it.value().value<QColor>();
Color c = Color(qc.red()/255., qc.green()/255., qc.blue()/255.); Color c = Color(qc.red()/255., qc.green()/255., qc.blue()/255.);
p->add_state(it.key().toStdString(), c, qc.alpha()==255.); p->add_state(it.key().toStdString(), c, qc.alpha()==255.);
......
...@@ -201,7 +201,7 @@ bool Shader::charger() ...@@ -201,7 +201,7 @@ bool Shader::charger()
} }
bool Shader::compilerShader(GLuint &shader, GLenum type, const std::string code) bool Shader::compilerShader(GLuint &shader, GLenum type, const std::string &code)
{ {
// Create shader // Create shader
shader = glCreateShader(type); shader = glCreateShader(type);
......
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