mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
generic: format and indent
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
2970cad3e9
commit
e5be0d5a2a
2 changed files with 20 additions and 19 deletions
|
@ -453,9 +453,7 @@ void CopyJobPrivate::sourceStated(const UDSEntry& entry, const KUrl& sourceUrl)
|
||||||
}
|
}
|
||||||
|
|
||||||
startListing( sourceUrl );
|
startListing( sourceUrl );
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
//kDebug(7007) << "Source is a file (or a symlink), or we are linking -> no recursive listing";
|
//kDebug(7007) << "Source is a file (or a symlink), or we are linking -> no recursive listing";
|
||||||
|
|
||||||
if (sourceUrl.isLocalFile()) {
|
if (sourceUrl.isLocalFile()) {
|
||||||
|
@ -622,9 +620,11 @@ void CopyJobPrivate::addCopyInfoFromUDSEntry(const UDSEntry& entry, const KUrl&
|
||||||
destFileName = path.mid(pos + 1);
|
destFileName = path.mid(pos + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if ( fnu == KProtocolInfo::Name ) { // destination filename taken from UDS_NAME
|
} else if (fnu == KProtocolInfo::Name) {
|
||||||
|
// destination filename taken from UDS_NAME
|
||||||
destFileName = fileName;
|
destFileName = fileName;
|
||||||
} else { // from display name (with fallback to name)
|
} else {
|
||||||
|
// from display name (with fallback to name)
|
||||||
const QString displayName = entry.stringValue(KIO::UDSEntry::UDS_DISPLAY_NAME);
|
const QString displayName = entry.stringValue(KIO::UDSEntry::UDS_DISPLAY_NAME);
|
||||||
destFileName = displayName.isEmpty() ? fileName : displayName;
|
destFileName = displayName.isEmpty() ? fileName : displayName;
|
||||||
}
|
}
|
||||||
|
@ -641,7 +641,8 @@ void CopyJobPrivate::addCopyInfoFromUDSEntry(const UDSEntry& entry, const KUrl&
|
||||||
}
|
}
|
||||||
// kDebug(7007) << " uDest(2)=" << info.uDest;
|
// kDebug(7007) << " uDest(2)=" << info.uDest;
|
||||||
// kDebug(7007) << " " << info.uSource << "->" << info.uDest;
|
// kDebug(7007) << " " << info.uSource << "->" << info.uDest;
|
||||||
if (info.linkDest.isEmpty() && isDir && m_mode != CopyJob::Link) { // Dir
|
if (info.linkDest.isEmpty() && isDir && m_mode != CopyJob::Link) {
|
||||||
|
// Dir
|
||||||
dirs.append(info); // Directories
|
dirs.append(info); // Directories
|
||||||
if (m_mode == CopyJob::Move) {
|
if (m_mode == CopyJob::Move) {
|
||||||
dirsToRemove.append(info.uSource);
|
dirsToRemove.append(info.uSource);
|
||||||
|
|
Loading…
Add table
Reference in a new issue