1 files changed, 11 insertions, 15 deletions

diff --git a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
index 0a74dc64c0..1643eed3d2 100644
--- a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
+++ b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp
@@ -202,18 +202,15 @@ private slots:
         QLoggingRegistry registry;
         registry.init();
 
-        QCOMPARE(registry.apiRules.size(), 0);
-        QCOMPARE(registry.configRules.size(), 0);
-        QCOMPARE(registry.envRules.size(), 1);
-
-        QCOMPARE(registry.rules.size(), 1);
+        QCOMPARE(registry.ruleSets[QLoggingRegistry::ApiRules].size(), 0);
+        QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 0);
+        QCOMPARE(registry.ruleSets[QLoggingRegistry::EnvironmentRules].size(), 1);
 
         // check that QT_LOGGING_RULES take precedence
         qputenv("QT_LOGGING_RULES", "Digia.*=true");
         registry.init();
-        QCOMPARE(registry.envRules.size(), 2);
-        QCOMPARE(registry.envRules.at(1).enabled, true);
-        QCOMPARE(registry.rules.size(), 2);
+        QCOMPARE(registry.ruleSets[QLoggingRegistry::EnvironmentRules].size(), 2);
+        QCOMPARE(registry.ruleSets[QLoggingRegistry::EnvironmentRules].at(1).enabled, true);
     }
 
     void QLoggingRegistry_config()
@@ -238,7 +235,7 @@ private slots:
 
         QLoggingRegistry registry;
         registry.init();
-        QCOMPARE(registry.configRules.size(), 1);
+        QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 1);
 
         // remove file again
         QVERIFY(file.remove());
@@ -260,10 +257,9 @@ private slots:
         QLoggingRegistry *registry = QLoggingRegistry::instance();
 
         // empty all rules , check default
-        registry->rules.clear();
-        registry->apiRules.clear();
-        registry->configRules.clear();
-        registry->envRules.clear();
+        registry->ruleSets[QLoggingRegistry::ApiRules].clear();
+        registry->ruleSets[QLoggingRegistry::ConfigRules].clear();
+        registry->ruleSets[QLoggingRegistry::EnvironmentRules].clear();
         registry->updateRules();
 
         QVERIFY(cat.isWarningEnabled());
@@ -271,7 +267,7 @@ private slots:
         // set Config rule
         QLoggingSettingsParser parser;
         parser.setContent("[Rules]\nDigia.*=false");
-        registry->configRules=parser.rules();
+        registry->ruleSets[QLoggingRegistry::ConfigRules] = parser.rules();
         registry->updateRules();
 
         QVERIFY(!cat.isWarningEnabled());
@@ -283,7 +279,7 @@ private slots:
 
         // set Env rule, should overwrite Config one
         parser.setContent("Digia.*=false");
-        registry->envRules=parser.rules();
+        registry->ruleSets[QLoggingRegistry::EnvironmentRules] = parser.rules();
         registry->updateRules();
 
         QVERIFY(!cat.isWarningEnabled());