OMPlot/OMEdit: QMouseEvent::globalPos, x, y are deprecated (#13020)

* OMPlot: QMouseEvent::globalPos is deprecated

* OMEdit: globalPos is deprecated

* OMEdit: QMouseEvent::x(), y() is deprecated

* OMNotebook: Use QT_VERSION_CHECK

Author: jschueller

OMEdit/OMEditLIB/Animation/ViewerWidget.cpp

@@ -210,7 +210,11 @@ void ViewerWidget::keyReleaseEvent(QKeyEvent *event)
 void ViewerWidget::mouseMoveEvent(QMouseEvent *event)
 {
   int pixelRatio = qCeil(qApp->devicePixelRatio());
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  getEventQueue()->mouseMotion(static_cast<float>(event->position().x() * pixelRatio), static_cast<float>(event->position().y() * pixelRatio));
+#else
   getEventQueue()->mouseMotion(static_cast<float>(event->x() * pixelRatio), static_cast<float>(event->y() * pixelRatio));
+#endif
 }
 
 /*!
@@ -240,15 +244,23 @@ void ViewerWidget::mousePressEvent(QMouseEvent *event)
       mMouseButton = 3;
       if (event->modifiers() == Qt::ShiftModifier) {
         //qt counts pixels from upper left corner and osg from bottom left corner
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+        pickVisualizer(event->position().x() * pixelRatio, (this->height() - event->position().y()) * pixelRatio);
+#else
         pickVisualizer(event->x() * pixelRatio, (this->height() - event->y()) * pixelRatio);
+#endif
         showVisualizerPickContextMenu(event->pos());
         return;
       }
       break;
     default:
       break;
   }
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  getEventQueue()->mouseButtonPress(static_cast<float>(event->position().x() * pixelRatio), static_cast<float>(event->position().y() * pixelRatio), mMouseButton);
+#else
   getEventQueue()->mouseButtonPress(static_cast<float>(event->x() * pixelRatio), static_cast<float>(event->y() * pixelRatio), mMouseButton);
+#endif
 }
 
 /*!
@@ -499,7 +511,11 @@ void ViewerWidget::mouseReleaseEvent(QMouseEvent *event)
       break;
   }
   int pixelRatio = qCeil(qApp->devicePixelRatio());
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  getEventQueue()->mouseButtonRelease(static_cast<float>(event->position().x() * pixelRatio), static_cast<float>(event->position().y() * pixelRatio), mMouseButton);
+#else
   getEventQueue()->mouseButtonRelease(static_cast<float>(event->x() * pixelRatio), static_cast<float>(event->y() * pixelRatio), mMouseButton);
+#endif
 }
 
 /*!

OMEdit/OMEditLIB/Editors/BaseEditor.cpp

@@ -1061,7 +1061,11 @@ void PlainTextEdit::lineNumberAreaMouseEvent(QMouseEvent *event)
         QMenu menu(this);
         mpBaseEditor->getToggleBreakpointAction()->setData(QStringList() << fileName << QString::number(lineNumber));
         menu.addAction(mpBaseEditor->getToggleBreakpointAction());
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+        menu.exec(event->globalPosition().toPoint());
+#else
         menu.exec(event->globalPos());
+#endif
       }
     }
   }

OMEdit/OMEditLIB/Modeling/ItemDelegate.cpp

@@ -52,7 +52,11 @@ ItemDelegate::ItemDelegate(QObject *pParent, bool drawRichText, bool drawGrid)
 QString ItemDelegate::formatDisplayText(QVariant variant) const
 {
   QString text;
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+  if (variant.typeId() == QMetaType::Double) {
+#else
   if (variant.type() == QVariant::Double) {
+#endif
     text = QLocale().toString(variant.toDouble());
   } else {
     text = variant.toString();
@@ -88,7 +92,11 @@ void ItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
   QRect decorationRect;
   value = index.data(Qt::DecorationRole);
   if (value.isValid()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    if (value.typeId() == QMetaType::QIcon) {
+#else
     if (value.type() == QVariant::Icon) {
+#endif
       icon = qvariant_cast<QIcon>(value);
       decorationRect = QRect(QPoint(0, 0), icon.actualSize(opt.decorationSize, iconMode, iconState));
     } else {

OMNotebook/OMNotebook/OMNotebookGUI/cell.cpp

@@ -383,7 +383,7 @@ namespace IAEX
       }
       else if( (*current)->attribute() == "FontFamily" )
       {
-#if QT_VERSION >= 0x060000
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
         style_.textCharFormat()->setFontFamilies({(*current)->value()});
 #else
         style_.textCharFormat()->setFontFamily( (*current)->value() );

OMNotebook/OMNotebook/OMNotebookGUI/cellstyle.h

@@ -69,7 +69,7 @@ namespace IAEX
   public:
     CellStyle()
     {
-#if QT_VERSION >= 0x060000
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
       textFormat_.setFontFamilies({"Times New Roman"});
 #else
       textFormat_.setFontFamily( "Times New Roman" );

OMNotebook/OMNotebook/OMNotebookGUI/stylesheet.cpp

@@ -363,7 +363,7 @@ namespace IAEX
         // FAMILY
         if( fontElement.tagName() == "family" )
         {
-#if QT_VERSION >= 0x060000
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
           item->textCharFormat()->setFontFamilies({fontElement.text()});
 #else
           item->textCharFormat()->setFontFamily( fontElement.text() );

OMPlot/OMPlot/OMPlotGUI/Legend.cpp

@@ -92,7 +92,11 @@ bool Legend::eventFilter(QObject *object, QEvent *event)
 #endif
     if (pPlotCurve) {
       QString toolTip = tr("Name: <b>%1</b><br />Filename: <b>%2</b>").arg(pPlotCurve->title().text()).arg(pPlotCurve->getFileName());
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+      QToolTip::showText(pMouseEvent->globalPosition().toPoint(), toolTip, this);
+#else
       QToolTip::showText(pMouseEvent->globalPos(), toolTip, this);
+#endif
     } else {
       QToolTip::hideText();
     }

OMShell/OMShell/OMShellGUI/oms.cpp

@@ -280,7 +280,7 @@ OMS::OMS( QWidget* parent )
   }
 
   // command stuff
-#if QT_VERSION >= 0x060000
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
   commandSignFormat_.setFontFamilies({"Arial"});
 #else
   commandSignFormat_.setFontFamily( "Arial" );
@@ -449,7 +449,7 @@ void OMS::addCommandLine()
 
   // set original text settings
   moshEdit_->document()->setDefaultFont(QFont("Courier New", fontSize_, QFont::Normal));
-#if QT_VERSION >= 0x060000
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
   textFormat_.setFontFamilies({"Courier New"});
 #else
   textFormat_.setFontFamily( "Courier New" );