diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /shell/source/backends/kde4be | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'shell/source/backends/kde4be')
-rw-r--r-- | shell/source/backends/kde4be/kde4access.cxx | 20 | ||||
-rw-r--r-- | shell/source/backends/kde4be/kde4access.hxx | 2 | ||||
-rw-r--r-- | shell/source/backends/kde4be/kde4backend.cxx | 38 |
3 files changed, 30 insertions, 30 deletions
diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx index 1669263b3c95..6bd8f4a45bd0 100644 --- a/shell/source/backends/kde4be/kde4access.cxx +++ b/shell/source/backends/kde4be/kde4access.cxx @@ -46,11 +46,11 @@ namespace uno = css::uno ; } -css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { +css::beans::Optional< css::uno::Any > getValue(OUString const & id) { if ( id == "ExternalMailer" ) { KEMailSettings aEmailSettings; QString aClientProgram; - ::rtl::OUString sClientProgram; + OUString sClientProgram; aClientProgram = aEmailSettings.getSetting( KEMailSettings::ClientProgram ); if ( aClientProgram.isEmpty() ) @@ -75,7 +75,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { { QFont aFixedFont; QString aFontName; - :: rtl::OUString sFontName; + :: OUString sFontName; aFixedFont = KGlobalSettings::fixedFont(); aFontName = aFixedFont.family(); @@ -88,13 +88,13 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { /* does not make much sense without an accessibility bridge */ sal_Bool ATToolSupport = sal_False; return css::beans::Optional< css::uno::Any >( - true, uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) ) ); + true, uno::makeAny( OUString::valueOf( ATToolSupport ) ) ); } else if (id.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"))) { QString aDocumentsDir( KGlobalSettings::documentPath() ); - rtl::OUString sDocumentsDir; - rtl::OUString sDocumentsURL; + OUString sDocumentsDir; + OUString sDocumentsURL; if ( aDocumentsDir.endsWith(QChar('/')) ) aDocumentsDir.truncate ( aDocumentsDir.length() - 1 ); sDocumentsDir = (const sal_Unicode *) aDocumentsDir.utf16(); @@ -124,7 +124,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aFTPProxy.isEmpty() ) { KUrl aProxy(aFTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); + OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -178,7 +178,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPProxy.isEmpty() ) { KUrl aProxy(aHTTPProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); + OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -232,7 +232,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { if ( !aHTTPSProxy.isEmpty() ) { KUrl aProxy(aHTTPSProxy); - ::rtl::OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); + OUString sProxy = (const sal_Unicode *) aProxy.host().utf16(); return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sProxy ) ); } @@ -278,7 +278,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { } if ( !aNoProxyFor.isEmpty() ) { - ::rtl::OUString sNoProxyFor; + OUString sNoProxyFor; aNoProxyFor = aNoProxyFor.replace( COMMA, SEMI_COLON ); sNoProxyFor = (const sal_Unicode *) aNoProxyFor.utf16(); diff --git a/shell/source/backends/kde4be/kde4access.hxx b/shell/source/backends/kde4be/kde4access.hxx index 26228fb05af5..f77a2ecad7cf 100644 --- a/shell/source/backends/kde4be/kde4access.hxx +++ b/shell/source/backends/kde4be/kde4access.hxx @@ -32,7 +32,7 @@ namespace rtl { class OUString; } namespace kde4access { com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue( - rtl::OUString const & id); + OUString const & id); } diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index d39eb5a6974e..672c41e059ed 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -54,15 +54,15 @@ namespace { -rtl::OUString SAL_CALL getServiceImplementationName() { - return rtl::OUString( +OUString SAL_CALL getServiceImplementationName() { + return OUString( "com.sun.star.comp.configuration.backend.KDE4Backend"); } -css::uno::Sequence< rtl::OUString > SAL_CALL getServiceSupportedServiceNames() { - rtl::OUString name( +css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() { + OUString name( "com.sun.star.configuration.backend.KDE4Backend"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + return css::uno::Sequence< OUString >(&name, 1); } class Service: @@ -76,15 +76,15 @@ public: private: virtual ~Service() {} - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getServiceImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException) { return ServiceName == getSupportedServiceNames()[0]; } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getServiceSupportedServiceNames(); } @@ -93,7 +93,7 @@ private: { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( - rtl::OUString const &, css::uno::Any const &) + OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -101,13 +101,13 @@ private: css::lang::WrappedTargetException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getPropertyValue( - rtl::OUString const & PropertyName) + OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -115,7 +115,7 @@ private: {} virtual void SAL_CALL removePropertyChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -123,7 +123,7 @@ private: {} virtual void SAL_CALL addVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -131,7 +131,7 @@ private: {} virtual void SAL_CALL removeVetoableChangeListener( - rtl::OUString const &, + OUString const &, css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, @@ -145,26 +145,26 @@ Service::Service(): enabled_(false) { css::uno::Reference< css::uno::XCurrentContext > context( css::uno::getCurrentContext()); if (context.is()) { - rtl::OUString desktop; + OUString desktop; context->getValueByName( - rtl::OUString("system.desktop-environment")) >>= + OUString("system.desktop-environment")) >>= desktop; enabled_ = desktop == "KDE4" && KApplication::kApplication() != 0; } } -void Service::setPropertyValue(rtl::OUString const &, css::uno::Any const &) +void Service::setPropertyValue(OUString const &, css::uno::Any const &) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { throw css::lang::IllegalArgumentException( - rtl::OUString("setPropertyValue not supported"), + OUString("setPropertyValue not supported"), static_cast< cppu::OWeakObject * >(this), -1); } -css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName) +css::uno::Any Service::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) |