[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/akregator/src
From:       Volker Krause <volker.krause () rwth-aachen ! de>
Date:       2006-01-03 16:25:46
Message-ID: 1136305546.425790.20918.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 493918 by vkrause:

Compile with new kdelibs snapshot.


 M  +9 -9      articlefilter.cpp  


--- trunk/KDE/kdepim/akregator/src/articlefilter.cpp #493917:493918
@@ -134,9 +134,9 @@
 
 void Criterion::readConfig(KConfig* config)
 {
-    m_subject = stringToSubject(config->readEntry(QString::fromLatin1("subject")));
-    m_predicate = stringToPredicate(config->readEntry(QString::fromLatin1("predicate")));
                
-    QVariant::Type type = \
QVariant::nameToType(config->readEntry(QString::fromLatin1("objType")).ascii()); +    \
m_subject = stringToSubject(config->readEntry(QString::fromLatin1("subject"), \
QString())); +    m_predicate = \
stringToPredicate(config->readEntry(QString::fromLatin1("predicate"), QString())); +  \
QVariant::Type type = \
QVariant::nameToType(config->readEntry(QString::fromLatin1("objType"), \
QString()).ascii());  
     if (type != QVariant::Invalid)
     {
@@ -277,7 +277,7 @@
 void ArticleMatcher::readConfig(KConfig* config)
 {
     m_criteria.clear();
-    m_association = \
stringToAssociation(config->readEntry(QString::fromLatin1("matcherAssociation"))); +  \
m_association = stringToAssociation(config->readEntry(QString::fromLatin1("matcherAssociation"), \
QString()));  
     int count =  config->readNumEntry(QString::fromLatin1("matcherCriteriaCount"), \
0);  
@@ -405,7 +405,7 @@
 
 void TagMatcher::readConfig(KConfig* config)
 {
-    d->tagID = config->readEntry(QString::fromLatin1("matcherParams"));
+    d->tagID = config->readEntry(QString::fromLatin1("matcherParams"), QString());
 }
 
 bool TagMatcher::operator==(const AbstractMatcher& other) const
@@ -600,7 +600,7 @@
 
 void AssignTagAction::readConfig(KConfig* config)
 {
-    m_tagID = config->readEntry(QString::fromLatin1("actionParams"));
+    m_tagID = config->readEntry(QString::fromLatin1("actionParams"), QString());
 }
 
 void AssignTagAction::writeConfig(KConfig* config) const
@@ -652,10 +652,10 @@
     delete d->action;
     d->action = 0;
 
-    d->name = config->readEntry(QString::fromLatin1("name"));
+    d->name = config->readEntry(QString::fromLatin1("name"), QString());
     d->id = config->readNumEntry(QString::fromLatin1("id"), 0);
 
-    QString matcherType = config->readEntry(QString::fromLatin1("matcherType"));
+    QString matcherType = config->readEntry(QString::fromLatin1("matcherType"), \
QString());  
     if (matcherType == QString::fromLatin1("TagMatcher"))
         d->matcher = new TagMatcher();
@@ -666,7 +666,7 @@
         d->matcher->readConfig(config);
 
 
-        QString actionType = config->readEntry(QString::fromLatin1("actionType"));
+        QString actionType = config->readEntry(QString::fromLatin1("actionType"), \
QString());  
     if (actionType == QString::fromLatin1("AssignTagAction"))
         d->action = new AssignTagAction();


[prev in list] [next in list] [prev in thread] [next in thread]