trying to move libvisio to librevenge API

Change-Id: I6a17a8e0e435b4de87e0017bddb5d16f6b1a543d

4 files changed, 6 insertions, 74 deletions

diff --git a/inc/libvisio/Makefile.am b/inc/libvisio/Makefile.am
index e4c3d6a..16c458f 100644
--- a/inc/libvisio/Makefile.am
+++ b/inc/libvisio/Makefile.am
@@ -1,4 +1,3 @@
 EXTRA_DIST = \
 	libvisio.h \
-	VSDStringVector.h \
 	VisioDocument.h
diff --git a/inc/libvisio/VSDStringVector.h b/inc/libvisio/VSDStringVector.h
deleted file mode 100644
index 50c929f..0000000
--- a/inc/libvisio/VSDStringVector.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* libvisio
- * Version: MPL 1.1 / GPLv2+ / LGPLv2+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Fridrich Strba <fridrich.strba@bluewin.ch>
- *
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
- * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
- * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
- * instead of those above.
- */
-
-#ifndef __VSDSTRINGVECTOR_H__
-#define __VSDSTRINGVECTOR_H__
-
-#include <libwpd/libwpd.h>
-
-namespace libvisio
-{
-class VSDStringVectorImpl;
-
-class VSDStringVector
-{
-public:
-  VSDStringVector();
-  VSDStringVector(const VSDStringVector &vec);
-  ~VSDStringVector();
-
-  VSDStringVector &operator=(const VSDStringVector &vec);
-
-  unsigned size() const;
-  bool empty() const;
-  const WPXString &operator[](unsigned idx) const;
-  void append(const WPXString &str);
-  void clear();
-
-private:
-  VSDStringVectorImpl *m_pImpl;
-};
-
-} // namespace libvisio
-
-#endif /* __VSDSTRINGVECTOR_H__ */
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libvisio/VisioDocument.h b/inc/libvisio/VisioDocument.h
index 75ed5ab..498ab2c 100644
--- a/inc/libvisio/VisioDocument.h
+++ b/inc/libvisio/VisioDocument.h
@@ -31,11 +31,7 @@
 #ifndef __VISIODOCUMENT_H__
 #define __VISIODOCUMENT_H__
 
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
-#include "VSDStringVector.h"
-
-class WPXInputStream;
+#include <librevenge/librevenge.h>
 
 namespace libvisio
 {
@@ -44,15 +40,15 @@ class VisioDocument
 {
 public:
 
-  static bool isSupported(WPXInputStream *input);
+  static bool isSupported(RVNGInputStream *input);
 
-  static bool parse(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+  static bool parse(RVNGInputStream *input, RVNGDrawingInterface *painter);
 
-  static bool parseStencils(WPXInputStream *input, libwpg::WPGPaintInterface *painter);
+  static bool parseStencils(RVNGInputStream *input, RVNGDrawingInterface *painter);
 
-  static bool generateSVG(WPXInputStream *input, VSDStringVector &output);
+  static bool generateSVG(RVNGInputStream *input, RVNGStringVector &output);
 
-  static bool generateSVGStencils(WPXInputStream *input, VSDStringVector &output);
+  static bool generateSVGStencils(RVNGInputStream *input, RVNGStringVector &output);
 };
 
 } // namespace libvisio
diff --git a/inc/libvisio/libvisio.h b/inc/libvisio/libvisio.h
index ff454a9..96286ad 100644
--- a/inc/libvisio/libvisio.h
+++ b/inc/libvisio/libvisio.h
@@ -31,8 +31,6 @@
 #ifndef __LIBVISIO_H__
 #define __LIBVISIO_H__
 
-#include <libwpd/libwpd.h>
-#include <libwpg/libwpg.h>
 #include "VisioDocument.h"
 
 #endif