flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-02 15:15:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #653 Rephrase "uninitialized value" message.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-04-30 23:02:28 +01:00
parent 1a3e610cbf
commit a492189874
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/valuecache.cpp
View File

@@ -597,7 +597,7 @@ namespace BlackMisc
{ {
if (! value.isValid()) if (! value.isValid())
{ {
return CStatusMessage(this, invalidSeverity, "Uninitialized value for " + element.m_key, true); return CStatusMessage(this, invalidSeverity, "Empty cache value " + element.m_key, true);
} }
else if (value.userType() != element.m_metaType) else if (value.userType() != element.m_metaType)
{ {

8
tests/blackmisc/testvaluecache.cpp
View File

@@ -109,7 +109,7 @@ namespace BlackMiscTest
void CTestValueCache::localOnly() void CTestValueCache::localOnly()
{ {
CValueCache cache(CValueCache::LocalOnly); CValueCache cache(CValueCache::LocalOnly);
for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Uninitialized value")); } for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Empty cache value")); }
CValueCacheUser user1(&cache); CValueCacheUser user1(&cache);
CValueCacheUser user2(&cache); CValueCacheUser user2(&cache);
testCommon(user1, user2); testCommon(user1, user2);
@@ -118,7 +118,7 @@ namespace BlackMiscTest
void CTestValueCache::localOnlyWithThreads() void CTestValueCache::localOnlyWithThreads()
{ {
CValueCache cache(CValueCache::LocalOnly); CValueCache cache(CValueCache::LocalOnly);
for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Uninitialized value")); } for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Empty cache value")); }
CValueCacheUser user1(&cache); CValueCacheUser user1(&cache);
CValueCacheUser user2(&cache); CValueCacheUser user2(&cache);
CRegularThread thread; CRegularThread thread;
@@ -148,7 +148,7 @@ namespace BlackMiscTest
QMetaObject::invokeMethod(&otherCache, "changeValuesFromRemote", Q_ARG(BlackMisc::CValueCachePacket, values), Q_ARG(BlackMisc::CIdentifier, thisProcess)); QMetaObject::invokeMethod(&otherCache, "changeValuesFromRemote", Q_ARG(BlackMisc::CValueCachePacket, values), Q_ARG(BlackMisc::CIdentifier, thisProcess));
}); });
for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Uninitialized value")); } for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Empty cache value")); }
CValueCacheUser thisUser(&thisCache); CValueCacheUser thisUser(&thisCache);
CValueCacheUser otherUser(&otherCache); CValueCacheUser otherUser(&otherCache);
@@ -169,7 +169,7 @@ namespace BlackMiscTest
void CTestValueCache::batched() void CTestValueCache::batched()
{ {
CValueCache cache(CValueCache::LocalOnly); CValueCache cache(CValueCache::LocalOnly);
for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Uninitialized value")); } for (int i = 0; i < 4; ++i) { QTest::ignoreMessage(QtDebugMsg, QRegularExpression("Empty cache value")); }
CValueCacheUser user1(&cache); CValueCacheUser user1(&cache);
CValueCacheUser user2(&cache); CValueCacheUser user2(&cache);