[graphics/digikam] core: limit widget usage when possible
Gilles Caulier <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit a31254e9c2b3906ae5537618b9d561e8dd84d861 by Gilles Caulier.
Committed on 04/08/2026 at 08:46.
Pushed by cgilles into branch 'master'.
limit widget usage when possible
M +4 -5 core/tests/database/haariface_utest.cpp
M +7 -2 core/utilities/fuzzysearch/findduplicatesalbumitem.cpp
M +1 -1 core/utilities/fuzzysearch/findduplicatesalbumitem.h
M +1 -1 core/utilities/maintenance/manager/maintenancetool.h
M +1 -1 core/utilities/maintenance/tools/duplicates/duplicatesfinder.cpp
https://invent.kde.org/graphics/digikam/-/commit/a31254e9c2b3906ae5537618b9d561e8dd84d861
diff --git a/core/tests/database/haariface_utest.cpp b/core/tests/database/haariface_utest.cpp
index 09077178cb..2a9c5cb0c7 100644
--- a/core/tests/database/haariface_utest.cpp
+++ b/core/tests/database/haariface_utest.cpp
@@ -69,6 +69,9 @@ do
50, 100, \
HaarIface::DuplicatesSearchRestrictions::None, \
refImageSelMethod, referenceAlbums); \
+ finder->setShowAtStart(false); \
+ finder->setUsesBusyIndicator(false); \
+ \
bool complete = false; \
\
connect(finder, &DuplicatesFinder::signalComplete, \
@@ -106,8 +109,6 @@ do
} \
} \
\
- QTreeWidget* const w = new QTreeWidget; \
- \
for (AlbumList::const_iterator it = aList.constBegin() ; it != aList.constEnd() ; ++it) \
{ \
SAlbum* const salbum = dynamic_cast<SAlbum*>(*it); \
@@ -116,7 +117,7 @@ do
{ \
/* Adding item to listView by creating an item and passing listView as parent */ \
\
- FindDuplicatesAlbumItem* const item = new FindDuplicatesAlbumItem(w, salbum); \
+ FindDuplicatesAlbumItem* const item = new FindDuplicatesAlbumItem(nullptr, salbum); \
item->waitForCalculate(); \
salbum->setExtraData(this, item); \
const auto id = salbum->title().toLongLong(); \
@@ -130,8 +131,6 @@ do
} \
} \
} \
- \
- delete w; \
} \
while (false);
diff --git a/core/utilities/fuzzysearch/findduplicatesalbumitem.cpp b/core/utilities/fuzzysearch/findduplicatesalbumitem.cpp
index dac066f60e..c34753de77 100644
--- a/core/utilities/fuzzysearch/findduplicatesalbumitem.cpp
+++ b/core/utilities/fuzzysearch/findduplicatesalbumitem.cpp
@@ -92,8 +92,13 @@ FindDuplicatesAlbumItem::FindDuplicatesAlbumItem(QTreeWidget* const parent, SAlb
calculateInfos();
}
- setThumb(QIcon::fromTheme(QLatin1String("view-preview")).pixmap(parent->iconSize().width(),
- QIcon::Disabled), false);
+ /// @note Parent can be null only with the unit-test.
+
+ if (parent)
+ {
+ setThumb(QIcon::fromTheme(QLatin1String("view-preview")).pixmap(parent->iconSize().width(),
+ QIcon::Disabled), false);
+ }
}
FindDuplicatesAlbumItem::~FindDuplicatesAlbumItem()
diff --git a/core/utilities/fuzzysearch/findduplicatesalbumitem.h b/core/utilities/fuzzysearch/findduplicatesalbumitem.h
index e41ab208cb..8df30c5979 100644
--- a/core/utilities/fuzzysearch/findduplicatesalbumitem.h
+++ b/core/utilities/fuzzysearch/findduplicatesalbumitem.h
@@ -91,7 +91,7 @@ private:
private:
class Private;
- Private* const d;
+ Private* const d = nullptr;
private:
diff --git a/core/utilities/maintenance/manager/maintenancetool.h b/core/utilities/maintenance/manager/maintenancetool.h
index ca9dc635d2..0dcef3dfa2 100644
--- a/core/utilities/maintenance/manager/maintenancetool.h
+++ b/core/utilities/maintenance/manager/maintenancetool.h
@@ -38,7 +38,7 @@ public:
/**
* If true, show a notification message on desktop notification manager
- * with time elpased to run process.
+ * with time elapsed to run process.
*/
void setNotificationEnabled(bool b);
diff --git a/core/utilities/maintenance/tools/duplicates/duplicatesfinder.cpp b/core/utilities/maintenance/tools/duplicates/duplicatesfinder.cpp
index 408fdac872..22aafcf14a 100644
--- a/core/utilities/maintenance/tools/duplicates/duplicatesfinder.cpp
+++ b/core/utilities/maintenance/tools/duplicates/duplicatesfinder.cpp
@@ -133,7 +133,7 @@ void DuplicatesFinder::slotStart()
{
// All reference images must be also in the search path, otherwise no duplicates are found
- imageIds.unite(referenceImageIds);
+ imageIds.unite(referenceImageIds);
break;
}