From 075d472a9d120431f0b8731e4dcfe3e8b4ded521 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 2 Oct 2013 16:41:03 +0200
Subject: Use std::auto_ptr::reset where applicable

(avoids warnings about std::auto_ptr ctor being deprecated)

Change-Id: I39d2d155c0bc62ca77a30c02428ea39102213f42
---
 slideshow/source/engine/shapes/viewmediashape.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'slideshow/source')

diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index bf3d6ad66f7e..2da034a902d7 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -141,7 +141,7 @@ namespace slideshow
                 mxPlayerWindow.clear();
             }
 
-            mpMediaWindow = ::std::auto_ptr< SystemChildWindow >();
+            mpMediaWindow.reset();
 
             // shutdown player
             if( mxPlayer.is() )
@@ -433,7 +433,7 @@ namespace slideshow
                                                                     rRangePix.getMaxX() - rRangePix.getMinX(),
                                                                     rRangePix.getMaxY() - rRangePix.getMinY() );
 
-                            mpMediaWindow = ::std::auto_ptr< SystemChildWindow >( new
+                            mpMediaWindow.reset( new
                                                 SystemChildWindow( pWindow, WB_CLIPCHILDREN ) );
                             mpMediaWindow->SetBackground( Color( COL_BLACK ) );
                             mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ),
-- 
cgit