[Libreoffice-commits] core.git: drawinglayer/README drawinglayer/source helpcompiler/source winaccessibility/inc

[Caolán McNamara]

 drawinglayer/README                                     |    2 +-
 drawinglayer/source/processor2d/vclpixelprocessor2d.hxx |    4 ++--
 helpcompiler/source/HelpIndexer.cxx                     |    4 ++--
 helpcompiler/source/HelpLinker.cxx                      |    3 +--
 helpcompiler/source/HelpLinker_main.cxx                 |    6 +++---
 winaccessibility/inc/AccObjectManagerAgent.hxx          |    4 ++--
 6 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit f7ef1cbb83fdc6c43fa39fd50a9e12703e4fcf5f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 18 15:37:00 2015 +0100

    boost->std
    
    Change-Id: I5079e03f70370ed83a1158b2e278f48642108f08
    Reviewed-on: https://gerrit.libreoffice.org/18692
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/drawinglayer/README b/drawinglayer/README
index d950f29..b530ba6 100644
--- a/drawinglayer/README
+++ b/drawinglayer/README
@@ -19,7 +19,7 @@ A stripped down version with extended comments:
      VirtualDevice aVirtualDevice;
 
      // 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(...));
 
      if (pProcessor2D)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
index 3a70dd8..6699934 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
@@ -25,7 +25,7 @@
 #include "vclprocessor2d.hxx"
 #include <vcl/outdev.hxx>
 
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 
 // predefines
@@ -53,7 +53,7 @@ namespace drawinglayer
         {
         private:
             struct Impl;
-            boost::scoped_ptr<Impl> m_pImpl;
+            std::unique_ptr<Impl> m_pImpl;
 
         protected:
             /*  the local processor for BasePrinitive2D-Implementation based primitives,
diff --git a/helpcompiler/source/HelpIndexer.cxx b/helpcompiler/source/HelpIndexer.cxx
index 05bc830..63cf85a 100644
--- a/helpcompiler/source/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -14,8 +14,8 @@
 #include <rtl/ustrbuf.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
-#include <boost/scoped_ptr.hpp>
 #include <algorithm>
+#include <memory>
 
 #include "LuceneHelper.hxx"
 
@@ -42,7 +42,7 @@ bool HelpIndexer::indexDocuments()
         bool bUseCJK = sLang == "ja" || sLang == "ko" || sLang == "zh";
 
         // Construct the analyzer appropriate for the given language
-        boost::scoped_ptr<lucene::analysis::Analyzer> analyzer;
+        std::unique_ptr<lucene::analysis::Analyzer> analyzer;
         if (bUseCJK)
             analyzer.reset(new lucene::analysis::LanguageBasedAnalyzer(L"cjk"));
         else
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index a977392..24653b4 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -37,7 +37,6 @@
 
 #include <expat.h>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 IndexerPreProcessor::IndexerPreProcessor
     ( const std::string& aModuleName, const fs::path& fsIndexBaseDir,
@@ -945,7 +944,7 @@ bool compileExtensionHelp
     xmlSetStructuredErrorFunc( NULL, StructuredXMLErrorFunction );
     try
     {
-        boost::scoped_ptr<HelpLinker> pHelpLinker(new HelpLinker());
+        std::unique_ptr<HelpLinker> pHelpLinker(new HelpLinker());
         pHelpLinker->main( args, &aStdStrExtensionPath, &aStdStrDestination, &aOfficeHelpPath );
     }
     catch( const HelpProcessingException& e )
diff --git a/helpcompiler/source/HelpLinker_main.cxx b/helpcompiler/source/HelpLinker_main.cxx
index e4e45fe..36826b4 100644
--- a/helpcompiler/source/HelpLinker_main.cxx
+++ b/helpcompiler/source/HelpLinker_main.cxx
@@ -19,9 +19,9 @@
 
 #include <HelpCompiler.hxx>
 #include <HelpLinker.hxx>
-#include <iostream>
 #include <sal/main.h>
-#include <boost/scoped_ptr.hpp>
+#include <iostream>
+#include <memory>
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
     std::vector<std::string> args;
@@ -29,7 +29,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
         args.push_back(std::string(argv[i]));
     try
     {
-        boost::scoped_ptr<HelpLinker> pHelpLinker(new HelpLinker());
+        std::unique_ptr<HelpLinker> pHelpLinker(new HelpLinker());
         pHelpLinker->main( args );
     }
     catch( const HelpProcessingException& e )
diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx
index 7e685b7..568d8e4 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -20,7 +20,7 @@
 #ifndef 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>
 
@@ -37,7 +37,7 @@ class AccObjectManagerAgent
 {
 private:
 
-    boost::scoped_ptr<AccObjectWinManager> pWinManager;
+    std::unique_ptr<AccObjectWinManager> pWinManager;
 
 public: