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

[Carlos Jose Mazieri]

class SmbListWorker removed from repostory

class SmbListWorker removed from repostory

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:516
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/39/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/253/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/39/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

Off you go foul beast!

review: Approve

=== modified file 'src/plugin/folderlistmodel/CMakeLists.txt'
--- src/plugin/folderlistmodel/CMakeLists.txt	2015-12-12 15:48:35 +0000
+++ src/plugin/folderlistmodel/CMakeLists.txt	2015-12-12 15:48:35 +0000
@@ -73,8 +73,6 @@
     trash/trashiteminfo.h
     trash/trashlocation.cpp
     trash/trashlocation.h 
-    smb/smblistworker.cpp
-    smb/smblistworker.h
     smb/qsambaclient/src/smbutil.cpp
     smb/qsambaclient/src/smbutil.h
     smb/qsambaclient/src/smbiteminfo.cpp
 
=== modified file 'src/plugin/folderlistmodel/folderlistmodel.pri'
--- src/plugin/folderlistmodel/folderlistmodel.pri	2015-12-12 15:48:35 +0000
+++ src/plugin/folderlistmodel/folderlistmodel.pri	2015-12-12 15:48:35 +0000
@@ -67,11 +67,11 @@
 
 SOURCES += $$PWD/smb/smblocation.cpp      \
            $$PWD/smb/smblocationauthentication.cpp \
-           $$PWD/smb/smblistworker.cpp
+
 
 HEADERS += $$PWD/smb/smblocation.h        \
            $$PWD/smb/smblocationauthentication.h \
-           $$PWD/smb/smblistworker.h
+
 
 include ($$PWD/smb/qsambaclient/qsambaclient.pri)
 
 
=== removed file 'src/plugin/folderlistmodel/smb/smblistworker.cpp'
--- src/plugin/folderlistmodel/smb/smblistworker.cpp	2015-12-08 16:55:41 +0000
+++ src/plugin/folderlistmodel/smb/smblistworker.cpp	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2015 Canonical Ltd.
- * Copyright 2015 Carlos J Mazieri <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * File: smblistworker.cpp
- * Date: 17/01/2015
- */
-
-#include "smblistworker.h"
-#include "smblocationdiriterator.h"
-
-SmbListWorker::SmbListWorker(const QString &pathName,
-                             QDir::Filters filter,
-                             const bool isRecursive,
-                             DirItemInfo * parentItem,
-                             Const_SmbUtil_Ptr smb)
-   : DirListWorker(pathName, filter, isRecursive)  
-   , SmbObject(pathName, smb)
-   , m_parent(parentItem)
-{
-    mLoaderType =  NetworkLoader;
-}
-
-/*!
- * \brief SmbListWorker::getNetworkContent() it fills a \ref DirItemInfoList with samba (share/directory) content
- * \return the list of \ref SmbItemInfo items
- */
-DirItemInfoList SmbListWorker::getNetworkContent()
-{
-    DirItemInfoList smbContent;
-
-    QDirIterator::IteratorFlags flags = mIsRecursive ?
-                                        QDirIterator::Subdirectories :
-                                        QDirIterator::NoIteratorFlags;
-
-    SmbLocationDirIterator dir(mPathName, mFilter, flags, m_smb);
-    while (dir.hasNext())
-    {
-        QString next = dir.next();
-        SmbItemInfo item (next, m_smb);
-        if (m_parent)
-        {
-            if (m_parent->isHost()) {
-                item.setAsShare();
-            }
-            else if (m_parent->isWorkGroup()) {
-                 item.setAsHost();
-            }
-        }
-        smbContent.append(item);
-    }
-
-    return smbContent;
-}
-
 
=== removed file 'src/plugin/folderlistmodel/smb/smblistworker.h'
--- src/plugin/folderlistmodel/smb/smblistworker.h	2015-12-08 16:55:41 +0000
+++ src/plugin/folderlistmodel/smb/smblistworker.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2015 Canonical Ltd.
- * Copyright 2015 Carlos J Mazieri <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * File: smblistworker.h
- * Date: 17/01/2015
- */
-
-#ifndef SMBLISTWORKER_H
-#define SMBLISTWORKER_H
-
-#include "iorequestworker.h"
-#include "smbiteminfo.h"
-
-class SmbListWorker : public DirListWorker, public SmbObject
-{
-    Q_OBJECT
-public:
-    explicit SmbListWorker(const QString &pathName, QDir::Filters filter, const bool isRecursive, DirItemInfo * parentItem, Const_SmbUtil_Ptr smb);
-
-private:
-    DirItemInfoList getNetworkContent();
-private:
-    DirItemInfo    * m_parent;
-};
-
-#endif // SMBLISTWORKER_H