[digikam] [Bug 376815] Restore from Trash works incorrectly

[Johannes Hirte]

https://bugs.kde.org/show_bug.cgi?id=376815

Johannes Hirte <johannes.hirte at datenkhaos.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |johannes.hirte at datenkhaos.d
                   |                            |e

--- Comment #4 from Johannes Hirte <johannes.hirte at datenkhaos.de> ---
This leads now to the following compile error:

/var/tmp/portage/media-gfx/digikam-9999/work/digikam-9999/libs/dtrash/dtrash.cpp:
In static member function ‘static QString
Digikam::DTrash::getAvialableJsonFilePathInTrash(const QString&, const
QString&, int)’:
/var/tmp/portage/media-gfx/digikam-9999/work/digikam-9999/libs/dtrash/dtrash.cpp:222:41:
error: ‘QChar::QChar(char)’ is private within this context
     randomString.replace(0, 1, QChar('-'));
                                         ^
In file included from /usr/include/qt5/QtCore/qstring.h:48:0,
                 from /usr/include/qt5/QtCore/qobject.h:47,
                 from /usr/include/qt5/QtCore/QObject:1,
                 from
/var/tmp/portage/media-gfx/digikam-9999/work/digikam-9999/libs/dtrash/dtrash.h:29,
                 from
/var/tmp/portage/media-gfx/digikam-9999/work/digikam-9999/libs/dtrash/dtrash.cpp:24:
/usr/include/qt5/QtCore/qchar.h:562:5: note: declared private here
     QChar(char c) Q_DECL_NOTHROW;
     ^~~~~
make[2]: *** [libs/dtrash/CMakeFiles/dtrash_src.dir/build.make:63:
libs/dtrash/CMakeFiles/dtrash_src.dir/dtrash.cpp.o] Error 1


possible fix

diff --git a/libs/dtrash/dtrash.cpp b/libs/dtrash/dtrash.cpp
index 7b65f3844d..4eed798c3e 100644
--- a/libs/dtrash/dtrash.cpp
+++ b/libs/dtrash/dtrash.cpp
@@ -219,7 +219,7 @@ QString DTrash::createJsonRecordForFile(const QString&
collectionPath, const QSt
 QString DTrash::getAvialableJsonFilePathInTrash(const QString& collectionPath,
const QString& baseName, int version)
 {
     QString randomString = QUuid::createUuid().toString();
-    randomString.replace(0, 1, QChar('-'));
+    randomString.replace(0, 1, QChar(0x2D));
     randomString.chop(1);

     QString pathToCreateJsonFile = collectionPath + QLatin1Char('/') +


QChar::fromLatin1() should work too

-- 
You are receiving this mail because:
You are the assignee for the bug.