lp:~carlos-mazieri/ubuntu-filemanager-app/samba-actions-14

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-filemanager-app at revision 453

Carlos Jose Mazieri: Approve on 2015-08-25

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2015-08-24

Arto Jalkanen: Approve on 2015-08-22

Diff: 571 lines (+395/-3)

14 files modified

src/plugin/folderlistmodel/CMakeLists.txt (+6/-0)
src/plugin/folderlistmodel/disk/disklocation.cpp (+8/-0)
src/plugin/folderlistmodel/disk/disklocation.h (+1/-0)
src/plugin/folderlistmodel/disk/disklocationitemdir.cpp (+61/-0)
src/plugin/folderlistmodel/disk/disklocationitemdir.h (+45/-0)
src/plugin/folderlistmodel/folderlistmodel.pri (+6/-2)
src/plugin/folderlistmodel/location.h (+10/-0)
src/plugin/folderlistmodel/locationitemdir.cpp (+34/-0)
src/plugin/folderlistmodel/locationitemdir.h (+41/-0)
src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri (+2/-0)
src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemdir.cpp (+128/-0)
src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemdir.h (+42/-0)
src/plugin/folderlistmodel/smb/smblocation.cpp (+9/-0)
src/plugin/folderlistmodel/smb/smblocation.h (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

448. By Carlos Jose Mazieri on 2015-08-24

removed unused files added by mistake after fixing the merge conflic in CMakeLists.txt

447. By Carlos Jose Mazieri on 2015-08-24

avoiding merge conflicts

446. By Carlos Jose Mazieri on 2015-08-16

Removed memory leak from DiskLocationItemDir::m_qtQDir

445. By Carlos Jose Mazieri on 2015-07-15

Inherited Location classes now provide inherited LocationItemDir classes which will replace Qt QDir class in Actions.
DiskLocation provides DiskLocationItemDir and SmbLocation provides SmbLocationItemDir

444. By Carlos Jose Mazieri on 2015-07-15

Some DirItemInfo objects created by targetLocation in Actions
QFile is no longer used in Actions, instead the abstract LocationItemFile is created by the suitable Location object

443. By Carlos Jose Mazieri on 2015-07-15

Inherited Location classes now provide inherited LocationItemFile classes which will replace Qt QFile class in Actions.
DiskLocation provides DiskLocationItemFile and SmbLocation provides SmbLocationItemFile

442. By Carlos Jose Mazieri on 2015-07-15

improved SmbUtil class, added method SmbUtil::changePermissions() that will be used by SmbLocationItemFile

441. By Carlos Jose Mazieri on 2015-07-15

forgot to commit TrashLocation::urlBelongsToLocation()

440. By Carlos Jose Mazieri on 2015-07-13

Actions are using LocationItemDirIterator instead of Qt QDirIterator object.

439. By Carlos Jose Mazieri on 2015-07-13

Object LocationItemDirIterator is created by Location classes, it will replace Qt Object QDirIterator in Actions.