refs #207, renamed CValueMap to CIndexVariantMap.

* The map will be used with CSimulaorInfo to transfer a variable number of setting information about the flight simulator. It is being used, because it is already DBus and tupel compliant. The new name better fits its purpose.
* Add == operator for CIndexVariantMap (ambiguity error with tupels)
This commit is contained in:
Klaus Basan
2014-04-14 11:15:14 +02:00
parent 2b07012e4f
commit e474671ead
17 changed files with 121 additions and 152 deletions

View File

@@ -5,7 +5,7 @@
#include "testvariantandmap.h"
#include "blackmisc/avatcstation.h"
#include "blackmisc/valuemap.h"
#include "blackmisc/indexvariantmap.h"
#include "blackmisc/tuple.h"
#include <QList>
#include <QString>
@@ -77,9 +77,9 @@ namespace BlackMiscTest
geoPos, CLength(50, CLengthUnit::km()), false, dtFrom, dtUntil);
// value maps
CValueMap vmWildcard(true);
CValueMap vmNoWildcard(false);
CValueMap vm;
CIndexVariantMap vmWildcard(true);
CIndexVariantMap vmNoWildcard(false);
CIndexVariantMap vm;
// remark: Shortcoming here, as the callsign will automatically set for user in station
// I have to set this as well, otherwise, not match.
@@ -89,6 +89,7 @@ namespace BlackMiscTest
QVERIFY2(vmWildcard == station1, "Station should be equal to wildcard");
QVERIFY2(station1 != vmNoWildcard, "Station should not be equal to empty list");
QVERIFY2(station1 == vm, "Controller should match");
QVERIFY2(vmWildcard == vmWildcard, "Maps should be equal");
}
} //namespace BlackMiscTest