~ubuntu-filemanager-dev/ubuntu-filemanager-app/trunk

« back to all changes in this revision

Viewing changes to src/plugin/folderlistmodel/net/netutil.h

Committer: Bileto Bot
Date: 2017-04-04 17:06:41 UTC
mfrom: (588.1.19 fix-desktop-file)
Revision ID: ci-train-bot@canonical.com-20170404170641-1p15lmx8wodlx2ut

* Rename binary file to ubuntu-filemanager-app
* Join plugin packages into the main package

files added:
COPYING.BSD

COPYING.LGPL

config.h.in

debian/apparmor

debian/apparmor/ubuntu-filemanager-app

debian/source.lintian-overrides

debian/ubuntu-filemanager-app-autopilot.lintian-overrides

debian/ubuntu-filemanager-app.lintian-overrides

src/plugin/folderlistmodel

src/plugin/folderlistmodel/CMakeLists.txt

src/plugin/folderlistmodel/README

src/plugin/folderlistmodel/cleanurl.cpp

src/plugin/folderlistmodel/cleanurl.h

src/plugin/folderlistmodel/clipboard.cpp

src/plugin/folderlistmodel/clipboard.h

src/plugin/folderlistmodel/diritemabstractlistmodel.h

src/plugin/folderlistmodel/diriteminfo.cpp

src/plugin/folderlistmodel/diriteminfo.h

src/plugin/folderlistmodel/dirmodel.cpp

src/plugin/folderlistmodel/dirmodel.h

src/plugin/folderlistmodel/dirselection.cpp

src/plugin/folderlistmodel/dirselection.h

src/plugin/folderlistmodel/disk

src/plugin/folderlistmodel/disk/disklocation.cpp

src/plugin/folderlistmodel/disk/disklocation.h

src/plugin/folderlistmodel/disk/disklocationitemdir.cpp

src/plugin/folderlistmodel/disk/disklocationitemdir.h

src/plugin/folderlistmodel/disk/disklocationitemdiriterator.cpp

src/plugin/folderlistmodel/disk/disklocationitemdiriterator.h

src/plugin/folderlistmodel/disk/disklocationitemfile.cpp

src/plugin/folderlistmodel/disk/disklocationitemfile.h

src/plugin/folderlistmodel/externalfswatcher.cpp

src/plugin/folderlistmodel/externalfswatcher.h

src/plugin/folderlistmodel/filecompare.cpp

src/plugin/folderlistmodel/filecompare.h

src/plugin/folderlistmodel/filesystemaction.cpp

src/plugin/folderlistmodel/filesystemaction.h

src/plugin/folderlistmodel/fmutil.cpp

src/plugin/folderlistmodel/fmutil.h

src/plugin/folderlistmodel/folderlistmodel.pri

src/plugin/folderlistmodel/folderlistmodel.pro

src/plugin/folderlistmodel/imageprovider.cpp

src/plugin/folderlistmodel/imageprovider.h

src/plugin/folderlistmodel/iorequest.cpp

src/plugin/folderlistmodel/iorequest.h

src/plugin/folderlistmodel/iorequestworker.cpp

src/plugin/folderlistmodel/iorequestworker.h

src/plugin/folderlistmodel/ioworkerthread.cpp

src/plugin/folderlistmodel/ioworkerthread.h

src/plugin/folderlistmodel/location.cpp

src/plugin/folderlistmodel/location.h

src/plugin/folderlistmodel/locationitemdir.cpp

src/plugin/folderlistmodel/locationitemdir.h

src/plugin/folderlistmodel/locationitemdiriterator.cpp

src/plugin/folderlistmodel/locationitemdiriterator.h

src/plugin/folderlistmodel/locationitemfile.cpp

src/plugin/folderlistmodel/locationitemfile.h

src/plugin/folderlistmodel/locationsfactory.cpp

src/plugin/folderlistmodel/locationsfactory.h

src/plugin/folderlistmodel/locationurl.cpp

src/plugin/folderlistmodel/locationurl.h

src/plugin/folderlistmodel/net

src/plugin/folderlistmodel/net/netauthenticationdata.cpp

src/plugin/folderlistmodel/net/netauthenticationdata.h

src/plugin/folderlistmodel/net/netutil.cpp

src/plugin/folderlistmodel/net/netutil.h

src/plugin/folderlistmodel/networklistworker.cpp

src/plugin/folderlistmodel/networklistworker.h

src/plugin/folderlistmodel/networklocation.cpp

src/plugin/folderlistmodel/networklocation.h

src/plugin/folderlistmodel/plugin.cpp

src/plugin/folderlistmodel/plugin.h

src/plugin/folderlistmodel/qmldir

src/plugin/folderlistmodel/smb

src/plugin/folderlistmodel/smb/qsambaclient

src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri

src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient_test.pro

src/plugin/folderlistmodel/smb/qsambaclient/src

src/plugin/folderlistmodel/smb/qsambaclient/src/smbiteminfo.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbiteminfo.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemdir.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemdir.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smbobject.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbobject.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smbplaces.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbplaces.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.h

src/plugin/folderlistmodel/smb/qsambaclient/test

src/plugin/folderlistmodel/smb/qsambaclient/test/main_testqsambaclient.cpp

src/plugin/folderlistmodel/smb/qsambaclient/test/testqsambasuite.cpp

src/plugin/folderlistmodel/smb/qsambaclient/test/testqsambasuite.h

src/plugin/folderlistmodel/smb/qsambaclient/test/testsuite.pri

src/plugin/folderlistmodel/smb/smblocation.cpp

src/plugin/folderlistmodel/smb/smblocation.h

src/plugin/folderlistmodel/smb/smblocationauthentication.cpp

src/plugin/folderlistmodel/smb/smblocationauthentication.h

src/plugin/folderlistmodel/trash

src/plugin/folderlistmodel/trash/qtrashdir.cpp

src/plugin/folderlistmodel/trash/qtrashdir.h

src/plugin/folderlistmodel/trash/qtrashutilinfo.cpp

src/plugin/folderlistmodel/trash/qtrashutilinfo.h

src/plugin/folderlistmodel/trash/trashiteminfo.cpp

src/plugin/folderlistmodel/trash/trashiteminfo.h

src/plugin/folderlistmodel/trash/trashlocation.cpp

src/plugin/folderlistmodel/trash/trashlocation.h

src/plugin/folderlistmodel/urliteminfo.cpp

src/plugin/folderlistmodel/urliteminfo.h

files removed:
debian/qtdeclarative5-archives0.1.install

debian/qtdeclarative5-fm-pamauthentication0.1.install

debian/qtdeclarative5-nemo-qml-plugin-folderlistmodel.install

debian/qtdeclarative5-placesmodel0.1.install

filemanager-libs.json

filemanager.apparmor

get-click-deps

manifest.json.in

src/plugin/folderlistmodel

src/plugin/folderlistmodel/CMakeLists.txt

src/plugin/folderlistmodel/README

src/plugin/folderlistmodel/cleanurl.cpp

src/plugin/folderlistmodel/cleanurl.h

src/plugin/folderlistmodel/clipboard.cpp

src/plugin/folderlistmodel/clipboard.h

src/plugin/folderlistmodel/diritemabstractlistmodel.h

src/plugin/folderlistmodel/diriteminfo.cpp

src/plugin/folderlistmodel/diriteminfo.h

src/plugin/folderlistmodel/dirmodel.cpp

src/plugin/folderlistmodel/dirmodel.h

src/plugin/folderlistmodel/dirselection.cpp

src/plugin/folderlistmodel/dirselection.h

src/plugin/folderlistmodel/disk

src/plugin/folderlistmodel/disk/disklocation.cpp

src/plugin/folderlistmodel/disk/disklocation.h

src/plugin/folderlistmodel/disk/disklocationitemdir.cpp

src/plugin/folderlistmodel/disk/disklocationitemdir.h

src/plugin/folderlistmodel/disk/disklocationitemdiriterator.cpp

src/plugin/folderlistmodel/disk/disklocationitemdiriterator.h

src/plugin/folderlistmodel/disk/disklocationitemfile.cpp

src/plugin/folderlistmodel/disk/disklocationitemfile.h

src/plugin/folderlistmodel/externalfswatcher.cpp

src/plugin/folderlistmodel/externalfswatcher.h

src/plugin/folderlistmodel/filecompare.cpp

src/plugin/folderlistmodel/filecompare.h

src/plugin/folderlistmodel/filesystemaction.cpp

src/plugin/folderlistmodel/filesystemaction.h

src/plugin/folderlistmodel/fmutil.cpp

src/plugin/folderlistmodel/fmutil.h

src/plugin/folderlistmodel/folderlistmodel.pri

src/plugin/folderlistmodel/folderlistmodel.pro

src/plugin/folderlistmodel/imageprovider.cpp

src/plugin/folderlistmodel/imageprovider.h

src/plugin/folderlistmodel/iorequest.cpp

src/plugin/folderlistmodel/iorequest.h

src/plugin/folderlistmodel/iorequestworker.cpp

src/plugin/folderlistmodel/iorequestworker.h

src/plugin/folderlistmodel/ioworkerthread.cpp

src/plugin/folderlistmodel/ioworkerthread.h

src/plugin/folderlistmodel/location.cpp

src/plugin/folderlistmodel/location.h

src/plugin/folderlistmodel/locationitemdir.cpp

src/plugin/folderlistmodel/locationitemdir.h

src/plugin/folderlistmodel/locationitemdiriterator.cpp

src/plugin/folderlistmodel/locationitemdiriterator.h

src/plugin/folderlistmodel/locationitemfile.cpp

src/plugin/folderlistmodel/locationitemfile.h

src/plugin/folderlistmodel/locationsfactory.cpp

src/plugin/folderlistmodel/locationsfactory.h

src/plugin/folderlistmodel/locationurl.cpp

src/plugin/folderlistmodel/locationurl.h

src/plugin/folderlistmodel/net

src/plugin/folderlistmodel/net/netauthenticationdata.cpp

src/plugin/folderlistmodel/net/netauthenticationdata.h

src/plugin/folderlistmodel/net/netutil.cpp

src/plugin/folderlistmodel/net/netutil.h

src/plugin/folderlistmodel/networklistworker.cpp

src/plugin/folderlistmodel/networklistworker.h

src/plugin/folderlistmodel/networklocation.cpp

src/plugin/folderlistmodel/networklocation.h

src/plugin/folderlistmodel/plugin.cpp

src/plugin/folderlistmodel/plugin.h

src/plugin/folderlistmodel/qmldir

src/plugin/folderlistmodel/smb

src/plugin/folderlistmodel/smb/qsambaclient

src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri

src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient_test.pro

src/plugin/folderlistmodel/smb/qsambaclient/src

src/plugin/folderlistmodel/smb/qsambaclient/src/smbiteminfo.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbiteminfo.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemdir.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemdir.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationitemfile.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smbobject.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbobject.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smbplaces.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbplaces.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbusershare.h

src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.cpp

src/plugin/folderlistmodel/smb/qsambaclient/src/smbutil.h

src/plugin/folderlistmodel/smb/qsambaclient/test

src/plugin/folderlistmodel/smb/qsambaclient/test/main_testqsambaclient.cpp

src/plugin/folderlistmodel/smb/qsambaclient/test/testqsambasuite.cpp

src/plugin/folderlistmodel/smb/qsambaclient/test/testqsambasuite.h

src/plugin/folderlistmodel/smb/qsambaclient/test/testsuite.pri

src/plugin/folderlistmodel/smb/smblocation.cpp

src/plugin/folderlistmodel/smb/smblocation.h

src/plugin/folderlistmodel/smb/smblocationauthentication.cpp

src/plugin/folderlistmodel/smb/smblocationauthentication.h

src/plugin/folderlistmodel/trash

src/plugin/folderlistmodel/trash/qtrashdir.cpp

src/plugin/folderlistmodel/trash/qtrashdir.h

src/plugin/folderlistmodel/trash/qtrashutilinfo.cpp

src/plugin/folderlistmodel/trash/qtrashutilinfo.h

src/plugin/folderlistmodel/trash/trashiteminfo.cpp

src/plugin/folderlistmodel/trash/trashiteminfo.h

src/plugin/folderlistmodel/trash/trashlocation.cpp

src/plugin/folderlistmodel/trash/trashlocation.h

src/plugin/folderlistmodel/urliteminfo.cpp

src/plugin/folderlistmodel/urliteminfo.h

src/plugin/pamauthentication

src/plugin/pamauthentication/CMakeLists.txt

src/plugin/pamauthentication/pamauthentication.cpp

src/plugin/pamauthentication/pamauthentication.h

src/plugin/pamauthentication/pamauthentication_plugin.cpp

src/plugin/pamauthentication/pamauthentication_plugin.h

src/plugin/pamauthentication/qmldir

src/plugin/test_folderlistmodel

src/plugin/test_folderlistmodel/regression

src/plugin/test_folderlistmodel/regression/media_asx.h

src/plugin/test_folderlistmodel/regression/media_xspf.h

src/plugin/test_folderlistmodel/regression/regression_folderlilstmodel.pro

src/plugin/test_folderlistmodel/regression/sound_7200_amr.h

src/plugin/test_folderlistmodel/regression/sound_mp3.h

src/plugin/test_folderlistmodel/regression/tempfiles.cpp

src/plugin/test_folderlistmodel/regression/tempfiles.h

src/plugin/test_folderlistmodel/regression/testonly_pdf.h

src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp

src/plugin/test_folderlistmodel/regression/ubuntu_touch_run.sh

src/plugin/test_folderlistmodel/results

src/plugin/test_folderlistmodel/results/DesktopQt4.74.txt

src/plugin/test_folderlistmodel/results/DesktopQt5.0.txt

src/plugin/test_folderlistmodel/results/NemoEmulatorQ8.43.txt

src/plugin/test_folderlistmodel/results/openFiles.Readme.txt

src/plugin/test_folderlistmodel/simpleUI

src/plugin/test_folderlistmodel/simpleUI/authenticationdialog.ui

src/plugin/test_folderlistmodel/simpleUI/main.cpp

src/plugin/test_folderlistmodel/simpleUI/placesmodel.cpp

src/plugin/test_folderlistmodel/simpleUI/placesmodel.h

src/plugin/test_folderlistmodel/simpleUI/res.qrc

src/plugin/test_folderlistmodel/simpleUI/resources

src/plugin/test_folderlistmodel/simpleUI/resources/copy.png

src/plugin/test_folderlistmodel/simpleUI/resources/cut.png

src/plugin/test_folderlistmodel/simpleUI/resources/document_folder.png

src/plugin/test_folderlistmodel/simpleUI/resources/downloads_folder.png

src/plugin/test_folderlistmodel/simpleUI/resources/edit-rename.png

src/plugin/test_folderlistmodel/simpleUI/resources/empty_trash.png

src/plugin/test_folderlistmodel/simpleUI/resources/exit.png

src/plugin/test_folderlistmodel/simpleUI/resources/fileclose.png

src/plugin/test_folderlistmodel/simpleUI/resources/filenew.png

src/plugin/test_folderlistmodel/simpleUI/resources/fileopen.png

src/plugin/test_folderlistmodel/simpleUI/resources/folder-new.png

src/plugin/test_folderlistmodel/simpleUI/resources/go-previous.png

src/plugin/test_folderlistmodel/simpleUI/resources/go-up.png

src/plugin/test_folderlistmodel/simpleUI/resources/home-page.png

src/plugin/test_folderlistmodel/simpleUI/resources/paste.png

src/plugin/test_folderlistmodel/simpleUI/resources/recyclebin_full.png

src/plugin/test_folderlistmodel/simpleUI/resources/red_folder.png

src/plugin/test_folderlistmodel/simpleUI/resources/remove.png

src/plugin/test_folderlistmodel/simpleUI/resources/samba_folder.png

src/plugin/test_folderlistmodel/simpleUI/resources/server.png

src/plugin/test_folderlistmodel/simpleUI/resources/temp_folder.png

src/plugin/test_folderlistmodel/simpleUI/resources/trash.png

src/plugin/test_folderlistmodel/simpleUI/resources/undo.png

src/plugin/test_folderlistmodel/simpleUI/resources/workgroup.png

src/plugin/test_folderlistmodel/simpleUI/resources/xterm_48x48.xpm

src/plugin/test_folderlistmodel/simpleUI/simplelist.cpp

src/plugin/test_folderlistmodel/simpleUI/simplelist.h

src/plugin/test_folderlistmodel/simpleUI/simplelist.ui

src/plugin/test_folderlistmodel/simpleUI/simpleslots.cpp

src/plugin/test_folderlistmodel/simpleUI/simpleui.pro

src/plugin/test_folderlistmodel/simpleUI/terminalfolderapp.cpp

src/plugin/test_folderlistmodel/simpleUI/terminalfolderapp.h

ubuntu-filemanager-app.json

files renamed:
COPYING => COPYING.GPL

po/com.ubuntu.filemanager.pot => po/ubuntu-filemanager-app.pot

tests/autopilot/filemanager/ => tests/autopilot/ubuntu_filemanager_app/

com.ubuntu.filemanager.desktop.in.in => ubuntu-filemanager-app.desktop.in.in

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/copyright

debian/rules

debian/ubuntu-filemanager-app-autopilot.install

debian/ubuntu-filemanager-app.install

snapcraft.yaml

src/app/CMakeLists.txt

src/app/main.cpp

src/app/qml/filemanager.qml

src/app/qml/ui/FolderListPage.qml

src/plugin/CMakeLists.txt

src/plugin/test_placesmodel/placesmodeltest.cpp

tests/autopilot/CMakeLists.txt

tests/autopilot/ubuntu_filemanager_app/content/Test.tar.bz2

tests/autopilot/ubuntu_filemanager_app/content/Test.tar.gz

tests/autopilot/ubuntu_filemanager_app/tests/__init__.py

tests/autopilot/ubuntu_filemanager_app/tests/test_context_menu.py

tests/autopilot/ubuntu_filemanager_app/tests/test_filemanager.py

tests/autopilot/ubuntu_filemanager_app/tests/test_places.py

Show diffs side-by-side

added added

removed removed

src/plugin/folderlistmodel/net/netutil.h

/**************************************************************************

* 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: netutil.h

* Date: 29/11/2014

#ifndef NETUTIL_H

#define NETUTIL_H

#include <QString>

class NetUtil

{

private:

NetUtil();

public:

static QString normalizeHostName(const QString& name);

static QString urlConvertHostnameToIP(const QString& url);

};

#endif // NETUTIL_H

Older »