diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp --- a/krArc/krarc.cpp +++ b/krArc/krarc.cpp @@ -1722,6 +1722,9 @@ void kio_krarcProtocol::checkIf7zIsEncrypted(bool &encrypted, QString fileName) { + // Reminder: If that function is modified, it's important to research if the + // changes must also be applied to `KRarcHandler::checkIf7zIsEncrypted()` + KRFUNC; if (encryptedArchPath == fileName) encrypted = true; @@ -1753,6 +1756,9 @@ void kio_krarcProtocol::check7zOutputForPassword(KProcess * proc, QByteArray & buf) { + // Reminder: If that function is modified, it's important to research if the + // changes must also be applied to `Kr7zEncryptionChecker::receivedOutput()` + KRFUNC; QString data = QString(buf); @@ -1869,6 +1875,10 @@ QString kio_krarcProtocol::fullPathName(const QString& name) { + // Reminder: If that function is modified, it's important to research if the + // changes must also be applied to `KrServices::fullPathName()` + // and `KrServices::cmdExist()` + // Note: KRFUNC was not used here in order to avoid filling the log with too much information KRDEBUG(name); diff --git a/krusader/Archive/kr7zencryptionchecker.cpp b/krusader/Archive/kr7zencryptionchecker.cpp --- a/krusader/Archive/kr7zencryptionchecker.cpp +++ b/krusader/Archive/kr7zencryptionchecker.cpp @@ -36,6 +36,9 @@ void Kr7zEncryptionChecker::receivedOutput() { + // Reminder: If that function is modified, it's important to research if the + // changes must also be applied to `kio_krarcProtocol::check7zOutputForPassword()` + QString data = QString::fromLocal8Bit(this->readAllStandardOutput()); QString checkable = lastData + data; diff --git a/krusader/Archive/krarchandler.cpp b/krusader/Archive/krarchandler.cpp --- a/krusader/Archive/krarchandler.cpp +++ b/krusader/Archive/krarchandler.cpp @@ -658,6 +658,9 @@ void KRarcHandler::checkIf7zIsEncrypted(bool &encrypted, QString fileName) { + // Reminder: If that function is modified, it's important to research if the + // changes must also be applied to `kio_krarcProtocol::checkIf7zIsEncrypted()` + Kr7zEncryptionChecker proc; // TODO incorporate all this in Kr7zEncryptionChecker proc << KrServices::fullPathName("7z") << "-y" << "t"; diff --git a/krusader/krservices.cpp b/krusader/krservices.cpp --- a/krusader/krservices.cpp +++ b/krusader/krservices.cpp @@ -89,6 +89,10 @@ bool KrServices::cmdExist(const QString& cmdName) { + // Reminder: If that function is modified, it's important to research if the + // changes must also be applied to `KrServices::fullPathName()` + // and `kio_krarcProtocol::fullPathName()` + KConfigGroup group(krConfig, "Dependencies"); if (QFile(group.readEntry(cmdName, QString())).exists()) return true; @@ -98,6 +102,10 @@ QString KrServices::fullPathName(const QString& name, QString confName) { + // Reminder: If that function is modified, it's important to research if the + // changes must also be applied to `kio_krarcProtocol::fullPathName()` + // and `KrServices::cmdExist()` + QString supposedName; if (confName.isNull())