summaryrefslogtreecommitdiffstats
path: root/src/optiondialog.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:20:19 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:20:19 -0600
commit672c9c39de40e4da2849acbacf0b943dd26a31ac (patch)
tree4e7c5dc2fdb4ad4a5965f155d637469539f5756f /src/optiondialog.cpp
parentf6fa7358bce15f669048effe68b8fb77ed6ffb58 (diff)
downloadkdiff3-672c9c39de40e4da2849acbacf0b943dd26a31ac.tar.gz
kdiff3-672c9c39de40e4da2849acbacf0b943dd26a31ac.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/optiondialog.cpp')
-rw-r--r--src/optiondialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index 8b15dc8..7c70004 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -518,7 +518,7 @@ void OptionDialog::setupFontPage( void )
#elif defined( KREPLACEMENTS_H )
TQFont("Courier", 10 );
#else
- KGlobalSettings::fixedFont();
+ TDEGlobalSettings::fixedFont();
#endif
OptionFontChooser* pFontChooser = new OptionFontChooser( defaultFont, "Font", &m_font, page, this );