Fix further porting issues. [skip ci]

Author: VolkerEnderlein

volumerendering/Cute/curvep/CurveView.cpp

@@ -186,7 +186,11 @@ CurveView::contentsMouseReleaseEvent(QMouseEvent * e)
 void
 CurveView::contentsMouseMoveEvent(QMouseEvent* e)
 {
+#if QT_VERSION >= 0x050D00
+  QPoint p = transform().inverted().map(e->pos());
+#else
   QPoint p = matrix().inverted().map(e->pos());
+#endif
 
   if (this->curvemode == CurveView::SMOOTH) {
     // change the cursor if it is over a control point

volumerendering/OrthoSliceHandler.cpp

@@ -93,7 +93,11 @@ OrthoSliceHandler::initGUI(void)
 
 
   QString s;
+#if QT_VERSION >= 0x050E00
+  s = QString("%1").arg(this->node->sliceNumber.getValue());
+#else
   s.sprintf("%d", this->node->sliceNumber.getValue());
+#endif
   this->ctrl->sliceNumberEdit->setText(s);
 
   QObject::connect(this->ctrl->sliceNumberEdit, SIGNAL(returnPressed()),
@@ -142,7 +146,11 @@ OrthoSliceHandler::sliceNumberSliderUpdate(int val)
   this->node->sliceNumber = val;
 
   QString s;
+#if QT_VERSION >= 0x050E00
+  s = QString("%1").arg(val);
+#else
   s.sprintf("%d", val);
+#endif
   this->ctrl->sliceNumberEdit->setText(s);
 }
 

volumerendering/TransferFunctionHandler.cpp

@@ -85,9 +85,17 @@ TransferFunctionHandler::initGUI(void)
   this->ctrl->highEdit->setValidator(v);
 
   QString s;
+#if QT_VERSION >= 0x050E00
+  s = QString("%1").arg(this->remap[0]);
+#else
   s.sprintf("%d", this->remap[0]);
+#endif
   this->ctrl->lowEdit->setText(s);
+#if QT_VERSION >= 0x050E00
+  s = QString("%1").arg(this->remap[1]);
+#else
   s.sprintf("%d", this->remap[1]);
+#endif
   this->ctrl->highEdit->setText(s);
 
   QObject::connect(this->ctrl->lowEdit, SIGNAL(returnPressed()),
@@ -112,9 +120,17 @@ TransferFunctionHandler::initGUI(void)
   this->ctrl->shiftEdit->setValidator(v);
   this->ctrl->offsetEdit->setValidator(v);
 
+#if QT_VERSION >= 0x050E00
+  s = QString("%1").arg(this->node->shift.getValue());
+#else
   s.sprintf("%d", this->node->shift.getValue());
+#endif
   this->ctrl->shiftEdit->setText(s);
+#if QT_VERSION >= 0x050E00
+  s = QString("%1").arg(this->node->offset.getValue());
+#else
   s.sprintf("%d", this->node->offset.getValue());
+#endif
   this->ctrl->offsetEdit->setText(s);
 
   QObject::connect(this->ctrl->shiftEdit, SIGNAL(returnPressed()),

volumerendering/VolumeRenderHandler.cpp

@@ -95,7 +95,11 @@ VolumeRenderHandler::initGUI(void)
 
 
   QString s;
+#if QT_VERSION >= 0x050E00
+  s = QString("%1").arg(this->node->numSlices.getValue());
+#else
   s.sprintf("%d", this->node->numSlices.getValue());
+#endif
   this->ctrl->numSlicesEdit->setText(s);
 
   QObject::connect(this->ctrl->numSlicesEdit, SIGNAL(returnPressed()),
@@ -145,7 +149,11 @@ VolumeRenderHandler::numSlicesSliderUpdate(int val)
   this->node->numSlices = val;
 
   QString s;
+#if QT_VERSION >= 0x050E00
+  s = QString("%1").arg(val);
+#else
   s.sprintf("%d", val);
+#endif
   this->ctrl->numSlicesEdit->setText(s);
 }