From 27cea710fd1e4e8887bcb95e1d25a53d9eae9f22 Mon Sep 17 00:00:00 2001 From: Szabolcs Dezsi Date: Fri, 6 Apr 2012 15:37:46 +0200 Subject: Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator Pattern used: find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\)) *) *) *{$/\1\2 ( \3 == \4 ) {/' \{\} \; --- shell/source/backends/desktopbe/desktopbackend.cxx | 6 +++--- shell/source/backends/kde4be/kde4access.cxx | 6 +++--- shell/source/backends/kdebe/kdeaccess.cxx | 6 +++--- shell/source/backends/localebe/localebackend.cxx | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'shell/source') diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 12f6471234a2..7c59762cb01b 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -237,19 +237,19 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( } // Fall back to the default if the specific backend is not available: css::uno::Reference< css::uno::XInterface > backend; - if (desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME"))) { + if ( desktop == "GNOME" ) { backend = createBackend( context, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.backend.GconfBackend"))); - } else if (desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE"))) { + } else if ( desktop == "KDE" ) { backend = createBackend( context, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.backend.KDEBackend"))); - } else if (desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE4"))) { + } else if ( desktop == "KDE4" ) { backend = createBackend( context, rtl::OUString( diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx index 60dfa57813f0..e4e116456efc 100644 --- a/shell/source/backends/kde4be/kde4access.cxx +++ b/shell/source/backends/kde4be/kde4access.cxx @@ -57,7 +57,7 @@ namespace uno = css::uno ; } css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { - if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExternalMailer"))) { + if ( id == "ExternalMailer" ) { KEMailSettings aEmailSettings; QString aClientProgram; ::rtl::OUString sClientProgram; @@ -273,7 +273,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { return css::beans::Optional< css::uno::Any >( true, uno::makeAny( nPort ) ); } - } else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"))) { + } else if ( id == "ooInetNoProxy" ) { QString aNoProxyFor; switch ( KProtocolManager::proxyType() ) { @@ -295,7 +295,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sNoProxyFor ) ); } - } else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) { + } else if ( id == "ooInetProxyType" ) { int nProxyType; switch ( KProtocolManager::proxyType() ) { diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx index 7e75b0923f06..0d7ad8ddd27a 100644 --- a/shell/source/backends/kdebe/kdeaccess.cxx +++ b/shell/source/backends/kdebe/kdeaccess.cxx @@ -53,7 +53,7 @@ namespace uno = css::uno ; } css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { - if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ExternalMailer"))) { + if ( id == "ExternalMailer" ) { KEMailSettings aEmailSettings; QString aClientProgram; ::rtl::OUString sClientProgram; @@ -269,7 +269,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { return css::beans::Optional< css::uno::Any >( true, uno::makeAny( nPort ) ); } - } else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"))) { + } else if ( id == "ooInetNoProxy" ) { QString aNoProxyFor; switch ( KProtocolManager::proxyType() ) { @@ -291,7 +291,7 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { return css::beans::Optional< css::uno::Any >( true, uno::makeAny( sNoProxyFor ) ); } - } else if (id.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"))) { + } else if ( id == "ooInetProxyType" ) { int nProxyType; switch ( KProtocolManager::proxyType() ) { diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 15eb4cde17f7..1734305e8781 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -294,7 +294,7 @@ css::uno::Any LocaleBackend::getPropertyValue( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { - if (PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Locale"))) { + if ( PropertyName == "Locale" ) { return css::uno::makeAny( css::beans::Optional< css::uno::Any >( true, css::uno::makeAny(getLocale()))); -- cgit