diff --git a/sources/elementspanel.cpp b/sources/elementspanel.cpp index 4c8e28973..8fd1e075a 100644 --- a/sources/elementspanel.cpp +++ b/sources/elementspanel.cpp @@ -28,37 +28,6 @@ #include "templatescollection.h" #include "treecoloranimation.h" -/** - This class implements a thread reloading the following elements - collections: - * the common collection - * the custom collection - * the embedded collection of each project listed in the projects_ - attribute. -*/ -class ReloadCollectionThread : public QThread { - public: - void run(); - /// list of projects whose embedded collection should be reloaded. - QList projects_; -}; - -/** - Reloads collections. -*/ -void ReloadCollectionThread::run() { - QETApp::commonElementsCollection() -> reload(); - QETApp::customElementsCollection() -> reload(); - - // reloads collection of every project displayed in this panel - foreach(QETProject *project, projects_) { - if (ElementsCollection *project_collection = project -> embeddedCollection()) { - project_collection -> reload(); - } - } - exit(); -} - /* Lorsque le flag ENABLE_PANEL_DND_CHECKS est defini, le panel d'elements effectue des verifications lors des drag'n drop d'elements et categories. @@ -540,11 +509,14 @@ bool ElementsPanel::matchesCurrentFilter(const QTreeWidgetItem *item) const { * collection of every project displayed in this panel */ void ElementsPanel::reloadCollections() { - ReloadCollectionThread thread; - thread.projects_ = projects_to_display_.values(); - thread.start(); - while(!thread.wait(50)) { - QApplication::processEvents(); + QETApp::commonElementsCollection() -> reload(); + QETApp::customElementsCollection() -> reload(); + + // reloads collection of every project displayed in this panel + foreach(QETProject *project, projects_to_display_) { + if (ElementsCollection *project_collection = project -> embeddedCollection()) { + project_collection -> reload(); + } } } diff --git a/sources/fileelementscollection.cpp b/sources/fileelementscollection.cpp index 465b4642b..2c38cc5af 100644 --- a/sources/fileelementscollection.cpp +++ b/sources/fileelementscollection.cpp @@ -89,7 +89,7 @@ void FileElementsCollection::setFilePath(const QString &path) { Supprime le contenu en memoire de cette collection */ void FileElementsCollection::deleteContent() { - if(!root) delete root; + delete root; root = 0; }