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

boost->std

Change-Id: Id55e334156628a916ce15fca8ec618eed0ae9366
Reviewed-on: https://gerrit.libreoffice.org/18683Tested-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 33570469
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
#include "bib.hrc" #include "bib.hrc"
#include "bibliography.hrc" #include "bibliography.hrc"
#include <connectivity/dbtools.hxx> #include <connectivity/dbtools.hxx>
#include <boost/scoped_ptr.hpp> #include <memory>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::beans; using namespace ::com::sun::star::beans;
......
...@@ -75,9 +75,9 @@ struct SysPlugData ...@@ -75,9 +75,9 @@ struct SysPlugData
} }
}; };
::boost::shared_ptr<SysPlugData> CreateSysPlugData() std::shared_ptr<SysPlugData> CreateSysPlugData()
{ {
return ::boost::shared_ptr<SysPlugData>(new SysPlugData); return std::shared_ptr<SysPlugData>(new SysPlugData);
} }
void XPlugin_Impl::SetSysPlugDataParentView(SystemEnvData const& rEnvData) void XPlugin_Impl::SetSysPlugDataParentView(SystemEnvData const& rEnvData)
......
...@@ -30,11 +30,8 @@ ...@@ -30,11 +30,8 @@
#include <config_lgpl.h> #include <config_lgpl.h>
#ifdef SOLARIS
#include <limits> #include <limits>
#endif #include <memory>
#include <boost/shared_ptr.hpp>
#include "cppuhelper/weak.hxx" #include "cppuhelper/weak.hxx"
...@@ -83,7 +80,7 @@ ...@@ -83,7 +80,7 @@
struct SysPlugData; struct SysPlugData;
::boost::shared_ptr<SysPlugData> CreateSysPlugData(); std::shared_ptr<SysPlugData> CreateSysPlugData();
extern "C" { extern "C" {
...@@ -130,7 +127,7 @@ private: ...@@ -130,7 +127,7 @@ private:
PluginComm* m_pPluginComm; PluginComm* m_pPluginComm;
NPP_t m_aInstance; NPP_t m_aInstance;
NPWindow m_aNPWindow; NPWindow m_aNPWindow;
::boost::shared_ptr<SysPlugData> m_pSysPlugData; std::shared_ptr<SysPlugData> m_pSysPlugData;
rtl_TextEncoding m_aEncoding; rtl_TextEncoding m_aEncoding;
const char** m_pArgv; const char** m_pArgv;
......
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
#include <plugin/impl.hxx> #include <plugin/impl.hxx>
::boost::shared_ptr<SysPlugData> CreateSysPlugData() std::shared_ptr<SysPlugData> CreateSysPlugData()
{ {
return ::boost::shared_ptr<SysPlugData>(); return std::shared_ptr<SysPlugData>();
} }
UnxPluginComm::UnxPluginComm( UnxPluginComm::UnxPluginComm(
......
...@@ -65,9 +65,9 @@ void TRACEN( char const * s, long n ); ...@@ -65,9 +65,9 @@ void TRACEN( char const * s, long n );
#define TRACEN(x,n) #define TRACEN(x,n)
#endif #endif
::boost::shared_ptr<SysPlugData> CreateSysPlugData() std::shared_ptr<SysPlugData> CreateSysPlugData()
{ {
return ::boost::shared_ptr<SysPlugData>(); return std::shared_ptr<SysPlugData>();
} }
......
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
#include <tools/link.hxx> #include <tools/link.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <memory>
#include <set> #include <set>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <boost/shared_ptr.hpp>
namespace pcr namespace pcr
...@@ -51,7 +51,7 @@ namespace pcr ...@@ -51,7 +51,7 @@ namespace pcr
// administrative structures for OBrowserListBox // administrative structures for OBrowserListBox
typedef ::boost::shared_ptr< OBrowserLine > BrowserLinePointer; typedef std::shared_ptr< OBrowserLine > BrowserLinePointer;
struct ListBoxLine struct ListBoxLine
{ {
OUString aName; OUString aName;
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "browserview.hxx" #include "browserview.hxx"
#include "propertyeditor.hxx" #include "propertyeditor.hxx"
#include "propctrlr.hrc" #include "propctrlr.hrc"
#include <boost/scoped_ptr.hpp>
#include <vcl/tabpage.hxx> #include <vcl/tabpage.hxx>
#include <memory>
namespace pcr namespace pcr
{ {
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include <cstdlib> #include <cstdlib>
#include <limits> #include <limits>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/scoped_ptr.hpp> #include <memory>
namespace pcr namespace pcr
......
...@@ -26,21 +26,21 @@ using namespace ::com::sun::star::container; ...@@ -26,21 +26,21 @@ using namespace ::com::sun::star::container;
namespace namespace
{ {
static ::boost::shared_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs) static std::shared_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs)
{ {
if(rArgs.getLength()!=1) if(rArgs.getLength()!=1)
return ::boost::shared_ptr<ResMgr>(); return std::shared_ptr<ResMgr>();
OUString sFilename; OUString sFilename;
rArgs[0] >>= sFilename; rArgs[0] >>= sFilename;
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
const OString sEncName(OUStringToOString(sFilename, osl_getThreadTextEncoding())); const OString sEncName(OUStringToOString(sFilename, osl_getThreadTextEncoding()));
return ::boost::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName.getStr())); return std::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName.getStr()));
} }
class ResourceIndexAccessBase : public cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess> class ResourceIndexAccessBase : public cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess>
{ {
public: public:
ResourceIndexAccessBase( ::boost::shared_ptr<ResMgr> pResMgr) ResourceIndexAccessBase( std::shared_ptr<ResMgr> pResMgr)
: m_pResMgr(pResMgr) : m_pResMgr(pResMgr)
{ {
OSL_ENSURE(m_pResMgr, "no resource manager given"); OSL_ENSURE(m_pResMgr, "no resource manager given");
...@@ -55,13 +55,13 @@ namespace ...@@ -55,13 +55,13 @@ namespace
protected: protected:
// m_pResMgr should never be NULL // m_pResMgr should never be NULL
const ::boost::shared_ptr<ResMgr> m_pResMgr; const std::shared_ptr<ResMgr> m_pResMgr;
}; };
class ResourceStringIndexAccess : public ResourceIndexAccessBase class ResourceStringIndexAccess : public ResourceIndexAccessBase
{ {
public: public:
ResourceStringIndexAccess( ::boost::shared_ptr<ResMgr> pResMgr) ResourceStringIndexAccess( std::shared_ptr<ResMgr> pResMgr)
: ResourceIndexAccessBase(pResMgr) {} : ResourceIndexAccessBase(pResMgr) {}
// XIndexAccess // XIndexAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
...@@ -73,7 +73,7 @@ namespace ...@@ -73,7 +73,7 @@ namespace
class ResourceStringListIndexAccess : public ResourceIndexAccessBase class ResourceStringListIndexAccess : public ResourceIndexAccessBase
{ {
public: public:
ResourceStringListIndexAccess( ::boost::shared_ptr<ResMgr> pResMgr) ResourceStringListIndexAccess( std::shared_ptr<ResMgr> pResMgr)
: ResourceIndexAccessBase(pResMgr) {} : ResourceIndexAccessBase(pResMgr) {}
// XIndexAccess // XIndexAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
......
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
#define INCLUDED_EXTENSIONS_SOURCE_RESOURCE_RESOURCEINDEXACCESS_HXX #define INCLUDED_EXTENSIONS_SOURCE_RESOURCE_RESOURCEINDEXACCESS_HXX
#include <boost/shared_ptr.hpp>
#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <memory>
namespace com { namespace sun { namespace star { namespace uno { namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext; class XComponentContext;
...@@ -46,7 +46,7 @@ namespace extensions { namespace resource ...@@ -46,7 +46,7 @@ namespace extensions { namespace resource
private: private:
// m_pResMgr should never be NULL // m_pResMgr should never be NULL
const ::boost::shared_ptr<ResMgr> m_pResMgr; const std::shared_ptr<ResMgr> m_pResMgr;
}; };
}} }}
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx> #include <cppuhelper/weakref.hxx>
#include <boost/shared_ptr.hpp>
#include <map> #include <map>
#include <memory>
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::resource; using namespace ::com::sun::star::resource;
...@@ -94,7 +94,7 @@ namespace extensions { namespace resource ...@@ -94,7 +94,7 @@ namespace extensions { namespace resource
class OpenOfficeResourceBundle : public OpenOfficeResourceBundle_Base class OpenOfficeResourceBundle : public OpenOfficeResourceBundle_Base
{ {
private: private:
typedef ::boost::shared_ptr< IResourceType > ResourceTypePtr; typedef std::shared_ptr< IResourceType > ResourceTypePtr;
typedef ::std::map< OUString, ResourceTypePtr > ResourceTypes; typedef ::std::map< OUString, ResourceTypePtr > ResourceTypes;
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <sanedlg.hxx> #include <sanedlg.hxx>
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <boost/shared_ptr.hpp> #include <memory>
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
#include <stdio.h> #include <stdio.h>
...@@ -110,7 +110,7 @@ struct SaneHolder ...@@ -110,7 +110,7 @@ struct SaneHolder
namespace namespace
{ {
typedef std::vector< boost::shared_ptr<SaneHolder> > sanevec; typedef std::vector< std::shared_ptr<SaneHolder> > sanevec;
class allSanes class allSanes
{ {
private: private:
...@@ -146,7 +146,7 @@ namespace ...@@ -146,7 +146,7 @@ namespace
class ScannerThread : public osl::Thread class ScannerThread : public osl::Thread
{ {
boost::shared_ptr<SaneHolder> m_pHolder; std::shared_ptr<SaneHolder> m_pHolder;
Reference< com::sun::star::lang::XEventListener > m_xListener; Reference< com::sun::star::lang::XEventListener > m_xListener;
ScannerManager* m_pManager; // just for the disposing call ScannerManager* m_pManager; // just for the disposing call
...@@ -154,7 +154,7 @@ public: ...@@ -154,7 +154,7 @@ public:
virtual void run() SAL_OVERRIDE; virtual void run() SAL_OVERRIDE;
virtual void onTerminated() SAL_OVERRIDE { delete this; } virtual void onTerminated() SAL_OVERRIDE { delete this; }
public: public:
ScannerThread( boost::shared_ptr<SaneHolder> pHolder, ScannerThread( std::shared_ptr<SaneHolder> pHolder,
const Reference< com::sun::star::lang::XEventListener >& listener, const Reference< com::sun::star::lang::XEventListener >& listener,
ScannerManager* pManager ); ScannerManager* pManager );
virtual ~ScannerThread(); virtual ~ScannerThread();
...@@ -163,7 +163,7 @@ public: ...@@ -163,7 +163,7 @@ public:
ScannerThread::ScannerThread( ScannerThread::ScannerThread(
boost::shared_ptr<SaneHolder> pHolder, std::shared_ptr<SaneHolder> pHolder,
const Reference< com::sun::star::lang::XEventListener >& listener, const Reference< com::sun::star::lang::XEventListener >& listener,
ScannerManager* pManager ) ScannerManager* pManager )
: m_pHolder( pHolder ), m_xListener( listener ), m_pManager( pManager ) : m_pHolder( pHolder ), m_xListener( listener ), m_pManager( pManager )
...@@ -251,7 +251,7 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exc ...@@ -251,7 +251,7 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exc
if( rSanes.empty() ) if( rSanes.empty() )
{ {
boost::shared_ptr<SaneHolder> pSaneHolder(new SaneHolder); std::shared_ptr<SaneHolder> pSaneHolder(new SaneHolder);
if( Sane::IsSane() ) if( Sane::IsSane() )
rSanes.push_back( pSaneHolder ); rSanes.push_back( pSaneHolder );
} }
...@@ -290,7 +290,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex ...@@ -290,7 +290,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
ScanError_InvalidContext ScanError_InvalidContext
); );
boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; std::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
if( pHolder->m_bBusy ) if( pHolder->m_bBusy )
throw ScannerException( throw ScannerException(
"Scanner is busy", "Scanner is busy",
...@@ -328,7 +328,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, ...@@ -328,7 +328,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
Reference< XScannerManager >( this ), Reference< XScannerManager >( this ),
ScanError_InvalidContext ScanError_InvalidContext
); );
boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; std::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
if( pHolder->m_bBusy ) if( pHolder->m_bBusy )
throw ScannerException( throw ScannerException(
"Scanner is busy", "Scanner is busy",
...@@ -355,7 +355,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro ...@@ -355,7 +355,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
ScanError_InvalidContext ScanError_InvalidContext
); );
boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; std::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
return pHolder->m_nError; return pHolder->m_nError;
} }
...@@ -373,7 +373,7 @@ Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& ...@@ -373,7 +373,7 @@ Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext&
Reference< XScannerManager >( this ), Reference< XScannerManager >( this ),
ScanError_InvalidContext ScanError_InvalidContext
); );
boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; std::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
osl::MutexGuard aProtGuard( pHolder->m_aProtector ); osl::MutexGuard aProtGuard( pHolder->m_aProtector );
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "updatehdl.hxx" #include "updatehdl.hxx"
#include "updateprotocol.hxx" #include "updateprotocol.hxx"
#include <boost/scoped_ptr.hpp> #include <memory>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
...@@ -103,7 +103,7 @@ public: ...@@ -103,7 +103,7 @@ public:
private: private:
uno::Reference<uno::XComponentContext> m_xContext; uno::Reference<uno::XComponentContext> m_xContext;
uno::Reference< frame::XDesktop2 > m_xDesktop; uno::Reference< frame::XDesktop2 > m_xDesktop;
boost::scoped_ptr< InitUpdateCheckJobThread > m_pInitThread; std::unique_ptr< InitUpdateCheckJobThread > m_pInitThread;
void handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp ); void handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp );
}; };
......
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