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

Fix override and shadow warnings for clang

This commit is contained in:
Maxime Gimeno 2019-05-31 10:22:21 +02:00
parent ef26c37b75
commit d34ac7b14b
7 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp
View File

@ -860,6 +860,7 @@ public:
return ok; return ok;
} }
using Polyhedron_demo_plugin_interface::init;
void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface,
Messages_interface* m) override; Messages_interface* m) override;
QList<QAction*> actions() const Q_DECL_OVERRIDE; QList<QAction*> actions() const Q_DECL_OVERRIDE;

2
Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_plugin.cpp
View File

@ -18,7 +18,7 @@ class Polyhedron_demo_camera_positions_plugin :
Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90") Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90")
public: public:
void init(); void init() override;
QString name() const { return "camera_positions_plugin"; } QString name() const { return "camera_positions_plugin"; }
QString nameFilters() const { return "Camera positions (*.camera.txt)"; } QString nameFilters() const { return "Camera positions (*.camera.txt)"; }

1
Polyhedron/demo/Polyhedron/Plugins/IO/Implicit_function_io_plugin.cpp
View File

@ -42,7 +42,6 @@
using namespace CGAL::Three; using namespace CGAL::Three;
class Io_implicit_function_plugin : class Io_implicit_function_plugin :
public QObject, public QObject,
// public Polyhedron_demo_plugin_interface,
protected Polyhedron_demo_plugin_helper protected Polyhedron_demo_plugin_helper
{ {
Q_OBJECT Q_OBJECT

17
Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp
View File

@ -24,6 +24,7 @@ public:
// To silent a warning -Woverloaded-virtual // To silent a warning -Woverloaded-virtual
// See http://stackoverflow.com/questions/9995421/gcc-woverloaded-virtual-warnings // See http://stackoverflow.com/questions/9995421/gcc-woverloaded-virtual-warnings
using Polyhedron_demo_io_plugin_interface::init;
//! Configures the widget //! Configures the widget
void init(QMainWindow* mainWindow, void init(QMainWindow* mainWindow,
CGAL::Three::Scene_interface* scene_interface, CGAL::Three::Scene_interface* scene_interface,
@ -43,14 +44,14 @@ public:
connect(actionJoin_polylines, &QAction::triggered, this, &Polyhedron_demo_polylines_io_plugin::join); connect(actionJoin_polylines, &QAction::triggered, this, &Polyhedron_demo_polylines_io_plugin::join);
} }
QString name() const { return "polylines_io_plugin"; } QString name() const override{ return "polylines_io_plugin"; }
QString nameFilters() const { return "Polylines files (*.polylines.txt *.cgal)"; } QString nameFilters() const override{ return "Polylines files (*.polylines.txt *.cgal)"; }
bool canLoad(QFileInfo fileinfo) const; bool canLoad(QFileInfo fileinfo) const override;
QList<Scene_item*> load(QFileInfo fileinfo, bool& ok, bool add_to_scene=true); QList<Scene_item*> load(QFileInfo fileinfo, bool& ok, bool add_to_scene=true) override;
bool canSave(const CGAL::Three::Scene_item*); bool canSave(const CGAL::Three::Scene_item*) override;
bool save(QFileInfo fileinfo,QList<CGAL::Three::Scene_item*>&); bool save(QFileInfo fileinfo,QList<CGAL::Three::Scene_item*>&) override;
bool applicable(QAction* a) const { bool applicable(QAction* a) const override{
bool all_polylines_selected = true; bool all_polylines_selected = true;
Q_FOREACH(int index, scene->selectionIndices()) Q_FOREACH(int index, scene->selectionIndices())
{ {
@ -69,7 +70,7 @@ public:
else else
return false; return false;
} }
QList<QAction*> actions() const { QList<QAction*> actions() const override{
return QList<QAction*>()<<actionSplit_polylines return QList<QAction*>()<<actionSplit_polylines
<<actionJoin_polylines; <<actionJoin_polylines;

1
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp
View File

@ -31,7 +31,6 @@ public:
private: private:
bool try_load_other_binary_format(std::istream& in, C3t3& c3t3); bool try_load_other_binary_format(std::istream& in, C3t3& c3t3);
bool try_load_a_cdt_3(std::istream& in, C3t3& c3t3); bool try_load_a_cdt_3(std::istream& in, C3t3& c3t3);
CGAL::Three::Scene_interface* scene;
}; };

20
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp
View File

@ -211,11 +211,11 @@ class Io_image_plugin :
public: public:
bool applicable(QAction*) const { bool applicable(QAction*) const override{
return qobject_cast<Scene_image_item*>(scene->item(scene->mainSelectionIndex())); return qobject_cast<Scene_image_item*>(scene->item(scene->mainSelectionIndex()));
} }
using Polyhedron_demo_plugin_interface::init;
void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface *mi) override { void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface *mi) override {
this->message_interface = mi; this->message_interface = mi;
this->scene = scene_interface; this->scene = scene_interface;
@ -270,10 +270,10 @@ public:
} }
} }
} }
QList<QAction*> actions() const { QList<QAction*> actions() const override{
return QList<QAction*>() << planeSwitch; return QList<QAction*>() << planeSwitch;
} }
virtual void closure() virtual void closure() override
{ {
QDockWidget* controlDockWidget = mw->findChild<QDockWidget*>("volumePlanesControl"); QDockWidget* controlDockWidget = mw->findChild<QDockWidget*>("volumePlanesControl");
if(controlDockWidget) if(controlDockWidget)
@ -281,12 +281,12 @@ public:
} }
Io_image_plugin() : planeSwitch(NULL) {} Io_image_plugin() : planeSwitch(NULL) {}
QString nameFilters() const; QString nameFilters() const override;
bool canLoad(QFileInfo) const; bool canLoad(QFileInfo) const override;
QList<Scene_item*> load(QFileInfo fileinfo, bool& ok, bool add_to_scene=true); QList<Scene_item*> load(QFileInfo fileinfo, bool& ok, bool add_to_scene=true) override;
bool canSave(const CGAL::Three::Scene_item*); bool canSave(const CGAL::Three::Scene_item*) override;
bool save(QFileInfo fileinfo, QList<CGAL::Three::Scene_item*>& items ) { bool save(QFileInfo fileinfo, QList<CGAL::Three::Scene_item*>& items ) override{
Scene_item* item = items.front(); Scene_item* item = items.front();
const Scene_image_item* im_item = qobject_cast<const Scene_image_item*>(item); const Scene_image_item* im_item = qobject_cast<const Scene_image_item*>(item);
@ -295,7 +295,7 @@ public:
items.pop_front(); items.pop_front();
return ok; return ok;
} }
QString name() const { return "segmented images"; } QString name() const override{ return "segmented images"; }
public Q_SLOTS: public Q_SLOTS:

22
Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp
View File

@ -75,10 +75,10 @@ class Polyhedron_demo_selection_plugin :
Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "selection_plugin.json") Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "selection_plugin.json")
Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90") Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90")
public: public:
QString nameFilters() const { return "Selection files(*.selection.txt)"; } QString nameFilters() const override { return "Selection files(*.selection.txt)"; }
QString name() const { return "selection_sm_plugin"; } QString name() const override { return "selection_sm_plugin"; }
bool canLoad(QFileInfo) const { bool canLoad(QFileInfo) const override {
Scene_item * item = CGAL::Three::Three::scene()->item( Scene_item * item = CGAL::Three::Three::scene()->item(
CGAL::Three::Three::scene()->mainSelectionIndex()); CGAL::Three::Three::scene()->mainSelectionIndex());
Scene_facegraph_item* fg_item = qobject_cast<Scene_facegraph_item*>(item); Scene_facegraph_item* fg_item = qobject_cast<Scene_facegraph_item*>(item);
@ -91,7 +91,7 @@ public:
return false; return false;
} }
QList<Scene_item*> load(QFileInfo fileinfo, bool& ok, bool add_to_scene=true) { QList<Scene_item*> load(QFileInfo fileinfo, bool& ok, bool add_to_scene=true) override {
if(fileinfo.suffix().toLower() != "txt") if(fileinfo.suffix().toLower() != "txt")
{ {
ok = false; ok = false;
@ -111,10 +111,10 @@ public:
return QList<Scene_item*>()<<item; return QList<Scene_item*>()<<item;
} }
bool canSave(const CGAL::Three::Scene_item* scene_item) { bool canSave(const CGAL::Three::Scene_item* scene_item) override {
return qobject_cast<const Scene_polyhedron_selection_item*>(scene_item); return qobject_cast<const Scene_polyhedron_selection_item*>(scene_item);
} }
bool save(QFileInfo fileinfo,QList<CGAL::Three::Scene_item*>& items) { bool save(QFileInfo fileinfo,QList<CGAL::Three::Scene_item*>& items) override {
Scene_item* scene_item = items.front(); Scene_item* scene_item = items.front();
const Scene_polyhedron_selection_item* item = qobject_cast<const Scene_polyhedron_selection_item*>(scene_item); const Scene_polyhedron_selection_item* item = qobject_cast<const Scene_polyhedron_selection_item*>(scene_item);
if(item == NULL) { return false; } if(item == NULL) { return false; }
@ -125,14 +125,14 @@ public:
return res; return res;
} }
bool applicable(QAction*) const { bool applicable(QAction*) const override {
return qobject_cast<Scene_face_graph_item*>(scene->item(scene->mainSelectionIndex())) return qobject_cast<Scene_face_graph_item*>(scene->item(scene->mainSelectionIndex()))
|| qobject_cast<Scene_polyhedron_selection_item*>(scene->item(scene->mainSelectionIndex())); || qobject_cast<Scene_polyhedron_selection_item*>(scene->item(scene->mainSelectionIndex()));
} }
void print_message(QString message) { CGAL::Three::Three::information(message); } void print_message(QString message) { CGAL::Three::Three::information(message); }
QList<QAction*> actions() const { return QList<QAction*>() << actionSelection; } QList<QAction*> actions() const override { return QList<QAction*>() << actionSelection; }
using Polyhedron_demo_io_plugin_interface::init;
void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) override{ virtual void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) override{
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
messages = m; messages = m;
@ -216,7 +216,7 @@ public:
operations_map[operations_strings[8]] = 8; operations_map[operations_strings[8]] = 8;
operations_map[operations_strings[9]] = 9; operations_map[operations_strings[9]] = 9;
} }
virtual void closure() virtual void closure() override
{ {
dock_widget->hide(); dock_widget->hide();
} }