1 files changed, 19 insertions, 49 deletions

diff --git a/source/fb2xml2.h b/source/fb2xml2.h
index 881ce7c..9a06720 100644
--- a/source/fb2xml2.h
+++ b/source/fb2xml2.h
@@ -1,74 +1,44 @@
 #ifndef FB2XML2_H
 #define FB2XML2_H
 
-#ifdef FB2_USE_LIBXML2
-
-/////////////////////////////////////////////////////////////////////////////
-//
-//   Append into project file:
-//     INCLUDEPATH += /usr/include/libxml2
-//     LIBS        += -lxml2
-//
-//   http://blog.sjinks.pro/c-cpp/qt/942-html-parser-qt/
-//
-//
-//     QByteArray data;
-//     QXmlInputSource src;
-//     HtmlReader reader;
-//     QDomDocument doc;
-//     src.setData(data);
-//     doc.setContent(&src, &reader);
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#include <QtXml/QXmlReader>
-#include <libxml/xmlstring.h>
+#include <QtXml>
+#include "fb2xml.hpp"
 
 namespace XML2 {
 
 class XmlReaderPrivate;
 
-class XmlReader : public QXmlReader
+class XmlReader
 {
 public:
     XmlReader(void);
-    virtual ~XmlReader(void);
+    ~XmlReader(void);
 
-    virtual bool feature(const QString& name, bool* ok = 0) const;
-    virtual void setFeature(const QString& name, bool value);
-    virtual bool hasFeature(const QString& name) const;
-    virtual void* property(const QString& name, bool* ok = 0) const;
-    virtual void setProperty(const QString& name, void* value);
-    virtual bool hasProperty(const QString& name) const;
+    bool feature(const QString& name, bool* ok = 0) const;
+    void setFeature(const QString& name, bool value);
+    bool hasFeature(const QString& name) const;
+    void* property(const QString& name, bool* ok = 0) const;
+    void setProperty(const QString& name, void* value);
+    bool hasProperty(const QString& name) const;
 
-    virtual void setEntityResolver(QXmlEntityResolver* handler);
-    virtual QXmlEntityResolver* entityResolver(void) const;
-    virtual void setDTDHandler(QXmlDTDHandler* handler);
-    virtual QXmlDTDHandler* DTDHandler(void) const;
-    virtual void setContentHandler(QXmlContentHandler* handler);
-    virtual QXmlContentHandler* contentHandler(void) const;
-    virtual void setErrorHandler(QXmlErrorHandler* handler);
-    virtual QXmlErrorHandler* errorHandler(void) const;
-    virtual void setLexicalHandler(QXmlLexicalHandler* handler);
-    virtual QXmlLexicalHandler* lexicalHandler(void) const;
-    virtual void setDeclHandler(QXmlDeclHandler* handler);
-    virtual QXmlDeclHandler* declHandler(void) const;
+    void setContentHandler(FbXmlHandler* handler);
+    FbXmlHandler* contentHandler(void) const;
+    void setErrorHandler(FbXmlHandler* handler);
+    FbXmlHandler* errorHandler(void) const;
+    void setLexicalHandler(FbXmlHandler* handler);
+    FbXmlHandler* lexicalHandler(void) const;
 
-    virtual bool parse(QIODevice *input);
-    virtual bool parse(const QXmlInputSource&);
-    virtual bool parse(const QXmlInputSource*);
+    bool parse(QIODevice *input);
+    bool parse(const QString&);
+    bool parse(const QString*);
 
 
 private:
     Q_DISABLE_COPY(XmlReader)
     Q_DECLARE_PRIVATE(XmlReader)
     QScopedPointer<XmlReaderPrivate> d_ptr;
-
-    friend class XmlReaderLocator;
 };
 
 } // namespace XML2
 
-#endif // FB2_USE_LIBXML2
-
 #endif // FB2XML2_H