Differential D6197 Diff 15729 src/ioslaves/file/file.cpp

Changeset View

Standalone View

View Options

src/ioslaves/file/file.cpp

Context not available.
154} 154​}
155 155​
156FileProtocol::FileProtocol(const QByteArray &pool, const QByteArray &app) 156​FileProtocol::FileProtocol(const QByteArray &pool, const QByteArray &app)
157 : SlaveBase(QByteArrayLiteral("file"), pool, app), mFile(nullptr) 157​ : SlaveBase(QByteArrayLiteral("file"), pool, app), mFile(nullptr), mPriviledgeOpStarted(false)
158{ 158​{
159} 159​}
160 160​
Context not available.
1376 } 1376​ }
1377} 1377​}
1378 1378​
1379​void FileProtocol::endPrivilegeOperation()
1380​{
1381​ mPriviledgeOpStarted = false;
1382​}
elvisangelaccioUnsubmitted
Done

Can't this go in file_unix.cpp, without ifdefs?

elvisangelaccio: Can't this go in file_unix.cpp, without ifdefs?
aacidUnsubmitted
Done

Why is there an ifdef anyway? KAuth has at least a mac backend (no idea how much it works) but adding an ifdef at this level seems the wrong thing to do.

aacid: Why is there an ifdef anyway? KAuth has at least a mac backend (no idea how much it works) but…
chinmoyrAuthorUnsubmitted
Done

This method will be used by FileProtocol::mkdir and FileProtocol::chmod which are not virtual method. So when called in windows this must return false for the time being. So IMO ifdef or something similar is necessary. What do you suggest?

chinmoyr: This method will be used by FileProtocol::mkdir and FileProtocol::chmod which are not virtual…
aacidUnsubmitted
Done

Well, just use KAuth, since there's no backend in windows it will return false, why do you need an ifdef?

aacid: Well, just use KAuth, since there's no backend in windows it will return false, why do you need…
1383​
1384​QString FileProtocol::warningMessage(PrivilegeWarning warnId) const
1385​{
1386​ QString message;
1387​ switch(warnId) {
elvisangelaccioUnsubmitted
Done

Prefer QLatin1String if you want to concatenate. Or you could use QStringLiteral("org.kde.kio.file.%1").arg(action).

elvisangelaccio: Prefer `QLatin1String` if you want to concatenate. Or you could use `QStringLiteral("org.kde.
1388​
1389​ case WARN_PRIVILEGE_DEL: {
1390​ message = i18n("You are attempting to delete a file from a write protected location. "
1391​ "Doing so may cause irreversible damage to your system. Do you want to proceed?");
1392​ break;
1393​ }
1394​ case WARN_PRIVILEGE_RMDIR: {
1395​ message = i18n("You are attempting to delete a directory from a write protected location. "
1396​ "Doing so may cause irreversible damage to your system. Do you want to proceed?");
1397​ break;
1398​ }
1399​
1400​ }
1401​
1402​ return message;
1403​}
1404​
1405​bool FileProtocol::showWarning(PrivilegeWarning warnId)
1406​{
1407​ int status = messageBox(WarningContinueCancel, warningMessage(warnId), i18n("Warning!"),
1408​ i18n("Continue"), i18n("Cancel"));
elvisangelaccioUnsubmitted
Done

Missing i18n() here

elvisangelaccio: Missing i18n() here
1409​ return status != 2;
elvisangelaccioUnsubmitted
Done

Use ButtonCode::Cancel rather than hardcoding 2

elvisangelaccio: Use `ButtonCode::Cancel` rather than hardcoding 2
1410​}
1411​
1379// needed for JSON file embedding 1412​// needed for JSON file embedding
1380#include "file.moc" 1413​#include "file.moc"
Context not available.
elvisangelaccioUnsubmitted
Done

I didn't get this messagebox after deleting something when I was already authenticated. What did I do wrong?

elvisangelaccio: I didn't get this messagebox after deleting something when I was already authenticated. What…