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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/commands
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-11-11 15:06:03
Message-ID: 20101111150603.85EE7AC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195587 by mutz:

ImportCertificatesCommand: use FingerprintRole instead of Fingerprint column

 M  +2 -7      importcertificatescommand.cpp  


--- trunk/KDE/kdepim/kleopatra/commands/importcertificatescommand.cpp \
#1195586:1195587 @@ -104,10 +104,7 @@
         /* reimp */ QVariant data( const QModelIndex & index, int role ) const {
             if ( !index.isValid() || role != Qt::ToolTipRole )
                 return AbstractKeyListSortFilterProxyModel::data( index, role );
-            // get the fingerprint:
-            const QModelIndex fprIndex = index.sibling( index.row(), \
                AbstractKeyListModel::Fingerprint );
-            assert( fprIndex.isValid() );
-            const QString fpr = fprIndex.data( Qt::EditRole ).toString();
+            const QString fpr = index.data( FingerprintRole ).toString();
             // find information:
             const std::vector<Import>::const_iterator it
                 = qBinaryFind( m_importsByFingerprint.begin(), \
m_importsByFingerprint.end(), @@ -130,9 +127,7 @@
             //
             // 1. Check that this is an imported key:
             //
-            const QModelIndex fprIndex = sourceModel()->index( source_row, \
                AbstractKeyListModel::Fingerprint, source_parent );
-            assert( fprIndex.isValid() );
-            const QString fpr = fprIndex.data( Qt::EditRole ).toString();
+            const QString fpr = index.data( FingerprintRole ).toString();
 
             return std::binary_search( m_importsByFingerprint.begin(), \
m_importsByFingerprint.end(),  fpr.toLatin1().constData(),


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