Differential D24489 Diff 67489 src/lib/io/kautosavefile.cpp

Changeset View

Standalone View

View Options

src/lib/io/kautosavefile.cpp

Context not available.
67{ 67​{
68 // Note: we drop any query string and user/pass info 68​ // Note: we drop any query string and user/pass info
69 const QString protocol(managedFile.scheme()); 69​ const QString protocol(managedFile.scheme());
70 const QString path(managedFile.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash).path()); 70​ const QString path(QString::fromLatin1(QUrl::toPercentEncoding(managedFile.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash).path()).constData()));
dfaureUnsubmitted
Done

That's one long line, hard to read. Extract a const QByteArray encodedPath = QUrl::toPercentEncoding(....) ?

[pre-existing: I would personally call this QByteArray encodedDirectory and QString directory, to my eyes path is a full path including filename. At least it's ambiguous, unlike directory]

Also check if you can remove the .constData(). QString::fromLatin1(const QByteArray &str) was added in Qt 5.0, this code is probably older than that.

dfaure: That's one long line, hard to read. Extract a `const QByteArray encodedPath = QUrl…
71 QString name(managedFile.fileName()); 71​ QString name(QString::fromLatin1(QUrl::toPercentEncoding(managedFile.fileName()).constData()));
dfaureUnsubmitted
Done

and a const QByteArray encodedFileName = ..., for symmetry.

Simpler than toPercentEncoding: use QUrl::fileName(QUrl::FullyEncoded).
However this wouldn't work for encodedDirectory above, because it wouldn't encode '/'.

dfaure: and a `const QByteArray encodedFileName = ...`, for symmetry. Simpler than toPercentEncoding…
72 72​
73 // Remove any part of the path to the right if it is longer than the max file size and 73​ // Remove any part of the path to the right if it is longer than the max file size and
74 // ensure that the max filesize takes into account the other parts of the tempFileName 74​ // ensure that the max filesize takes into account the other parts of the tempFileName
75 // Subtract 1 for the _ char, 3 for the padding separator, 5 is for the .lock 75​ // Subtract 1 for the _ char, 3 for the padding separator, 5 is for the .lock
76 int pathLengthLimit = FILENAME_MAX - NamePadding - name.size() - protocol.size() - 9; 76​ int pathLengthLimit = NAME_MAX - NamePadding - name.size() - protocol.size() - 9;
dfaureUnsubmitted
Done

(while changing this line: prepend const)

dfaure: (while changing this line: prepend `const`)
77 77​
78 QString junk = KRandom::randomString(NamePadding); 78​ QString junk = KRandom::randomString(NamePadding);
79 // tempName = fileName + junk.truncated + protocol + _ + path.truncated + junk 79​ // tempName = fileName + junk.truncated + protocol + _ + path.truncated + junk
80 // This is done so that the separation between the filename and path can be determined 80​ // This is done so that the separation between the filename and path can be determined
81 name += junk.rightRef(3) + protocol + QLatin1Char('_') + path.leftRef(pathLengthLimit) + junk; 81​ name += junk.rightRef(3) + protocol + QLatin1Char('_') + path.leftRef(pathLengthLimit) + junk;
82 82​
83 return QString::fromLatin1(QUrl::toPercentEncoding(name).constData()); 83​ return name;
84} 84​}
85 85​
86KAutoSaveFile::KAutoSaveFile(const QUrl &filename, QObject *parent) 86​KAutoSaveFile::KAutoSaveFile(const QUrl &filename, QObject *parent)
Context not available.