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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-07-15 17:05:54
Message-ID: 1247677554.294452.8096.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 997262 by tmcguire:

Merged revisions 990532 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

........
  r990532 | winterz | 2009-07-02 17:36:31 +0200 (Thu, 02 Jul 2009) | 4 lines
  
  backport SVN commit 990226 by winterz:
  
  simplify nonKDECustomProperty() and removeNonKDECustomProperty()
........


 _M            . (directory)  
 M  +2 -8      kcal/customproperties.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158,990023
   + /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532
--- branches/kdepim/enterprise4/kdepimlibs/kcal/customproperties.cpp #997261:997262
@@ -123,20 +123,14 @@
 
 void CustomProperties::removeNonKDECustomProperty( const QByteArray &name )
 {
-  QMap<QByteArray, QString>::Iterator it = d->mProperties.find( name );
-  if ( it != d->mProperties.end() ) {
-    d->mProperties.erase( it );
+  if ( d->mProperties.remove( name ) ) {
     customPropertyUpdated();
   }
 }
 
 QString CustomProperties::nonKDECustomProperty( const QByteArray &name ) const
 {
-  QMap<QByteArray, QString>::ConstIterator it = d->mProperties.find( name );
-  if ( it == d->mProperties.end() ) {
-    return QString();
-  }
-  return it.value();
+  return d->mProperties.value( name );
 }
 
 void CustomProperties::setCustomProperties( const QMap<QByteArray, QString> &properties )
[prev in list] [next in list] [prev in thread] [next in thread]