summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorormorph <roma251078@mail.ru>2024-03-20 17:45:23 +0300
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-03-25 22:43:32 +0900
commit49db40e4a2afa9e0ac9ac1b1643c41ed6fa692cb (patch)
tree6f69a5a13a7d6bf86a2da399f007fd0bc694e458
parent5f5631cfa9b2b754b84bcacf4602b1deb6303e8e (diff)
downloadtdewebdev-49db40e4a2afa9e0ac9ac1b1643c41ed6fa692cb.tar.gz
tdewebdev-49db40e4a2afa9e0ac9ac1b1643c41ed6fa692cb.zip
Adding support for libxml2-2.12.0 and later for Quanta+
Solution to issue #42 Signed-off-by: ormorph <roma251078@mail.ru> (cherry picked from commit 7ab481cf8bd4ef4045d9fc794ca86d0d6489fd9d)
-rw-r--r--quanta/parsers/dtd/dtdparser.cpp5
1 files changed, 3 insertions, 2 deletions
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 += "<br>" + s;
errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2);
- xmlResetError(errorPtr);
+ xmlResetLastError();
}
KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr));
return false;