summaryrefslogtreecommitdiffabout
path: root/kaddressbook
authorzautrix <zautrix>2005-04-04 12:59:35 (UTC)
committer zautrix <zautrix>2005-04-04 12:59:35 (UTC)
commit919f1060a9ef41e6c865f28132cf9e82c3f67409 (patch) (side-by-side diff)
tree8e7c1283071ff2af2897ccf1c7e51e8b2b2bfadc /kaddressbook
parent23db4aa99cb7a5feb540b6be578efaee8ec6ef80 (diff)
downloadkdepimpi-919f1060a9ef41e6c865f28132cf9e82c3f67409.zip
kdepimpi-919f1060a9ef41e6c865f28132cf9e82c3f67409.tar.gz
kdepimpi-919f1060a9ef41e6c865f28132cf9e82c3f67409.tar.bz2
kapi filter fixes
Diffstat (limited to 'kaddressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/filter.cpp24
-rw-r--r--kaddressbook/filter.h1
2 files changed, 18 insertions, 7 deletions
diff --git a/kaddressbook/filter.cpp b/kaddressbook/filter.cpp
index 7a869fa..12ab1e3 100644
--- a/kaddressbook/filter.cpp
+++ b/kaddressbook/filter.cpp
@@ -32,15 +32,17 @@
Filter::Filter()
- : mName( QString::null ), mMatchRule( Matching ), mEnabled( true ),
+ : mName( QString::null ), mMatchRule( NotMatching ), mEnabled( true ),
mInternal( false )
{
mCriteria = ShowPublic | ShowPrivate| ShowConfidential ;
+ noName = true;
}
Filter::Filter( const QString &name )
- : mName( name ), mMatchRule( Matching ), mEnabled( true ),
+ : mName( name ), mMatchRule( NotMatching ), mEnabled( true ),
mInternal( false )
{
mCriteria = ShowPublic | ShowPrivate| ShowConfidential ;
+ noName = false;
}
@@ -52,4 +54,5 @@ void Filter::setName( const QString &name )
{
mName = name;
+ noName = false;
}
@@ -65,5 +68,7 @@ bool Filter::isInternal() const
void Filter::apply( KABC::Addressee::List &addresseeList )
-{
+{
+ if ( noName )
+ return;
KABC::Addressee::List::Iterator iter;
for ( iter = addresseeList.begin(); iter != addresseeList.end(); ) {
@@ -83,4 +88,8 @@ void Filter::apply( KABC::Addressee::List &addresseeList )
bool Filter::filterAddressee( const KABC::Addressee &a )
{
+
+ if ( noName )
+ return true;
+ //qDebug("Filter::filterAddressee %s",mName.latin1() );
switch ( a.secrecy().type()) {
case KABC::Secrecy::Public:
@@ -102,8 +111,7 @@ bool Filter::filterAddressee( const KABC::Addressee &a )
QStringList::Iterator iter;
iter = mCategoryList.begin();
- // empty filter always matches
if ( iter == mCategoryList.end() )
- return true;
+ return ( !(mMatchRule == Matching) );
for ( ; iter != mCategoryList.end(); ++iter ) {
@@ -145,5 +153,6 @@ void Filter::save( KConfig *config )
void Filter::restore( KConfig *config )
-{
+{
+ noName = false;
mName = config->readEntry( "Name", "<internal error>" );
mEnabled = config->readBoolEntry( "Enabled", true );
@@ -206,5 +215,6 @@ Filter::List Filter::restore( KConfig *config, QString baseGroup )
QStringList cats = KABPrefs::instance()->mCustomCategories;
for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
- Filter filter;
+ Filter filter;
+ filter.noName = false;
filter.mName = *it;
filter.mEnabled = true;
diff --git a/kaddressbook/filter.h b/kaddressbook/filter.h
index 93f1352..f4ae123 100644
--- a/kaddressbook/filter.h
+++ b/kaddressbook/filter.h
@@ -147,4 +147,5 @@ class Filter
private:
+ bool noName;
int mCriteria;
QString mName;