diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/konq/fontopts.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konq/fontopts.cpp')
| -rw-r--r-- | kcontrol/konq/fontopts.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 37ab6f71c..a01cdc06d 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -246,11 +246,11 @@ void KonqFontOptions::load( bool useDefaults ) if ( m_fSize == -1 ) m_fSize = TQFontInfo(stdFont).pointSize(); - normalTextColor = KGlobalSettings::textColor(); + normalTextColor = TDEGlobalSettings::textColor(); normalTextColor = g_pConfig->readColorEntry( "NormalTextColor", &normalTextColor ); m_pNormalText->setColor( normalTextColor ); - /* highlightedTextColor = KGlobalSettings::highlightedTextColor(); + /* highlightedTextColor = TDEGlobalSettings::highlightedTextColor(); highlightedTextColor = g_pConfig->readColorEntry( "HighlightedTextColor", &highlightedTextColor ); m_pHighlightedText->setColor( highlightedTextColor ); */ @@ -298,7 +298,7 @@ void KonqFontOptions::defaults() void KonqFontOptions::updateGUI() { if ( m_stdName.isEmpty() ) - m_stdName = KGlobalSettings::generalFont().family(); + m_stdName = TDEGlobalSettings::generalFont().family(); m_pStandard->setCurrentFont( m_stdName ); m_pSize->setValue( m_fSize ); |