diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /khtml/khtml_settings.cc | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khtml/khtml_settings.cc')
| -rw-r--r-- | khtml/khtml_settings.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 431aec0ca..5c5db7341 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -292,7 +292,7 @@ void KHTMLSettings::init() KConfig global( "khtmlrc", true, false ); init( &global, true ); - KConfig *local = KGlobal::config(); + KConfig *local = TDEGlobal::config(); if ( !local ) return; @@ -369,8 +369,8 @@ void KHTMLSettings::init( KConfig * config, bool reset ) // Fonts and colors if( reset ) { d->defaultFonts = TQStringList(); - d->defaultFonts.append( config->readEntry( "StandardFont", KGlobalSettings::generalFont().family() ) ); - d->defaultFonts.append( config->readEntry( "FixedFont", KGlobalSettings::fixedFont().family() ) ); + d->defaultFonts.append( config->readEntry( "StandardFont", TDEGlobalSettings::generalFont().family() ) ); + d->defaultFonts.append( config->readEntry( "FixedFont", TDEGlobalSettings::fixedFont().family() ) ); d->defaultFonts.append( config->readEntry( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) ); d->defaultFonts.append( config->readEntry( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) ); d->defaultFonts.append( config->readEntry( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) ); @@ -1027,7 +1027,7 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled) { d->m_jsErrorsEnabled = enabled; // save it - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("HTML Settings"); config->writeEntry("ReportJSErrors", enabled); config->sync(); @@ -1052,7 +1052,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled) { d->m_jsPopupBlockerPassivePopup = enabled; // save it - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Java/JavaScript Settings"); config->writeEntry("PopupBlockerPassivePopup", enabled); config->sync(); |