summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorormorph <roma251078@mail.ru>2024-03-20 17:45:23 +0300
committerormorph <roma251078@mail.ru>2024-03-22 07:47:11 +0300
commit7ab481cf8bd4ef4045d9fc794ca86d0d6489fd9d (patch)
tree411cbb13ba22fbd45ad09658b958f44128016df6
parent5bf2d0e29bf14701f2f043d3692246e98e3d4b0f (diff)
downloadtdewebdev-7ab481cf8bd4ef4045d9fc794ca86d0d6489fd9d.tar.gz
tdewebdev-7ab481cf8bd4ef4045d9fc794ca86d0d6489fd9d.zip
Adding support for libxml2-2.12.0 and later for Quanta+
Solution to issue #42 Signed-off-by: ormorph <roma251078@mail.ru>
-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;