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/filterimporterexporter.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kmail/filterimporterexporter.cpp') diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index d63278ad..3f6208d6 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -139,9 +139,9 @@ void FilterSelectionDialog::slotSelectAllButton() } /* static */ -TQValueList FilterImporterExporter::readFiltersFromConfig( KConfig* config, bool bPopFilter ) +TQValueList FilterImporterExporter::readFiltersFromConfig( TDEConfig* config, bool bPopFilter ) { - KConfigGroupSaver saver(config, "General"); + TDEConfigGroupSaver saver(config, "General"); int numFilters = 0; if (bPopFilter) numFilters = config->readNumEntry("popfilters",0); @@ -152,7 +152,7 @@ TQValueList FilterImporterExporter::readFiltersFromConfig( KConfig* c for ( int i=0 ; i < numFilters ; ++i ) { TQString grpName; grpName.sprintf("%s #%d", (bPopFilter ? "PopFilter" : "Filter") , i); - KConfigGroupSaver saver(config, grpName); + TDEConfigGroupSaver saver(config, grpName); KMFilter * filter = new KMFilter(config, bPopFilter); filter->purify(); if ( filter->isEmpty() ) { @@ -168,7 +168,7 @@ TQValueList FilterImporterExporter::readFiltersFromConfig( KConfig* c } /* static */ -void FilterImporterExporter::writeFiltersToConfig( const TQValueList& filters, KConfig* config, bool bPopFilter ) +void FilterImporterExporter::writeFiltersToConfig( const TQValueList& filters, TDEConfig* config, bool bPopFilter ) { // first, delete all groups: TQStringList filterGroups = @@ -186,12 +186,12 @@ void FilterImporterExporter::writeFiltersToConfig( const TQValueList& grpName.sprintf("PopFilter #%d", i); else grpName.sprintf("Filter #%d", i); - KConfigGroupSaver saver(config, grpName); + TDEConfigGroupSaver saver(config, grpName); (*it)->writeConfig(config); ++i; } } - KConfigGroupSaver saver(config, "General"); + TDEConfigGroupSaver saver(config, "General"); if (bPopFilter) config->writeEntry("popfilters", i); else @@ -222,7 +222,7 @@ TQValueList FilterImporterExporter::importFilters() } } - KConfig config( fileName ); + TDEConfig config( fileName ); TQValueList imported = readFiltersFromConfig( &config, mPopFilter ); FilterSelectionDialog dlg( mParent ); dlg.setFilters( imported ); @@ -237,7 +237,7 @@ void FilterImporterExporter::exportFilters(const TQValueList & filter if ( saveUrl.isEmpty() || !Util::checkOverwrite( saveUrl, mParent ) ) return; - KConfig config( saveUrl.path() ); + TDEConfig config( saveUrl.path() ); FilterSelectionDialog dlg( mParent ); dlg.setFilters( filters ); dlg.exec(); -- cgit v1.2.3