From 59495c9090d32de025310bc9e3c9febb93c9f6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Thu, 13 Oct 2022 01:55:18 +0200
Subject: Remove code to support libxml2 < 2.6.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable LIBXML_DOCB_ENABLED independently of the presence
of 'libxml/DOCBparser.h' because from libxml2 >= 2.6 for
docbook files are not used deprecated functions from
DOCBparser, so 'libxml/DOCBparser.h' is not needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f4859ad13cd26b31e44d981bd0d55a9fa19c7aab)
---
 quanta/parsers/dtd/dtdparser.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'quanta')

diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index 0562f61e..4f1b9d14 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -36,10 +36,6 @@
 #include <tdeio/netaccess.h>
 
 //other includes
-#ifdef LIBXML_2_5
-#include <libxml/hash.h>
-#endif
-
 #include <libxml/parser.h>
 #include <libxml/valid.h>
 
@@ -86,7 +82,6 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
   if( DTD::dtd_ptr == NULL )
   {
     TQString errorStr = i18n("Unknown");
-#ifndef LIBXML_2_5
     xmlErrorPtr errorPtr = xmlGetLastError();
     if (errorPtr != NULL)
     {
@@ -105,7 +100,6 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
       errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2);
       xmlResetError(errorPtr);
     }
-#endif
     KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr));
     return false;
   }
-- 
cgit v1.2.3