Browse Source

fixup

pull/2/head
Skycoder42 7 years ago
parent
commit
3d245b478e
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
  1. 6
      src/mvvmcore/settingsviewmodel.cpp
  2. 5
      tests/auto/mvvmcore/settingsconfigloader/invalidDocument.xml
  3. 3
      tests/auto/mvvmcore/settingsconfigloader/settingsconfigloader.pro
  4. 6
      tests/auto/mvvmcore/settingsconfigloader/tst_settingsconfigloader.cpp

6
src/mvvmcore/settingsviewmodel.cpp

@ -2,7 +2,6 @@
#include "settingsviewmodel_p.h"
#include "coreapp.h"
#include "qtmvvm_logging_p.h"
#include "settingssetuploader_p.h"
#include "qsettingsaccessor.h"
using namespace QtMvvm;
@ -121,10 +120,9 @@ void QtMvvm::SettingsViewModel::setAccessor(ISettingsAccessor *accessor)
this, &SettingsViewModel::valueChanged);
disconnect(d->accessor, &ISettingsAccessor::entryRemoved,
this, &SettingsViewModel::valueChanged);
if(d->accessor->parent() == this)
d->accessor->deleteLater();
}
if(d->accessor->parent() == this)
d->accessor->deleteLater();
d->accessor = accessor;
if(d->accessor) {

5
tests/auto/mvvmcore/settingsconfigloader/invalidDocument.xml

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<SettingsConfig>
<Category/>
<Section/>
</SettingsConfig>

3
tests/auto/mvvmcore/settingsconfigloader/settingsconfigloader.pro

@ -32,4 +32,5 @@ DISTFILES += \
includeDocument_section.xml \
includeDocument_group.xml \
includeDocument_entry.xml \
includeDocument_filtered.xml
includeDocument_filtered.xml \
invalidDocument.xml

6
tests/auto/mvvmcore/settingsconfigloader/tst_settingsconfigloader.cpp

@ -107,6 +107,12 @@ void SettingsConfigLoaderTest::testConfigLoader_data()
<< QStringList{}
<< true
<< createIncludesSetup();
QTest::newRow("invalidDocument") << QStringLiteral(SRCDIR "/invalidDocument.xml")
<< QStringLiteral("dummy")
<< QStringList{}
<< false
<< Setup{};
}
void SettingsConfigLoaderTest::testConfigLoader()

Loading…
Cancel
Save