Merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-05 into lp:ubuntu-filemanager-app

Proposed by Carlos Jose Mazieri on 2015-12-12
Status: Merged
Approved by: Arto Jalkanen on 2016-01-10
Approved revision: 516
Merged at revision: 518
Proposed branch: lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-05
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-04
Diff against target: 148 lines (+2/-112)
4 files modified
src/plugin/folderlistmodel/CMakeLists.txt (+0/-2)
src/plugin/folderlistmodel/folderlistmodel.pri (+2/-2)
src/plugin/folderlistmodel/smb/smblistworker.cpp (+0/-68)
src/plugin/folderlistmodel/smb/smblistworker.h (+0/-40)
To merge this branch: bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-05
Reviewer Review Type Date Requested Status
Arto Jalkanen 2015-12-12 Approve on 2016-01-10
Jenkins Bot continuous-integration Approve on 2015-12-12
Review via email: mp+280391@code.launchpad.net

Commit message

class SmbListWorker removed from repostory

Description of the change

class SmbListWorker removed from repostory

To post a comment you must log in.
review: Approve (continuous-integration)
Arto Jalkanen (ajalkane) wrote :

Off you go foul beast!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/folderlistmodel/CMakeLists.txt'
2--- src/plugin/folderlistmodel/CMakeLists.txt 2015-12-12 15:48:35 +0000
3+++ src/plugin/folderlistmodel/CMakeLists.txt 2015-12-12 15:48:35 +0000
4@@ -73,8 +73,6 @@
5 trash/trashiteminfo.h
6 trash/trashlocation.cpp
7 trash/trashlocation.h
8- smb/smblistworker.cpp
9- smb/smblistworker.h
10 smb/qsambaclient/src/smbutil.cpp
11 smb/qsambaclient/src/smbutil.h
12 smb/qsambaclient/src/smbiteminfo.cpp
13
14=== modified file 'src/plugin/folderlistmodel/folderlistmodel.pri'
15--- src/plugin/folderlistmodel/folderlistmodel.pri 2015-12-12 15:48:35 +0000
16+++ src/plugin/folderlistmodel/folderlistmodel.pri 2015-12-12 15:48:35 +0000
17@@ -67,11 +67,11 @@
18
19 SOURCES += $$PWD/smb/smblocation.cpp \
20 $$PWD/smb/smblocationauthentication.cpp \
21- $$PWD/smb/smblistworker.cpp
22+
23
24 HEADERS += $$PWD/smb/smblocation.h \
25 $$PWD/smb/smblocationauthentication.h \
26- $$PWD/smb/smblistworker.h
27+
28
29 include ($$PWD/smb/qsambaclient/qsambaclient.pri)
30
31
32=== removed file 'src/plugin/folderlistmodel/smb/smblistworker.cpp'
33--- src/plugin/folderlistmodel/smb/smblistworker.cpp 2015-12-08 16:55:41 +0000
34+++ src/plugin/folderlistmodel/smb/smblistworker.cpp 1970-01-01 00:00:00 +0000
35@@ -1,68 +0,0 @@
36-/**************************************************************************
37- *
38- * Copyright 2015 Canonical Ltd.
39- * Copyright 2015 Carlos J Mazieri <carlos.mazieri@gmail.com>
40- *
41- * This program is free software; you can redistribute it and/or modify
42- * it under the terms of the GNU Lesser General Public License as published by
43- * the Free Software Foundation; version 3.
44- *
45- * This program is distributed in the hope that it will be useful,
46- * but WITHOUT ANY WARRANTY; without even the implied warranty of
47- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
48- * GNU Lesser General Public License for more details.
49- *
50- * You should have received a copy of the GNU Lesser General Public License
51- * along with this program. If not, see <http://www.gnu.org/licenses/>.
52- *
53- * File: smblistworker.cpp
54- * Date: 17/01/2015
55- */
56-
57-#include "smblistworker.h"
58-#include "smblocationdiriterator.h"
59-
60-SmbListWorker::SmbListWorker(const QString &pathName,
61- QDir::Filters filter,
62- const bool isRecursive,
63- DirItemInfo * parentItem,
64- Const_SmbUtil_Ptr smb)
65- : DirListWorker(pathName, filter, isRecursive)
66- , SmbObject(pathName, smb)
67- , m_parent(parentItem)
68-{
69- mLoaderType = NetworkLoader;
70-}
71-
72-/*!
73- * \brief SmbListWorker::getNetworkContent() it fills a \ref DirItemInfoList with samba (share/directory) content
74- * \return the list of \ref SmbItemInfo items
75- */
76-DirItemInfoList SmbListWorker::getNetworkContent()
77-{
78- DirItemInfoList smbContent;
79-
80- QDirIterator::IteratorFlags flags = mIsRecursive ?
81- QDirIterator::Subdirectories :
82- QDirIterator::NoIteratorFlags;
83-
84- SmbLocationDirIterator dir(mPathName, mFilter, flags, m_smb);
85- while (dir.hasNext())
86- {
87- QString next = dir.next();
88- SmbItemInfo item (next, m_smb);
89- if (m_parent)
90- {
91- if (m_parent->isHost()) {
92- item.setAsShare();
93- }
94- else if (m_parent->isWorkGroup()) {
95- item.setAsHost();
96- }
97- }
98- smbContent.append(item);
99- }
100-
101- return smbContent;
102-}
103-
104
105=== removed file 'src/plugin/folderlistmodel/smb/smblistworker.h'
106--- src/plugin/folderlistmodel/smb/smblistworker.h 2015-12-08 16:55:41 +0000
107+++ src/plugin/folderlistmodel/smb/smblistworker.h 1970-01-01 00:00:00 +0000
108@@ -1,40 +0,0 @@
109-/**************************************************************************
110- *
111- * Copyright 2015 Canonical Ltd.
112- * Copyright 2015 Carlos J Mazieri <carlos.mazieri@gmail.com>
113- *
114- * This program is free software; you can redistribute it and/or modify
115- * it under the terms of the GNU Lesser General Public License as published by
116- * the Free Software Foundation; version 3.
117- *
118- * This program is distributed in the hope that it will be useful,
119- * but WITHOUT ANY WARRANTY; without even the implied warranty of
120- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
121- * GNU Lesser General Public License for more details.
122- *
123- * You should have received a copy of the GNU Lesser General Public License
124- * along with this program. If not, see <http://www.gnu.org/licenses/>.
125- *
126- * File: smblistworker.h
127- * Date: 17/01/2015
128- */
129-
130-#ifndef SMBLISTWORKER_H
131-#define SMBLISTWORKER_H
132-
133-#include "iorequestworker.h"
134-#include "smbiteminfo.h"
135-
136-class SmbListWorker : public DirListWorker, public SmbObject
137-{
138- Q_OBJECT
139-public:
140- explicit SmbListWorker(const QString &pathName, QDir::Filters filter, const bool isRecursive, DirItemInfo * parentItem, Const_SmbUtil_Ptr smb);
141-
142-private:
143- DirItemInfoList getNetworkContent();
144-private:
145- DirItemInfo * m_parent;
146-};
147-
148-#endif // SMBLISTWORKER_H

Subscribers

People subscribed via source and target branches