summaryrefslogtreecommitdiffstats
path: root/kmail/kmsearchpattern.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/kmsearchpattern.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/kmsearchpattern.cpp')
-rw-r--r--kmail/kmsearchpattern.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 2c003e49e..0d94c149f 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -125,7 +125,7 @@ KMSearchRule * KMSearchRule::createInstance( const KMSearchRule & other )
return ( createInstance( other.field(), other.function(), other.contents() ) );
}
-KMSearchRule * KMSearchRule::createInstanceFromConfig( const KConfig * config, int aIdx )
+KMSearchRule * KMSearchRule::createInstanceFromConfig( const TDEConfig * config, int aIdx )
{
const char cIdx = char( int('A') + aIdx );
@@ -161,7 +161,7 @@ TQString KMSearchRule::functionToString( Function function )
return "invalid";
}
-void KMSearchRule::writeConfig( KConfig * config, int aIdx ) const {
+void KMSearchRule::writeConfig( TDEConfig * config, int aIdx ) const {
const char cIdx = char('A' + aIdx);
static const TQString & field = TDEGlobal::staticQString( "field" );
static const TQString & func = TDEGlobal::staticQString( "func" );
@@ -712,7 +712,7 @@ bool KMSearchRuleStatus::matches( const KMMessage * msg ) const
//
//==================================================
-KMSearchPattern::KMSearchPattern( const KConfig * config )
+KMSearchPattern::KMSearchPattern( const TDEConfig * config )
: TQPtrList<KMSearchRule>()
{
setAutoDelete( true );
@@ -827,7 +827,7 @@ void KMSearchPattern::purify() {
}
}
-void KMSearchPattern::readConfig( const KConfig * config ) {
+void KMSearchPattern::readConfig( const TDEConfig * config ) {
init();
mName = config->readEntry("name");
@@ -850,7 +850,7 @@ void KMSearchPattern::readConfig( const KConfig * config ) {
}
}
-void KMSearchPattern::importLegacyConfig( const KConfig * config ) {
+void KMSearchPattern::importLegacyConfig( const TDEConfig * config ) {
KMSearchRule * rule = KMSearchRule::createInstance( config->readEntry("fieldA").latin1(),
config->readEntry("funcA").latin1(),
config->readEntry("contentsA") );
@@ -893,7 +893,7 @@ void KMSearchPattern::importLegacyConfig( const KConfig * config ) {
// treat any other case as "and" (our default).
}
-void KMSearchPattern::writeConfig( KConfig * config ) const {
+void KMSearchPattern::writeConfig( TDEConfig * config ) const {
config->writeEntry("name", mName);
config->writeEntry("operator", (mOperator == KMSearchPattern::OpOr) ? "or" : "and" );