core: fix miscellaneous Qt6 API changes

IonutMuthi · IonutMuthi · commit c9aaa07b93a2 · 2026-03-19T16:59:15.000+02:00
- QStyleOption::init() -&gt; initFrom()
- QString(int) -&gt; QString::number() (ambiguous in Qt6)
- QString != NULL -&gt; !str.isNull()
- QFileInfo implicit from QString -&gt; explicit QFileInfo()
- QSslError list explicit construction
- splitRef() -&gt; split() (removed in Qt6)
- endl -&gt; Qt::endl for QTextStream
- QFont::setWeight(75) -&gt; QFont::setWeight(QFont::Bold)
- midRef() -&gt; mid() (removed in Qt6)
- Add #include &lt;QFile&gt; for incomplete type fix
- Fix QString comparison with int/pointer ambiguity


Signed-off-by: IonutMuthi &lt;Ionut.Muthi@analog.com&gt;
diff --git a/core/src/scopymainwindow_api.cpp b/core/src/scopymainwindow_api.cpp
@@ -364,7 +364,7 @@ QPair<QString, QVariant> ScopyMainWindow_API::getPreference(QString prefName)
 {
 	Preferences *p = Preferences::GetInstance();
 	QMap<QString, QVariant> prefMap = p->getPreferences();
-	if(prefName != NULL) {
+	if(!prefName.isNull()) {
 		return QPair<QString, QVariant>(prefName, prefMap[prefName]);
 	}
 	return {};
diff --git a/gui/include/gui/tutorialbuilder.h b/gui/include/gui/tutorialbuilder.h
@@ -24,6 +24,7 @@
 #include "scopy-gui_export.h"
 #include "tutorialoverlay.h"
 
+#include <QFile>
 #include <QMap>
 
 namespace scopy::gui {
diff --git a/gui/include/gui/utils.h b/gui/include/gui/utils.h
@@ -78,7 +78,7 @@ public:
 	void paintEvent(QPaintEvent *e) override                                                                       \
 	{                                                                                                              \
 		QStyleOption opt;                                                                                      \
-		opt.init(this);                                                                                        \
+		opt.initFrom(this);                                                                                    \
 		QPainter p(this);                                                                                      \
 		style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);                                             \
 	}
diff --git a/gui/src/widgets/menuwidget.cpp b/gui/src/widgets/menuwidget.cpp
@@ -84,7 +84,7 @@ void MenuWidget::add(QWidget *w, QString name, MenuAlignment position)
 
 void MenuWidget::add(QWidget *w)
 {
-	add(w, "widget" + QString(uuid), MA_TOPLAST);
+	add(w, "widget" + QString::number(uuid), MA_TOPLAST);
 	uuid++;
 }
 
diff --git a/packages/extproc/plugins/extprocplugin/include/extprocplugin/controller/extprocplotinfo.h b/packages/extproc/plugins/extprocplugin/include/extprocplugin/controller/extprocplotinfo.h
@@ -85,7 +85,7 @@ class ExtProcPlotInfo
 
 	bool isValid() const
 	{
-		if(id < 0 || title.isEmpty() || xLabel.isEmpty() || yLabel.isEmpty() || type == INVALID_TYPE) {
+		if(id.isEmpty() || title.isEmpty() || xLabel.isEmpty() || yLabel.isEmpty() || type == INVALID_TYPE) {
 			return false;
 		}
 
diff --git a/packages/generic-plugins/plugins/adc/src/freq/fftplotmanagersettings.cpp b/packages/generic-plugins/plugins/adc/src/freq/fftplotmanagersettings.cpp
@@ -97,7 +97,7 @@ QWidget *FFTPlotManagerSettings::createMenu(QWidget *parent)
 	m_menu->add(m_plotStack);
 
 	connect(m_plotCb->combo(), qOverload<int>(&QComboBox::currentIndexChanged), this,
-		[=](int idx) { m_plotStack->show(QString(m_plotCb->combo()->currentData().toInt())); });
+		[=](int idx) { m_plotStack->show(QString::number(m_plotCb->combo()->currentData().toInt())); });
 
 	m_menu->add(m_addPlotBtn, "add", gui::MenuWidget::MA_BOTTOMLAST);
 
@@ -302,7 +302,7 @@ void FFTPlotManagerSettings::addPlot(FFTPlotComponent *p)
 		m_plotCb->combo()->setItemText(idx, newName);
 	});
 	m_plotCb->combo()->addItem(p->name(), p->uuid());
-	m_plotStack->add(QString(p->uuid()), plotMenu);
+	m_plotStack->add(QString::number(p->uuid()), plotMenu);
 	// m_menu->add(plotMenu, p->name() + QString(p->uuid()), gui::MenuWidget::MA_TOPLAST);
 	setPlotComboVisible();
 
@@ -335,7 +335,7 @@ void FFTPlotManagerSettings::removePlot(FFTPlotComponent *p)
 	// m_menu->remove(plotMenu);
 	int idx = m_plotCb->combo()->findData(p->uuid());
 	m_plotCb->combo()->removeItem(idx);
-	m_plotStack->remove(QString(p->uuid()));
+	m_plotStack->remove(QString::number(p->uuid()));
 
 	setPlotComboVisible();
 }
diff --git a/packages/generic-plugins/plugins/adc/src/time/timeplotmanagersettings.cpp b/packages/generic-plugins/plugins/adc/src/time/timeplotmanagersettings.cpp
@@ -92,7 +92,7 @@ QWidget *TimePlotManagerSettings::createMenu(QWidget *parent)
 	m_menu->add(m_plotStack);
 
 	connect(m_plotCb->combo(), qOverload<int>(&QComboBox::currentIndexChanged), this,
-		[=](int idx) { m_plotStack->show(QString(m_plotCb->combo()->currentData().toInt())); });
+		[=](int idx) { m_plotStack->show(QString::number(m_plotCb->combo()->currentData().toInt())); });
 
 	m_menu->add(m_addPlotBtn, "add", gui::MenuWidget::MA_BOTTOMLAST);
 
@@ -391,8 +391,8 @@ void TimePlotManagerSettings::addPlot(TimePlotComponent *p)
 		m_plotCb->combo()->setItemText(idx, newName);
 	});
 	m_plotCb->combo()->addItem(p->name(), p->uuid());
-	m_plotStack->add(QString(p->uuid()), plotMenu);
-	// m_menu->add(plotMenu, p->name() + QString(p->uuid()), gui::MenuWidget::MA_TOPLAST);
+	m_plotStack->add(QString::number(p->uuid()), plotMenu);
+	// m_menu->add(plotMenu, p->name() + QString::number(p->uuid()), gui::MenuWidget::MA_TOPLAST);
 	setPlotComboVisible();
 	connect(p->plotMenu(), &TimePlotComponentSettings::requestSettings, this, [=]() {
 		int idx = m_plotCb->combo()->findData(p->uuid());
@@ -416,7 +416,7 @@ void TimePlotManagerSettings::removePlot(TimePlotComponent *p)
 	// m_menu->remove(plotMenu);
 	int idx = m_plotCb->combo()->findData(p->uuid());
 	m_plotCb->combo()->removeItem(idx);
-	m_plotStack->remove(QString(p->uuid()));
+	m_plotStack->remove(QString::number(p->uuid()));
 
 	setPlotComboVisible();
 }
diff --git a/packages/generic-plugins/plugins/datalogger/src/menus/logdatatofile.cpp b/packages/generic-plugins/plugins/datalogger/src/menus/logdatatofile.cpp
@@ -58,7 +58,7 @@ void LogDataToFile::continuousLogData(QString path)
 		}
 
 		// if a channels is added or removed we need to recreate the file using logData()
-		if(currentFileHeader != fileHeader) {
+		if(*currentFileHeader != fileHeader) {
 			logData(path);
 
 			currentFileHeader = new QString(fileHeader);
@@ -236,7 +236,7 @@ void LogDataToFile::loadData(QString path)
 
 		// we don't override data we create dummy monitors for all channels from file
 		for(it = valueMap.begin(); it != valueMap.end(); ++it) {
-			QString fileTitle("Import: " + file.fileName().splitRef("/").last());
+			QString fileTitle("Import: " + file.fileName().split("/").last());
 			QString monitorName(fileTitle + ":" + it.key());
 			if(m_dataAcquisitionManager->getDataMonitorMap()->contains(monitorName)) {
 
diff --git a/packages/generic-plugins/plugins/regmap/src/jsonformatedelement.cpp b/packages/generic-plugins/plugins/regmap/src/jsonformatedelement.cpp
@@ -46,9 +46,9 @@ bool JsonFormatedElement::getUseBifieldNameAsDescription() const { return useBif
 
 QString JsonFormatedElement::toString()
 {
-	return QString("Filename : " + fileName + " Compatible Dev: " + compatibleDevices->length() +
-		       " isAxiCompatible :" + isAxiCompatible + " useRegisterDescriptionAsName: " +
-		       useRegisterDescriptionAsName + " useBifieldDescriptionAsName: " + useBifieldDescriptionAsName);
+	return QString("Filename : " + fileName + " Compatible Dev: " + QString::number(compatibleDevices->length()) +
+		       " isAxiCompatible :" + QString::number(isAxiCompatible) + " useRegisterDescriptionAsName: " +
+		       QString::number(useRegisterDescriptionAsName) + " useBifieldDescriptionAsName: " + QString::number(useBifieldDescriptionAsName));
 }
 
 int JsonFormatedElement::getBitsPerRow() const { return bitsPerRow; }
diff --git a/packages/generic-plugins/plugins/regmap/src/registermapvalues.cpp b/packages/generic-plugins/plugins/regmap/src/registermapvalues.cpp
@@ -95,7 +95,7 @@ void RegisterMapValues::registerDump(QString path)
 			for(mapIterator = registerReadValues->begin(); mapIterator != registerReadValues->end();
 			    mapIterator++) {
 				out << QString::number(mapIterator.key(), 16) << ","
-				    << QString::number(mapIterator.value(), 16) << endl;
+				    << QString::number(mapIterator.value(), 16) << Qt::endl;
 			}
 		}
 
diff --git a/packages/m2k/plugins/m2k/m2k-gui/src/FftDisplayPlot.cc b/packages/m2k/plugins/m2k/m2k-gui/src/FftDisplayPlot.cc
@@ -409,7 +409,7 @@ void FftDisplayPlot::setZoomerEnabled()
 
 		QFont font;
 		font.setPointSize(10);
-		font.setWeight(75);
+		font.setWeight(QFont::Bold);
 		d_zoomer[0]->setTrackerFont(font);
 
 #if QWT_VERSION < 0x060000
diff --git a/packages/m2k/plugins/m2k/m2k-gui/src/TimeDomainDisplayPlot.cc b/packages/m2k/plugins/m2k/m2k-gui/src/TimeDomainDisplayPlot.cc
@@ -194,7 +194,7 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(QWidget *parent, bool isdBgraph, un
 
 	QFont font;
 	font.setPointSize(10);
-	font.setWeight(75);
+	font.setWeight(QFont::Bold);
 	// d_zoomer->setTrackerFont(font);
 
 #if QWT_VERSION < 0x060000
@@ -595,7 +595,7 @@ void TimeDomainDisplayPlot::addZoomer(unsigned int zoomerIdx)
 {
 	QFont font;
 	font.setPointSize(10);
-	font.setWeight(75);
+	font.setWeight(QFont::Bold);
 	d_zoomer[zoomerIdx]->setTrackerFont(font);
 
 #if QWT_VERSION < 0x060000
diff --git a/packages/m2k/plugins/m2k/m2k-gui/src/WaterfallDisplayPlot.cc b/packages/m2k/plugins/m2k/m2k-gui/src/WaterfallDisplayPlot.cc
@@ -170,7 +170,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(int nplots, QWidget *parent)
 
 	QFont font;
 	font.setPointSize(10);
-	font.setWeight(75);
+	font.setWeight(QFont::Bold);
 	d_zoomer[0]->setTrackerFont(font);
 
 	d_magnifier.push_back(new PlotMagnifier(this));
diff --git a/packages/m2k/plugins/m2k/m2k-gui/src/osc_scale_zoomer.cpp b/packages/m2k/plugins/m2k/m2k-gui/src/osc_scale_zoomer.cpp
@@ -38,7 +38,7 @@ OscScaleZoomer::OscScaleZoomer(QWidget *parent)
 
 	QFont font;
 	font.setPointSize(10);
-	font.setWeight(75);
+	font.setWeight(QFont::Bold);
 
 	setTrackerFont(font);
 	setZoomBase();
diff --git a/packages/m2k/plugins/m2k/src/old/spectrum_analyzer.cpp b/packages/m2k/plugins/m2k/src/old/spectrum_analyzer.cpp
@@ -1756,7 +1756,7 @@ QString SpectrumAnalyzer::getReferenceChannelName() const
 		bool isOk = true;
 		for(const auto &ref_channel : referenceChannels) {
 			QString shortName = ref_channel->shortName();
-			int channel_counter = shortName.midRef(shortName.size() - 1).toInt();
+			int channel_counter = shortName.mid(shortName.size() - 1).toInt();
 			if(current == channel_counter) {
 				isOk = false;
 				break;
diff --git a/pkg-manager/src/pkgmanager.cpp b/pkg-manager/src/pkgmanager.cpp
@@ -148,7 +148,7 @@ QFileInfo PkgManager::reverseSearch(const QString &filePath)
 	for(auto it = validPackages_.begin(); it != validPackages_.end(); ++it) {
 		const QString pkgPath = it.value()[PkgManifest::PKG_PATH].toString();
 		if(filePath.contains(pkgPath)) {
-			return pkgPath;
+			return QFileInfo(pkgPath);
 		}
 	}
 	qWarning(CAT_PKGMANAGER) << "Couldn't find the package of the file:" << filePath;
diff --git a/pkg-manager/src/pkgutil.cpp b/pkg-manager/src/pkgutil.cpp
@@ -231,7 +231,7 @@ QFileInfoList PkgUtil::getFilesInfo(const QString &path, const QStringList &dirF
 	QDirIterator it(path, nameFilters, QDir::NoFilter, QDirIterator::Subdirectories);
 	while(it.hasNext()) {
 		if(dirFilter.isEmpty()) {
-			files.append(it.next());
+			files.append(QFileInfo(it.next()));
 		} else {
 			QDir dir(it.next());
 			files.append(dir.entryInfoList(fileFilter, QDir::Files));
diff --git a/pluginbase/src/versionchecker.cpp b/pluginbase/src/versionchecker.cpp
@@ -116,7 +116,7 @@ void VersionChecker::pullNewCache()
 	connect(m_nam, &QNetworkAccessManager::sslErrors, this,
 		[](QNetworkReply *reply, const QList<QSslError> &errors) {
 			qDebug(CAT_VERSION) << "Ignoring ssl errors:" << errors;
-			reply->ignoreSslErrors({QSslError::NoPeerCertificate});
+			reply->ignoreSslErrors(QList<QSslError>{QSslError(QSslError::NoPeerCertificate)});
 		});
 
 	connect(m_nam, &QNetworkAccessManager::finished, this, [this](QNetworkReply *r) {

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ QPair<QString, QVariant> ScopyMainWindow_API::getPreference(QString prefName)`
`364`	`364`	`{`
`365`	`365`	`Preferences *p = Preferences::GetInstance();`
`366`	`366`	`QMap<QString, QVariant> prefMap = p->getPreferences();`
`367`		`- if(prefName != NULL) {`
	`367`	`+ if(!prefName.isNull()) {`
`368`	`368`	`return QPair<QString, QVariant>(prefName, prefMap[prefName]);`
`369`	`369`	`}`
`370`	`370`	`return {};`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public:`
`78`	`78`	`void paintEvent(QPaintEvent *e) override \`
`79`	`79`	`{ \`
`80`	`80`	`QStyleOption opt; \`
`81`		`- opt.init(this); \`
	`81`	`+ opt.initFrom(this); \`
`82`	`82`	`QPainter p(this); \`
`83`	`83`	`style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); \`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void MenuWidget::add(QWidget *w, QString name, MenuAlignment position)`
`84`	`84`
`85`	`85`	`void MenuWidget::add(QWidget *w)`
`86`	`86`	`{`
`87`		`- add(w, "widget" + QString(uuid), MA_TOPLAST);`
	`87`	`+ add(w, "widget" + QString::number(uuid), MA_TOPLAST);`
`88`	`88`	`uuid++;`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class ExtProcPlotInfo`
`85`	`85`
`86`	`86`	`bool isValid() const`
`87`	`87`	`{`
`88`		`- if(id < 0 \|\| title.isEmpty() \|\| xLabel.isEmpty() \|\| yLabel.isEmpty() \|\| type == INVALID_TYPE) {`
	`88`	`+ if(id.isEmpty() \|\| title.isEmpty() \|\| xLabel.isEmpty() \|\| yLabel.isEmpty() \|\| type == INVALID_TYPE) {`
`89`	`89`	`return false;`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ bool JsonFormatedElement::getUseBifieldNameAsDescription() const { return useBif`
`46`	`46`
`47`	`47`	`QString JsonFormatedElement::toString()`
`48`	`48`	`{`
`49`		`- return QString("Filename : " + fileName + " Compatible Dev: " + compatibleDevices->length() +`
`50`		`- " isAxiCompatible :" + isAxiCompatible + " useRegisterDescriptionAsName: " +`
`51`		`- useRegisterDescriptionAsName + " useBifieldDescriptionAsName: " + useBifieldDescriptionAsName);`
	`49`	`+ return QString("Filename : " + fileName + " Compatible Dev: " + QString::number(compatibleDevices->length()) +`
	`50`	`+ " isAxiCompatible :" + QString::number(isAxiCompatible) + " useRegisterDescriptionAsName: " +`
	`51`	`+ QString::number(useRegisterDescriptionAsName) + " useBifieldDescriptionAsName: " + QString::number(useBifieldDescriptionAsName));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`int JsonFormatedElement::getBitsPerRow() const { return bitsPerRow; }`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void RegisterMapValues::registerDump(QString path)`
`95`	`95`	`for(mapIterator = registerReadValues->begin(); mapIterator != registerReadValues->end();`
`96`	`96`	`mapIterator++) {`
`97`	`97`	`out << QString::number(mapIterator.key(), 16) << ","`
`98`		`- << QString::number(mapIterator.value(), 16) << endl;`
	`98`	`+ << QString::number(mapIterator.value(), 16) << Qt::endl;`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`