summaryrefslogtreecommitdiffstats
path: root/kmail/antispamwizard.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kmail/antispamwizard.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kmail/antispamwizard.cpp')
-rw-r--r--kmail/antispamwizard.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 2f6750f2c..d83a19e1f 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" );