diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-30 13:19:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-30 19:26:41 +0100 |
| commit | 29730225f2e1dcc0a2e0a63f1eebbc442055fecb (patch) | |
| tree | 609d24b594b83b66869a10dd6c5498101203d79f /vcl/unx/kde4/KDESalFrame.cxx | |
| parent | a2dbaac6a802af438d82b9889d58fc6ac534ca09 (diff) | |
silence coverity#1371204 Missing move assignment operator
and
silence coverity#1371210 Missing move assignment operator
Change-Id: I6d7a59fd789c16ee11a27d50ba8fd14f17ae77e0
Diffstat (limited to 'vcl/unx/kde4/KDESalFrame.cxx')
| -rw-r--r-- | vcl/unx/kde4/KDESalFrame.cxx | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 1d945a5c5b44..9edeb11f24ca 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -177,28 +177,33 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) KConfig *pConfig = KGlobal::config().data(); if ( pConfig ) { - KConfigGroup aGroup = pConfig->group( "WM" ); const char *pKey; - pKey = "titleFont"; - if ( aGroup.hasKey( pKey ) ) { - vcl::Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); - style.SetTitleFont( aFont ); - bSetTitleFont = true; + KConfigGroup aWMGroup = pConfig->group( "WM" ); + + pKey = "titleFont"; + if (aWMGroup.hasKey(pKey)) + { + vcl::Font aFont = toFont(aWMGroup.readEntry(pKey, QFont()), + rSettings.GetUILanguageTag().getLocale()); + style.SetTitleFont( aFont ); + bSetTitleFont = true; + } } - aGroup = pConfig->group( "Icons" ); + KConfigGroup aIconsGroup = pConfig->group("Icons"); pKey = "Theme"; - if ( aGroup.hasKey( pKey ) ) - style.SetPreferredIconTheme( readEntryUntranslated( &aGroup, pKey ) ); + if (aIconsGroup.hasKey(pKey)) + style.SetPreferredIconTheme( readEntryUntranslated(&aIconsGroup, pKey)); //toolbar pKey = "toolbarFont"; - if ( aGroup.hasKey( pKey ) ) + if (aIconsGroup.hasKey(pKey)) { - vcl::Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); + vcl::Font aFont = toFont(aIconsGroup.readEntry(pKey, QFont()), + rSettings.GetUILanguageTag().getLocale()); style.SetToolFont( aFont ); } } |