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

sd/source/ui/framework boost::scoped_ptr->std::unique_ptr

Change-Id: I37e8c596d7afc3f7d0461b40e596dea45e9470a4
Reviewed-on: https://gerrit.libreoffice.org/18824Tested-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 14a9a7d5
......@@ -36,7 +36,7 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <boost/scoped_ptr.hpp>
#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
......@@ -80,7 +80,7 @@ public:
/** The queue processor ownes the queue of configuration change request
objects and processes the objects.
*/
::boost::scoped_ptr<ChangeRequestQueueProcessor> mpQueueProcessor;
std::unique_ptr<ChangeRequestQueueProcessor> mpQueueProcessor;
std::shared_ptr<ConfigurationUpdaterLock> mpConfigurationUpdaterLock;
......
......@@ -33,7 +33,6 @@
#include <cppuhelper/compbase.hxx>
#include <memory>
#include <boost/scoped_ptr.hpp>
namespace {
......@@ -109,7 +108,7 @@ private:
ViewShellBase* mpViewShellBase;
class PaneDescriptor;
class PaneContainer;
::boost::scoped_ptr<PaneContainer> mpPaneContainer;
std::unique_ptr<PaneContainer> mpPaneContainer;
/** Create a new instance of FrameWindowPane.
@param rPaneId
......
......@@ -34,7 +34,6 @@
#include <vcl/vclptr.hxx>
#include <memory>
#include <boost/scoped_ptr.hpp>
namespace sd {
class ViewShell;
......@@ -100,7 +99,7 @@ private:
mxConfigurationController;
class ViewDescriptor;
class ViewShellContainer;
::boost::scoped_ptr<ViewShellContainer> mpViewShellContainer;
std::unique_ptr<ViewShellContainer> mpViewShellContainer;
ViewShellBase* mpBase;
FrameView* mpFrameView;
......
......@@ -26,7 +26,6 @@
#include <com/sun/star/frame/XController.hpp>
#include <cppuhelper/compbase.hxx>
#include <memory>
#include <boost/scoped_ptr.hpp>
namespace {
......@@ -83,7 +82,7 @@ protected:
private:
class MainViewContainer;
::boost::scoped_ptr<MainViewContainer> mpActiveMainViewContainer;
std::unique_ptr<MainViewContainer> mpActiveMainViewContainer;
/// The resource managed by this class.
css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId;
......
......@@ -32,7 +32,6 @@
#include <vcl/idle.hxx>
#include <cppuhelper/compbase.hxx>
#include <memory>
#include <boost/scoped_ptr.hpp>
namespace {
......@@ -85,7 +84,7 @@ private:
css::uno::Reference<css::drawing::framework::XConfigurationController>
mxConfigurationController;
ViewShellBase* mpBase;
::boost::scoped_ptr<ConfigurationController::Lock> mpUpdateLock;
std::unique_ptr<ConfigurationController::Lock> mpUpdateLock;
Idle maPrinterPollingIdle;
DECL_LINK_TYPED(TimeoutHandler, Idle*, void);
......
......@@ -29,7 +29,6 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <memory>
#include <boost/scoped_ptr.hpp>
namespace sd {
class ViewShellBase;
......@@ -77,7 +76,7 @@ private:
css::uno::Reference<
css::drawing::framework::XConfigurationController> mxConfigurationController;
ViewShellBase* mpBase;
::boost::scoped_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock;
std::unique_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock;
bool mbMainViewSwitchUpdatePending;
void HandleUpdateStart();
......
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