Kaydet (Commit) f7ef1cbb authored tarafından Caolán McNamara's avatar Caolán McNamara

boost->std

Change-Id: I5079e03f70370ed83a1158b2e278f48642108f08
Reviewed-on: https://gerrit.libreoffice.org/18692Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f626b886
...@@ -19,7 +19,7 @@ A stripped down version with extended comments: ...@@ -19,7 +19,7 @@ A stripped down version with extended comments:
VirtualDevice aVirtualDevice; VirtualDevice aVirtualDevice;
// Create processor and draw primitives, to get it ready for rendering. // Create processor and draw primitives, to get it ready for rendering.
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D( std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(...)); drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(...));
if (pProcessor2D) if (pProcessor2D)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "vclprocessor2d.hxx" #include "vclprocessor2d.hxx"
#include <vcl/outdev.hxx> #include <vcl/outdev.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
// predefines // predefines
...@@ -53,7 +53,7 @@ namespace drawinglayer ...@@ -53,7 +53,7 @@ namespace drawinglayer
{ {
private: private:
struct Impl; struct Impl;
boost::scoped_ptr<Impl> m_pImpl; std::unique_ptr<Impl> m_pImpl;
protected: protected:
/* the local processor for BasePrinitive2D-Implementation based primitives, /* the local processor for BasePrinitive2D-Implementation based primitives,
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
#include <osl/thread.h> #include <osl/thread.h>
#include <boost/scoped_ptr.hpp>
#include <algorithm> #include <algorithm>
#include <memory>
#include "LuceneHelper.hxx" #include "LuceneHelper.hxx"
...@@ -42,7 +42,7 @@ bool HelpIndexer::indexDocuments() ...@@ -42,7 +42,7 @@ bool HelpIndexer::indexDocuments()
bool bUseCJK = sLang == "ja" || sLang == "ko" || sLang == "zh"; bool bUseCJK = sLang == "ja" || sLang == "ko" || sLang == "zh";
// Construct the analyzer appropriate for the given language // Construct the analyzer appropriate for the given language
boost::scoped_ptr<lucene::analysis::Analyzer> analyzer; std::unique_ptr<lucene::analysis::Analyzer> analyzer;
if (bUseCJK) if (bUseCJK)
analyzer.reset(new lucene::analysis::LanguageBasedAnalyzer(L"cjk")); analyzer.reset(new lucene::analysis::LanguageBasedAnalyzer(L"cjk"));
else else
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <expat.h> #include <expat.h>
#include <memory> #include <memory>
#include <boost/scoped_ptr.hpp>
IndexerPreProcessor::IndexerPreProcessor IndexerPreProcessor::IndexerPreProcessor
( const std::string& aModuleName, const fs::path& fsIndexBaseDir, ( const std::string& aModuleName, const fs::path& fsIndexBaseDir,
...@@ -945,7 +944,7 @@ bool compileExtensionHelp ...@@ -945,7 +944,7 @@ bool compileExtensionHelp
xmlSetStructuredErrorFunc( NULL, StructuredXMLErrorFunction ); xmlSetStructuredErrorFunc( NULL, StructuredXMLErrorFunction );
try try
{ {
boost::scoped_ptr<HelpLinker> pHelpLinker(new HelpLinker()); std::unique_ptr<HelpLinker> pHelpLinker(new HelpLinker());
pHelpLinker->main( args, &aStdStrExtensionPath, &aStdStrDestination, &aOfficeHelpPath ); pHelpLinker->main( args, &aStdStrExtensionPath, &aStdStrDestination, &aOfficeHelpPath );
} }
catch( const HelpProcessingException& e ) catch( const HelpProcessingException& e )
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include <HelpCompiler.hxx> #include <HelpCompiler.hxx>
#include <HelpLinker.hxx> #include <HelpLinker.hxx>
#include <iostream>
#include <sal/main.h> #include <sal/main.h>
#include <boost/scoped_ptr.hpp> #include <iostream>
#include <memory>
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
std::vector<std::string> args; std::vector<std::string> args;
...@@ -29,7 +29,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { ...@@ -29,7 +29,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
args.push_back(std::string(argv[i])); args.push_back(std::string(argv[i]));
try try
{ {
boost::scoped_ptr<HelpLinker> pHelpLinker(new HelpLinker()); std::unique_ptr<HelpLinker> pHelpLinker(new HelpLinker());
pHelpLinker->main( args ); pHelpLinker->main( args );
} }
catch( const HelpProcessingException& e ) catch( const HelpProcessingException& e )
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX #ifndef INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX
#define INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX #define INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTMANAGERAGENT_HXX
#include <boost/scoped_ptr.hpp> #include <memory>
#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessible.hpp>
...@@ -37,7 +37,7 @@ class AccObjectManagerAgent ...@@ -37,7 +37,7 @@ class AccObjectManagerAgent
{ {
private: private:
boost::scoped_ptr<AccObjectWinManager> pWinManager; std::unique_ptr<AccObjectWinManager> pWinManager;
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment