diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
| commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
| tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /khtml/khtml_settings.cc | |
| parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
| download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'khtml/khtml_settings.cc')
| -rw-r--r-- | khtml/khtml_settings.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 5c5db7341..430271877 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -186,7 +186,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai } } -void KHTMLSettings::readDomainSettings(KConfig *config, bool reset, +void KHTMLSettings::readDomainSettings(TDEConfig *config, bool reset, bool global, KPerDomainSettings &pd_settings) { TQString jsPrefix = global ? TQString::null : TQString::fromLatin1("javascript."); @@ -289,17 +289,17 @@ bool KHTMLSettings::hoverLink() const void KHTMLSettings::init() { - KConfig global( "khtmlrc", true, false ); + TDEConfig global( "khtmlrc", true, false ); init( &global, true ); - KConfig *local = TDEGlobal::config(); + TDEConfig *local = TDEGlobal::config(); if ( !local ) return; init( local, false ); } -void KHTMLSettings::init( KConfig * config, bool reset ) +void KHTMLSettings::init( TDEConfig * config, bool reset ) { TQString group_save = config->group(); if (reset || config->hasGroup("MainView Settings")) @@ -741,7 +741,7 @@ bool KHTMLSettings::isAdFiltered( const TQString &url ) const void KHTMLSettings::addAdFilter( const TQString &url ) { - KConfig config( "khtmlrc", false, false ); + TDEConfig config( "khtmlrc", false, false ); config.setGroup( "Filter Settings" ); TQRegExp rx; @@ -1027,7 +1027,7 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled) { d->m_jsErrorsEnabled = enabled; // save it - KConfig *config = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Java/JavaScript Settings"); config->writeEntry("PopupBlockerPassivePopup", enabled); config->sync(); |