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 /tubes | |
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 'tubes')
-rw-r--r-- | tubes/inc/tubes/manager.hxx | 12 | ||||
-rw-r--r-- | tubes/qa/test_manager.cxx | 4 | ||||
-rw-r--r-- | tubes/source/contacts.cxx | 12 | ||||
-rw-r--r-- | tubes/source/manager.cxx | 16 |
4 files changed, 22 insertions, 22 deletions
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index 6a73cd54149a..53a4b8e9896c 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -105,8 +105,8 @@ public: ignored, hopefully resulting in a local DBus tube. */ static TeleConference* startGroupSession( TpAccount *pAccount, - const rtl::OUString& rConferenceRoom, - const rtl::OUString& rConferenceServer ); + const OUString& rConferenceRoom, + const OUString& rConferenceServer ); /** Start a session with a buddy. @@ -135,7 +135,7 @@ public: // Only for callbacks. static void addConference( TeleConference* pConference ); - static rtl::OString createUuid(); + static OString createUuid(); /** @param rUuid is stored so that accepted conference with this UUID could be then retrieved by getConference() when loading new document @@ -143,13 +143,13 @@ public: static void setCurrentUuid( const OString& rUuid ); /// "LibreOfficeWhatEver" - static rtl::OString getFullClientName(); + static OString getFullClientName(); /// "org.libreoffice.calcWhatEver" - static rtl::OString getFullServiceName(); + static OString getFullServiceName(); /// "/org/libreoffice/calcWhatEver" - static rtl::OString getFullObjectPath(); + static OString getFullObjectPath(); /** Add a suffix to the client name and DBus tube names, e.g. "WhatEver" diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx index 5e2ccf7fc5c8..e7a2b1f64f94 100644 --- a/tubes/qa/test_manager.cxx +++ b/tubes/qa/test_manager.cxx @@ -99,12 +99,12 @@ void TestTeleTubes::setUp() TeleManager::addSuffixToNames( "TeleTest"); - rtl::OUString aOffererIdentifier; + OUString aOffererIdentifier; CPPUNIT_ASSERT_MESSAGE( "See README for how to set up test-config.ini", aTestConfig.getFrom("offerer", aOffererIdentifier)); maOffererIdentifier = OUStringToOString( aOffererIdentifier, RTL_TEXTENCODING_UTF8); - rtl::OUString aAccepterIdentifier; + OUString aAccepterIdentifier; CPPUNIT_ASSERT_MESSAGE( "See README for how to set up test-config.ini", aTestConfig.getFrom("accepter", aAccepterIdentifier)); maAccepterIdentifier = OUStringToOString( aAccepterIdentifier, RTL_TEXTENCODING_UTF8); diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx index a6badfb21cf3..0cc58dfe332c 100644 --- a/tubes/source/contacts.cxx +++ b/tubes/source/contacts.cxx @@ -114,7 +114,7 @@ class TubeContacts : public ModelessDialog TpAccount* pAccount = maACs[i].first; SAL_INFO( "tubes", "picked " << tp_account_get_display_name( pAccount ) ); TeleConference* pConference = TeleManager::startGroupSession( pAccount, - rtl::OUString("liboroom"), rtl::OUString("conference.jabber.org") ); + OUString("liboroom"), OUString("conference.jabber.org") ); if (!pConference) SAL_WARN( "tubes", "Could not start group session." ); else @@ -145,9 +145,9 @@ public: { } - static rtl::OUString fromUTF8( const char *pStr ) + static OUString fromUTF8( const char *pStr ) { - return rtl::OStringToOUString( rtl::OString( pStr, strlen( pStr ) ), + return OStringToOUString( OString( pStr, strlen( pStr ) ), RTL_TEXTENCODING_UTF8 ); } @@ -168,9 +168,9 @@ public: GFile *pAvatarFile = tp_contact_get_avatar_file( it->second ); if( pAvatarFile ) { - const rtl::OUString sAvatarFileUrl = fromUTF8( g_file_get_path ( pAvatarFile ) ); + const OUString sAvatarFileUrl = fromUTF8( g_file_get_path ( pAvatarFile ) ); Graphic aGraphic; - if( GRFILTER_OK == GraphicFilter::LoadGraphic( sAvatarFileUrl, rtl::OUString(""), aGraphic ) ) + if( GRFILTER_OK == GraphicFilter::LoadGraphic( sAvatarFileUrl, OUString(""), aGraphic ) ) { BitmapEx aBitmap = aGraphic.GetBitmapEx(); double fScale = 30.0 / aBitmap.GetSizePixel().Height(); @@ -178,7 +178,7 @@ public: aImage = Image( aBitmap ); } } - rtl::OUStringBuffer aEntry( 128 ); + OUStringBuffer aEntry( 128 ); aEntry.append( " " ); aEntry.append( fromUTF8 ( tp_contact_get_alias( it->second ) ) ); aEntry.append( " - " ); diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index f8070ad1064e..70d9e44b87a0 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -289,7 +289,7 @@ static void TeleManager_TransferDone( EmpathyFTHandler *handler, TpFileTransferC SAL_INFO( "tubes", "TeleManager_TransferDone: hooray!"); GFile *gfile = empathy_ft_handler_get_gfile( handler); char *uri = g_file_get_uri( gfile); - rtl::OUString aUri( OUString::createFromAscii( uri ) ); + OUString aUri( OUString::createFromAscii( uri ) ); g_free( uri); TeleManager_fileReceived( aUri, empathy_ft_handler_get_description( handler ) ); @@ -609,8 +609,8 @@ TeleConference* TeleManager::startDemoSession() /* TODO: factor out common code with startBuddySession() */ TeleConference* TeleManager::startGroupSession( TpAccount *pAccount, - const rtl::OUString& rUConferenceRoom, - const rtl::OUString& rUConferenceServer ) + const OUString& rUConferenceRoom, + const OUString& rUConferenceServer ) { INFO_LOGGER_F( "TeleManager::startGroupSession"); @@ -824,21 +824,21 @@ AccountContactPairV TeleManager::getContacts() return pairs; } -rtl::OString TeleManager::getFullClientName() +OString TeleManager::getFullClientName() { OStringBuffer aBuf(64); aBuf.append( LIBO_CLIENT_SUFFIX ).append( pImpl->msNameSuffix); return aBuf.makeStringAndClear(); } -rtl::OString TeleManager::getFullServiceName() +OString TeleManager::getFullServiceName() { OStringBuffer aBuf(64); aBuf.append( LIBO_DTUBE_SERVICE ).append( pImpl->msNameSuffix); return aBuf.makeStringAndClear(); } -rtl::OString TeleManager::getFullObjectPath() +OString TeleManager::getFullObjectPath() { OStringBuffer aBuf(64); aBuf.append( '/').append( LIBO_DTUBE_SERVICE ).append( pImpl->msNameSuffix); @@ -846,7 +846,7 @@ rtl::OString TeleManager::getFullObjectPath() return aStr; } -rtl::OString TeleManager::createUuid() +OString TeleManager::createUuid() { sal_uInt8 nId[16]; rtl_createUuid( nId, 0, sal_True); @@ -856,7 +856,7 @@ rtl::OString TeleManager::createUuid() snprintf( aBuf+2*i, 3, "%02x", (unsigned char)nId[i]); } aBuf[32] = 0; - return rtl::OString( aBuf); + return OString( aBuf); } Mutex& TeleManager::GetMutex() |