Skip to content

Replace function deprecated in Qt 6.8. #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dfaure-kdab merged 2 commits into from
Jun 17, 2025
Merged

Replace function deprecated in Qt 6.8. #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9284d6b
Replace deprecated functions.
jtjbrady Jun 16, 2025
9f49e92
Formatting.
jtjbrady Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion schema/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,13 +1131,21 @@ void Parser::importSchema(ParserContext *context, const QString &location)
}

QDomDocument doc(QLatin1String("kwsdl"));
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
QString errorMsg;
int errorLine, errorColumn;
bool ok = doc.setContent(&file, false, &errorMsg, &errorLine, &errorColumn);
if (!ok) {
qDebug("Error[%d:%d] %s", errorLine, errorColumn, qPrintable(errorMsg));
return;
}
#else
if (auto result = doc.setContent(&file); !result) {
qDebug("Error[%lld:%lld] %s", result.errorLine, result.errorColumn,
qPrintable(result.errorMessage));
return;
}
#endif

QDomElement node = doc.documentElement();

Expand Down Expand Up @@ -1172,13 +1180,21 @@ void Parser::includeSchema(ParserContext *context, const QString &location)
}

QDomDocument doc(QLatin1String("kwsdl"));
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
QString errorMsg;
int errorLine, errorColumn;
bool ok = doc.setContent(&file, false, &errorMsg, &errorLine, &errorColumn);
if (!ok) {
qDebug("Error[%d:%d] %s", errorLine, errorColumn, qPrintable(errorMsg));
return;
}
#else
if (auto result = doc.setContent(&file); !result) {
qDebug("Error[%lld:%lld] %s", result.errorLine, result.errorColumn,
qPrintable(result.errorMessage));
return;
}
#endif

QDomElement node = doc.documentElement();
NSManager namespaceManager(context, node);
Expand Down Expand Up @@ -1400,13 +1416,21 @@ bool Parser::parse(ParserContext *context, QIODevice *sourceDevice)
{
QDomDocument document(QLatin1String("KWSDL"));

QDomDocument doc;
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
QString errorMsg;
int errorLine, errorCol;
QDomDocument doc;
if (!doc.setContent(sourceDevice, false, &errorMsg, &errorLine, &errorCol)) {
qDebug("%s at (%d,%d)", qPrintable(errorMsg), errorLine, errorCol);
return false;
}
#else
if (auto result = doc.setContent(sourceDevice); !result) {
qDebug("%s at (%lld,%lld)", qPrintable(result.errorMessage), result.errorLine,
result.errorColumn);
return false;
}
#endif

QDomElement element = doc.documentElement();
const QName name = element.tagName();
Expand Down