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 /khtml/xml | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khtml/xml')
-rw-r--r-- | khtml/xml/dom_docimpl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp index 197ceee13..3a277ecf5 100644 --- a/khtml/xml/dom_docimpl.cpp +++ b/khtml/xml/dom_docimpl.cpp @@ -1127,7 +1127,7 @@ void DocumentImpl::recalcStyle( StyleChange change ) // ### make the font stuff _really_ work!!!! khtml::FontDef fontDef; - TQFont f = KGlobalSettings::generalFont(); + TQFont f = TDEGlobalSettings::generalFont(); fontDef.family = f.family(); fontDef.italic = f.italic(); fontDef.weight = f.weight(); |