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

List:       kde-commits
Subject:    playground/utils/filelight/src/part
From:       Jakub Stachowski <qbast () go2 ! pl>
Date:       2010-03-13 18:04:08
Message-ID: 1268503448.500375.10982.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1102814 by qbast:

Make variables non-static. Makes possible to use two radial views on split window
without weird interaction.



 M  +5 -5      localLister.cpp  
 M  +4 -2      localLister.h  
 M  +1 -1      part.cpp  
 M  +3 -2      progressBox.cpp  
 M  +5 -1      progressBox.h  
 M  +3 -2      remoteLister.cpp  
 M  +4 -1      remoteLister.h  
 M  +8 -8      scan.cpp  
 M  +4 -4      scan.h  


--- trunk/playground/utils/filelight/src/part/localLister.cpp #1102813:1102814
@@ -47,7 +47,7 @@
 QStringList LocalLister::s_remoteMounts;
 QStringList LocalLister::s_localMounts;
 
-LocalLister::LocalLister(const QString &path, Chain<Folder> *cachedTrees, QObject \
*parent) +LocalLister::LocalLister(const QString &path, Chain<Folder> *cachedTrees, \
ScanManager *parent)  : QThread()
         , m_path(path)
         , m_trees(cachedTrees)
@@ -77,7 +77,7 @@
     //in a sucessful scan the contents would now be transferred to 'tree'
     delete m_trees;
 
-    if (ScanManager::s_abort) //scan was cancelled
+    if (m_parent->m_abort) //scan was cancelled
     {
         kDebug() << "Scan successfully aborted";
         delete tree;
@@ -148,7 +148,7 @@
     dirent *ent;
     while ((ent = KDE_readdir(dir)))
     {
-        if (ScanManager::s_abort)
+        if (m_parent->m_abort)
             return cwd;
 
         if (qstrcmp(ent->d_name, ".") == 0 || qstrcmp(ent->d_name, "..") == 0)
@@ -191,7 +191,7 @@
                 {
                     kDebug() << "Tree pre-completed: " << (*it)->name();
                     d = it.remove();
-                    ScanManager::s_files += d->children();
+                    m_parent->m_files += d->children();
                     //**** ideally don't have this redundant extra somehow
                     cwd->append(d, new_dirname);
                 }
@@ -202,7 +202,7 @@
                     cwd->append(d);
         }
 
-        ++ScanManager::s_files;
+        ++m_parent->m_files;
     }
 
     closedir(dir);
--- trunk/playground/utils/filelight/src/part/localLister.h #1102813:1102814
@@ -30,12 +30,14 @@
 
 namespace Filelight
 {
+class ScanManager;
+
 class LocalLister : public QThread
 {
     Q_OBJECT
 
 public:
-    LocalLister(const QString &path, Chain<Folder> *cachedTrees, QObject *parent);
+    LocalLister(const QString &path, Chain<Folder> *cachedTrees, ScanManager \
*parent);  
     static bool readMounts();
 
@@ -45,7 +47,7 @@
 private:
     QString m_path;
     Chain<Folder> *m_trees;
-    QObject *m_parent;
+    ScanManager *m_parent;
 
 private:
     virtual void run();
--- trunk/playground/utils/filelight/src/part/part.cpp #1102813:1102814
@@ -80,7 +80,7 @@
     m_map = new RadialMap::Widget(widget());
     m_layout->addWidget(m_map);
 
-    m_stateWidget = new ProgressBox(statusBar(), this);
+    m_stateWidget = new ProgressBox(statusBar(), this, m_manager);
     m_layout->addWidget(m_stateWidget);
     m_stateWidget->hide();
 
--- trunk/playground/utils/filelight/src/part/progressBox.cpp #1102813:1102814
@@ -31,8 +31,9 @@
 #include <QtGui/QLabel>
 
 
-ProgressBox::ProgressBox(QWidget *parent, QObject *part)
+ProgressBox::ProgressBox(QWidget *parent, QObject *part, Filelight::ScanManager *m) 
         : QLabel(parent)
+        , m_manager(m)
 {
     hide();
 
@@ -62,7 +63,7 @@
 void
 ProgressBox::report() //slot
 {
-    setText(Filelight::ScanManager::files());
+    setText(m_manager->files());
 }
 
 void
--- trunk/playground/utils/filelight/src/part/progressBox.h #1102813:1102814
@@ -25,13 +25,16 @@
 #include <QtGui/QLabel>
 #include <QtCore/QTimer>
 
+namespace Filelight {
+class ScanManager;
+}
 
 class ProgressBox : public QLabel
 {
     Q_OBJECT
 
 public:
-    ProgressBox(QWidget*, QObject*);
+    ProgressBox(QWidget*, QObject*, Filelight::ScanManager*);
 
     void setText(int);
 
@@ -43,6 +46,7 @@
 
 private:
     QTimer m_timer;
+    Filelight::ScanManager* m_manager;
 };
 
 #endif
--- trunk/playground/utils/filelight/src/part/remoteLister.cpp #1102813:1102814
@@ -81,10 +81,11 @@
 };
 
 
-RemoteLister::RemoteLister(const KUrl &url, QWidget *parent)
+RemoteLister::RemoteLister(const KUrl &url, QWidget *parent, ScanManager* manager)
         : KDirLister(parent)
         , m_root(new Store(url, url.url(), 0))
         , m_store(m_root)
+        , m_manager(manager)
 {
     setAutoUpdate(false); // Don't use KDirWatchers
     setShowingDotFiles(true); // Stupid KDirLister API function names
@@ -135,7 +136,7 @@
         else
             m_store->folder->append(it->name().toUtf8(), it->size() / 1024);
 
-        ScanManager::s_files++;
+        m_manager->m_files++;
     }
 
 
--- trunk/playground/utils/filelight/src/part/remoteLister.h #1102813:1102814
@@ -28,11 +28,13 @@
 
 namespace Filelight
 {
+class ScanManager;
+
 class RemoteLister : public KDirLister
 {
     Q_OBJECT
 public:
-    RemoteLister(const KUrl &url, QWidget *parent);
+    RemoteLister(const KUrl &url, QWidget *parent, ScanManager* manager);
     ~RemoteLister();
 
 signals:
@@ -45,6 +47,7 @@
 
 private:
     class Store *m_root, *m_store;
+    ScanManager* m_manager;
 };
 }
 
--- trunk/playground/utils/filelight/src/part/scan.cpp #1102813:1102814
@@ -31,11 +31,11 @@
 
 namespace Filelight
 {
-bool ScanManager::s_abort = false;
-uint ScanManager::s_files = 0;
 
 ScanManager::ScanManager(QObject *parent)
         : QObject(parent)
+        , m_abort(false)
+        , m_files(0)
         , m_mutex()
         , m_thread(0)
         , m_cache(new Chain<Folder>)
@@ -48,7 +48,7 @@
 {
     if (m_thread) {
         kDebug() << "Attempting to abort scan operation..." << endl;
-        s_abort = true;
+        m_abort = true;
         m_thread->wait();
     }
 
@@ -78,8 +78,8 @@
         return false;
     }
 
-    s_files = 0;
-    s_abort = false;
+    m_files = 0;
+    m_abort = false;
 
     if (url.protocol() == "file")
     {
@@ -166,7 +166,7 @@
     m_url = url;
     QApplication::setOverrideCursor(Qt::BusyCursor);
     //will start listing straight away
-    Filelight::RemoteLister *remoteLister = new Filelight::RemoteLister(url, \
(QWidget*)parent()); +    Filelight::RemoteLister *remoteLister = new \
                Filelight::RemoteLister(url, (QWidget*)parent(), this);
     connect(remoteLister, SIGNAL(branchCompleted(Folder*, bool)), this, \
SLOT(cacheTree(Folder*, bool)), Qt::QueuedConnection);  \
remoteLister->setParent(this);  remoteLister->setObjectName("remote_lister");
@@ -177,7 +177,7 @@
 bool
 ScanManager::abort()
 {
-    s_abort = true;
+    m_abort = true;
 
     delete findChild<RemoteLister *>("remote_lister");
 
@@ -187,7 +187,7 @@
 void
 ScanManager::emptyCache()
 {
-    s_abort = true;
+    m_abort = true;
 
     if (m_thread && m_thread->isRunning())
         m_thread->wait();
--- trunk/playground/utils/filelight/src/part/scan.h #1102813:1102814
@@ -46,8 +46,8 @@
     bool start(const KUrl&);
     bool running() const;
 
-    static uint files() {
-        return s_files;
+    uint files() const {
+        return m_files;
     }
 
 public slots:
@@ -61,8 +61,8 @@
     void branchCompleted(Folder* tree, bool finished);
 
 private:
-    static bool s_abort;
-    static uint s_files;
+    bool m_abort;
+    uint m_files;
 
     KUrl m_url;
     QMutex m_mutex;


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