summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-07-29 19:24:25 +0200
committerDavid Tardon <dtardon@redhat.com>2017-07-29 19:24:25 +0200
commit8a1c39f7da057504fd04d46c700357aea1ea1cc6 (patch)
treea07d1419e4a5bf2842c846840144bd20df137af1
parent6f04b3bd154968043b224fc0b7d8c2fbf0512ad9 (diff)
boost::shared_ptr -> std::shared_ptr
-rw-r--r--configure.ac1
-rw-r--r--src/lib/C602ChartParser.cpp2
-rw-r--r--src/lib/C602ChartParser.h2
-rw-r--r--src/lib/C602Parser.cpp2
-rw-r--r--src/lib/C602Parser.h2
-rw-r--r--src/lib/SW602CharsetConverter.cpp4
-rw-r--r--src/lib/SW602CharsetConverter.h4
-rw-r--r--src/lib/SW602Chart.cpp8
-rw-r--r--src/lib/SW602Debug.h13
-rw-r--r--src/lib/SW602Document.cpp6
-rw-r--r--src/lib/SW602GraphicEncoder.h2
-rw-r--r--src/lib/SW602GraphicListener.cpp16
-rw-r--r--src/lib/SW602GraphicListener.h8
-rw-r--r--src/lib/SW602List.cpp10
-rw-r--r--src/lib/SW602List.h7
-rw-r--r--src/lib/SW602PageSpan.cpp4
-rw-r--r--src/lib/SW602PageSpan.h2
-rw-r--r--src/lib/SW602Parser.cpp4
-rw-r--r--src/lib/SW602Parser.h19
-rw-r--r--src/lib/SW602Printer.h2
-rw-r--r--src/lib/SW602SpreadsheetEncoder.h2
-rw-r--r--src/lib/SW602SpreadsheetListener.cpp18
-rw-r--r--src/lib/SW602SpreadsheetListener.h8
-rw-r--r--src/lib/SW602SubDocument.cpp4
-rw-r--r--src/lib/SW602SubDocument.h10
-rw-r--r--src/lib/SW602Table.cpp8
-rw-r--r--src/lib/SW602Table.h6
-rw-r--r--src/lib/SW602TextListener.cpp14
-rw-r--r--src/lib/SW602TextListener.h8
-rw-r--r--src/lib/SW602Types.h17
-rw-r--r--src/lib/T602Parser.cpp2
-rw-r--r--src/lib/T602Parser.h2
-rw-r--r--src/lib/WinText602Parser.cpp16
-rw-r--r--src/lib/WinText602Parser.h8
34 files changed, 116 insertions, 125 deletions
diff --git a/configure.ac b/configure.ac
index d98bed5..0fb5cab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,6 @@ AC_CHECK_HEADERS(
boost/spirit/include/phoenix_operator.hpp \
boost/spirit/include/qi_core.hpp \
boost/spirit/include/qi_eol.hpp \
- boost/shared_ptr.hpp \
,
[],
[AC_MSG_ERROR([Requires boost headers not found.])],
diff --git a/src/lib/C602ChartParser.cpp b/src/lib/C602ChartParser.cpp
index 2d03f1d..66a583b 100644
--- a/src/lib/C602ChartParser.cpp
+++ b/src/lib/C602ChartParser.cpp
@@ -12,7 +12,7 @@
namespace libsw602
{
-C602ChartParser::C602ChartParser(boost::shared_ptr<librevenge::RVNGInputStream> input)
+C602ChartParser::C602ChartParser(std::shared_ptr<librevenge::RVNGInputStream> input)
: SW602SpreadsheetParser(input)
, m_header()
{
diff --git a/src/lib/C602ChartParser.h b/src/lib/C602ChartParser.h
index 86b422f..d8bf058 100644
--- a/src/lib/C602ChartParser.h
+++ b/src/lib/C602ChartParser.h
@@ -19,7 +19,7 @@ namespace libsw602
class C602ChartParser : public SW602SpreadsheetParser
{
public:
- explicit C602ChartParser(boost::shared_ptr<librevenge::RVNGInputStream> input);
+ explicit C602ChartParser(std::shared_ptr<librevenge::RVNGInputStream> input);
virtual void parse(librevenge::RVNGSpreadsheetInterface *documentInterface);
diff --git a/src/lib/C602Parser.cpp b/src/lib/C602Parser.cpp
index a06078f..d1f1771 100644
--- a/src/lib/C602Parser.cpp
+++ b/src/lib/C602Parser.cpp
@@ -12,7 +12,7 @@
namespace libsw602
{
-C602Parser::C602Parser(boost::shared_ptr<librevenge::RVNGInputStream> input)
+C602Parser::C602Parser(std::shared_ptr<librevenge::RVNGInputStream> input)
: SW602SpreadsheetParser(input)
, m_header()
{
diff --git a/src/lib/C602Parser.h b/src/lib/C602Parser.h
index e011ea1..240083e 100644
--- a/src/lib/C602Parser.h
+++ b/src/lib/C602Parser.h
@@ -19,7 +19,7 @@ namespace libsw602
class C602Parser : public SW602SpreadsheetParser
{
public:
- explicit C602Parser(boost::shared_ptr<librevenge::RVNGInputStream> input);
+ explicit C602Parser(std::shared_ptr<librevenge::RVNGInputStream> input);
virtual void parse(librevenge::RVNGSpreadsheetInterface *documentInterface);
diff --git a/src/lib/SW602CharsetConverter.cpp b/src/lib/SW602CharsetConverter.cpp
index 09ef899..2e62c35 100644
--- a/src/lib/SW602CharsetConverter.cpp
+++ b/src/lib/SW602CharsetConverter.cpp
@@ -16,10 +16,10 @@ SW602CharsetConverter::~SW602CharsetConverter()
{
}
-boost::shared_ptr<SW602CharsetConverter> SW602CharsetConverter::create(const SW602Document::Encoding /*encoding*/)
+std::shared_ptr<SW602CharsetConverter> SW602CharsetConverter::create(const SW602Document::Encoding /*encoding*/)
{
// TODO: implement me
- return boost::shared_ptr<SW602CharsetConverter>();
+ return std::shared_ptr<SW602CharsetConverter>();
}
}
diff --git a/src/lib/SW602CharsetConverter.h b/src/lib/SW602CharsetConverter.h
index 9cfcc70..8bf9664 100644
--- a/src/lib/SW602CharsetConverter.h
+++ b/src/lib/SW602CharsetConverter.h
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SW602_CHARSETCONVERTER_H
#define INCLUDED_SW602_CHARSETCONVERTER_H
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <libsw602/libsw602.h>
@@ -27,7 +27,7 @@ public:
virtual uint32_t unicode(char c) const = 0;
public:
- static boost::shared_ptr<SW602CharsetConverter> create(SW602Document::Encoding encoding);
+ static std::shared_ptr<SW602CharsetConverter> create(SW602Document::Encoding encoding);
};
}
diff --git a/src/lib/SW602Chart.cpp b/src/lib/SW602Chart.cpp
index 164f138..47c8f3a 100644
--- a/src/lib/SW602Chart.cpp
+++ b/src/lib/SW602Chart.cpp
@@ -39,7 +39,7 @@ class SubDocument : public SW602SubDocument
{
public:
SubDocument(SW602Chart *chart, SW602Chart::TextZone::Type textZone) :
- SW602SubDocument(0, boost::shared_ptr<librevenge::RVNGInputStream>(), SW602Entry()), m_chart(chart), m_textZone(textZone)
+ SW602SubDocument(0, std::shared_ptr<librevenge::RVNGInputStream>(), SW602Entry()), m_chart(chart), m_textZone(textZone)
{
}
@@ -165,7 +165,7 @@ void SW602Chart::sendChart(SW602SpreadsheetListenerPtr &listener, librevenge::RV
SW602_DEBUG_MSG(("SW602Chart::sendChart: can not find the series\n"));
return;
}
- boost::shared_ptr<SW602Listener> genericListener=listener;
+ std::shared_ptr<SW602Listener> genericListener=listener;
int styleId=0;
librevenge::RVNGPropertyList style;
@@ -215,7 +215,7 @@ void SW602Chart::sendChart(SW602SpreadsheetListenerPtr &listener, librevenge::RV
interface->openChartTextObject(textZone);
if (zone.m_contentType==TextZone::C_Text)
{
- boost::shared_ptr<SW602SubDocument> doc(new SW602ChartInternal::SubDocument(this, zone.m_type));
+ std::shared_ptr<SW602SubDocument> doc(new SW602ChartInternal::SubDocument(this, zone.m_type));
listener->handleSubDocument(doc, libsw602::DOC_CHART_ZONE);
}
interface->closeChartTextObject();
@@ -295,7 +295,7 @@ void SW602Chart::sendChart(SW602SpreadsheetListenerPtr &listener, librevenge::RV
interface->openChartTextObject(textZone);
if (zone.m_contentType==TextZone::C_Text)
{
- boost::shared_ptr<SW602SubDocument> doc(new SW602ChartInternal::SubDocument(this, zone.m_type));
+ std::shared_ptr<SW602SubDocument> doc(new SW602ChartInternal::SubDocument(this, zone.m_type));
listener->handleSubDocument(doc, libsw602::DOC_CHART_ZONE);
}
interface->closeChartTextObject();
diff --git a/src/lib/SW602Debug.h b/src/lib/SW602Debug.h
index 3bba251..45600cd 100644
--- a/src/lib/SW602Debug.h
+++ b/src/lib/SW602Debug.h
@@ -10,10 +10,9 @@
#ifndef INCLUDED_SW602_DEBUG_H
#define INCLUDED_SW602_DEBUG_H
+#include <memory>
#include <string>
-#include <boost/shared_ptr.hpp>
-
#include <librevenge/librevenge.h>
#include <librevenge-stream/librevenge-stream.h>
@@ -50,11 +49,11 @@ class DebugFile
{
public:
//! constructor given the input file
- explicit DebugFile(boost::shared_ptr<librevenge::RVNGInputStream> ip)
+ explicit DebugFile(std::shared_ptr<librevenge::RVNGInputStream> ip)
: m_fileName(""), m_file(), m_on(false), m_input(ip), m_actOffset(-1), m_notes(), m_skipZones() { }
//! resets the input
- void setStream(boost::shared_ptr<librevenge::RVNGInputStream> ip)
+ void setStream(std::shared_ptr<librevenge::RVNGInputStream> ip)
{
m_input = ip;
}
@@ -103,7 +102,7 @@ protected:
mutable bool m_on;
//! the input
- boost::shared_ptr<librevenge::RVNGInputStream> m_input;
+ std::shared_ptr<librevenge::RVNGInputStream> m_input;
//! \brief a note and its position (used to sort all notes)
struct NotePos
@@ -190,9 +189,9 @@ public:
class DebugFile
{
public:
- explicit DebugFile(boost::shared_ptr<librevenge::RVNGInputStream>) {}
+ explicit DebugFile(std::shared_ptr<librevenge::RVNGInputStream>) {}
DebugFile() {}
- static void setStream(boost::shared_ptr<librevenge::RVNGInputStream>) { }
+ static void setStream(std::shared_ptr<librevenge::RVNGInputStream>) { }
~DebugFile() { }
static bool open(std::string const &)
diff --git a/src/lib/SW602Document.cpp b/src/lib/SW602Document.cpp
index 91f7988..6978688 100644
--- a/src/lib/SW602Document.cpp
+++ b/src/lib/SW602Document.cpp
@@ -12,8 +12,6 @@
#include <cassert>
#include <memory>
-#include <boost/shared_ptr.hpp>
-
#include <librevenge-stream/librevenge-stream.h>
#include "T602Header.h"
@@ -166,7 +164,7 @@ SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream *const in
{
case TYPE_T602:
{
- const boost::shared_ptr<RVNGInputStream> input_(input);
+ const std::shared_ptr<RVNGInputStream> input_(input);
T602Parser parser(input_);
parser.parse(document);
return RESULT_OK;
@@ -175,7 +173,7 @@ SW602Document::Result SW602Document::parse(librevenge::RVNGInputStream *const in
{
if (!input->existsSubStream("CONTENTS"))
return RESULT_UNSUPPORTED_FORMAT;
- const boost::shared_ptr<RVNGInputStream> content(input->getSubStreamByName("CONTENTS"));
+ const std::shared_ptr<RVNGInputStream> content(input->getSubStreamByName("CONTENTS"));
if (!content)
return RESULT_UNSUPPORTED_FORMAT;
WinText602Parser parser(content);
diff --git a/src/lib/SW602GraphicEncoder.h b/src/lib/SW602GraphicEncoder.h
index bd6bd19..0e95bd9 100644
--- a/src/lib/SW602GraphicEncoder.h
+++ b/src/lib/SW602GraphicEncoder.h
@@ -105,7 +105,7 @@ public:
protected:
//! the actual state
- boost::shared_ptr<SW602GraphicEncoderInternal::State> m_state;
+ std::shared_ptr<SW602GraphicEncoderInternal::State> m_state;
};
}
diff --git a/src/lib/SW602GraphicListener.cpp b/src/lib/SW602GraphicListener.cpp
index 92dd406..1eb909c 100644
--- a/src/lib/SW602GraphicListener.cpp
+++ b/src/lib/SW602GraphicListener.cpp
@@ -97,7 +97,7 @@ struct State
//! the paragraph
SW602Paragraph m_paragraph;
//! the list of list
- boost::shared_ptr<SW602List> m_list;
+ std::shared_ptr<SW602List> m_list;
//! a flag to know if openFrame was called
bool m_isFrameOpened;
@@ -685,8 +685,8 @@ int SW602GraphicListener::_getListId() const
SW602_DEBUG_MSG(("SW602GraphicListener::_getListId: the list id is not set, try to find a new one\n"));
first = false;
}
- boost::shared_ptr<SW602List> list=m_parserState->m_listManager->getNewList
- (m_ps->m_list, int(newLevel), *m_ps->m_paragraph.m_listLevel);
+ std::shared_ptr<SW602List> list=m_parserState->m_listManager->getNewList
+ (m_ps->m_list, int(newLevel), *m_ps->m_paragraph.m_listLevel);
if (!list) return -1;
return list->getId();
}
@@ -717,7 +717,7 @@ void SW602GraphicListener::_changeList()
if (newLevel)
{
- boost::shared_ptr<SW602List> theList;
+ std::shared_ptr<SW602List> theList;
theList=m_parserState->m_listManager->getList(newListId);
if (!theList)
@@ -1125,7 +1125,7 @@ void SW602GraphicListener::insertTable
_startSubDocument();
m_ps->m_subDocumentType = libsw602::DOC_TABLE;
- boost::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602GraphicListener>());
+ std::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602GraphicListener>());
try
{
table.sendTable(listen);
@@ -1636,7 +1636,7 @@ void SW602GraphicListener::handleSubDocument(SW602Vec2f const &orig, SW602SubDoc
if (subDocument)
{
m_ds->m_subDocuments.push_back(subDocument);
- boost::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602Listener>());
+ std::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602Listener>());
try
{
subDocument->parse(listen, subDocumentType);
@@ -1689,9 +1689,9 @@ void SW602GraphicListener::_endSubDocument()
///////////////////
// ---------- state stack ------------------
-boost::shared_ptr<SW602GraphicListenerInternal::State> SW602GraphicListener::_pushParsingState()
+std::shared_ptr<SW602GraphicListenerInternal::State> SW602GraphicListener::_pushParsingState()
{
- boost::shared_ptr<SW602GraphicListenerInternal::State> actual = m_ps;
+ std::shared_ptr<SW602GraphicListenerInternal::State> actual = m_ps;
m_psStack.push_back(actual);
m_ps.reset(new SW602GraphicListenerInternal::State);
return actual;
diff --git a/src/lib/SW602GraphicListener.h b/src/lib/SW602GraphicListener.h
index b038654..b17dba7 100644
--- a/src/lib/SW602GraphicListener.h
+++ b/src/lib/SW602GraphicListener.h
@@ -250,17 +250,17 @@ protected:
/** creates a new parsing state (copy of the actual state)
*
* \return the old one */
- boost::shared_ptr<SW602GraphicListenerInternal::State> _pushParsingState();
+ std::shared_ptr<SW602GraphicListenerInternal::State> _pushParsingState();
//! resets the previous parsing state
void _popParsingState();
protected:
//! the actual global state
- boost::shared_ptr<SW602GraphicListenerInternal::GraphicState> m_ds;
+ std::shared_ptr<SW602GraphicListenerInternal::GraphicState> m_ds;
//! the actual local parse state
- boost::shared_ptr<SW602GraphicListenerInternal::State> m_ps;
+ std::shared_ptr<SW602GraphicListenerInternal::State> m_ps;
//! stack of local state
- std::vector<boost::shared_ptr<SW602GraphicListenerInternal::State> > m_psStack;
+ std::vector<std::shared_ptr<SW602GraphicListenerInternal::State> > m_psStack;
//! the parser state
SW602ParserStatePtr m_parserState;
//! the document interface
diff --git a/src/lib/SW602List.cpp b/src/lib/SW602List.cpp
index 10e0a66..eb38c5b 100644
--- a/src/lib/SW602List.cpp
+++ b/src/lib/SW602List.cpp
@@ -362,9 +362,9 @@ bool SW602ListManager::needToSend(int index, std::vector<int> &idMarkerList) con
return true;
}
-boost::shared_ptr<SW602List> SW602ListManager::getList(int index) const
+std::shared_ptr<SW602List> SW602ListManager::getList(int index) const
{
- boost::shared_ptr<SW602List> res;
+ std::shared_ptr<SW602List> res;
if (index <= 0) return res;
size_t mainId=size_t(index-1)/2;
if (mainId < m_listList.size())
@@ -376,7 +376,7 @@ boost::shared_ptr<SW602List> SW602ListManager::getList(int index) const
return res;
}
-boost::shared_ptr<SW602List> SW602ListManager::getNewList(boost::shared_ptr<SW602List> actList, int levl, SW602ListLevel const &level)
+std::shared_ptr<SW602List> SW602ListManager::getNewList(std::shared_ptr<SW602List> actList, int levl, SW602ListLevel const &level)
{
if (actList && actList->getId()>=0 && actList->isCompatibleWith(levl, level))
{
@@ -402,12 +402,12 @@ boost::shared_ptr<SW602List> SW602ListManager::getNewList(boost::shared_ptr<SW60
continue;
if (m_listList[l].numLevels() < levl)
m_listList[l].set(levl, level);
- boost::shared_ptr<SW602List> copy(new SW602List(m_listList[l]));
+ std::shared_ptr<SW602List> copy(new SW602List(m_listList[l]));
copy->updateIndicesFrom(res);
return copy;
}
m_listList.push_back(res);
- return boost::shared_ptr<SW602List>(new SW602List(res));
+ return std::shared_ptr<SW602List>(new SW602List(res));
}
}
diff --git a/src/lib/SW602List.h b/src/lib/SW602List.h
index e636f6f..0f9d06d 100644
--- a/src/lib/SW602List.h
+++ b/src/lib/SW602List.h
@@ -11,10 +11,9 @@
#define INCLUDED_SW602_LIST_H
#include <iostream>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
-
#include <librevenge/librevenge.h>
#include "libsw602_utils.h"
@@ -185,9 +184,9 @@ public:
/** check if a list need to be send/resend to the interface */
bool needToSend(int index, std::vector<int> &idMarkerList) const;
//! returns a list with given index ( if found )
- boost::shared_ptr<SW602List> getList(int index) const;
+ std::shared_ptr<SW602List> getList(int index) const;
//! returns a new list corresponding to a list where we have a new level
- boost::shared_ptr<SW602List> getNewList(boost::shared_ptr<SW602List> actList, int levl, SW602ListLevel const &level);
+ std::shared_ptr<SW602List> getNewList(std::shared_ptr<SW602List> actList, int levl, SW602ListLevel const &level);
protected:
//! the list of created list
std::vector<SW602List> m_listList;
diff --git a/src/lib/SW602PageSpan.cpp b/src/lib/SW602PageSpan.cpp
index c94b558..26dfe70 100644
--- a/src/lib/SW602PageSpan.cpp
+++ b/src/lib/SW602PageSpan.cpp
@@ -29,7 +29,7 @@ class SubDocument : public SW602SubDocument
public:
//! constructor
explicit SubDocument(SW602HeaderFooter const &headerFooter) :
- SW602SubDocument(0, boost::shared_ptr<librevenge::RVNGInputStream>(), SW602Entry()), m_headerFooter(headerFooter) {}
+ SW602SubDocument(0, std::shared_ptr<librevenge::RVNGInputStream>(), SW602Entry()), m_headerFooter(headerFooter) {}
//! destructor
virtual ~SubDocument() {}
@@ -138,7 +138,7 @@ void SW602HeaderFooter::send(SW602Listener *listener) const
}
if (m_pageNumberPosition!=None)
{
- boost::shared_ptr<SW602PageSpanInternal::SubDocument> doc
+ std::shared_ptr<SW602PageSpanInternal::SubDocument> doc
(new SW602PageSpanInternal::SubDocument(*this));
if (m_type == HEADER)
listener->insertHeader(doc,propList);
diff --git a/src/lib/SW602PageSpan.h b/src/lib/SW602PageSpan.h
index 038cc61..242c385 100644
--- a/src/lib/SW602PageSpan.h
+++ b/src/lib/SW602PageSpan.h
@@ -67,7 +67,7 @@ public:
SW602SubDocumentPtr m_subDocument;
};
-typedef boost::shared_ptr<SW602HeaderFooter> SW602HeaderFooterPtr;
+typedef std::shared_ptr<SW602HeaderFooter> SW602HeaderFooterPtr;
/** A class which defines the page properties */
class SW602PageSpan
diff --git a/src/lib/SW602Parser.cpp b/src/lib/SW602Parser.cpp
index dcb2c10..a5364cd 100644
--- a/src/lib/SW602Parser.cpp
+++ b/src/lib/SW602Parser.cpp
@@ -18,7 +18,7 @@
namespace libsw602
{
-SW602ParserState::SW602ParserState(SW602ParserState::Type type, boost::shared_ptr<librevenge::RVNGInputStream> input) :
+SW602ParserState::SW602ParserState(SW602ParserState::Type type, std::shared_ptr<librevenge::RVNGInputStream> input) :
m_type(type), m_kind(SW602Document::KIND_TEXT), m_version(0), m_input(input), m_pageSpan(), m_converter(),
m_graphicListener(), m_listManager(), m_spreadsheetListener(), m_textListener(), m_asciiFile(input)
{
@@ -63,7 +63,7 @@ SW602ListenerPtr SW602ParserState::getMainListener()
return SW602ListenerPtr();
}
-SW602Parser::SW602Parser(SW602ParserState::Type type, boost::shared_ptr<librevenge::RVNGInputStream> input):
+SW602Parser::SW602Parser(SW602ParserState::Type type, std::shared_ptr<librevenge::RVNGInputStream> input):
m_parserState(), m_asciiName("")
{
m_parserState.reset(new SW602ParserState(type, input));
diff --git a/src/lib/SW602Parser.h b/src/lib/SW602Parser.h
index 1f252cf..87e5aba 100644
--- a/src/lib/SW602Parser.h
+++ b/src/lib/SW602Parser.h
@@ -10,12 +10,11 @@
#ifndef INCLUDED_SW602_PARSER_H
#define INCLUDED_SW602_PARSER_H
+#include <memory>
#include <ostream>
#include <string>
#include <vector>
-#include <boost/shared_ptr.hpp>
-
#include <libsw602/libsw602.h>
#include "SW602Debug.h"
@@ -34,7 +33,7 @@ public:
//! the parser state type
enum Type { Graphic, Spreadsheet, Text };
//! Constructor
- SW602ParserState(Type type, boost::shared_ptr<librevenge::RVNGInputStream> input);
+ SW602ParserState(Type type, std::shared_ptr<librevenge::RVNGInputStream> input);
//! destructor
~SW602ParserState();
//! returns the main listener
@@ -46,11 +45,11 @@ public:
//! the actual version
int m_version;
//! the input
- boost::shared_ptr<librevenge::RVNGInputStream> m_input;
+ std::shared_ptr<librevenge::RVNGInputStream> m_input;
//! the actual document size
SW602PageSpan m_pageSpan;
//! the charset converter
- boost::shared_ptr<SW602CharsetConverter> m_converter;
+ std::shared_ptr<SW602CharsetConverter> m_converter;
//! the graphic listener
SW602GraphicListenerPtr m_graphicListener;
@@ -87,7 +86,7 @@ public:
return m_parserState;
}
//! returns the actual input
- const boost::shared_ptr<librevenge::RVNGInputStream> &getInput()
+ const std::shared_ptr<librevenge::RVNGInputStream> &getInput()
{
return m_parserState->m_input;
}
@@ -145,7 +144,7 @@ public:
}
protected:
//! constructor (protected)
- SW602Parser(SW602ParserState::Type type, boost::shared_ptr<librevenge::RVNGInputStream> input);
+ SW602Parser(SW602ParserState::Type type, std::shared_ptr<librevenge::RVNGInputStream> input);
//! constructor using a state
explicit SW602Parser(SW602ParserStatePtr state) : m_parserState(state), m_asciiName("") { }
@@ -197,7 +196,7 @@ public:
virtual void parse(librevenge::RVNGDrawingInterface *documentInterface) = 0;
protected:
//! constructor (protected)
- SW602GraphicParser(boost::shared_ptr<librevenge::RVNGInputStream> input) : SW602Parser(SW602ParserState::Graphic, input) {}
+ SW602GraphicParser(std::shared_ptr<librevenge::RVNGInputStream> input) : SW602Parser(SW602ParserState::Graphic, input) {}
//! constructor using a state
explicit SW602GraphicParser(SW602ParserStatePtr state) : SW602Parser(state) {}
};
@@ -210,7 +209,7 @@ public:
virtual void parse(librevenge::RVNGSpreadsheetInterface *documentInterface) = 0;
protected:
//! constructor (protected)
- SW602SpreadsheetParser(boost::shared_ptr<librevenge::RVNGInputStream> input) : SW602Parser(SW602ParserState::Spreadsheet, input) {}
+ SW602SpreadsheetParser(std::shared_ptr<librevenge::RVNGInputStream> input) : SW602Parser(SW602ParserState::Spreadsheet, input) {}
//! constructor using a state
explicit SW602SpreadsheetParser(SW602ParserStatePtr state) : SW602Parser(state) {}
};
@@ -223,7 +222,7 @@ public:
virtual void parse(librevenge::RVNGTextInterface *documentInterface) = 0;
protected:
//! constructor (protected)
- SW602TextParser(boost::shared_ptr<librevenge::RVNGInputStream> input) : SW602Parser(SW602ParserState::Text, input) {}
+ SW602TextParser(std::shared_ptr<librevenge::RVNGInputStream> input) : SW602Parser(SW602ParserState::Text, input) {}
//! constructor using a state
explicit SW602TextParser(SW602ParserStatePtr state) : SW602Parser(state) {}
};
diff --git a/src/lib/SW602Printer.h b/src/lib/SW602Printer.h
index 64778b2..5aba453 100644
--- a/src/lib/SW602Printer.h
+++ b/src/lib/SW602Printer.h
@@ -78,7 +78,7 @@ struct PrinterInfo
protected:
//! internal data
- boost::shared_ptr<PrinterInfoData> m_data;
+ std::shared_ptr<PrinterInfoData> m_data;
private:
PrinterInfo(PrinterInfo const &orig);
PrinterInfo &operator=(PrinterInfo const &orig);
diff --git a/src/lib/SW602SpreadsheetEncoder.h b/src/lib/SW602SpreadsheetEncoder.h
index b36e0cb..3efafa1 100644
--- a/src/lib/SW602SpreadsheetEncoder.h
+++ b/src/lib/SW602SpreadsheetEncoder.h
@@ -160,7 +160,7 @@ public:
protected:
//! the actual state
- boost::shared_ptr<SW602SpreadsheetEncoderInternal::State> m_state;
+ std::shared_ptr<SW602SpreadsheetEncoderInternal::State> m_state;
};
}
diff --git a/src/lib/SW602SpreadsheetListener.cpp b/src/lib/SW602SpreadsheetListener.cpp
index 3932926..4c11f34 100644
--- a/src/lib/SW602SpreadsheetListener.cpp
+++ b/src/lib/SW602SpreadsheetListener.cpp
@@ -113,7 +113,7 @@ struct State
//! the paragraph
SW602Paragraph m_paragraph;
- boost::shared_ptr<SW602List> m_list;
+ std::shared_ptr<SW602List> m_list;
bool m_isPageSpanOpened;
bool m_isHeaderFooterOpened /** a flag to know if the header footer is started */;
@@ -734,8 +734,8 @@ int SW602SpreadsheetListener::_getListId() const
SW602_DEBUG_MSG(("SW602SpreadsheetListener::_getListId: the list id is not set, try to find a new one\n"));
first = false;
}
- boost::shared_ptr<SW602List> list=m_parserState->m_listManager->getNewList
- (m_ps->m_list, int(newLevel), *m_ps->m_paragraph.m_listLevel);
+ std::shared_ptr<SW602List> list=m_parserState->m_listManager->getNewList
+ (m_ps->m_list, int(newLevel), *m_ps->m_paragraph.m_listLevel);
if (!list) return -1;
return list->getId();
}
@@ -764,7 +764,7 @@ void SW602SpreadsheetListener::_changeList()
if (newLevel)
{
- boost::shared_ptr<SW602List> theList;
+ std::shared_ptr<SW602List> theList;
theList=m_parserState->m_listManager->getList(newListId);
if (!theList)
@@ -1534,7 +1534,7 @@ void SW602SpreadsheetListener::handleSubDocument(SW602SubDocumentPtr subDocument
if (subDocument)
{
m_ds->m_subDocuments.push_back(subDocument);
- boost::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602SpreadsheetListener>());
+ std::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602SpreadsheetListener>());
try
{
subDocument->parse(listen, subDocumentType);
@@ -1813,7 +1813,7 @@ void SW602SpreadsheetListener::insertTable
_startSubDocument();
m_ps->m_subDocumentType = libsw602::DOC_TABLE;
- boost::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602SpreadsheetListener>());
+ std::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602SpreadsheetListener>());
try
{
table.sendTable(listen);
@@ -1846,7 +1846,7 @@ void SW602SpreadsheetListener::insertChart
_startSubDocument();
m_ps->m_subDocumentType = libsw602::DOC_CHART;
- boost::shared_ptr<SW602SpreadsheetListener> listen(this, SW602_shared_ptr_noop_deleter<SW602SpreadsheetListener>());
+ std::shared_ptr<SW602SpreadsheetListener> listen(this, SW602_shared_ptr_noop_deleter<SW602SpreadsheetListener>());
try
{
chart.sendChart(listen, m_documentInterface);
@@ -1996,9 +1996,9 @@ void SW602SpreadsheetListener::closeTableCell()
///////////////////
// ---------- state stack ------------------
-boost::shared_ptr<SW602SpreadsheetListenerInternal::State> SW602SpreadsheetListener::_pushParsingState()
+std::shared_ptr<SW602SpreadsheetListenerInternal::State> SW602SpreadsheetListener::_pushParsingState()
{
- boost::shared_ptr<SW602SpreadsheetListenerInternal::State> actual = m_ps;
+ std::shared_ptr<SW602SpreadsheetListenerInternal::State> actual = m_ps;
m_psStack.push_back(actual);
m_ps.reset(new SW602SpreadsheetListenerInternal::State);
diff --git a/src/lib/SW602SpreadsheetListener.h b/src/lib/SW602SpreadsheetListener.h
index 0a0611b..5714c0c 100644
--- a/src/lib/SW602SpreadsheetListener.h
+++ b/src/lib/SW602SpreadsheetListener.h
@@ -254,17 +254,17 @@ protected:
/** creates a new parsing state (copy of the actual state)
*
* \return the old one */
- boost::shared_ptr<SW602SpreadsheetListenerInternal::State> _pushParsingState();
+ std::shared_ptr<SW602SpreadsheetListenerInternal::State> _pushParsingState();
//! resets the previous parsing state
void _popParsingState();
protected:
//! the main parse state
- boost::shared_ptr<SW602SpreadsheetListenerInternal::DocumentState> m_ds;
+ std::shared_ptr<SW602SpreadsheetListenerInternal::DocumentState> m_ds;
//! the actual local parse state
- boost::shared_ptr<SW602SpreadsheetListenerInternal::State> m_ps;
+ std::shared_ptr<SW602SpreadsheetListenerInternal::State> m_ps;
//! stack of local state
- std::vector<boost::shared_ptr<SW602SpreadsheetListenerInternal::State> > m_psStack;
+ std::vector<std::shared_ptr<SW602SpreadsheetListenerInternal::State> > m_psStack;
//! the parser state
SW602ParserStatePtr m_parserState;
//! the document interface
diff --git a/src/lib/SW602SubDocument.cpp b/src/lib/SW602SubDocument.cpp
index 2925538..6cd2c29 100644
--- a/src/lib/SW602SubDocument.cpp
+++ b/src/lib/SW602SubDocument.cpp
@@ -12,7 +12,7 @@
namespace libsw602
{
-SW602SubDocument::SW602SubDocument(SW602Parser *pars, boost::shared_ptr<librevenge::RVNGInputStream> ip, SW602Entry const &z):
+SW602SubDocument::SW602SubDocument(SW602Parser *pars, std::shared_ptr<librevenge::RVNGInputStream> ip, SW602Entry const &z):
m_parser(pars), m_input(ip), m_zone(z)
{
}
@@ -45,7 +45,7 @@ bool SW602SubDocument::operator!=(SW602SubDocument const &doc) const
return false;
}
-bool SW602SubDocument::operator!=(boost::shared_ptr<SW602SubDocument> const &doc) const
+bool SW602SubDocument::operator!=(std::shared_ptr<SW602SubDocument> const &doc) const
{
if (!doc) return true;
return operator!=(*doc.get());
diff --git a/src/lib/SW602SubDocument.h b/src/lib/SW602SubDocument.h
index 44369ea..e448b66 100644
--- a/src/lib/SW602SubDocument.h
+++ b/src/lib/SW602SubDocument.h
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SW602_SUB_DOCUMENT_H
#define INCLUDED_SW602_SUB_DOCUMENT_H
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <librevenge/librevenge.h>
@@ -27,7 +27,7 @@ class SW602SubDocument
{
public:
//! constructor from parser, input stream and zone in the input
- SW602SubDocument(SW602Parser *pars, boost::shared_ptr<librevenge::RVNGInputStream> ip, SW602Entry const &z);
+ SW602SubDocument(SW602Parser *pars, std::shared_ptr<librevenge::RVNGInputStream> ip, SW602Entry const &z);
//! copy constructor
explicit SW602SubDocument(SW602SubDocument const &doc);
//! copy operator
@@ -43,9 +43,9 @@ public:
return !operator!=(doc);
}
//! comparison operator!=
- bool operator!=(boost::shared_ptr<SW602SubDocument> const &doc) const;
+ bool operator!=(std::shared_ptr<SW602SubDocument> const &doc) const;
//! comparison operator==
- bool operator==(boost::shared_ptr<SW602SubDocument> const &doc) const
+ bool operator==(std::shared_ptr<SW602SubDocument> const &doc) const
{
return !operator!=(doc);
}
@@ -59,7 +59,7 @@ protected:
//! the main zone parser
SW602Parser *m_parser;
//! the input
- boost::shared_ptr<librevenge::RVNGInputStream> m_input;
+ std::shared_ptr<librevenge::RVNGInputStream> m_input;
//! if valid the zone to parse
SW602Entry m_zone;
};
diff --git a/src/lib/SW602Table.cpp b/src/lib/SW602Table.cpp
index 44e7d32..a53f591 100644
--- a/src/lib/SW602Table.cpp
+++ b/src/lib/SW602Table.cpp
@@ -92,12 +92,12 @@ SW602Table::~SW602Table()
{
}
-boost::shared_ptr<SW602Cell> SW602Table::get(int id)
+std::shared_ptr<SW602Cell> SW602Table::get(int id)
{
if (id < 0 || id >= int(m_cellsList.size()))
{
SW602_DEBUG_MSG(("SW602Table::get: cell %d does not exists\n",id));
- return boost::shared_ptr<SW602Cell>();
+ return std::shared_ptr<SW602Cell>();
}
return m_cellsList[size_t(id)];
}
@@ -388,7 +388,7 @@ bool SW602Table::buildDims()
{
int cPos = getCellIdPos(c, r);
if (cPos<0 || m_posToCellId[size_t(cPos)]<0) continue;
- boost::shared_ptr<SW602Cell> cell=m_cellsList[size_t(m_posToCellId[size_t(cPos)])];
+ std::shared_ptr<SW602Cell> cell=m_cellsList[size_t(m_posToCellId[size_t(cPos)])];
if (!cell) continue;
SW602Vec2i const &pos=cell->position();
SW602Vec2i lastPos=pos+cell->numSpannedCells();
@@ -429,7 +429,7 @@ bool SW602Table::buildDims()
{
int cPos = getCellIdPos(c, r);
if (cPos<0 || m_posToCellId[size_t(cPos)]<0) continue;
- boost::shared_ptr<SW602Cell> cell=m_cellsList[size_t(m_posToCellId[size_t(cPos)])];
+ std::shared_ptr<SW602Cell> cell=m_cellsList[size_t(m_posToCellId[size_t(cPos)])];
if (!cell) continue;
SW602Vec2i const &pos=cell->position();
SW602Vec2i lastPos=pos+cell->numSpannedCells();
diff --git a/src/lib/SW602Table.h b/src/lib/SW602Table.h
index 29db4a2..1aa6436 100644
--- a/src/lib/SW602Table.h
+++ b/src/lib/SW602Table.h
@@ -51,7 +51,7 @@ public:
virtual ~SW602Table();
//! add a new cells
- void add(boost::shared_ptr<SW602Cell> cell)
+ void add(std::shared_ptr<SW602Cell> cell)
{
if (!cell)
{
@@ -105,7 +105,7 @@ public:
}
//! returns the i^th cell
- boost::shared_ptr<SW602Cell> get(int id);
+ std::shared_ptr<SW602Cell> get(int id);
/** try to build the table structures */
bool updateTable();
@@ -157,7 +157,7 @@ protected:
/** do we need to merge cell borders ( default yes) */
bool m_mergeBorders;
/** the list of cells */
- std::vector<boost::shared_ptr<SW602Cell> > m_cellsList;
+ std::vector<std::shared_ptr<SW602Cell> > m_cellsList;
/** the number of rows ( set by buildPosToCellId ) */
size_t m_numRows;
/** the number of cols ( set by buildPosToCellId ) */
diff --git a/src/lib/SW602TextListener.cpp b/src/lib/SW602TextListener.cpp
index 4d62d25..3df7077 100644
--- a/src/lib/SW602TextListener.cpp
+++ b/src/lib/SW602TextListener.cpp
@@ -102,7 +102,7 @@ struct State
//! a sequence of bit used to know if we need page/column break
int m_paragraphNeedBreak;
- boost::shared_ptr<SW602List> m_list;
+ std::shared_ptr<SW602List> m_list;
bool m_isPageSpanOpened;
bool m_isSectionOpened;
@@ -832,8 +832,8 @@ int SW602TextListener::_getListId() const
SW602_DEBUG_MSG(("SW602TextListener::_getListId: the list id is not set, try to find a new one\n"));
first = false;
}
- boost::shared_ptr<SW602List> list=m_parserState->m_listManager->getNewList
- (m_ps->m_list, int(newLevel), *m_ps->m_paragraph.m_listLevel);
+ std::shared_ptr<SW602List> list=m_parserState->m_listManager->getNewList
+ (m_ps->m_list, int(newLevel), *m_ps->m_paragraph.m_listLevel);
if (!list) return -1;
return list->getId();
}
@@ -864,7 +864,7 @@ void SW602TextListener::_changeList()
if (newLevel)
{
- boost::shared_ptr<SW602List> theList;
+ std::shared_ptr<SW602List> theList;
theList=m_parserState->m_listManager->getList(newListId);
if (!theList)
@@ -1680,7 +1680,7 @@ void SW602TextListener::handleSubDocument(SW602SubDocumentPtr subDocument, libsw
if (subDocument)
{
m_ds->m_subDocuments.push_back(subDocument);
- boost::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602TextListener>());
+ std::shared_ptr<SW602Listener> listen(this, SW602_shared_ptr_noop_deleter<SW602TextListener>());
try
{
subDocument->parse(listen, subDocumentType);
@@ -1879,9 +1879,9 @@ void SW602TextListener::closeTableCell()
///////////////////
// ---------- state stack ------------------
-boost::shared_ptr<SW602TextListenerInternal::State> SW602TextListener::_pushParsingState()
+std::shared_ptr<SW602TextListenerInternal::State> SW602TextListener::_pushParsingState()
{
- boost::shared_ptr<SW602TextListenerInternal::State> actual = m_ps;
+ std::shared_ptr<SW602TextListenerInternal::State> actual = m_ps;
m_psStack.push_back(actual);
m_ps.reset(new SW602TextListenerInternal::State);
diff --git a/src/lib/SW602TextListener.h b/src/lib/SW602TextListener.h
index 57ad36c..8fef6ad 100644
--- a/src/lib/SW602TextListener.h
+++ b/src/lib/SW602TextListener.h
@@ -232,17 +232,17 @@ protected:
/** creates a new parsing state (copy of the actual state)
*
* \return the old one */
- boost::shared_ptr<SW602TextListenerInternal::State> _pushParsingState();
+ std::shared_ptr<SW602TextListenerInternal::State> _pushParsingState();
//! resets the previous parsing state
void _popParsingState();
protected:
//! the main parse state
- boost::shared_ptr<SW602TextListenerInternal::DocumentState> m_ds;
+ std::shared_ptr<SW602TextListenerInternal::DocumentState> m_ds;
//! the actual local parse state
- boost::shared_ptr<SW602TextListenerInternal::State> m_ps;
+ std::shared_ptr<SW602TextListenerInternal::State> m_ps;
//! stack of local state
- std::vector<boost::shared_ptr<SW602TextListenerInternal::State> > m_psStack;
+ std::vector<std::shared_ptr<SW602TextListenerInternal::State> > m_psStack;
//! the parser state
SW602ParserStatePtr m_parserState;
//! the document interface
diff --git a/src/lib/SW602Types.h b/src/lib/SW602Types.h
index 885dbc1..a80584f 100644
--- a/src/lib/SW602Types.h
+++ b/src/lib/SW602Types.h
@@ -12,11 +12,10 @@
#include <cmath>
#include <map>
+#include <memory>
#include <ostream>
#include <vector>
-#include <boost/shared_ptr.hpp>
-
#include "libsw602_utils.h"
/* ---------- input ----------------- */
@@ -350,19 +349,19 @@ class SW602SpreadsheetListener;
class SW602SubDocument;
class SW602TextListener;
//! a smart pointer of SW602GraphicListener
-typedef boost::shared_ptr<SW602GraphicListener> SW602GraphicListenerPtr;
+typedef std::shared_ptr<SW602GraphicListener> SW602GraphicListenerPtr;
//! a smart pointer of SW602Listener
-typedef boost::shared_ptr<SW602Listener> SW602ListenerPtr;
+typedef std::shared_ptr<SW602Listener> SW602ListenerPtr;
//! a smart pointer of SW602ListManager
-typedef boost::shared_ptr<SW602ListManager> SW602ListManagerPtr;
+typedef std::shared_ptr<SW602ListManager> SW602ListManagerPtr;
//! a smart pointer of SW602ParserState
-typedef boost::shared_ptr<SW602ParserState> SW602ParserStatePtr;
+typedef std::shared_ptr<SW602ParserState> SW602ParserStatePtr;
//! a smart pointer of SW602SpreadsheetListener
-typedef boost::shared_ptr<SW602SpreadsheetListener> SW602SpreadsheetListenerPtr;
+typedef std::shared_ptr<SW602SpreadsheetListener> SW602SpreadsheetListenerPtr;
//! a smart pointer of SW602SubDocument
-typedef boost::shared_ptr<SW602SubDocument> SW602SubDocumentPtr;
+typedef std::shared_ptr<SW602SubDocument> SW602SubDocumentPtr;
//! a smart pointer of SW602TextListener
-typedef boost::shared_ptr<SW602TextListener> SW602TextListenerPtr;
+typedef std::shared_ptr<SW602TextListener> SW602TextListenerPtr;
/* ---------- vec2/box2f ------------- */
/*! \class SW602Vec2
diff --git a/src/lib/T602Parser.cpp b/src/lib/T602Parser.cpp
index 9c0d77b..be7c60e 100644
--- a/src/lib/T602Parser.cpp
+++ b/src/lib/T602Parser.cpp
@@ -12,7 +12,7 @@
namespace libsw602
{
-T602Parser::T602Parser(boost::shared_ptr<librevenge::RVNGInputStream> input)
+T602Parser::T602Parser(std::shared_ptr<librevenge::RVNGInputStream> input)
: SW602TextParser(input)
, m_header()
{
diff --git a/src/lib/T602Parser.h b/src/lib/T602Parser.h
index e7d9ab8..73023c7 100644
--- a/src/lib/T602Parser.h
+++ b/src/lib/T602Parser.h
@@ -19,7 +19,7 @@ namespace libsw602
class T602Parser : public SW602TextParser
{
public:
- explicit T602Parser(boost::shared_ptr<librevenge::RVNGInputStream> input);
+ explicit T602Parser(std::shared_ptr<librevenge::RVNGInputStream> input);
virtual void parse(librevenge::RVNGTextInterface *documentInterface);
diff --git a/src/lib/WinText602Parser.cpp b/src/lib/WinText602Parser.cpp
index 1bcd768..5b0ed11 100644
--- a/src/lib/WinText602Parser.cpp
+++ b/src/lib/WinText602Parser.cpp
@@ -19,8 +19,6 @@
#include "SW602MemoryStream.h"
#include "libsw602_utils.h"
-using boost::shared_ptr;
-
using librevenge::RVNGInputStream;
namespace libsw602
@@ -48,7 +46,7 @@ public:
bool isPresent(WinText602Section section) const;
- shared_ptr<RVNGInputStream> getSectionStream(librevenge::RVNGInputStream &input, WinText602Section section) const;
+ std::shared_ptr<RVNGInputStream> getSectionStream(librevenge::RVNGInputStream &input, WinText602Section section) const;
private:
std::vector<Section_t> m_sections;
@@ -87,9 +85,9 @@ bool WinText602SectionMap::isPresent(const WinText602Section section) const
return false;
}
-shared_ptr<RVNGInputStream> WinText602SectionMap::getSectionStream(librevenge::RVNGInputStream &input, const WinText602Section section) const
+std::shared_ptr<RVNGInputStream> WinText602SectionMap::getSectionStream(librevenge::RVNGInputStream &input, const WinText602Section section) const
{
- shared_ptr<RVNGInputStream> strm;
+ std::shared_ptr<RVNGInputStream> strm;
if (isPresent(section))
{
@@ -110,7 +108,7 @@ shared_ptr<RVNGInputStream> WinText602SectionMap::getSectionStream(librevenge::R
namespace libsw602
{
-WinText602Parser::WinText602Parser(const boost::shared_ptr<librevenge::RVNGInputStream> input)
+WinText602Parser::WinText602Parser(const std::shared_ptr<librevenge::RVNGInputStream> input)
: SW602TextParser(input)
, m_header()
, m_input(input)
@@ -142,8 +140,8 @@ void WinText602Parser::parse(librevenge::RVNGTextInterface *documentInterface)
void WinText602Parser::readText()
{
- const shared_ptr<RVNGInputStream> textInput(getSection(WinText602_SECTION_TEXT));
- const shared_ptr<RVNGInputStream> textInfoInput(getSection(WinText602_SECTION_TEXT_INFO));
+ const std::shared_ptr<RVNGInputStream> textInput(getSection(WinText602_SECTION_TEXT));
+ const std::shared_ptr<RVNGInputStream> textInfoInput(getSection(WinText602_SECTION_TEXT_INFO));
const unsigned textLength = readU32(*textInput);
const unsigned spanCount = readU32(*textInfoInput);
@@ -192,7 +190,7 @@ void WinText602Parser::readText()
}
}
-shared_ptr<RVNGInputStream> WinText602Parser::getSection(const WinText602Section section) const
+std::shared_ptr<RVNGInputStream> WinText602Parser::getSection(const WinText602Section section) const
{
return m_sectionMap->getSectionStream(*m_input, section);
}
diff --git a/src/lib/WinText602Parser.h b/src/lib/WinText602Parser.h
index 0d69a87..2d6c706 100644
--- a/src/lib/WinText602Parser.h
+++ b/src/lib/WinText602Parser.h
@@ -66,21 +66,21 @@ class WinText602Parser : public SW602TextParser
WinText602Parser &operator=(const WinText602Parser &other);
public:
- explicit WinText602Parser(boost::shared_ptr<librevenge::RVNGInputStream> input);
+ explicit WinText602Parser(std::shared_ptr<librevenge::RVNGInputStream> input);
virtual void parse(librevenge::RVNGTextInterface *documentInterface);
private:
void readText();
- boost::shared_ptr<librevenge::RVNGInputStream> getSection(WinText602Section section) const;
+ std::shared_ptr<librevenge::RVNGInputStream> getSection(WinText602Section section) const;
private:
WinText602Header m_header;
- const boost::shared_ptr<librevenge::RVNGInputStream> m_input;
+ const std::shared_ptr<librevenge::RVNGInputStream> m_input;
librevenge::RVNGTextInterface *m_document;
- boost::shared_ptr<WinText602SectionMap> m_sectionMap;
+ std::shared_ptr<WinText602SectionMap> m_sectionMap;
};
} // namespace libsw602