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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim/libkleo/kleo
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-03-03 16:25:25
Message-ID: 1267633525.006129.3251.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1098383 by mutz:

Kleo::DN::dn: allow custom separators

 M  +8 -4      dn.cpp  
 M  +5 -0      dn.h  


--- branches/kdepim/enterprise4/kdepim/libkleo/kleo/dn.cpp #1098382:1098383
@@ -292,12 +292,12 @@
 }
 
 static QString
-serialise( const QVector<Kleo::DN::Attribute> & dn ) {
+serialise( const QVector<Kleo::DN::Attribute> & dn, const QString & sep ) {
   QStringList result;
   for ( QVector<Kleo::DN::Attribute>::const_iterator it = dn.begin() ; it != dn.end() ; ++it )
     if ( !(*it).name().isEmpty() && !(*it).value().isEmpty() )
       result.push_back( (*it).name().trimmed() + '=' + dn_escape( (*it).value().trimmed() ) );
-  return result.join( "," );
+  return result.join( sep );
 }
 
 static Kleo::DN::Attribute::List
@@ -383,13 +383,17 @@
     return QString();
   if ( d->reorderedAttributes.empty() )
     d->reorderedAttributes = reorder_dn( d->attributes );
-  return serialise( d->reorderedAttributes );
+  return serialise( d->reorderedAttributes, "," );
 }
 
 QString Kleo::DN::dn() const {
-  return d ? serialise( d->attributes ) : QString() ;
+  return d ? serialise( d->attributes, "," ) : QString() ;
 }
 
+QString Kleo::DN::dn( const QString & sep ) const {
+  return d ? serialise( d->attributes, sep ) : QString() ;
+}
+
 // static
 QString Kleo::DN::escape( const QString & value ) {
     return dn_escape( value );
--- branches/kdepim/enterprise4/kdepim/libkleo/kleo/dn.h #1098382:1098383
@@ -96,6 +96,11 @@
     QString prettyDN() const;
     /** @return the DN in the original form */
     QString dn() const;
+    /**
+       \overload
+       Uses \a sep as separator (default: ,)
+    */
+    QString dn( const QString & sep ) const;
 
     QString operator[]( const QString & attr ) const;
 
[prev in list] [next in list] [prev in thread] [next in thread]