← Back to branch summary

~carlos-mazieri/ubuntu-filemanager-app/samba-ui-03

« back to all changes in this revision

Viewing changes to src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp

  • Committer: Tarmac
  • Author(s): carlos-mazieri
  • Date: 2015-08-06 21:26:05 UTC
  • mfrom: (430.3.5 samba-actions-04)
  • Revision ID: tarmac-20150806212605-vt588v1jsz8wk6j1


    FileSystemAction needs to interact with Locations, it now depends from LocationsFactory and Locations classes.

    The following methods were removed because the Location where the Action was performed needs to create its DirIteminfo for its items:
       * Removed signals FileSystemAction::added(QString) and FileSystemAction::removed(QString)
       * Removed slots DirModel::onItemAdded(QString) and DirModel::onItemRemoved(QString)

    FileSystemAction::isThereDiskSpace() was removed and Location::isThereDiskSpace() is used.
.

Approved by Arto Jalkanen, Ubuntu Phone Apps Jenkins Bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp
74
74
       TestDirModel();
75
75
      ~TestDirModel();
76
76
 
77
 
protected slots:
78
 
    void slotFileAdded(const QString& s)     {m_filesAdded.append(s); }
79
 
    void slotFileRemoved(const QString& s)   {m_filesRemoved.append(s); }
 
77
protected slots:  
80
78
    void slotFileAdded(const DirItemInfo& f)   {m_filesAdded.append(f.absoluteFilePath()); }
81
79
    void slotFileRemoved(const DirItemInfo& f) {m_filesRemoved.append(f.absoluteFilePath()); }
82
80
    void slotPathChamged(QString path)       { m_currentPath = path;}
211
209
 
212
210
};
213
211
 
214
 
TestDirModel::TestDirModel() : m_deepDir_01(0)
 
212
TestDirModel::TestDirModel() :       fsAction(new LocationsFactory(this), this)
 
213
                                    ,m_deepDir_01(0)
215
214
                                    ,m_deepDir_02(0)
216
215
                                    ,m_deepDir_03(0)
217
216
                                    ,m_dirModel_01(0)
218
217
                                    ,m_dirModel_02(0)
219
 
{
220
 
    connect(&fsAction, SIGNAL(added(QString)),
221
 
            this,      SLOT(slotFileAdded(QString)) );
222
 
    connect(&fsAction, SIGNAL(removed(QString)),
223
 
            this,      SLOT(slotFileRemoved(QString)) );
224
 
 
 
218
{   
225
219
    connect(&fsAction, SIGNAL(added(DirItemInfo)),
226
220
            this,      SLOT(slotFileAdded(DirItemInfo)));
227
221
    connect(&fsAction, SIGNAL(removed(DirItemInfo)),
401
395
    m_dirModel_01 = new DirModel();
402
396
    m_dirModel_02 = new DirModel();
403
397
 
404
 
    connect(m_dirModel_01->m_fsAction, SIGNAL(added(QString)),
405
 
            this,      SLOT(slotFileAdded(QString)) );
406
 
    connect(m_dirModel_01->m_fsAction, SIGNAL(removed(QString)),
407
 
            this,      SLOT(slotFileRemoved(QString)) );
408
398
    connect(m_dirModel_01->m_fsAction, SIGNAL(added(DirItemInfo)),
409
399
            this,      SLOT(slotFileAdded(DirItemInfo)));
410
400
    connect(m_dirModel_01->m_fsAction, SIGNAL(removed(DirItemInfo)),
411
401
            this,      SLOT(slotFileRemoved(DirItemInfo)));
412
402
 
413
 
    connect(m_dirModel_02->m_fsAction, SIGNAL(added(QString)),
414
 
            this,      SLOT(slotFileAdded(QString)) );
415
 
    connect(m_dirModel_02->m_fsAction, SIGNAL(removed(QString)),
416
 
            this,      SLOT(slotFileRemoved(QString)) );
417
403
    connect(m_dirModel_02->m_fsAction, SIGNAL(added(DirItemInfo)),
418
404
            this,      SLOT(slotFileAdded(DirItemInfo)));
419
405
    connect(m_dirModel_02->m_fsAction, SIGNAL(removed(DirItemInfo)),