diff --git a/kded/daemon.cpp b/kded/daemon.cpp --- a/kded/daemon.cpp +++ b/kded/daemon.cpp @@ -160,7 +160,7 @@ Serializer::moveConfig(configId + QLatin1String("_lidOpened"), configId); } - KScreen::ConfigPtr config = Serializer::config(m_monitoredConfig, configId); + KScreen::ConfigPtr config = Serializer::loadConfig(m_monitoredConfig, configId); // It's possible that the Serializer returned a nullptr if (!config || !KScreen::Config::canBeApplied(config, KScreen::Config::ValidityFlag::RequireAtLeastOneEnabledScreen)) { applyIdealConfig(); @@ -331,7 +331,7 @@ const QString openConfigId = Serializer::configId(m_monitoredConfig) + QLatin1String("_lidOpened"); if (Serializer::configExists(openConfigId)) { - const KScreen::ConfigPtr openedConfig = Serializer::config(m_monitoredConfig, openConfigId); + const KScreen::ConfigPtr openedConfig = Serializer::loadConfig(m_monitoredConfig, openConfigId); Serializer::removeConfig(openConfigId); doApplyConfig(openedConfig); diff --git a/kded/serializer.h b/kded/serializer.h --- a/kded/serializer.h +++ b/kded/serializer.h @@ -30,7 +30,7 @@ static QString configId(const KScreen::ConfigPtr &config); static bool configExists(const KScreen::ConfigPtr &config); static bool configExists(const QString& id); - static KScreen::ConfigPtr config(const KScreen::ConfigPtr ¤tConfig, const QString& id); + static KScreen::ConfigPtr loadConfig(const KScreen::ConfigPtr ¤tConfig, const QString& id); static bool saveConfig(const KScreen::ConfigPtr &config, const QString &configId); static void removeConfig(const QString &id); static bool moveConfig(const QString &srcId, const QString &destId); diff --git a/kded/serializer.cpp b/kded/serializer.cpp --- a/kded/serializer.cpp +++ b/kded/serializer.cpp @@ -70,7 +70,7 @@ return (QFile::exists(sConfigPath % id) || QFile::exists(sConfigPath % sFixedConfig)); } -KScreen::ConfigPtr Serializer::config(const KScreen::ConfigPtr ¤tConfig, const QString &id) +KScreen::ConfigPtr Serializer::loadConfig(const KScreen::ConfigPtr ¤tConfig, const QString &id) { KScreen::ConfigPtr config = currentConfig->clone(); diff --git a/tests/kded/serializertest.cpp b/tests/kded/serializertest.cpp --- a/tests/kded/serializertest.cpp +++ b/tests/kded/serializertest.cpp @@ -108,7 +108,7 @@ void TestSerializer::testSimpleConfig() { KScreen::ConfigPtr config = createConfig(true, false); - config = Serializer::config(config, QStringLiteral("simpleConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("simpleConfig.json")); QVERIFY(config); QCOMPARE(config->connectedOutputs().count(), 1); @@ -129,7 +129,7 @@ void TestSerializer::testTwoScreenConfig() { KScreen::ConfigPtr config = createConfig(true, true); - config = Serializer::config(config, QStringLiteral("twoScreenConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("twoScreenConfig.json")); QVERIFY(config); QCOMPARE(config->connectedOutputs().count(), 2); @@ -159,7 +159,7 @@ void TestSerializer::testRotatedScreenConfig() { KScreen::ConfigPtr config = createConfig(true, true); - config = Serializer::config(config, QStringLiteral("rotatedScreenConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("rotatedScreenConfig.json")); QVERIFY(config); QCOMPARE(config->connectedOutputs().count(), 2); @@ -189,7 +189,7 @@ void TestSerializer::testDisabledScreenConfig() { KScreen::ConfigPtr config = createConfig(true, true); - config = Serializer::config(config, QStringLiteral("disabledScreenConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("disabledScreenConfig.json")); QVERIFY(config); QCOMPARE(config->connectedOutputs().count(), 2); @@ -214,33 +214,33 @@ void TestSerializer::testConfig404() { KScreen::ConfigPtr config = createConfig(true, true); - config = Serializer::config(config, QStringLiteral("filenotfoundConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("filenotfoundConfig.json")); QVERIFY(!config); QVERIFY(config.isNull()); } void TestSerializer::testCorruptConfig() { KScreen::ConfigPtr config = createConfig(true, true); - config = Serializer::config(config, QStringLiteral("corruptConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("corruptConfig.json")); QVERIFY(config); QCOMPARE(config->outputs().count(), 2); QVERIFY(config->isValid()); } void TestSerializer::testCorruptEmptyConfig() { KScreen::ConfigPtr config = createConfig(true, true); - config = Serializer::config(config, QStringLiteral("corruptEmptyConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("corruptEmptyConfig.json")); QVERIFY(config); QCOMPARE(config->outputs().count(), 2); QVERIFY(config->isValid()); } void TestSerializer::testCorruptUselessConfig() { KScreen::ConfigPtr config = createConfig(true, true); - config = Serializer::config(config, QStringLiteral("corruptUselessConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("corruptUselessConfig.json")); QVERIFY(config); QCOMPARE(config->outputs().count(), 2); QVERIFY(config->isValid()); @@ -256,7 +256,7 @@ // Load config from a file not found results in a nullptr KScreen::ConfigPtr config = createConfig(true, true); - QVERIFY(!Serializer::config(config, QString())); + QVERIFY(!Serializer::loadConfig(config, QString())); // Wrong config file name should fail to save QCOMPARE(Serializer::saveConfig(config, QString()), false); @@ -359,7 +359,7 @@ positions[QStringLiteral("DVI-0")] = QPoint(4020, 1080); positions[QStringLiteral("DVI-1")] = QPoint(0, 0); - config = Serializer::config(config, QStringLiteral("outputgrid_2x3.json")); + config = Serializer::loadConfig(config, QStringLiteral("outputgrid_2x3.json")); QVERIFY(config); QCOMPARE(config->connectedOutputs().count(), 6); @@ -381,7 +381,7 @@ // Load a dualhead config KScreen::ConfigPtr config = createConfig(true, true); - config = Serializer::config(config, QStringLiteral("twoScreenConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("twoScreenConfig.json")); QVERIFY(config); // Make sure we don't write into TEST_DATA @@ -430,7 +430,7 @@ QVERIFY(closedCfg.exists()); // Now load the resulting config and make sure the laptop panel is enabled and primary again - config = Serializer::config(config, QStringLiteral("0xdeadbeef")); + config = Serializer::loadConfig(config, QStringLiteral("0xdeadbeef")); output = config->connectedOutputs().first(); QCOMPARE(output->name(), QLatin1String("OUTPUT-1")); @@ -445,7 +445,7 @@ // Make sure we don't screw up when there's no _lidOpened config QVERIFY(!Serializer::moveConfig(QStringLiteral("0xdeadbeef_lidOpened"), QStringLiteral("0xdeadbeef"))); - config = Serializer::config(config, QStringLiteral("0xdeadbeef")); + config = Serializer::loadConfig(config, QStringLiteral("0xdeadbeef")); output = config->connectedOutputs().first(); QCOMPARE(output->name(), QLatin1String("OUTPUT-1")); @@ -464,7 +464,7 @@ { // Load a dualhead config KScreen::ConfigPtr config = createConfig(true, true); - config = Serializer::config(config, QStringLiteral("twoScreenConfig.json")); + config = Serializer::loadConfig(config, QStringLiteral("twoScreenConfig.json")); QVERIFY(config); // Make sure we don't write into TEST_DATA