From 1ee8d38ca76b62123af6f5ca1fbb6278f55049e0 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 4 Jun 2009 11:51:25 +0200 Subject: [PATCH] UnifiedResourcesProvider: fixed calls to remergeItems() Make a direct signal-slot-connection between ResourcesDatebase::itemsChanged() of merged databases and UnifiedResourcesProvider::remergeItems() for instantly updating items in unified database. Also call remergeItems() before emitting global itemsChanged() signal. Furthermore instantly call remergeItems() after adding a new database. Signed-off-by: Tobias Doerffel --- src/core/unified_resources_provider.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/unified_resources_provider.cpp b/src/core/unified_resources_provider.cpp index 643acaea6..c06cebcfd 100644 --- a/src/core/unified_resources_provider.cpp +++ b/src/core/unified_resources_provider.cpp @@ -56,12 +56,16 @@ void UnifiedResourcesProvider::addDatabase( ResourcesDB * _db ) { m_mergedDatabases << _db; connect( _db, SIGNAL( itemsChanged() ), - database(), SIGNAL( itemsChanged() ) ); + this, SLOT( remergeItems() ), + Qt::DirectConnection ); connect( _db, SIGNAL( itemsChanged() ), - this, SLOT( remergeItems() ) ); + database(), SIGNAL( itemsChanged() ), + Qt::DirectConnection ); childRoot->setParent( database()->topLevelNode() ); database()->topLevelNode()->addChild( childRoot ); + + remergeItems(); } }