Ubuntu File Manager App

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

  1. new-protocols-support-03
  2. Merge into trunk
Proposed by Carlos Jose Mazieri
Status: Merged
Approved by: Arto Jalkanen
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 Approve
Jenkins Bot continuous-integration Approve
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.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/plugin/folderlistmodel/disk/disklocation.cpp'
--- src/plugin/folderlistmodel/disk/disklocation.cpp 2015-12-12 15:45:39 +0000
+++ src/plugin/folderlistmodel/disk/disklocation.cpp 2015-12-12 15:45:39 +0000
@@ -178,12 +178,12 @@
178}178}
179179
180180
181QString DiskLocation::urlBelongsToLocation(const QString &urlPath, int indexOfColonAndSlashe)181QString DiskLocation::urlBelongsToLocation(const QString &urlPath, int indexOfColonAndSlash)
182{182{
183 QString ret;183 QString ret;
184 if (urlPath.startsWith(LocationUrl::DiskRootURL.midRef(0,5)))184 if (urlPath.startsWith(LocationUrl::DiskRootURL.midRef(0,5)))
185 {185 {
186 ret = QDir::rootPath() + DirItemInfo::removeExtraSlashes(urlPath, indexOfColonAndSlashe+1);186 ret = QDir::rootPath() + DirItemInfo::removeExtraSlashes(urlPath, indexOfColonAndSlash+1);
187 }187 }
188 return ret;188 return ret;
189}189}
190190
=== modified file 'src/plugin/folderlistmodel/disk/disklocation.h'
--- src/plugin/folderlistmodel/disk/disklocation.h 2015-12-12 15:45:39 +0000
+++ src/plugin/folderlistmodel/disk/disklocation.h 2015-12-12 15:45:39 +0000
@@ -70,7 +70,7 @@
70 virtual LocationItemFile * newFile(const QString & path);70 virtual LocationItemFile * newFile(const QString & path);
71 virtual LocationItemDir * newDir(const QString & dir = QLatin1String(0));71 virtual LocationItemDir * newDir(const QString & dir = QLatin1String(0));
72 virtual bool isThereDiskSpace(const QString& pathname, qint64 requiredSize);72 virtual bool isThereDiskSpace(const QString& pathname, qint64 requiredSize);
73 virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlashe);73 virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlash);
7474
75protected:75protected:
76 void addExternalFsWorkerRequest(ExternalFileSystemChangesWorker *);76 void addExternalFsWorkerRequest(ExternalFileSystemChangesWorker *);
7777
=== modified file 'src/plugin/folderlistmodel/location.h'
--- src/plugin/folderlistmodel/location.h 2015-12-12 15:45:39 +0000
+++ src/plugin/folderlistmodel/location.h 2015-12-12 15:45:39 +0000
@@ -153,7 +153,7 @@
153 * If the URL or Path in \a urlPath is valid and belongs to its location153 * If the URL or Path in \a urlPath is valid and belongs to its location
154 *154 *
155 * \param urlPath The input URL that is going to be parsed155 * \param urlPath The input URL that is going to be parsed
156 * \param indexOfColonAndSlashe The index of ":/"156 * \param indexOfColonAndSlash The index of ":/"
157 * \return The good URL (parsed with extra slashes removed)157 * \return The good URL (parsed with extra slashes removed)
158 * or an empty string if \a urlPath does not belong to its location158 * or an empty string if \a urlPath does not belong to its location
159 *159 *
@@ -166,7 +166,7 @@
166 * The return will be: an empty string meaning that this URL is not related to Samba166 * The return will be: an empty string meaning that this URL is not related to Samba
167 *\endcode167 *\endcode
168 */168 */
169 virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlashe) = 0;169 virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlash) = 0;
170170
171public:171public:
172 /*!172 /*!
173173
=== modified file 'src/plugin/folderlistmodel/smb/smblocation.cpp'
--- src/plugin/folderlistmodel/smb/smblocation.cpp 2015-12-12 15:45:39 +0000
+++ src/plugin/folderlistmodel/smb/smblocation.cpp 2015-12-12 15:45:39 +0000
@@ -95,14 +95,14 @@
95}95}
9696
9797
98QString SmbLocation::urlBelongsToLocation(const QString &urlPath, int indexOfColonAndSlashe)98QString SmbLocation::urlBelongsToLocation(const QString &urlPath, int indexOfColonAndSlash)
99{99{
100 QString ret;100 QString ret;
101 if ( urlPath.startsWith(LocationUrl::SmbURL.midRef(0,4)) ||101 if ( urlPath.startsWith(LocationUrl::SmbURL.midRef(0,4)) ||
102 urlPath.startsWith(LocationUrl::CifsURL.midRef(0,5))102 urlPath.startsWith(LocationUrl::CifsURL.midRef(0,5))
103 )103 )
104 {104 {
105 ret = LocationUrl::SmbURL + DirItemInfo::removeExtraSlashes(urlPath, indexOfColonAndSlashe+1);105 ret = LocationUrl::SmbURL + DirItemInfo::removeExtraSlashes(urlPath, indexOfColonAndSlash+1);
106 }106 }
107 return ret;107 return ret;
108}108}
109109
=== modified file 'src/plugin/folderlistmodel/smb/smblocation.h'
--- src/plugin/folderlistmodel/smb/smblocation.h 2015-12-12 15:45:39 +0000
+++ src/plugin/folderlistmodel/smb/smblocation.h 2015-12-12 15:45:39 +0000
@@ -45,8 +45,8 @@
45 LocationItemDirIterator::LoadMode loadmode = LocationItemDirIterator::LoadOnConstructor);45 LocationItemDirIterator::LoadMode loadmode = LocationItemDirIterator::LoadOnConstructor);
46 virtual LocationItemFile * newFile(const QString & path); 46 virtual LocationItemFile * newFile(const QString & path);
47 virtual LocationItemDir * newDir(const QString & dir = QLatin1String(0));47 virtual LocationItemDir * newDir(const QString & dir = QLatin1String(0));
48 virtual bool isThereDiskSpace(const QString& pathname, qint64 requiredSize);48 virtual bool isThereDiskSpace(const QString& pathname, qint64 requiredSize);
49 virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlashe);49 virtual QString urlBelongsToLocation(const QString& urlPath, int indexOfColonAndSlash);
50 virtual QString currentAuthenticationUser();50 virtual QString currentAuthenticationUser();
51 virtual QString currentAuthenticationPassword();51 virtual QString currentAuthenticationPassword();
5252

Subscribers

People subscribed via source and target branches