Add Qt6 support. [skip ci]

Author: VolkerEnderlein

actions/raypick.cpp.in

@@ -53,8 +53,8 @@ static SoCoordinate3 * pickpoints = NULL;
 
 // Calculates azimuth angle for the "directionvec" input argument. An
 // azimuth angle is the angle of a vector versus the direction of
-// compass north, where 0� means the input vector points straight
-// north, 90� is east, 180� south and 270� is west.
+// compass north, where 0° means the input vector points straight
+// north, 90° is east, 180° south and 270° is west.
 static float
 azimuth_angle(SbVec3f north, SbVec3f east, SbVec3f directionvec)
 {

actions/tesselate.cpp

@@ -69,7 +69,7 @@ find_coord3_idx(const SoCoordinate3 * c, const SbVec3f & v)
 #else // __COIN__
 
   // FIXME: the run-time of this algorithm could quickly get very
-  // ugly.. like O(n²)-time ugly. Use an oct-tree or something to
+  // ugly.. like O(n^2)-time ugly. Use an oct-tree or something to
   // fix. 20011009 mortene.
   int size = c->point.getNum();
   for (int i=0; i < size; i++) {

components/backgroundimg.cpp.in

@@ -230,7 +230,7 @@ MyExaminerViewer::actualRedraw(void)
   So@Gui@ExaminerViewer::actualRedraw();
 
 
-  // Increase arrow angle with 1/1000 � every frame.
+  // Increase arrow angle with 1/1000 ° every frame.
   arrowrotation->angle = arrowrotation->angle.getValue() + (0.001f / float(M_PI) * 180);
   // Render overlay front scenegraph.
   glClear(GL_DEPTH_BUFFER_BIT);

eyecandy/mandelzoom.cpp.in

@@ -208,7 +208,7 @@ Landscape::~Landscape(void)
 
 void
 Landscape::createJulia(int n) { 
-  register double zr, zr_old, zi, cr, ci; 
+  double zr, zr_old, zi, cr, ci; 
   int w,minw=293284296;
   static int oldw = 0;
 

eyecandy/moirepatterns.cpp.in

@@ -90,7 +90,7 @@ main(
   }
 
   (void)fprintf( stdout, "PointSet contains a total of %d points.\n\n", num );
-  (void)fprintf( stdout, "Spin the pointset to see the moir� patterns change.\n" );
+  (void)fprintf( stdout, "Spin the pointset to see the moirè patterns change.\n" );
   (void)fprintf( stdout, "You can also change between perspective camera and\n" );
   (void)fprintf( stdout, "orthographic camera to get different types of patterns.\n" );
   (void)fprintf( stdout, "\n" );
@@ -128,7 +128,7 @@ main(
   // set up viewer
   So@Gui@ExaminerViewer * viewer = new So@Gui@ExaminerViewer( window );
   viewer->setSceneGraph( root );
-  viewer->setTitle( "Moir� Patterns" );
+  viewer->setTitle( "Moirè Patterns" );
   viewer->show();
 
   So@Gui@::show( window );

volumerendering/Cute/curvep/ColorTableEditor.cpp

@@ -154,7 +154,11 @@ SoQtColorTableEditor::SoQtColorTableEditor(int numcolors, QWidget * parent, cons
   this->setSizePolicy(sizepolicy);
 
   QGridLayout * toplayout = new QGridLayout(this);
+#if QT_VERSION >= 0x050000
+  toplayout->setContentsMargins(10, 10, 10, 10);
+#else
   toplayout->setMargin(10);
+#endif
   QVBoxLayout * buttonlayout = new QVBoxLayout();
 
   QGroupBox * controlgroup = new QGroupBox(this);

volumerendering/Cute/curvep/CurveView.cpp

@@ -141,7 +141,11 @@ void CurveView::contentsMousePressEvent(QMouseEvent* e)
   if (e->button() == Qt::LeftButton) {
     this->mousepressed = TRUE;
   }
+#if QT_VERSION >= 0x050D00
+  QPoint p = transform().inverted().map(e->pos());
+#else
   QPoint p = matrix().inverted().map(e->pos());
+#endif
   this->movingstart = p;
   this->lastpos = p;
   QList<QGraphicsItem*> list = this->canvas->items(p);

volumerendering/Cute/curvep/CurveView.h

@@ -60,8 +60,12 @@ class CurveView : public QGraphicsView
             QGraphicsScene * canvas, 
             QWidget * parent = 0, 
             const char * name = 0, 
-            Qt::WindowFlags flags = 0);
-  
+#if QT_VERSION >= 0x050F00
+            Qt::WindowFlags flags = Qt::WindowFlags()
+#else
+            Qt::WindowFlags flags = 0
+#endif
+  );
   ~CurveView();
 
   enum CurveType { SMOOTH, FREE };

volumerendering/Cute/gradientp/GradientView.cpp

@@ -171,7 +171,11 @@ GradientView::updateView(void)
 void
 GradientView::mousePressEvent(QMouseEvent * e)
 {
+#if QT_VERSION >= 0x050D00
+  QPoint p = transform().inverted().map(e->pos());
+#else
   QPoint p = matrix().inverted().map(e->pos());
+#endif
 
   switch (e->button()) {
   case Qt::LeftButton:
@@ -206,7 +210,11 @@ GradientView::mousePressEvent(QMouseEvent * e)
   case Qt::RightButton:
     if ((this->currenttick != -1) || (this->segmentidx != -1)) {
       this->buildMenu();
+#if QT_VERSION >= 0x060000
+      if (this->menu->exec(e->globalPosition().toPoint())) {
+#else
       if (this->menu->exec(e->globalPos())) {
+#endif
         // FIXME: this seems unnecessary. 20031008 mortene.
         delete this->menu;
         this->menu = NULL;
@@ -230,7 +238,11 @@ GradientView::mouseMoveEvent(QMouseEvent * e)
 {
   if (this->mousepressed) {
     if (this->currenttick == -1) { return; }
+#if QT_VERSION >= 0x050D00
+    QPoint p = transform().inverted().map(e->pos());
+#else
     QPoint p = matrix().inverted().map(e->pos());
+#endif
     int x = p.x();
 
     assert(this->currenttick > 0);
@@ -253,21 +265,33 @@ GradientView::mouseMoveEvent(QMouseEvent * e)
 
       const float value = t * (this->max - this->min) + 0.5f;
       QString s;
+#if QT_VERSION >= 0x050E00
+      s = QString("Color table index: %1").arg((int)(value + 0.5f));
+#else
       s.sprintf("Color table index: %d", (int)(value + 0.5f));
+#endif
       this->statusbar->showMessage(s);
 
       emit this->viewChanged();
     }
   } else {
+#if QT_VERSION >= 0x050D00
+    QPoint p = transform().inverted().map(e->pos());
+#else
     QPoint p = matrix().inverted().map(e->pos());
+#endif
     float t = (float)p.x() / (float)this->width();
     // this test should not be necessary, however the mouse coordinates from
     // the mouse event can sometimes be out of bounds, i.e. they can sometimes
     // be smaller than 0 or larger than canvas.width or canvas.height.
     if ((t >= 0.0f) && (t <= 1.0f)) {
       QRgb col = this->grad.eval(t);
       QString s;
+#if QT_VERSION >= 0x050E00
+      s = QString("RGBA: 0x%1%2%3%4").arg(qRed(col), 2, 16, '0').arg(qGreen(col), 2, 16, '0').arg(qBlue(col, 2, 16, '0').arg(qAlpha(col, 2, 16, '0'));
+#else
       s.sprintf("RGBA: 0x%02x%02x%02x%02x", qRed(col), qGreen(col), qBlue(col), qAlpha(col));
+#endif
       this->statusbar->showMessage(s);
     }
   }

volumerendering/Cute/gradientp/GradientView.h

@@ -56,7 +56,12 @@ class GradientView : public QGraphicsView
                const Gradient & g = Gradient(), 
                QWidget * parent = 0, 
                const char * name = 0, 
-               Qt::WindowFlags f = 0);
+#if QT_VERSION >= 0x050F00
+               Qt::WindowFlags f = Qt::WindowFlags()
+#else
+               Qt::WindowFlags f = 0
+#endif
+  );
 
   ~GradientView();