Fix bit-rot in the iOS "code"

4 files changed, 13 insertions, 13 deletions

diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index 76bec375caa2..b47c1688dd68 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -140,13 +140,13 @@ sal_Bool ImplSVMainHook( int * pnInit )
 
 // =======================================================================
 
-void SalAbort( const XubString& rErrorText, bool bDumpCore )
+void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
 {
-    if( !rErrorText.Len() )
+    if( rErrorText.isEmpty() )
         fprintf( stderr, "Application Error " );
     else
         fprintf( stderr, "%s ",
-            ByteString( rErrorText, osl_getThreadTextEncoding() ).GetBuffer() );
+            rtl::OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() );
     if( bDumpCore )
         abort();
     else
@@ -197,7 +197,7 @@ void InitSalMain()
             if ( aCmdPath.Len() ) {
                 DirEntry aCmdDirEntry( aCmdPath );
                 aCmdDirEntry.ToAbs();
-                aCmdPath = ByteString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
+                aCmdPath = rtl::OUStringToOString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
             }
             // Assign to PATH environment variable
             if ( aCmdPath.Len() )
@@ -205,7 +205,7 @@ void InitSalMain()
                 aTmpPath = ByteString( "PATH=" );
                 aTmpPath += aCmdPath;
                 if ( aPath.Len() )
-                    aTmpPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
+                    aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
                 aTmpPath += aPath;
                 putenv( (char*)aTmpPath.GetBuffer() );
             }
@@ -215,7 +215,7 @@ void InitSalMain()
                 aTmpPath = ByteString( "STAR_RESOURCEPATH=" );
                 aTmpPath += aCmdPath;
                 if ( aResPath.Len() )
-                    aTmpPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
+                    aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
                 aTmpPath += aResPath;
                 putenv( (char*)aTmpPath.GetBuffer() );
             }
@@ -624,7 +624,7 @@ void IosSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
 
 // -----------------------------------------------------------------------
 
-XubString IosSalInstance::GetDefaultPrinter()
+rtl::OUString IosSalInstance::GetDefaultPrinter()
 {
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
diff --git a/vcl/ios/source/app/salsys.cxx b/vcl/ios/source/app/salsys.cxx
index 3a517baeb5c7..02cd6442525a 100644
--- a/vcl/ios/source/app/salsys.cxx
+++ b/vcl/ios/source/app/salsys.cxx
@@ -147,8 +147,8 @@ static NSString* getStandardString( int nButtonId )
 }
 @end
 
-int IosSalSystem::ShowNativeMessageBox( const String& rTitle,
-                                        const String& rMessage,
+int IosSalSystem::ShowNativeMessageBox( const rtl::OUString& rTitle,
+                                        const rtl::OUString& rMessage,
                                         int nButtonCombination,
                                         int nDefaultButton)
 {
diff --git a/vcl/ios/source/gdi/salgdi.cxx b/vcl/ios/source/gdi/salgdi.cxx
index f6ffbaa84b2f..7f9e5b4bbc5b 100644
--- a/vcl/ios/source/gdi/salgdi.cxx
+++ b/vcl/ios/source/gdi/salgdi.cxx
@@ -1511,7 +1511,7 @@ void IosSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
 // -----------------------------------------------------------------------
 
 bool IosSalGraphics::AddTempDevFont( ImplDevFontList*,
-    const String& rFontFileURL, const String& /*rFontName*/ )
+    const rtl::OUString& rFontFileURL, const rtl::OUString& /*rFontName*/ )
 {
     ::rtl::OUString aUSytemPath;
     OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) );
diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx
index b1464a6fb40f..baed581973e1 100644
--- a/vcl/ios/source/window/salframe.cxx
+++ b/vcl/ios/source/window/salframe.cxx
@@ -240,7 +240,7 @@ sal_Bool IosSalFrame::PostEvent( void *pData )
 }
 
 // -----------------------------------------------------------------------
-void IosSalFrame::SetTitle(const XubString& /* rTitle */)
+void IosSalFrame::SetTitle(const rtl::OUString& /* rTitle */)
 {
 }
 
@@ -617,7 +617,7 @@ void IosSalFrame::EndExtTextInput( sal_uInt16 )
 
 // -----------------------------------------------------------------------
 
-XubString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
+rtl::OUString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
     static std::map< sal_uInt16, rtl::OUString > aKeyMap;
     if( aKeyMap.empty() )
@@ -704,7 +704,7 @@ XubString IosSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 
 // -----------------------------------------------------------------------
 
-XubString IosSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode )
+rtl::OUString IosSalFrame::GetSymbolKeyName( const rtl::OUString&, sal_uInt16 nKeyCode )
 {
     return GetKeyName( nKeyCode );
 }