Fix the call to Q_INIT_RESOURCE

lrineau · lrineau · commit 88ef56171549 · 2011-10-11T09:51:29.000Z
For resources that are shipped by the CGAL_Qt4 library, one need to call
CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources
(exported by the CGAL_Qt4 DLL)
diff --git a/AABB_tree/demo/AABB_tree/AABB_demo.cpp b/AABB_tree/demo/AABB_tree/AABB_demo.cpp
@@ -24,6 +24,7 @@
 
 #include "MainWindow.h"
 #include <QApplication>
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -34,10 +35,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Triangulation_2); 
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp b/Alpha_shapes_3/demo/Alpha_shapes_3/Alpha_shape_3.cpp
@@ -4,7 +4,7 @@
 #include <QApplication>
 
 
-
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char** argv)
 {
@@ -16,9 +16,9 @@ int main(int argc, char** argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
+  CGAL_QT4_INIT_RESOURCES;
   Q_INIT_RESOURCE(Alpha_shape_3);
-  Q_INIT_RESOURCE(CGAL);
+  
   MainWindow mw;
   mw.show();
 
diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp
@@ -1618,6 +1618,7 @@ void MainWindow::zoomToFit()
 }
 
 #include "boolean_operations_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -1629,9 +1630,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
   
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp
@@ -289,6 +289,7 @@ MainWindow::on_actionRecenter_triggered()
 
 
 #include "Alpha_shapes_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -300,10 +301,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Triangulation_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp
@@ -272,6 +272,7 @@ MainWindow::on_actionRecenter_triggered()
 
 
 #include "Apollonius_graph_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -283,10 +284,8 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
+  CGAL_QT4_INIT_RESOURCES;
   Q_INIT_RESOURCE(Apollonius_graph_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp
@@ -529,6 +529,7 @@ MainWindow::on_actionRecenter_triggered()
 
 
 #include "Bounding_volumes.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -540,9 +541,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp b/GraphicsView/demo/Circular_kernel_2/Circular_kernel_2.cpp
@@ -278,6 +278,7 @@ MainWindow::on_actionRecenter_triggered()
 
 
 #include "Circular_kernel_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -289,9 +290,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Generator/Generator_2.cpp b/GraphicsView/demo/Generator/Generator_2.cpp
@@ -271,6 +271,7 @@ MainWindow::clear()
 
 
 #include "Generator_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -282,10 +283,8 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
+  CGAL_QT4_INIT_RESOURCES;
   Q_INIT_RESOURCE(Generator_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp b/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp
@@ -374,6 +374,7 @@ MainWindow::bounding_rect() {
 
 
 #include "L1_voronoi_diagram_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -385,11 +386,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Triangulation_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
-
+  CGAL_QT4_INIT_RESOURCES;
   MainWindow mainWindow;
   mainWindow.show();
   return app.exec();
diff --git a/GraphicsView/demo/Largest_empty_rect_2/Largest_empty_rectangle_2.cpp b/GraphicsView/demo/Largest_empty_rect_2/Largest_empty_rectangle_2.cpp
@@ -265,6 +265,7 @@ MainWindow::clear()
 
 
 #include "Largest_empty_rectangle_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -276,10 +277,8 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
+  CGAL_QT4_INIT_RESOURCES;
   Q_INIT_RESOURCE(Largest_empty_rectangle_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Polygon/Polygon_2.cpp b/GraphicsView/demo/Polygon/Polygon_2.cpp
@@ -553,6 +553,7 @@ MainWindow::clear()
 
 
 #include "Polygon_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -564,10 +565,8 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
+  CGAL_QT4_INIT_RESOURCES;
   Q_INIT_RESOURCE(Polygon_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp
@@ -365,6 +365,7 @@ MainWindow::saveConstraints(QString /*fileName*/)
 
 
 #include "Segment_voronoi_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -376,10 +377,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Triangulation_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp
@@ -296,6 +296,7 @@ MainWindow::on_actionRecenter_triggered()
 
 
 #include "Snap_rounding_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -307,10 +308,8 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
+  CGAL_QT4_INIT_RESOURCES;
   Q_INIT_RESOURCE(Snap_rounding_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp b/GraphicsView/demo/Spatial_searching_2/Spatial_searching_2.cpp
@@ -278,6 +278,7 @@ MainWindow::clear()
 
 
 #include "Spatial_searching_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -289,10 +290,8 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
+  CGAL_QT4_INIT_RESOURCES;
   Q_INIT_RESOURCE(Spatial_searching_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp
@@ -229,6 +229,7 @@ MainWindow::on_actionRecenter_triggered()
 
 
 #include "Stream_lines_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -240,10 +241,8 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
+  CGAL_QT4_INIT_RESOURCES;
   Q_INIT_RESOURCE(Stream_lines_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
@@ -712,6 +712,7 @@ MainWindow::on_actionInsertRandomPoints_triggered()
 }
 
 #include "Constrained_Delaunay_triangulation_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -723,10 +724,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Triangulation_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp
@@ -370,6 +370,7 @@ MainWindow::on_actionRecenter_triggered()
 
 
 #include "Delaunay_triangulation_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -381,10 +382,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Triangulation_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp
@@ -285,6 +285,7 @@ MainWindow::on_actionRecenter_triggered()
 
 
 #include "Regular_triangulation_2.moc"
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -296,10 +297,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Triangulation_2);
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/GraphicsView/include/CGAL/Qt/resources.h b/GraphicsView/include/CGAL/Qt/resources.h
@@ -20,9 +20,13 @@
 #ifndef CGAL_QT_RESOURCES_H
 #define CGAL_QT_RESOURCES_H
 
+#include <CGAL/Qt/export.h>
+
 // cannot use namespaces because of the Q_INIT_RESOURCE macro
 CGAL_QT4_EXPORT void CGAL_Qt4_init_resources();
 
-#define CGAL_QT4_INIT_RESOURCES CGAL_Qt4_init_resources();
+#define CGAL_QT4_INIT_RESOURCES do { CGAL_Qt4_init_resources(); } while(0)
+// The do{}while(0) trick is used to make that macro value a regular
+// statement and not a compound statement.
 
 #endif // CGAL_QT_RESOURCES_H
diff --git a/Mesh_3/demo/Mesh_3/Mesh_3.cpp b/Mesh_3/demo/Mesh_3/Mesh_3.cpp
@@ -1,5 +1,6 @@
 #include "MainWindow.h"
 #include <QApplication>
+#include <CGAL/Qt/resources.h>
 
 int main(int argc, char **argv)
 {
@@ -10,10 +11,7 @@ int main(int argc, char **argv)
 
   // Import resources from libCGALQt4.
   // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE
-  Q_INIT_RESOURCE(File);
-  Q_INIT_RESOURCE(Triangulation_2); 
-  Q_INIT_RESOURCE(Input);
-  Q_INIT_RESOURCE(CGAL);
+  CGAL_QT4_INIT_RESOURCES;
 
   MainWindow mainWindow;
   mainWindow.show();
diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/Periodic_Lloyd_3.cpp
diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp
diff --git a/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp b/Principal_component_analysis/demo/Principal_component_analysis/PCA_demo.cpp
diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp

Original file line number	Diff line number	Diff line change
`@@ -1618,6 +1618,7 @@ void MainWindow::zoomToFit()`
`1618`	`1618`	`}`
`1619`	`1619`
`1620`	`1620`	`#include "boolean_operations_2.moc"`
	`1621`	`+#include <CGAL/Qt/resources.h>`
`1621`	`1622`
`1622`	`1623`	`int main(int argc, char **argv)`
`1623`	`1624`	`{`
`@@ -1629,9 +1630,7 @@ int main(int argc, char **argv)`
`1629`	`1630`
`1630`	`1631`	`// Import resources from libCGALQt4.`
`1631`	`1632`	`// See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE`
`1632`		`- Q_INIT_RESOURCE(File);`
`1633`		`- Q_INIT_RESOURCE(Input);`
`1634`		`- Q_INIT_RESOURCE(CGAL);`
	`1633`	`+ CGAL_QT4_INIT_RESOURCES;`
`1635`	`1634`
`1636`	`1635`	`MainWindow mainWindow;`
`1637`	`1636`	`mainWindow.show();`