Fix all build warnings in our code

aalex · aalex · commit 68f44a690940 · 2026-05-23T15:21:19.000-04:00
Replace deprecated Qt 5 APIs with Qt 6 equivalents:
- QVariant::Type enum with QMetaType::Type (Int, Double, QColor, QPointF, QSize)
- QVariant::type() with typeId()
- Q_OS_OSX with Q_OS_MACOS
- QMouseEvent::globalPos() with globalPosition().toPoint()

Silence OpenGL deprecation warnings on macOS with GL_SILENCE_DEPRECATION.
Remove QT_DISABLE_DEPRECATED_BEFORE=0 from qtpropertybrowser build config.
Fix unused variables and parameters, suppress nodiscard warnings.

We cannot replace QImage::mirrored() with flipped(), though:
for Qt &lt; 6.8 compatibility
QImage::flipped() requires Qt 6.8+. Use mirrored() with warning
suppression macros to maintain compatibility with older Qt 6 versions.
diff --git a/.gitignore b/.gitignore
@@ -93,3 +93,6 @@ trash
 !resources/macOS/MapMap.icns
 
 *.json
+
+# Local development notes
+KNOWN-WARNINGS.txt
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -143,12 +143,12 @@ int main(int argc, char *argv[])
     qtTranslator.load(QString("qt_%1").arg(lang),
                       QApplication::applicationDirPath().append("/translations"));
 #else
-    qtTranslator.load(QString("qtbase_%1").arg(lang),
+    (void)qtTranslator.load(QString("qtbase_%1").arg(lang),
                       QLibraryInfo::path(QLibraryInfo::TranslationsPath));
 #endif
     app.installTranslator(&qtTranslator);
 
-    appTranslator.load(QString(":/translations_mapmap_%1").arg(lang));
+    (void)appTranslator.load(QString(":/translations_mapmap_%1").arg(lang));
     app.installTranslator(&appTranslator);
   }
   else {
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
 
   // Load stylesheet.
   QFile stylesheet(":/stylesheet");
-  stylesheet.open(QFile::ReadOnly);
+  (void)stylesheet.open(QFile::ReadOnly);
   app.setStyleSheet(QLatin1String(stylesheet.readAll()));
 
   // read positional argument:
diff --git a/src/control/OscInterface.cpp b/src/control/OscInterface.cpp
@@ -90,7 +90,7 @@ void OscInterface::messageReceivedCb(const QString& oscAddress, const QVariantLi
   QString types = "";
   for (int i = 0; i < arguments.count(); ++ i) {
     QVariant argument = arguments[i];
-    QMetaType::Type type = static_cast<QMetaType::Type>(argument.type());
+    QMetaType::Type type = static_cast<QMetaType::Type>(argument.typeId());
 
     if (type == QMetaType::Int) {
       types += "i";
@@ -126,15 +126,15 @@ static void printCommand(QVariantList &command)
 {
   for (int i = 0; i < command.size(); ++i)
   {
-    if (command.at(i).type() == QVariant::Int)
+    if (command.at(i).typeId() == QMetaType::Int)
     {
       qDebug() << command.at(i).toInt() << " ";
     }
-    else if (command.at(i).type() == QVariant::Double)
+    else if (command.at(i).typeId() == QMetaType::Double)
     {
       qDebug() << command.at(i).toDouble() << " ";
     }
-    else if (command.at(i).type() == QVariant::String)
+    else if (command.at(i).typeId() == QMetaType::QString)
     {
       qDebug() << command.at(i).toString() << " ";
     }
@@ -161,11 +161,11 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma
   {
     return;
   }
-  if (command.at(0).type() != QVariant::String)
+  if (command.at(0).typeId() != QMetaType::QString)
   {
     return;
   }
-  if (command.at(1).type() != QVariant::String)
+  if (command.at(1).typeId() != QMetaType::QString)
   {
     return;
   }
@@ -192,7 +192,7 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma
         if (command.size() >= 3)
         {
           QVector<Source::ptr> sources;
-          if (command.at(2).type() == QVariant::String)
+          if (command.at(2).typeId() == QMetaType::QString)
             sources = main_window.getMappingManager().getSourcesByNameRegExp(command.at(2).toString());
           else
           {
@@ -225,7 +225,7 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma
         if (command.size() >= 3)
         {
           QVector<Layer::ptr> layers;
-          if (command.at(2).type() == QVariant::String)
+          if (command.at(2).typeId() == QMetaType::QString)
             layers = main_window.getMappingManager().getLayersByNameRegExp(command.at(2).toString());
           else
           {
diff --git a/src/control/qosc/oscsender.cpp b/src/control/qosc/oscsender.cpp
@@ -41,7 +41,7 @@ void OscSender::variantListToByteArray(QByteArray& outputResult, const QString&
 
     for (int i = 0; i < arguments.count(); ++ i) {
         QVariant argument = arguments[i];
-        QMetaType::Type type = static_cast<QMetaType::Type>(argument.type());
+        QMetaType::Type type = static_cast<QMetaType::Type>(argument.typeId());
 
         if (type == QMetaType::Int) {
             packet << argument.toInt();
diff --git a/src/core/CameraSurface.cpp b/src/core/CameraSurface.cpp
@@ -41,7 +41,10 @@ void CameraSurface::onVideoFrameChanged(const QVideoFrame& frame)
   _temporaryImage = img;
 #else
   // Straighten the image for OpenGL (bottom-left origin convention).
+  QT_WARNING_PUSH
+  QT_WARNING_DISABLE_DEPRECATED
   _temporaryImage = img.mirrored(true, false).transformed(QTransform().rotate(180));
+  QT_WARNING_POP
 #endif
 }
 
diff --git a/src/core/Source.cpp b/src/core/Source.cpp
@@ -108,7 +108,10 @@ void Image::build()
   _images.clear();
   for (int i = 0; i < reader.imageCount(); i++) {
     QImage raw = reader.read().convertToFormat(QImage::Format_RGBA8888);
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     _images.push_back(raw.mirrored(true, false).transformed(QTransform().rotate(180)));
+    QT_WARNING_POP
   }
 
   rewind();
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
@@ -95,11 +95,11 @@ void AboutDialog::createAboutTab()
   QString copyrightText = "<p>" + tr("Copyright &copy; 2013 %1.").arg(MM::COPYRIGHT_OWNERS) + "</p>";
   // License short notice
   QFile licenseShortFile(":/license-short");
-  licenseShortFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)licenseShortFile.open(QIODevice::ReadOnly | QIODevice::Text);
   QString licenseNoticeText = Qt::convertFromPlainText(QString::fromUtf8(licenseShortFile.readAll()), Qt::WhiteSpaceNormal);
   // About projection mapping
   QFile aboutMappingFile(":/projection-mapping");
-  aboutMappingFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)aboutMappingFile.open(QIODevice::ReadOnly | QIODevice::Text);
   QString aboutMappingText = QString::fromUtf8(aboutMappingFile.readAll());
   // Visit our website for more information
   QString projectWebsiteText = "<p>" + tr("See the ") + QString("<a href=\"%1\">").arg(MM::WEBSITE_URL) +
@@ -126,7 +126,7 @@ void AboutDialog::createChangelogTab()
   changelogTextBrowser->setOpenExternalLinks(true);
 
   QFile changelogFile(":/changelog_md");
-  changelogFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)changelogFile.open(QIODevice::ReadOnly | QIODevice::Text);
   changelogTextBrowser->setMarkdown(QString::fromUtf8(changelogFile.readAll()));
   _tabWidget->addTab(changelogTextBrowser, tr("Changelog"));
 }
@@ -152,7 +152,7 @@ void AboutDialog::createContributorsTab()
   contributorsTextBrowser->setOpenExternalLinks(true);
 
   QFile contributorsFile(":/contributors_md");
-  contributorsFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)contributorsFile.open(QIODevice::ReadOnly | QIODevice::Text);
   contributorsTextBrowser->setMarkdown(QString::fromUtf8(contributorsFile.readAll()));
   _tabWidget->addTab(contributorsTextBrowser, tr("Contributors"));
 }
@@ -163,7 +163,7 @@ void AboutDialog::createLicenseTab()
   licenseTextBrowser->setOpenExternalLinks(true);
 
   QFile licenseFile(":/license");
-  licenseFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)licenseFile.open(QIODevice::ReadOnly | QIODevice::Text);
   licenseTextBrowser->setText(QString::fromUtf8(licenseFile.readAll()));
 
   _tabWidget->addTab(licenseTextBrowser, tr("License"));
@@ -176,7 +176,7 @@ void AboutDialog::createOscTab()
   oscBrowser->setOpenExternalLinks(true);
 
   QFile oscFile(":/osc-documentation_md");
-  oscFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)oscFile.open(QIODevice::ReadOnly | QIODevice::Text);
   oscBrowser->setMarkdown(QString::fromUtf8(oscFile.readAll()));
   _tabWidget->addTab(oscBrowser, tr("OSC Commands"));
 }
diff --git a/src/gui/ConsoleWindow.cpp b/src/gui/ConsoleWindow.cpp
@@ -86,7 +86,7 @@ void ConsoleWindow::writeLogFile(const QString &message)
 {
   QString logFilePath = QDir(QDir::tempPath()).filePath("mapmap.log");
   QFile logFile(logFilePath);
-  logFile.open(QIODevice::Append);
+  (void)logFile.open(QIODevice::Append);
   QTextStream stream(&logFile);
   stream << message << Qt::endl;
 }
diff --git a/src/gui/LayerGui.cpp b/src/gui/LayerGui.cpp
@@ -41,13 +41,13 @@ LayerGui::LayerGui(Layer::ptr layer)
   _sourceEnumManager = new QtEnumPropertyManager(this);
 
   // Mapping UID.
-  _idItem = _variantManager->addProperty(QVariant::Int, QObject::tr("ID"));
+  _idItem = _variantManager->addProperty(QMetaType::Int, QObject::tr("ID"));
   _idItem->setEnabled(false);
   _idItem->setValue(_layer->getId());
   _propertyBrowser->addProperty(_idItem);
 
   // Mapping basic properties.
-  _opacityItem = _variantManager->addProperty(QVariant::Double, QObject::tr("Opacity (%)"));
+  _opacityItem = _variantManager->addProperty(QMetaType::Double, QObject::tr("Opacity (%)"));
   _opacityItem->setAttribute("minimum", 0.0);
   _opacityItem->setAttribute("maximum", 100.0);
   _opacityItem->setAttribute("decimals", 1);
@@ -147,7 +147,7 @@ void LayerGui::_buildShapeProperty(QtProperty* shapeItem, MShape* shape)
   for (int i=0; i<shape->nVertices(); i++)
   {
     // Add point.
-    QtVariantProperty* pointItem = _variantManager->addProperty(QVariant::PointF,
+    QtVariantProperty* pointItem = _variantManager->addProperty(QMetaType::QPointF,
                                                                 QObject::tr("Point %1").arg(i));
 
     const QPointF& p = shape->getVertex(i);
@@ -192,7 +192,7 @@ MeshColorLayerGui::MeshColorLayerGui(Layer::ptr layer)
 
   // Add mesh sub property.
   QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_layer->getShape());
-  _meshItem = _variantManager->addProperty(QVariant::Size, QObject::tr("Mesh Subdivisions"));
+  _meshItem = _variantManager->addProperty(QMetaType::QSize, QObject::tr("Mesh Subdivisions"));
   _meshItem->setValue(QSize(mesh->nColumns(), mesh->nRows()));
   _meshItem->setAttribute("minimum", QSize(2,2));
   _propertyBrowser->insertProperty(_meshItem, _sourceItem); // insert at the beginning
@@ -228,7 +228,7 @@ EllipseColorLayerGui::EllipseColorLayerGui(Layer::ptr layer) : ColorLayerGui(lay
 //  : ColorLayerGui(layer) {
 //  // Add mesh sub property.
 //  Mesh* mesh = (Mesh*)layer->getShape().get();
-//  _meshItem = _variantManager->addProperty(QVariant::Size, QObject::tr("Mesh Subdivisions"));
+//  _meshItem = _variantManager->addProperty(QMetaType::QSize, QObject::tr("Mesh Subdivisions"));
 //  _meshItem->setValue(QSize(mesh->nColumns(), mesh->nRows()));
 //  _topItem->insertSubProperty(_meshItem, 0); // insert at the beginning
 //}
@@ -421,7 +421,7 @@ MeshTextureLayerGui::MeshTextureLayerGui(QSharedPointer<TextureLayer> mapping)
 
   // Add mesh sub property.
   QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_layer->getShape());
-  _meshItem = _variantManager->addProperty(QVariant::Size, QObject::tr("Subdivisions"));
+  _meshItem = _variantManager->addProperty(QMetaType::QSize, QObject::tr("Subdivisions"));
 
   // Rename subdivision subproperties.
   QList<QtProperty *> subList = _meshItem->subProperties();
diff --git a/src/gui/LayerListModel.cpp b/src/gui/LayerListModel.cpp
@@ -170,23 +170,23 @@ bool LayerListModel::setData(const QModelIndex &index, const QVariant &value, in
   if (!index.isValid())
     return false;
 
-  if (role == Qt::CheckStateRole && value.type() == QVariant::Bool) {
+  if (role == Qt::CheckStateRole && value.typeId() == QMetaType::Bool) {
     if (layerList[index.row()].isVisible != value.toBool()) {
       layerList[index.row()].isVisible = value.toBool();
       emit dataChanged(index, index);
       return true;
     }
   }
 
-  if (role == Qt::CheckStateRole + 1 && value.type() == QVariant::Bool) {
+  if (role == Qt::CheckStateRole + 1 && value.typeId() == QMetaType::Bool) {
     if (layerList[index.row()].isSolo != value.toBool()) {
       layerList[index.row()].isSolo = value.toBool();
       emit dataChanged(index, index);
       return true;
     }
   }
 
-  if (role == Qt::CheckStateRole + 2 && value.type() == QVariant::Bool) {
+  if (role == Qt::CheckStateRole + 2 && value.typeId() == QMetaType::Bool) {
     if (layerList[index.row()].isLocked != value.toBool()) {
       layerList[index.row()].isLocked = value.toBool();
       emit dataChanged(index, index);
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -386,7 +386,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
 void MainWindow::keyPressEvent(QKeyEvent *event)
 {
-#ifdef Q_OS_OSX // On Mac OS X
+#ifdef Q_OS_MACOS // On Mac OS X
   Q_UNUSED(event);
   // Do nothing
 #endif
@@ -850,7 +850,7 @@ void MainWindow::showMenuBar(bool shown)
 {
   _showMenuBar = shown;
 
-#ifdef Q_OS_OSX // On Mac OS X
+#ifdef Q_OS_MACOS // On Mac OS X
   // Do nothing
 #endif
 #ifdef Q_OS_LINUX // On Linux
@@ -3147,12 +3147,10 @@ void MainWindow::moveLayerItem(uid layerId, int idx)
   Q_CHECK_PTR(layer);
 
   // Remove mapping from model.
-  uid exchangeLayerId = mappingManager->getLayer(idx)->getId();
   mappingManager->moveLayer(layerId, idx);
 
   // Remove widget from layerList.
   int row = layerListModel->getItemRowFromId(layerId);
-  int rowTo = layerListModel->getItemRowFromId(exchangeLayerId);
   Q_ASSERT( row >= 0 );
   layerListModel->moveItem(row, idx);
 
diff --git a/src/gui/MapperGLCanvas.cpp b/src/gui/MapperGLCanvas.cpp
@@ -45,6 +45,7 @@ MapperGLCanvas::MapperGLCanvas(MainWindow* mainWindow,
     _zoomLevel(0),
     _shapeIsAdapted(false)
 {
+  Q_UNUSED(shareWidget);
   // For now clicking on the window doesn't do anything.
   setDragMode(QGraphicsView::NoDrag);
 
@@ -383,7 +384,7 @@ void MapperGLCanvas::mouseReleaseEvent(QMouseEvent* event)
   if (event->buttons() & Qt::MiddleButton)
   {
     QMouseEvent fakeEvent(
-          event->type(), event->pos(), event->globalPos(),
+          event->type(), event->pos(), event->globalPosition().toPoint(),
           Qt::LeftButton, event->buttons() & ~Qt::LeftButton,
           event->modifiers());
     QGraphicsView::mouseReleaseEvent(&fakeEvent);
diff --git a/src/gui/OutputGLCanvas.cpp b/src/gui/OutputGLCanvas.cpp
@@ -80,7 +80,7 @@ void OutputGLCanvas::drawForeground(QPainter *painter , const QRectF &rect)
     // Display crosshair cursor.
     if (_displayCrosshair)
     {
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
       QPoint globalCursorPos = QCursor::pos();
       QScreen* mouseScreenPtr = QGuiApplication::screenAt(globalCursorPos);
       QRect mouseScreenGeometry = mouseScreenPtr ? mouseScreenPtr->geometry() : QRect();
@@ -250,6 +250,8 @@ void OutputGLCanvas::_drawResolutionText(QPainter *painter, const QRect &rect, i
 
 void OutputGLCanvas::resizeGL(int width, int height)
 {
+  Q_UNUSED(width);
+  Q_UNUSED(height);
   setSceneRectToViewportGeometry();
 }
 
diff --git a/src/gui/PreferenceDialog.cpp b/src/gui/PreferenceDialog.cpp
@@ -307,9 +307,9 @@ void PreferenceDialog::createControlsPage()
   QFont bold;
   bold.setWeight(QFont::Bold);
   // Set IP Address validator
-  QString octet("(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])");
-  QRegularExpression rx(octet + "\\." + octet + "\\." + octet + "\\." + octet);
-  QRegularExpressionValidator *ipValidator = new QRegularExpressionValidator(rx);
+  // QString octet("(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])");
+  // QRegularExpression rx(octet + "\\." + octet + "\\." + octet + "\\." + octet);
+  // QRegularExpressionValidator *ipValidator = new QRegularExpressionValidator(rx);
   QMargins margins(40, 0, 0, 0);
 
   // _sendMessageBox = new QCheckBox;
diff --git a/src/gui/SourceGui.cpp b/src/gui/SourceGui.cpp
@@ -35,13 +35,13 @@ SourceGui::SourceGui(Source::ptr source)
           this,            SLOT(setValue(QtProperty*, const QVariant&)));
 
   // Mapping UID.
-  _idItem = _variantManager->addProperty(QVariant::Int, QObject::tr("ID"));
+  _idItem = _variantManager->addProperty(QMetaType::Int, QObject::tr("ID"));
   _idItem->setEnabled(false);
   _idItem->setValue(_source->getId());
   _propertyBrowser->addProperty(_idItem);
 
   // Source basic properties.
-  _opacityItem = _variantManager->addProperty(QVariant::Double, QObject::tr("Opacity (%)"));
+  _opacityItem = _variantManager->addProperty(QMetaType::Double, QObject::tr("Opacity (%)"));
   _opacityItem->setAttribute("minimum", 0.0);
   _opacityItem->setAttribute("maximum", 100.0);
   _opacityItem->setAttribute("decimals", 1);
@@ -84,7 +84,7 @@ ColorGui::ColorGui(Source::ptr source)
   color = qSharedPointerCast<Color>(source);
   Q_CHECK_PTR(color);
 
-  _colorItem = _variantManager->addProperty(QVariant::Color,
+  _colorItem = _variantManager->addProperty(QMetaType::QColor,
                                             QObject::tr("Color"));
 
   _colorItem->setValue(color->getColor());
@@ -124,7 +124,7 @@ _imageFileItem = _variantManager->addProperty(VariantManager::filePathTypeId(),
 _imageFileItem->setAttribute("filter", tr("Image files (%1);;All files (*)").arg(MM::IMAGE_FILES_FILTER));
 _imageFileItem->setValue(image->getUri());
 
-  _imageRateItem = _variantManager->addProperty(QVariant::Double,
+  _imageRateItem = _variantManager->addProperty(QMetaType::Double,
                                                 tr("Speed (%)"));
   // we need to save it because the call to setAttribute will set it to minimum
   double rate = image->getRate()*100;
@@ -172,14 +172,14 @@ VideoGui::VideoGui(Source::ptr source)
   _mediaFileItem->setAttribute("filter", tr("Video files (%1);;All files (*)").arg(MM::VIDEO_FILES_FILTER));
   _mediaFileItem->setValue(media->getUri());
 
-  _mediaRateItem = _variantManager->addProperty(QVariant::Double,
+  _mediaRateItem = _variantManager->addProperty(QMetaType::Double,
                                                 tr("Speed (%)"));
   // we need to save it because the call to setAttribute will set it to minimum
   double rate = media->getRate()*100;
   _mediaRateItem->setAttribute("decimals", 1);
   _mediaRateItem->setValue(rate);
 
-  _mediaVolumeItem = _variantManager->addProperty(QVariant::Double,
+  _mediaVolumeItem = _variantManager->addProperty(QMetaType::Double,
                                                 tr("Volume (%)"));
   double volume = media->getVolume()*100;
   _mediaVolumeItem->setAttribute("minimum", 0.0);
diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri b/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri
@@ -6,7 +6,6 @@ DEPENDPATH += $$PWD
 qtpropertybrowser-uselib:!qtpropertybrowser-buildlib {
     LIBS += -L$$QTPROPERTYBROWSER_LIBDIR -l$$QTPROPERTYBROWSER_LIBNAME
 } else {
-    DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
     SOURCES += $$PWD/qtpropertybrowser.cpp \
             $$PWD/qtpropertymanager.cpp \
             $$PWD/qteditorfactory.cpp \
diff --git a/src/src.pri b/src/src.pri

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ void OscInterface::messageReceivedCb(const QString& oscAddress, const QVariantLi`
`90`	`90`	`QString types = "";`
`91`	`91`	`for (int i = 0; i < arguments.count(); ++ i) {`
`92`	`92`	`QVariant argument = arguments[i];`
`93`		`- QMetaType::Type type = static_cast<QMetaType::Type>(argument.type());`
	`93`	`+ QMetaType::Type type = static_cast<QMetaType::Type>(argument.typeId());`
`94`	`94`
`95`	`95`	`if (type == QMetaType::Int) {`
`96`	`96`	`types += "i";`
`@@ -126,15 +126,15 @@ static void printCommand(QVariantList &command)`
`126`	`126`	`{`
`127`	`127`	`for (int i = 0; i < command.size(); ++i)`
`128`	`128`	`{`
`129`		`- if (command.at(i).type() == QVariant::Int)`
	`129`	`+ if (command.at(i).typeId() == QMetaType::Int)`
`130`	`130`	`{`
`131`	`131`	`qDebug() << command.at(i).toInt() << " ";`
`132`	`132`	`}`
`133`		`- else if (command.at(i).type() == QVariant::Double)`
	`133`	`+ else if (command.at(i).typeId() == QMetaType::Double)`
`134`	`134`	`{`
`135`	`135`	`qDebug() << command.at(i).toDouble() << " ";`
`136`	`136`	`}`
`137`		`- else if (command.at(i).type() == QVariant::String)`
	`137`	`+ else if (command.at(i).typeId() == QMetaType::QString)`
`138`	`138`	`{`
`139`	`139`	`qDebug() << command.at(i).toString() << " ";`
`140`	`140`	`}`
`@@ -161,11 +161,11 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma`
`161`	`161`	`{`
`162`	`162`	`return;`
`163`	`163`	`}`
`164`		`- if (command.at(0).type() != QVariant::String)`
	`164`	`+ if (command.at(0).typeId() != QMetaType::QString)`
`165`	`165`	`{`
`166`	`166`	`return;`
`167`	`167`	`}`
`168`		`- if (command.at(1).type() != QVariant::String)`
	`168`	`+ if (command.at(1).typeId() != QMetaType::QString)`
`169`	`169`	`{`
`170`	`170`	`return;`
`171`	`171`	`}`
`@@ -192,7 +192,7 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma`
`192`	`192`	`if (command.size() >= 3)`
`193`	`193`	`{`
`194`	`194`	`QVector<Source::ptr> sources;`
`195`		`- if (command.at(2).type() == QVariant::String)`
	`195`	`+ if (command.at(2).typeId() == QMetaType::QString)`
`196`	`196`	`sources = main_window.getMappingManager().getSourcesByNameRegExp(command.at(2).toString());`
`197`	`197`	`else`
`198`	`198`	`{`
`@@ -225,7 +225,7 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma`
`225`	`225`	`if (command.size() >= 3)`
`226`	`226`	`{`
`227`	`227`	`QVector<Layer::ptr> layers;`
`228`		`- if (command.at(2).type() == QVariant::String)`
	`228`	`+ if (command.at(2).typeId() == QMetaType::QString)`
`229`	`229`	`layers = main_window.getMappingManager().getLayersByNameRegExp(command.at(2).toString());`
`230`	`230`	`else`
`231`	`231`	`{`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ void ConsoleWindow::writeLogFile(const QString &message)`
`86`	`86`	`{`
`87`	`87`	`QString logFilePath = QDir(QDir::tempPath()).filePath("mapmap.log");`
`88`	`88`	`QFile logFile(logFilePath);`
`89`		`- logFile.open(QIODevice::Append);`
	`89`	`+ (void)logFile.open(QIODevice::Append);`
`90`	`90`	`QTextStream stream(&logFile);`
`91`	`91`	`stream << message << Qt::endl;`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,23 +170,23 @@ bool LayerListModel::setData(const QModelIndex &index, const QVariant &value, in`
`170`	`170`	`if (!index.isValid())`
`171`	`171`	`return false;`
`172`	`172`
`173`		`- if (role == Qt::CheckStateRole && value.type() == QVariant::Bool) {`
	`173`	`+ if (role == Qt::CheckStateRole && value.typeId() == QMetaType::Bool) {`
`174`	`174`	`if (layerList[index.row()].isVisible != value.toBool()) {`
`175`	`175`	`layerList[index.row()].isVisible = value.toBool();`
`176`	`176`	`emit dataChanged(index, index);`
`177`	`177`	`return true;`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		`- if (role == Qt::CheckStateRole + 1 && value.type() == QVariant::Bool) {`
	`181`	`+ if (role == Qt::CheckStateRole + 1 && value.typeId() == QMetaType::Bool) {`
`182`	`182`	`if (layerList[index.row()].isSolo != value.toBool()) {`
`183`	`183`	`layerList[index.row()].isSolo = value.toBool();`
`184`	`184`	`emit dataChanged(index, index);`
`185`	`185`	`return true;`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`189`		`- if (role == Qt::CheckStateRole + 2 && value.type() == QVariant::Bool) {`
	`189`	`+ if (role == Qt::CheckStateRole + 2 && value.typeId() == QMetaType::Bool) {`
`190`	`190`	`if (layerList[index.row()].isLocked != value.toBool()) {`
`191`	`191`	`layerList[index.row()].isLocked = value.toBool();`
`192`	`192`	`emit dataChanged(index, index);`