songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mesh_3 fix post merge

This commit is contained in:
Maxime Gimeno 2015-06-30 13:47:52 +02:00
parent 8ab112f5bd
commit 0a55b1399e
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mesh_3/demo/Mesh_3/Scene_implicit_function_item.h
View File

@ -117,7 +117,7 @@ private:
void compile_shaders(); void compile_shaders();
void compute_texture(int, int); void compute_texture(int, int);
public slots: public Q_SLOTS:
void changed(); void changed();
}; };

2
Mesh_3/demo/Mesh_3/Scene_polygon_soup.h
View File

@ -73,7 +73,7 @@ private:
void attrib_buffers(QGLViewer*) const; void attrib_buffers(QGLViewer*) const;
void compile_shaders(); void compile_shaders();
public slots: public Q_SLOTS:
void changed(); void changed();
}; // end class Scene_polygon_soup }; // end class Scene_polygon_soup

2
Mesh_3/demo/Mesh_3/Scene_polyhedron_item.h
View File

@ -75,7 +75,7 @@ private:
void attrib_buffers(QGLViewer*) const; void attrib_buffers(QGLViewer*) const;
void compile_shaders(); void compile_shaders();
public slots: public Q_SLOTS:
void changed(); void changed();
}; // end class Scene_polyhedron_item }; // end class Scene_polyhedron_item

2
Mesh_3/demo/Mesh_3/Scene_segmented_image_item.h
View File

@ -78,7 +78,7 @@ private:
void attrib_buffers(QGLViewer*) const; void attrib_buffers(QGLViewer*) const;
void compile_shaders(); void compile_shaders();
void draw_Bbox(Bbox bbox, std::vector<float> *vertices); void draw_Bbox(Bbox bbox, std::vector<float> *vertices);
public slots: public Q_SLOTS:
void changed(); void changed();
#endif // SCENE_SEGMENTED_IMAGE_GL_BUFFERS_AVAILABLE #endif // SCENE_SEGMENTED_IMAGE_GL_BUFFERS_AVAILABLE
}; };

9
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
View File

@ -54,23 +54,18 @@ Scene::erase(int index)
return -1; return -1;
Scene_item* item = entries[index]; Scene_item* item = entries[index];
<<<<<<< HEAD
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
QAbstractListModel::beginResetModel(); QAbstractListModel::beginResetModel();
emit itemAboutToBeDestroyed(item); Q_EMIT itemAboutToBeDestroyed(item);
delete item; delete item;
entries.removeAt(index); entries.removeAt(index);
selected_item = -1; selected_item = -1;
emit updated(); Q_EMIT updated();
QAbstractListModel::endResetModel(); QAbstractListModel::endResetModel();
#else #else
emit itemAboutToBeDestroyed(item);
=======
Q_EMIT itemAboutToBeDestroyed(item); Q_EMIT itemAboutToBeDestroyed(item);
>>>>>>> cgal/master
delete item; delete item;
entries.removeAt(index); entries.removeAt(index);