diff --git a/Apps/Examples/Debug/CMakeLists.txt b/Apps/Examples/Debug/CMakeLists.txt index 5082e8da21a631e3c6d9631a604141da32f33afd..6385abd22d63825de34fd419b864050e4883fc7d 100644 --- a/Apps/Examples/Debug/CMakeLists.txt +++ b/Apps/Examples/Debug/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) project(examplesD) diff --git a/Apps/Examples/Release/CMakeLists.txt b/Apps/Examples/Release/CMakeLists.txt index ed1f85f1b109f51ef1c24a16d5e119f47bb08178..bb47f66e51a1ab79a75bde9631da3508ed8f1d95 100644 --- a/Apps/Examples/Release/CMakeLists.txt +++ b/Apps/Examples/Release/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) project(examples) diff --git a/Apps/Examples/clipping.cpp b/Apps/Examples/clipping.cpp index 06d1523b23ef0d5c9a5046023b03128116177601..82bf692da0bddd52545bb73004af9f221a16eca1 100644 --- a/Apps/Examples/clipping.cpp +++ b/Apps/Examples/clipping.cpp @@ -186,10 +186,7 @@ void Clipping::slot_spinBox_GridResolution(int i) void Clipping::slot_pushButton_changePlanesColor() { - QColor NewColor; - QColorDialog ColDialog; - - NewColor = ColDialog.getColor(); + QColor NewColor = QColorDialog::getColor(); int r, g, b; NewColor.getRgb(&r, &g, &b); diff --git a/Apps/Tuto/CMakeLists.txt b/Apps/Tuto/CMakeLists.txt index 60c4e3d4a5aaa8a73f1d921a602d14b4f99c2568..161c5d4766fba67414308e97e87571c78e82651d 100644 --- a/Apps/Tuto/CMakeLists.txt +++ b/Apps/Tuto/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) project(Tutos) diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 5d3ab6b4c8364c63e8d5d8ea4abad08eb3c7076f..57b9f699763dc18b7e6c641b79b29d6fa200e2d4 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) project(CGoGN) diff --git a/build/Debug/CMakeLists.txt b/build/Debug/CMakeLists.txt index 24ac94c55b46c4846dd2baf05f96c4369cc7217c..1a8607f15873a924eb37cb04236779a5dd03560e 100644 --- a/build/Debug/CMakeLists.txt +++ b/build/Debug/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) project(CGoGNDebug) diff --git a/build/Release/CMakeLists.txt b/build/Release/CMakeLists.txt index 512990e979f60a7c84da8e1b7e3949512a36f4df..5c7459ad1a8f38916c065cf2f7a187a3bcfccb99 100644 --- a/build/Release/CMakeLists.txt +++ b/build/Release/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) project(CGoGNRelease) diff --git a/include/Algo/ImplicitHierarchicalMesh/ihm.h b/include/Algo/ImplicitHierarchicalMesh/ihm.h index c59a703458efeb7c96fc26bee8e75f3f38059ed0..7e3caa0c67b7332f959da6e23387f1e4774a09c2 100644 --- a/include/Algo/ImplicitHierarchicalMesh/ihm.h +++ b/include/Algo/ImplicitHierarchicalMesh/ihm.h @@ -25,8 +25,7 @@ #ifndef __IMPLICIT_HIERARCHICAL_MAP__ #define __IMPLICIT_HIERARCHICAL_MAP__ -#include "Topology/map/map2.h" -#include "Topology/generic/embeddedMap2.h" +#include "Topology/map/embeddedMap2.h" namespace CGoGN { @@ -39,7 +38,7 @@ namespace IHM template class AttributeHandler_IHM ; -class ImplicitHierarchicalMap : public EmbeddedMap2 +class ImplicitHierarchicalMap : public EmbeddedMap2 { template friend class AttributeHandler_IHM ; diff --git a/include/Algo/ImplicitHierarchicalMesh/ihm.hpp b/include/Algo/ImplicitHierarchicalMesh/ihm.hpp index 466dbf901ffcaac27f2e67478abc783232532921..466498f7c33504fe046f76bbba056a07add0be9c 100644 --- a/include/Algo/ImplicitHierarchicalMesh/ihm.hpp +++ b/include/Algo/ImplicitHierarchicalMesh/ihm.hpp @@ -253,7 +253,7 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_cc(Dart d, FunctorType& f, inline void ImplicitHierarchicalMap::splitFace(Dart d, Dart e) { - EmbeddedMap2::splitFace(d, e) ; + EmbeddedMap2::splitFace(d, e) ; if(isOrbitEmbedded(FACE)) { unsigned int cur = m_curLevel ; diff --git a/src/Utils/qtgl.cpp b/src/Utils/qtgl.cpp index e9cc62b24d02ca827c5d7989aa8542563acfd30a..f7bcb71c860ec3a0814298676e12e3bca8eaa4ef 100644 --- a/src/Utils/qtgl.cpp +++ b/src/Utils/qtgl.cpp @@ -336,8 +336,8 @@ void GLWidget::keyPressEvent(QKeyEvent* event) m_state_modifier = event->modifiers(); int k = event->key(); -// if ( (k >= 65) && (k <= 91) && !(event->modifiers() & Qt::ShiftModifier) ) -// k += 32; + if ( (k >= 65) && (k <= 91) && !(event->modifiers() & Qt::ShiftModifier) ) + k += 32; if (m_cbs) m_cbs->cb_keyPress(k);