SVN commit 648652 by mkossick:

changed return value of returnResultAsDataPtrs to allow method chaining
completed the implementation of that method in MetaQueryBuilder

 M  +9 -0      metaquerybuilder.cpp  
 M  +1 -2      metaquerybuilder.h  
 M  +1 -1      querymaker.h  
 M  +1 -1      sqlcollection/sqlquerybuilder.h  


--- trunk/extragear/multimedia/amarok/src/collection/metaquerybuilder.cpp #648651:648652
@@ -38,6 +38,7 @@
         connect( b, SIGNAL( newResultReady( QString, ComposerList ) ), this, SIGNAL( newResultReady( QString, ComposerList ) ), Qt::DirectConnection );
         connect( b, SIGNAL( newResultReady( QString, YearList ) ), this, SIGNAL( newResultReady( QString, YearList ) ), Qt::DirectConnection );
         connect( b, SIGNAL( newResultReady( QString, QStringList ) ), this, SIGNAL( newResultReady( QString, QStringList ) ), Qt::DirectConnection );
+        connect( b, SIGNAL( newResultReady( QString, DataList ) ), this, SIGNAL( newResultReady( QString, DataList ) ), Qt::DirectConnection );
     }
 }
 
@@ -222,6 +223,14 @@
     return this;
 }
 
+QueryMaker*
+MetaQueryBuilder::returnResultAsDataPtrs( bool resultAsDataPtrs )
+{
+    foreach( QueryMaker *b, builders )
+        b->returnResultAsDataPtrs( resultAsDataPtrs );
+    return this;
+}
+
 void
 MetaQueryBuilder::slotQueryDone()
 {
--- trunk/extragear/multimedia/amarok/src/collection/metaquerybuilder.h #648651:648652
@@ -46,7 +46,7 @@
         virtual QueryMaker* startYearQuery();
         virtual QueryMaker* startCustomQuery();
 
-        virtual void returnResultAsDataPtrs( bool resultAsDataPtrs ) { m_resultAsDataPtrs = resultAsDataPtrs; }
+        virtual QueryMaker* returnResultAsDataPtrs( bool resultAsDataPtrs );
 
         virtual QueryMaker* addReturnValue( qint64 value);
         virtual QueryMaker* orderBy( qint64 value, bool descending = false );
@@ -71,7 +71,6 @@
         QList<QueryMaker*> builders;
         int m_queryDoneCount;
         QMutex m_queryDoneCountMutex;
-        bool m_resultAsDataPtrs;
 
 };
 
--- trunk/extragear/multimedia/amarok/src/collection/querymaker.h #648651:648652
@@ -55,7 +55,7 @@
         virtual QueryMaker* startYearQuery() = 0;
         virtual QueryMaker* startCustomQuery() = 0;
 
-        virtual void returnResultAsDataPtrs( bool resultAsDataPtrs ) = 0;
+        virtual QueryMaker* returnResultAsDataPtrs( bool resultAsDataPtrs ) = 0;
 
         /**
             only works after starting a custom query with startCustomQuery()
--- trunk/extragear/multimedia/amarok/src/collection/sqlcollection/sqlquerybuilder.h #648651:648652
@@ -42,7 +42,7 @@
         virtual QueryMaker* startYearQuery();
         virtual QueryMaker* startCustomQuery();
 
-        virtual void returnResultAsDataPtrs( bool resultAsDataPtrs ) { m_resultAsDataPtrs = resultAsDataPtrs; }
+        virtual QueryMaker* returnResultAsDataPtrs( bool resultAsDataPtrs ) { m_resultAsDataPtrs = resultAsDataPtrs; return this; }
 
         virtual QueryMaker* includeCollection( const QString &collectionId );
         virtual QueryMaker* excludeCollection( const QString &collectionId );