summaryrefslogtreecommitdiffstats
path: root/khexedit/hexeditstate.h
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/hexeditstate.h
parent95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff)
downloadtdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz
tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/hexeditstate.h')
-rw-r--r--khexedit/hexeditstate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index 2ae2c8c..339a26a 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -429,7 +429,7 @@ class SDisplayFontInfo
SDisplayFontInfo &init( void )
{
- font = KGlobalSettings::fixedFont();
+ font = TDEGlobalSettings::fixedFont();
nonPrintChar = '.';
return( *this );
}
@@ -444,7 +444,7 @@ class SDisplayFont
SDisplayFont( void )
{
useSystemFont = false;
- localFont = KGlobalSettings::fixedFont();
+ localFont = TDEGlobalSettings::fixedFont();
nonPrintChar = '.';
}