Share I/O worker thread instances between all DirModels.

nemomobile · Feb 18, 2012 · 29525ef · 29525ef
1 parent 14cc320
commit 29525ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/dirmodel.cpp b/dirmodel.cpp
@@ -36,6 +36,9 @@
 #include <QUrl>
 
 #include "dirmodel.h"
+#include "ioworkerthread.h"
+
+Q_GLOBAL_STATIC(IOWorkerThread, ioWorkerThread);
 
 class DirListWorker : public IORequest
 {
@@ -190,7 +193,7 @@ void DirModel::setPath(const QString &pathName)
     // TODO: we need to set a spinner active before we start getting results from DirListWorker
     DirListWorker *dlw = new DirListWorker(pathName);
     connect(dlw, SIGNAL(itemsAdded(QVector<QFileInfo>)), SLOT(onItemsAdded(QVector<QFileInfo>)));
-    mIOWorker.addRequest(dlw);
+    ioWorkerThread()->addRequest(dlw);
 
     mCurrentDir = pathName;
     emit pathChanged();

diff --git a/dirmodel.h b/dirmodel.h
@@ -37,7 +37,6 @@
 #include <QVector>
 
 #include "iorequest.h"
-#include "ioworkerthread.h"
 
 class DirModel : public QAbstractListModel
 {
@@ -95,7 +94,6 @@ public slots:
     QString mCurrentDir;
     QVector<QFileInfo> mDirectoryContents;
     QHash<QByteArray, int> mRoleMapping;
-    IOWorkerThread mIOWorker;
 };