summaryrefslogtreecommitdiff
path: root/vcl/unx/generic
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r--vcl/unx/generic/app/keysymnames.cxx4
-rw-r--r--vcl/unx/generic/app/saldisp.cxx14
-rw-r--r--vcl/unx/generic/app/salinst.cxx8
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx2
-rw-r--r--vcl/unx/generic/plugadapt/salplug.cxx4
-rw-r--r--vcl/unx/generic/window/salframe.cxx8
6 files changed, 20 insertions, 20 deletions
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index c2db38c2a13a..1a276f8eecb2 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -404,7 +404,7 @@ namespace vcl_sal {
{ "English", aImplReplacements_English, SAL_N_ELEMENTS(aImplReplacements_English) }
};
- String getKeysymReplacementName( const char* pKeyboard, KeySym nSymbol )
+ rtl::OUString getKeysymReplacementName( const char* pKeyboard, KeySym nSymbol )
{
for( unsigned int n = 0; n < SAL_N_ELEMENTS(aKeyboards); n++ )
{
@@ -425,7 +425,7 @@ namespace vcl_sal {
if( nSymbol == pRepl[--m].aSymbol )
return String( pRepl[m].pName, RTL_TEXTENCODING_UTF8 );
}
- return String();
+ return rtl::OUString();
}
}
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index a26027d7b91a..b976569d146d 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -931,9 +931,9 @@ sal_uInt16 SalDisplay::GetIndicatorState() const
return nState;
}
-String SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
+rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
{
- String aRet;
+ rtl::OUString aRet;
// return an empty string for keysyms that are not bound to
// any key code
@@ -941,18 +941,18 @@ String SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
if( aKeyCode != 0 && aKeyCode != NoSymbol )
{
if( !nKeySym )
- aRet = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "???" ) );
+ aRet = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "???" ) );
else
{
aRet = ::vcl_sal::getKeysymReplacementName( const_cast<SalDisplay*>(this)->GetKeyboardName(), nKeySym );
- if( ! aRet.Len() )
+ if( aRet.isEmpty() )
{
const char *pString = XKeysymToString( nKeySym );
int n = strlen( pString );
if( n > 2 && pString[n-2] == '_' )
- aRet = String( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 );
+ aRet = rtl::OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 );
else
- aRet = String( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
+ aRet = rtl::OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
}
}
}
@@ -998,7 +998,7 @@ void SalDisplay::ModifierMapping()
}
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-XubString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
+rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
{
String aStrMap;
String aCustomKeyName;
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 73659f5bad9b..46d5f5fe0919 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -214,7 +214,7 @@ static void getServerDirectories( std::list< rtl::OString >& o_rFontPaths )
static const char* pCommands[] = {
"/usr/sbin/chkfontpath 2>/dev/null", "chkfontpath 2>/dev/null"
};
- ::std::list< ByteString > aLines;
+ ::std::list< rtl::OString > aLines;
for( unsigned int i = 0; i < SAL_N_ELEMENTS(pCommands); i++ )
{
@@ -238,13 +238,13 @@ static void getServerDirectories( std::list< rtl::OString >& o_rFontPaths )
}
}
- for( ::std::list< ByteString >::iterator it = aLines.begin(); it != aLines.end(); ++it )
+ for( ::std::list< rtl::OString >::iterator it = aLines.begin(); it != aLines.end(); ++it )
{
- if( ! access( it->GetBuffer(), F_OK ) )
+ if( ! access( it->getStr(), F_OK ) )
{
o_rFontPaths.push_back( *it );
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "adding fs dir %s\n", it->GetBuffer() );
+ fprintf( stderr, "adding fs dir %s\n", it->getStr() );
#endif
}
}
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 66a316bb5005..c07e167cb92b 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -532,7 +532,7 @@ X11SalGraphics::SetTextColor( SalColor nSalColor )
// ----------------------------------------------------------------------------
bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
- const String& rFileURL, const String& rFontName )
+ const rtl::OUString& rFileURL, const rtl::OUString& rFontName )
{
// inform PSP font manager
rtl::OUString aUSystemPath;
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 90f0d3eb52dc..39505ce6be23 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -267,9 +267,9 @@ void DeInitSalMain()
{
}
-void SalAbort( const XubString& rErrorText, bool bDumpCore )
+void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
{
- if( !rErrorText.Len() )
+ if( rErrorText.isEmpty() )
std::fprintf( stderr, "Application Error\n" );
else
std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index ad43f7afefe6..3f8d164ee588 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2497,7 +2497,7 @@ sal_Bool X11SalFrame::PostEvent( void *pData )
// Title
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalFrame::SetTitle( const XubString& rTitle )
+void X11SalFrame::SetTitle( const rtl::OUString& rTitle )
{
if( ! ( IsChildWindow() || (nStyle_ & SAL_FRAME_STYLE_FLOAT ) ) )
{
@@ -2572,12 +2572,12 @@ void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags )
// -----------------------------------------------------------------------
-XubString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode )
+rtl::OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
return GetDisplay()->GetKeyName( nKeyCode );
}
-XubString X11SalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode )
+rtl::OUString X11SalFrame::GetSymbolKeyName( const rtl::OUString&, sal_uInt16 nKeyCode )
{
return GetKeyName( nKeyCode );
}
@@ -2697,7 +2697,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, int nScreen )
// update graphics if necessary
updateGraphics(false);
- if( m_aTitle.Len() )
+ if( ! m_aTitle.isEmpty() )
SetTitle( m_aTitle );
if( mpParent )
generated by cgit (git 2.34.1) at 2024-07-15 09:04:18 +0000