Commit 8bb81a24 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Apply patch 4 from issue #13 - clazy-qvariant-template-instantiation

parent 0816dcf3
...@@ -31,6 +31,7 @@ else() ...@@ -31,6 +31,7 @@ else()
set (VITE_VERSION "${VITE_VERSION_MAJOR}.${VITE_VERSION_MINOR}.${VITE_VERSION_PATCH}") set (VITE_VERSION "${VITE_VERSION_MAJOR}.${VITE_VERSION_MINOR}.${VITE_VERSION_PATCH}")
endif() endif()
if (NOT ${VITE_WC_DATE} STREQUAL "") if (NOT ${VITE_WC_DATE} STREQUAL "")
set (VITE_DATE "\"${VITE_WC_DATE}\"") set (VITE_DATE "\"${VITE_WC_DATE}\"")
else() else()
......
...@@ -100,7 +100,7 @@ void MinimapSettings::load() { ...@@ -100,7 +100,7 @@ void MinimapSettings::load() {
_pen_size = s.value("minimap/pen_size").value<int>(); _pen_size = s.value("minimap/pen_size").value<int>();
_pen_color = s.value("minimap/pen_color").value<QColor>(); _pen_color = s.value("minimap/pen_color").value<QColor>();
_brush_color = s.value("minimap/brush_color").value<QColor>(); _brush_color = s.value("minimap/brush_color").value<QColor>();
_is_closed = s.value("minimap/is_closed").value<bool>(); _is_closed = s.value("minimap/is_closed").toBool();
} }
} }
...@@ -307,8 +307,8 @@ Palette *Session::get_palette(const std::string type, const std::string &palette ...@@ -307,8 +307,8 @@ Palette *Session::get_palette(const std::string type, const std::string &palette
p = new Palette(string(type+"/"+palette_name)); p = new Palette(string(type+"/"+palette_name));
*where_from = p; *where_from = p;
for(QMap<QString, QVariant>::const_iterator it = qmap.begin() ; for(QMap<QString, QVariant>::const_iterator it = qmap.cbegin() ;
it != qmap.end() ; ++ it) { it != qmap.cend() ; ++ it) {
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.);
......
...@@ -659,7 +659,6 @@ void Render_alternate::paintGL(){ ...@@ -659,7 +659,6 @@ void Render_alternate::paintGL(){
render_to_screen_y(3), render_to_screen_y(3),
buf_txt.str().c_str(), buf_txt.str().c_str(),
arial_font); arial_font);
QString q(buf_txt.str().c_str());
//glGetError(); //glGetError();
for (Element_pos i = Info::Render::_x_min_visible ; for (Element_pos i = Info::Render::_x_min_visible ;
......
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