From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@suse.cz>
Date: Sun, 7 Apr 2013 12:06:47 +0200
Subject: 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
---
 tubes/source/contacts.cxx | 12 ++++++------
 tubes/source/manager.cxx  | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'tubes/source')

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()
-- 
cgit v1.2.3