diff options
| -rw-r--r-- | tdeui/tdeactionclasses.cpp | 3 | ||||
| -rw-r--r-- | tdeui/tdefontcombo.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index 4b589f166..80f646869 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -1506,12 +1506,13 @@ void TDEFontAction::setFont( const TQString &family ) // check again to solve an alias FcPattern *pattern = NULL; FcConfig *config = NULL; + FcResult result; TQString realFamily; TQRegExp regExp("[-:]"); pattern = FcNameParse( (unsigned char*) family.ascii() ); FcDefaultSubstitute(pattern); FcConfigSubstitute (config, pattern, FcMatchPattern); - pattern = FcFontMatch(NULL, pattern, NULL); + pattern = FcFontMatch(NULL, pattern, &result); realFamily = (char*)FcNameUnparse(pattern); realFamily.remove(realFamily.find(regExp), realFamily.length()); diff --git a/tdeui/tdefontcombo.cpp b/tdeui/tdefontcombo.cpp index cb250385f..cc3b090b7 100644 --- a/tdeui/tdefontcombo.cpp +++ b/tdeui/tdefontcombo.cpp @@ -244,12 +244,13 @@ void TDEFontCombo::setCurrentFont(const TQString &family) // check again to solve an alias FcPattern *pattern = NULL; FcConfig *config = NULL; + FcResult result; TQString realFamily; TQRegExp regExp("[-:]"); pattern = FcNameParse( (unsigned char*) family.ascii() ); FcDefaultSubstitute(pattern); FcConfigSubstitute (config, pattern, FcMatchPattern); - pattern = FcFontMatch(NULL, pattern, NULL); + pattern = FcFontMatch(NULL, pattern, &result); realFamily = (char*)FcNameUnparse(pattern); realFamily.remove(realFamily.find(regExp), realFamily.length()); |