avmedia/source/gstreamer/gstframegrabber.hxx | 10 +++++-----
avmedia/source/gstreamer/gstmanager.cxx | 14 +++++++-------
avmedia/source/gstreamer/gstmanager.hxx | 8 ++++----
avmedia/source/gstreamer/gstplayer.cxx | 18 +++++++++---------
4 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 25ebe01cf39eba32e8e65995d709e5e803b627a1
Author: Ricardo Montania <rica...@linuxafundo.com.br>
Date: Fri Sep 14 13:15:37 2012 -0300
More ::rtl::OUString to OUString in avmedia
Change-Id: Ic5478199d8ff1cd79dc54e680e8a6c257e7d8325
Reviewed-on: https://gerrit.libreoffice.org/625
Reviewed-by: Olivier Hallot <olivier.hal...@alta.org.br>
Tested-by: Olivier Hallot <olivier.hal...@alta.org.br>
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx
b/avmedia/source/gstreamer/gstframegrabber.hxx
index 31dc3cf..bc8a536 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -47,20 +47,20 @@ public:
FrameGrabber( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
~FrameGrabber();
- bool create( const ::rtl::OUString& rURL );
+ bool create( const OUString& rURL );
// XFrameGrabber
virtual ::com::sun::star::uno::Reference<
::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime )
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString&
ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > mxMgr;
- ::rtl::OUString
maURL;
+ OUString
maURL;
};
} // namespace gstreamer
diff --git a/avmedia/source/gstreamer/gstmanager.cxx
b/avmedia/source/gstreamer/gstmanager.cxx
index f04e5cc..91ad26c 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -63,7 +63,7 @@ Manager::~Manager()
//
------------------------------------------------------------------------------
-uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const
::rtl::OUString& rURL )
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const
OUString& rURL )
throw (uno::RuntimeException)
{
Player* pPlayer( new Player( mxMgr ) );
@@ -80,15 +80,15 @@ uno::Reference< media::XPlayer > SAL_CALL
Manager::createPlayer( const ::rtl::OU
//
------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL Manager::getImplementationName( )
+OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME ) );
+ return OUString( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME );
}
//
------------------------------------------------------------------------------
-sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName
)
+sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_GST_MANAGER_SERVICENAME;
@@ -96,11 +96,11 @@ sal_Bool SAL_CALL Manager::supportsService( const
::rtl::OUString& ServiceName )
//
------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM (
AVMEDIA_GST_MANAGER_SERVICENAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = AVMEDIA_GST_MANAGER_SERVICENAME ;
return aRet;
}
diff --git a/avmedia/source/gstreamer/gstmanager.hxx
b/avmedia/source/gstreamer/gstmanager.hxx
index 73048f2..3f1a7e5 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -48,12 +48,12 @@ public:
~Manager();
// XManager
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer
> SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer
> SAL_CALL createPlayer( const OUString& aURL ) throw
(::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString&
ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index 3654410..b28e6a5 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -320,7 +320,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage
*message )
return GST_BUS_PASS;
}
-void Player::preparePlaybin( const ::rtl::OUString& rURL, bool bFakeVideo )
+void Player::preparePlaybin( const OUString& rURL, bool bFakeVideo )
{
GstBus *pBus;
@@ -347,7 +347,7 @@ void Player::preparePlaybin( const ::rtl::OUString& rURL,
bool bFakeVideo )
g_object_unref( pBus );
}
-bool Player::create( const ::rtl::OUString& rURL )
+bool Player::create( const OUString& rURL )
{
bool bRet = false;
@@ -368,7 +368,7 @@ bool Player::create( const ::rtl::OUString& rURL )
if( bRet )
maURL = rURL;
else
- maURL = ::rtl::OUString();
+ maURL = OUString();
return bRet;
}
@@ -643,15 +643,15 @@ uno::Reference< media::XFrameGrabber > SAL_CALL
Player::createFrameGrabber()
//
------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL Player::getImplementationName()
+OUString SAL_CALL Player::getImplementationName()
throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME ) );
+ return OUString( AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME );
}
//
------------------------------------------------------------------------------
-sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_GST_PLAYER_SERVICENAME;
@@ -659,11 +659,11 @@ sal_Bool SAL_CALL Player::supportsService( const
::rtl::OUString& ServiceName )
//
------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames()
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM (
AVMEDIA_GST_PLAYER_SERVICENAME ) );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = AVMEDIA_GST_PLAYER_SERVICENAME ;
return aRet;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
