summaryrefslogtreecommitdiffstats
path: root/khexedit/hexeditorwidget.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
commitaef5eada7f51ee48f3d21448db290bd8f06953a8 (patch)
tree9d6e7572ebcc27e402501d6966f9b46361a1702c /khexedit/hexeditorwidget.cc
parent95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff)
downloadtdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz
tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/hexeditorwidget.cc')
-rw-r--r--khexedit/hexeditorwidget.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index 894b70f..5bf6c7f 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -493,7 +493,7 @@ void CHexEditorWidget::setFont( const SDisplayFont &font )
SDisplayFontInfo fontInfo;
if( mDisplayState.font.useSystemFont == true )
{
- fontInfo.font = KGlobalSettings::fixedFont();
+ fontInfo.font = TDEGlobalSettings::fixedFont();
}
else
{