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

List:       kde-commits
Subject:    kdesupport/akonadi/server/src/search
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-10-24 8:43:09
Message-ID: 20101024084309.A9A19AC89A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1189184 by tokoe:

coding style cleanup


 M  +39 -30    xesamsearchengine.cpp  
 M  +4 -3      xesamsearchengine.h  


--- trunk/kdesupport/akonadi/server/src/search/xesamsearchengine.cpp #1189183:1189184
@@ -29,8 +29,8 @@
 
 using namespace Akonadi;
 
-XesamSearchEngine::XesamSearchEngine(QObject * parent) :
-    QObject( parent ),
+XesamSearchEngine::XesamSearchEngine( QObject *parent )
+  : QObject( parent ),
     mValid( true )
 {
   mInterface = new OrgFreedesktopXesamSearchInterface(
@@ -71,18 +71,21 @@
 {
   qDebug() << "hits added: " << search << count;
   mMutex.lock();
-  qint64 colId = mSearchMap.value( search );
+  const qint64 colId = mSearchMap.value( search );
   mMutex.unlock();
+
   if ( colId <= 0 || count <= 0 )
     return;
   qDebug() << "calling GetHits";
-  QList<QList<QVariant> > results = mInterface->GetHits( search, count );
+
+  const QList<QList<QVariant> > results = mInterface->GetHits( search, count );
   qDebug() << "GetHits returned:" << results.count();
   typedef QList<QVariant> VariantList;
   foreach ( const VariantList &list, results ) {
     if ( list.isEmpty() )
       continue;
-    qint64 itemId = uriToItemId( list.first().toString() );
+
+    const qint64 itemId = uriToItemId( list.first().toString() );
     Entity::addToRelation<CollectionPimItemRelation>( colId, itemId );
   }
 }
@@ -91,16 +94,19 @@
 {
   qDebug() << "hits removed: " << search << hits;
   mMutex.lock();
-  qint64 colId = mSearchMap.value( search );
+  const qint64 colId = mSearchMap.value( search );
   mMutex.unlock();
+
   if ( colId <= 0 )
     return;
-  QList<QList<QVariant> > results = mInterface->GetHitData( search, hits, \
QStringList( QLatin1String("uri") ) ); +
+  const QList<QList<QVariant> > results = mInterface->GetHitData( search, hits, \
QStringList( QLatin1String( "uri" ) ) );  typedef QList<QVariant> VariantList;
   foreach ( const VariantList &list, results ) {
     if ( list.isEmpty() )
       continue;
-    qint64 itemId = uriToItemId( list.first().toString() );
+
+    const qint64 itemId = uriToItemId( list.first().toString() );
     Entity::removeFromRelation<CollectionPimItemRelation>( colId, itemId );
   }
 }
@@ -112,28 +118,30 @@
 
 void XesamSearchEngine::reloadSearches()
 {
-  Resource res = Resource::retrieveByName( QLatin1String("akonadi_search_resource") \
                );
-  if ( !res.isValid() ) {
+  const Resource resource = Resource::retrieveByName( QLatin1String( \
"akonadi_search_resource" ) ); +  if ( !resource.isValid() ) {
     qWarning() << "No valid search resource found!";
     return;
   }
-  Collection::List cols = res.collections();
-  foreach ( const Collection &col, cols ) {
-    addSearch( col );
+
+  foreach ( const Collection &collection, resource.collections() ) {
+    addSearch( collection );
   }
 }
 
-void XesamSearchEngine::addSearch(const Collection & col)
+void XesamSearchEngine::addSearch( const Collection &collection )
 {
-  if ( !mInterface->isValid() || !mValid || col.queryLanguage() != QLatin1String( \
"XESAM" ) ) +  if ( !mInterface->isValid() || !mValid || collection.queryLanguage() \
!= QLatin1String( "XESAM" ) )  return;
+
   QMutexLocker lock( &mMutex );
-  if ( col.remoteId().isEmpty() )
+  if ( collection.remoteId().isEmpty() )
     return;
-  QString searchId = mInterface->NewSearch( mSession, col.remoteId() );
-  qDebug() << "XesamSearchEngine::addSeach" << col << searchId;
-  mSearchMap[ searchId ] = col.id();
-  mInvSearchMap[ col.id() ] = searchId;
+
+  const QString searchId = mInterface->NewSearch( mSession, collection.remoteId() );
+  qDebug() << "XesamSearchEngine::addSeach" << collection << searchId;
+  mSearchMap[ searchId ] = collection.id();
+  mInvSearchMap[ collection.id() ] = searchId;
   mInterface->StartSearch( searchId );
 
 #if 0
@@ -144,30 +152,31 @@
 #endif
 }
 
-void XesamSearchEngine::removeSearch(qint64 col)
+void XesamSearchEngine::removeSearch( qint64 collectionId )
 {
   QMutexLocker lock( &mMutex );
-  if ( !mInvSearchMap.contains( col ) )
+  if ( !mInvSearchMap.contains( collectionId ) )
     return;
-  QString searchId = mInvSearchMap.value( col );
-  mInvSearchMap.remove( col );
+
+  const QString searchId = mInvSearchMap.value( collectionId );
+  mInvSearchMap.remove( collectionId );
   mSearchMap.remove( searchId );
 }
 
 void XesamSearchEngine::stopSearches()
 {
-  Resource res = Resource::retrieveByName( QLatin1String("akonadi_search_resource") \
                );
-  if ( !res.isValid() ) {
+  const Resource resource = Resource::retrieveByName( QLatin1String( \
"akonadi_search_resource" ) ); +  if ( !resource.isValid() ) {
     qWarning() << "No valid search resource found!";
     return;
   }
-  Collection::List cols = res.collections();
-  foreach ( const Collection &col, cols ) {
-    removeSearch( col.id() );
+
+  foreach ( const Collection &collection, resource.collections() ) {
+    removeSearch( collection.id() );
   }
 }
 
-qint64 XesamSearchEngine::uriToItemId(const QString & uri)
+qint64 XesamSearchEngine::uriToItemId( const QString &uri ) const
 {
   // TODO implement me!
   return uri.toLongLong();
--- trunk/kdesupport/akonadi/server/src/search/xesamsearchengine.h #1189183:1189184
@@ -33,19 +33,20 @@
 class XesamSearchEngine : public QObject, public AbstractSearchEngine
 {
   Q_OBJECT
+
   public:
     XesamSearchEngine( QObject* parent = 0 );
     ~XesamSearchEngine();
 
     void addSearch( const Collection &collection );
-    void removeSearch( qint64 collection );
+    void removeSearch( qint64 collectionId );
 
   private:
     void reloadSearches();
     void stopSearches();
-    qint64 uriToItemId( const QString &uri );
+    qint64 uriToItemId( const QString &uri ) const;
 
-  private slots:
+  private Q_SLOTS:
     void slotHitsAdded( const QString &search, int count );
     void slotHitsRemoved( const QString &search, const QList<int> &hits );
     void slotHitsModified( const QString &search, const QList<int> &hits );


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