diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /khelpcenter/fontdialog.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 'khelpcenter/fontdialog.cpp')
| -rw-r--r-- | khelpcenter/fontdialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp index e540ae811..1919ce841 100644 --- a/khelpcenter/fontdialog.cpp +++ b/khelpcenter/fontdialog.cpp @@ -134,7 +134,7 @@ void FontDialog::setupFontEncodingBox() layout->addWidget( lDefaultEncoding, 0, 0 ); m_defaultEncoding = new KComboBox( false, gb ); layout->addWidget( m_defaultEncoding, 0, 1 ); - TQStringList encodings = KGlobal::charsets()->availableEncodingNames(); + TQStringList encodings = TDEGlobal::charsets()->availableEncodingNames(); encodings.prepend( i18n( "Use Language Encoding" ) ); m_defaultEncoding->insertStringList( encodings ); lDefaultEncoding->setBuddy( m_defaultEncoding ); @@ -157,8 +157,8 @@ void FontDialog::load() TQStringList fonts = cfg->readListEntry( "Fonts" ); if ( fonts.isEmpty() ) - fonts << KGlobalSettings::generalFont().family() - << KGlobalSettings::fixedFont().family() + fonts << TDEGlobalSettings::generalFont().family() + << TDEGlobalSettings::fixedFont().family() << HTML_DEFAULT_VIEW_SERIF_FONT << HTML_DEFAULT_VIEW_SANSSERIF_FONT << HTML_DEFAULT_VIEW_CURSIVE_FONT |