kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-08-03 10:34:14 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make the font restoration counters safe against nested project loads

Browse Source 
DialogWaiting pumps the event loop while the folios of a project are
built, so a second openAndAddProject() can run to completion nested
inside the first one (drop on another editor window, queued open) and
the plain reset/read counters would then report the wrong numbers.

Replace them with a RAII counting window (FontRestorationScope): the
constructor keeps the enclosing counts aside, the destructor restores
them. The nesting is strictly LIFO - the nested load completes inside
the pump of the outer one - so each load reports exactly its own
numbers, and the early-return paths of openAndAddProject() restore the
outer window automatically.

Suggested by ispyisail in the review of the reporting change.
This commit is contained in:
Dieter Mayer
2026-08-01 11:13:57 +02:00
parent 0fa2591c4f
commit 3bc2e8e712
3 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/utils/qetutils.cpp
+20 -11
View File
@@ -304,33 +304,42 @@ bool QETUtils::fontFromString(QFont &font, const QString &description)
}
/**
* @brief QETUtils::resetFontRestorationCounters
* Reset the counters incremented by fontFromString(), to be called before
* loading a project so the numbers reported afterwards are per-project.
* @brief QETUtils::FontRestorationScope::FontRestorationScope
* Open a fresh counting window: the enclosing window's counts are kept
* aside and restored by the destructor, so a project load nested inside
* another one (through the event loop) reports its own numbers only.
*/
void QETUtils::resetFontRestorationCounters()
QETUtils::FontRestorationScope::FontRestorationScope() :
m_outer_salvaged(salvaged_font_count),
m_outer_unreadable(unreadable_font_count)
{
salvaged_font_count = 0;
unreadable_font_count = 0;
}
QETUtils::FontRestorationScope::~FontRestorationScope()
{
salvaged_font_count = m_outer_salvaged;
unreadable_font_count = m_outer_unreadable;
}
/**
* @brief QETUtils::salvagedFontCount
* @brief QETUtils::FontRestorationScope::salvaged
* @return How many font descriptions fontFromString() restored from a
* foreign or corrupt format since the counters were last reset. Such
* descriptions are rewritten in the stable format on the next save.
* foreign or corrupt format since this window was opened. Such descriptions
* are rewritten in the stable format on the next save.
*/
int QETUtils::salvagedFontCount()
int QETUtils::FontRestorationScope::salvaged() const
{
return salvaged_font_count;
}
/**
* @brief QETUtils::unreadableFontCount
* @brief QETUtils::FontRestorationScope::unreadable
* @return How many font descriptions fontFromString() could not restore at
* all since the counters were last reset (the caller's default font applies).
* all since this window was opened (the caller's default font applies).
*/
int QETUtils::unreadableFontCount()
int QETUtils::FontRestorationScope::unreadable() const
{
return unreadable_font_count;
}