diff options
| author | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-02-10 11:04:00 +0200 |
|---|---|---|
| committer | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-02-10 11:04:00 +0200 |
| commit | 6ca0f841378117e7c31fa552206e7174b60d6b8d (patch) | |
| tree | a270f9d55d3b695a5317963d0d11d6b6fcd78217 | |
| parent | 30dcb37e647eed8fd68874f7588cd203ef8fc709 (diff) | |
bug fixes
| -rw-r--r-- | libresourceqt/src/resource-set.cpp | 4 | ||||
| -rw-r--r-- | tests/test-resource-engine/test-resource-engine.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp index 6ff8d9a..64bdf8e 100644 --- a/libresourceqt/src/resource-set.cpp +++ b/libresourceqt/src/resource-set.cpp @@ -6,7 +6,7 @@ ResourceSet::ResourceSet(const QString &applicationClass, QObject * parent) : QObject(parent), resourceClass(applicationClass) { identifier = (quint32)this; - memset(resourceSet, 0, sizeof(QPointer<Resource>)*NumberOfTypes); + memset(resourceSet, 0, sizeof(QPointer<Resource *>)*NumberOfTypes); } ResourceSet::~ResourceSet() @@ -51,7 +51,7 @@ bool ResourceSet::contains(const QList<ResourceType> &types) const do { containsAll = contains(types.at(i)); i++; - } while((i < NumberOfTypes) && containsAll); + } while((i < types.size()) && containsAll); return containsAll; } diff --git a/tests/test-resource-engine/test-resource-engine.cpp b/tests/test-resource-engine/test-resource-engine.cpp index fca6505..4278f77 100644 --- a/tests/test-resource-engine/test-resource-engine.cpp +++ b/tests/test-resource-engine/test-resource-engine.cpp @@ -3,7 +3,6 @@ using namespace ResourcePolicy; quint32 theID = 0; -resset_t *libresourceSet = NULL; void statusCallbackHandler(resset_t *libresourceSet, resmsg_t *message); @@ -69,7 +68,6 @@ void TestResourceEngine::testDisconnect() void TestResourceEngine::testStatusMessage() { resourceEngine->connect(); - libresourceSet = resourceEngine->libresourceSet; resourceEngine->messageMap.insert(1, RESMSG_REGISTER); QObject::connect(resourceEngine, SIGNAL(connectedToManager()), this, SLOT(connectedHandler())); resourceEngine->handleStatusMessage(1); @@ -169,7 +167,8 @@ int resconn_disconnect(resset_t *resSet, resmsg_t *message, static void verify_resconn_disconnect(resset_t *resourceSet, resmsg_t *message, resproto_status_t callbackFunction) { - QVERIFY(resourceSet == libresourceSet); + qDebug("resourceSet = %p resSet = %p", resourceSet, resSet); + QVERIFY(resourceSet == resSet); QVERIFY(message->record.type == RESMSG_UNREGISTER); QVERIFY(message->record.id == theID); QVERIFY(message->record.reqno > 1); |