diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kate/part/katefont.cpp | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kate/part/katefont.cpp')
-rw-r--r-- | kate/part/katefont.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp index 89bfd0025..29955d7e2 100644 --- a/kate/part/katefont.cpp +++ b/kate/part/katefont.cpp @@ -68,10 +68,10 @@ int KateFontMetrics::width(TQChar c) // KateFontStruct::KateFontStruct() -: myFont(KGlobalSettings::fixedFont()), - myFontBold(KGlobalSettings::fixedFont()), - myFontItalic(KGlobalSettings::fixedFont()), - myFontBI(KGlobalSettings::fixedFont()), +: myFont(TDEGlobalSettings::fixedFont()), + myFontBold(TDEGlobalSettings::fixedFont()), + myFontItalic(TDEGlobalSettings::fixedFont()), + myFontBI(TDEGlobalSettings::fixedFont()), myFontMetrics(myFont), myFontMetricsBold(myFontBold), myFontMetricsItalic(myFontItalic), |