Merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-03 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: 514
Merged at revision: 516
Proposed branch: lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-03
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02
Diff against target: 88 lines (+9/-9)
5 files modified
src/plugin/folderlistmodel/disk/disklocation.cpp (+2/-2)
src/plugin/folderlistmodel/disk/disklocation.h (+1/-1)
src/plugin/folderlistmodel/location.h (+2/-2)
src/plugin/folderlistmodel/smb/smblocation.cpp (+2/-2)
src/plugin/folderlistmodel/smb/smblocation.h (+2/-2)
To merge this branch: bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-03
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+280389@code.launchpad.net

Commit message

ust fixed a typo in some files 'indexOfColonAndSlashe' should not have the final 'e' as it refers to ':/'

Description of the change

ust fixed a typo in some files 'indexOfColonAndSlashe' should not have the final 'e' as it refers to ':/'

To post a comment you must log in.
review: Approve (continuous-integration)
Arto Jalkanen (ajalkane) :
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/disk/disklocation.cpp'
2--- src/plugin/folderlistmodel/disk/disklocation.cpp 2015-12-12 15:45:39 +0000
3+++ src/plugin/folderlistmodel/disk/disklocation.cpp 2015-12-12 15:45:39 +0000
4@@ -178,12 +178,12 @@
5 }
6
7
8-QString DiskLocation::urlBelongsToLocation(const QString &urlPath, int indexOfColonAndSlashe)
9+QString DiskLocation::urlBelongsToLocation(const QString &urlPath, int indexOfColonAndSlash)
10 {
11 QString ret;
12 if (urlPath.startsWith(LocationUrl::DiskRootURL.midRef(0,5)))
13 {
14- ret = QDir::rootPath() + DirItemInfo::removeExtraSlashes(urlPath, indexOfColonAndSlashe+1);
15+ ret = QDir::rootPath() + DirItemInfo::removeExtraSlashes(urlPath, indexOfColonAndSlash+1);
16 }
17 return ret;
18 }
19
20=== modified file 'src/plugin/folderlistmodel/disk/disklocation.h'
21--- src/plugin/folderlistmodel/disk/disklocation.h 2015-12-12 15:45:39 +0000
22+++ src/plugin/folderlistmodel/disk/disklocation.h 2015-12-12 15:45:39 +0000
23@@ -70,7 +70,7 @@
24 virtual LocationItemFile * newFile(const QString & path);
25 virtual LocationItemDir * newDir(const QString & dir = QLatin1String(0));
26 virtual bool isThereDiskSpace(const QString& pathname, qint64 requiredSize);
27- virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlashe);
28+ virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlash);
29
30 protected:
31 void addExternalFsWorkerRequest(ExternalFileSystemChangesWorker *);
32
33=== modified file 'src/plugin/folderlistmodel/location.h'
34--- src/plugin/folderlistmodel/location.h 2015-12-12 15:45:39 +0000
35+++ src/plugin/folderlistmodel/location.h 2015-12-12 15:45:39 +0000
36@@ -153,7 +153,7 @@
37 * If the URL or Path in \a urlPath is valid and belongs to its location
38 *
39 * \param urlPath The input URL that is going to be parsed
40- * \param indexOfColonAndSlashe The index of ":/"
41+ * \param indexOfColonAndSlash The index of ":/"
42 * \return The good URL (parsed with extra slashes removed)
43 * or an empty string if \a urlPath does not belong to its location
44 *
45@@ -166,7 +166,7 @@
46 * The return will be: an empty string meaning that this URL is not related to Samba
47 *\endcode
48 */
49- virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlashe) = 0;
50+ virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlash) = 0;
51
52 public:
53 /*!
54
55=== modified file 'src/plugin/folderlistmodel/smb/smblocation.cpp'
56--- src/plugin/folderlistmodel/smb/smblocation.cpp 2015-12-12 15:45:39 +0000
57+++ src/plugin/folderlistmodel/smb/smblocation.cpp 2015-12-12 15:45:39 +0000
58@@ -95,14 +95,14 @@
59 }
60
61
62-QString SmbLocation::urlBelongsToLocation(const QString &urlPath, int indexOfColonAndSlashe)
63+QString SmbLocation::urlBelongsToLocation(const QString &urlPath, int indexOfColonAndSlash)
64 {
65 QString ret;
66 if ( urlPath.startsWith(LocationUrl::SmbURL.midRef(0,4)) ||
67 urlPath.startsWith(LocationUrl::CifsURL.midRef(0,5))
68 )
69 {
70- ret = LocationUrl::SmbURL + DirItemInfo::removeExtraSlashes(urlPath, indexOfColonAndSlashe+1);
71+ ret = LocationUrl::SmbURL + DirItemInfo::removeExtraSlashes(urlPath, indexOfColonAndSlash+1);
72 }
73 return ret;
74 }
75
76=== modified file 'src/plugin/folderlistmodel/smb/smblocation.h'
77--- src/plugin/folderlistmodel/smb/smblocation.h 2015-12-12 15:45:39 +0000
78+++ src/plugin/folderlistmodel/smb/smblocation.h 2015-12-12 15:45:39 +0000
79@@ -45,8 +45,8 @@
80 LocationItemDirIterator::LoadMode loadmode = LocationItemDirIterator::LoadOnConstructor);
81 virtual LocationItemFile * newFile(const QString & path);
82 virtual LocationItemDir * newDir(const QString & dir = QLatin1String(0));
83- virtual bool isThereDiskSpace(const QString& pathname, qint64 requiredSize);
84- virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlashe);
85+ virtual bool isThereDiskSpace(const QString& pathname, qint64 requiredSize);
86+ virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlash);
87 virtual QString currentAuthenticationUser();
88 virtual QString currentAuthenticationPassword();
89

Subscribers

People subscribed via source and target branches