diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-18 13:12:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-18 13:12:49 +0200 |
| commit | 5aa24b83fca3a507f1c2dc03e3ec52f063029522 (patch) | |
| tree | af90253a83ea6334d81cac97656dec278680556f /vcl/unx/kde4 | |
| parent | 32d6415617b5815bb5d18719f6d2df74becc0997 (diff) | |
Font -> vcl::Font in vcl/unx/kde4
Change-Id: Iaa0c71e6d4f2b142821a6546772a3364b5eb7e29
Diffstat (limited to 'vcl/unx/kde4')
| -rw-r--r-- | vcl/unx/kde4/KDESalFrame.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 9306439ccf2a..b67b3eda0850 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -85,7 +85,7 @@ static OUString readEntryUntranslated( KConfigGroup *pGroup, const char *pKey ) Mostly grabbed from the Gtk+ vclplug (salnativewidgets-gtk.cxx). */ -static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& rLocale ) +static vcl::Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& rLocale ) { psp::FastPrintFontInfo aInfo; QFontInfo qFontInfo( rQFont ); @@ -145,7 +145,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r nPointHeight = rQFont.pointSize(); // Create the font - Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) ); + vcl::Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) ); if( aInfo.m_eWeight != WEIGHT_DONTKNOW ) aFont.SetWeight( aInfo.m_eWeight ); if( aInfo.m_eWidth != WIDTH_DONTKNOW ) @@ -189,7 +189,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) pKey = "titleFont"; if ( aGroup.hasKey( pKey ) ) { - Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); + vcl::Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); style.SetTitleFont( aFont ); bSetTitleFont = true; } @@ -204,7 +204,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) pKey = "toolbarFont"; if ( aGroup.hasKey( pKey ) ) { - Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); + vcl::Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); style.SetToolFont( aFont ); } } @@ -260,7 +260,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) style.SetHelpTextColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipText ))); // Font - Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() ); + vcl::Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() ); style.SetAppFont( aFont ); |