From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmail/antispamwizard.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kmail/antispamwizard.cpp') diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 2f6750f2..d83a19e1 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -680,9 +680,9 @@ AntiSpamWizard::ConfigReader::ConfigReader( WizardMode mode, mMode( mode ) { if ( mMode == AntiSpam ) - mConfig = new KConfig( "kmail.antispamrc", true ); + mConfig = new TDEConfig( "kmail.antispamrc", true ); else - mConfig = new KConfig( "kmail.antivirusrc", true ); + mConfig = new TDEConfig( "kmail.antivirusrc", true ); } AntiSpamWizard::ConfigReader::~ConfigReader( ) @@ -698,11 +698,11 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig() : TQString("Virustool #%1"); // read the configuration from the global config file mConfig->setReadDefaults( true ); - KConfigGroup general( mConfig, "General" ); + TDEConfigGroup general( mConfig, "General" ); int registeredTools = general.readNumEntry( "tools", 0 ); for (int i = 1; i <= registeredTools; i++) { - KConfigGroup toolConfig( mConfig, groupName.arg( i ) ); + TDEConfigGroup toolConfig( mConfig, groupName.arg( i ) ); if( !toolConfig.readBoolEntry( "HeadersOnly", false ) ) mToolList.append( readToolConfig( toolConfig ) ); } @@ -710,11 +710,11 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig() // read the configuration from the user config file // and merge newer config data mConfig->setReadDefaults( false ); - KConfigGroup user_general( mConfig, "General" ); + TDEConfigGroup user_general( mConfig, "General" ); int user_registeredTools = user_general.readNumEntry( "tools", 0 ); for (int i = 1; i <= user_registeredTools; i++) { - KConfigGroup toolConfig( mConfig, groupName.arg( i ) ); + TDEConfigGroup toolConfig( mConfig, groupName.arg( i ) ); if( !toolConfig.readBoolEntry( "HeadersOnly", false ) ) mergeToolConfig( readToolConfig( toolConfig ) ); } @@ -730,7 +730,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig() AntiSpamWizard::SpamToolConfig - AntiSpamWizard::ConfigReader::readToolConfig( KConfigGroup & configGroup ) + AntiSpamWizard::ConfigReader::readToolConfig( TDEConfigGroup & configGroup ) { TQString id = configGroup.readEntry( "Ident" ); int version = configGroup.readNumEntry( "Version" ); -- cgit v1.2.3