mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-28 07:54:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

refactoring as requested in pull request

Browse source
This commit is contained in:
Christian Burger 2015-05-05 16:34:01 +01:00
parent 018cc54a94
commit 79f7ea0965
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/folder.cpp
View file

@ -186,12 +186,12 @@ QString Folder::path() const
return p;
}
QString Folder::cleanPath(QString path)
QString Folder::cleanPath()
{
QString cleanedPath = QDir::cleanPath(path);
QString cleanedPath = QDir::cleanPath(_path);
if(cleanedPath.length() == 3 && cleanedPath.endsWith(":/"))
return cleanedPath.left(2);
cleanedPath.remove(2,1);
return cleanedPath;
}

2
src/gui/folder.h
View file

@ -74,7 +74,7 @@ public:
/**
* wrapper for QDir::cleanPath("Z:\\"), which returns "Z:\\", but we need "Z:" instead
*/
static QString cleanPath(QString path);
QString cleanPath();
/**
* remote folder path

2
src/gui/folderman.cpp
View file

@ -736,7 +736,7 @@ Folder *FolderMan::folderForPath(const QString &path)
QString absolutePath = QDir::cleanPath(path)+QLatin1Char('/');
foreach(Folder* folder, this->map().values()) {
const QString folderPath = Folder::cleanPath(folder->path())+QLatin1Char('/');
const QString folderPath = folder->cleanPath()+QLatin1Char('/');
if(absolutePath.startsWith(folderPath)) {
//qDebug() << "found folder: " << folder->path() << " for " << absolutePath;

2
src/gui/socketapi.cpp
View file

@ -402,7 +402,7 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QLocalSock
DEBUG << "folder offline or not watched:" << argument;
statusString = QLatin1String("NOP");
} else {
const QString file = QDir::cleanPath(argument).mid(Folder::cleanPath(syncFolder->path()).length()+1);
const QString file = QDir::cleanPath(argument).mid(syncFolder->cleanPath().length()+1);
SyncFileStatus fileStatus = this->fileStatus(syncFolder, file, _excludes);
statusString = fileStatus.toSocketAPIString();