From 49db40e4a2afa9e0ac9ac1b1643c41ed6fa692cb Mon Sep 17 00:00:00 2001 From: ormorph Date: Wed, 20 Mar 2024 17:45:23 +0300 Subject: Adding support for libxml2-2.12.0 and later for Quanta+ Solution to issue #42 Signed-off-by: ormorph (cherry picked from commit 7ab481cf8bd4ef4045d9fc794ca86d0d6489fd9d) --- quanta/parsers/dtd/dtdparser.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'quanta/parsers/dtd') diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index e2511b18..9de0f39a 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -82,7 +82,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) if( DTD::dtd_ptr == NULL ) { TQString errorStr = i18n("Unknown"); - xmlErrorPtr errorPtr = xmlGetLastError(); + // The type used is either xmlErrorPtr or const xmlError* + auto errorPtr = xmlGetLastError(); if (errorPtr != NULL) { TQString s = TQString::fromLatin1(errorPtr->message); @@ -98,7 +99,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) if (!s.isEmpty()) errorStr += "
" + s; errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); - xmlResetError(errorPtr); + xmlResetLastError(); } KMessageBox::error(0, i18n("Error while parsing the DTD.
The error message is:
%1
").arg(errorStr)); return false; -- cgit v1.2.1