> On Nov. 21, 2015, 12:35 p.m., David Faure wrote: > > src/ioslaves/trash/tests/testtrash.cpp, line 149 > > <https://git.reviewboard.kde.org/r/126125/diff/1/?file=417580#file417580line149> > > > > Use .at(0) to avoid unnecessary detaching. > > René J.V. Bertin wrote: > I tried that first, but that fails to compile: > ``` > kf5-kio/work/kio-5.16.0/src/ioslaves/trash/tests/testtrash.cpp:149:42: > error: no member named 'at' in 'QMap<int, QString>' > m_trashDir = impl.trashDirectories().at(0); > ~~~~~~~~~~~~~~~~~~~~~~~ ^ > 6 warnings and 1 error generated. > ``` > > David Faure wrote: > Ah, it's a map, not a list, right. Use .value(0) then, to avoid creating > an empty item in case 0 isn't in the map. You could do this first of course: > QVERIFY(trashDirs.contains(0)); > m_trashDir = trashDirs.value(0); > > (note that initTestCase already has a trashDirs local var which contains > the result of impl.trashDirectories())
Yeah, I had noted that. I'm not sure why I didn't decide to move its declaration upwards ... - René J.V. ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/126125/#review88667 ----------------------------------------------------------- On Nov. 21, 2015, 1:50 p.m., René J.V. Bertin wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/126125/ > ----------------------------------------------------------- > > (Updated Nov. 21, 2015, 1:50 p.m.) > > > Review request for KDE Software on Mac OS X, KDE Frameworks and David Faure. > > > Repository: kio > > > Description > ------- > > This is a "backport" of the [kde-runtime modification reviewed > here](https://git.reviewboard.kde.org/r/120573/) that makes the trash ioslave > use a subdirectory in the OS X trashcan. > > From the original review: > *KDE on OS X does not handle the desktop session (no "Plasma") nor can it > rely on XDG to obtain the proper paths to use for something like the trash. > As a result, all applications that propose to move things they manage to the > wastebin (Dolphin, but also digiKam) will store those items in a place that > has no particular meaning on OS X, and that will thus tend to fill up.* > > *OS X stores trash in one of several locations. Files trashed from the boot > volume (and/or the volume containing $HOME, I don't actually know that) end > up in ~/.Trash. Files deleted from other volumes end up in > /Volumes/volName/.Trashes/uid, where volName is the volume name (regardless > whether it's an external or a remote drive; only mounted NFS shares are > handled differently) and uid the numerical user id. Permissions on .Trashes > are the same as those expected by KDE.* > > The patch from KDE4 was straightforward to apply as the trash implementation > has only had what seem to be cosmetic changes and "Qt4 -> Qt5" adaptations. > Therefore, I have ported my code "as is", so as not to change anything that > was discussed and negotiated during the rather lengthy previous review > process. The only place where I've had to introduce a small additional change > is in `trashForMountPoint`, where KF5 made `trashDir` a const. Appending the > KDE trash-subdir in the `trashDir` declaration might seem the appropriate > approach, but since there is no guarantee at that point that the subdirectory > actually (still) exists, the `QT_LSTAT` test could fail, and the the > appending has to be done after the check on the actual host trash directory. > > I have also introduced a small change in `testtrash.cpp` allowing it to run > instead of failing because the 1st location returned `trashDirectories()` > doesn't match the one determined from QSP. > > > Diffs > ----- > > src/ioslaves/trash/CMakeLists.txt 05161cd > src/ioslaves/trash/kcmtrash.cpp 79c2ca7 > src/ioslaves/trash/tests/CMakeLists.txt 3e138f7 > src/ioslaves/trash/tests/testtrash.cpp 339aa19 > src/ioslaves/trash/trashimpl.h 9886011 > src/ioslaves/trash/trashimpl.cpp 26d9ea8 > > Diff: https://git.reviewboard.kde.org/r/126125/diff/ > > > Testing > ------- > > OS X 10.9 with Qt 5.5.1 and KF5rameworks 5.16.0 . The code builds, and the > unittests from testtrash succeed (with the Trash open in the Finder one sees > the `KDE.trash` directory show up while the test runs, and disappear > afterwards). > > > Thanks, > > René J.V. Bertin > >
_______________________________________________ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
