diff --git a/effects/blur/blur.cpp b/effects/blur/blur.cpp index 828edbc9e1..4cc07fca43 100644 --- a/effects/blur/blur.cpp +++ b/effects/blur/blur.cpp @@ -78,7 +78,7 @@ void BlurEffect::reconfigure(ReconfigureFlags flags) { Q_UNUSED(flags) - BlurConfig::self()->readConfig(); + BlurConfig::self()->read(); int radius = qBound(2, BlurConfig::blurRadius(), 14); if (shader) shader->setRadius(radius); diff --git a/effects/coverswitch/coverswitch.cpp b/effects/coverswitch/coverswitch.cpp index f329c0db39..56c1a8df93 100644 --- a/effects/coverswitch/coverswitch.cpp +++ b/effects/coverswitch/coverswitch.cpp @@ -93,7 +93,7 @@ bool CoverSwitchEffect::supported() void CoverSwitchEffect::reconfigure(ReconfigureFlags) { - CoverSwitchConfig::self()->readConfig(); + CoverSwitchConfig::self()->read(); animationDuration = animationTime(200); animateSwitch = CoverSwitchConfig::animateSwitch(); animateStart = CoverSwitchConfig::animateStart(); diff --git a/effects/cube/cube.cpp b/effects/cube/cube.cpp index 3908d01a6c..6a6195dce4 100644 --- a/effects/cube/cube.cpp +++ b/effects/cube/cube.cpp @@ -130,7 +130,7 @@ bool CubeEffect::supported() void CubeEffect::reconfigure(ReconfigureFlags) { - CubeConfig::self()->readConfig(); + CubeConfig::self()->read(); foreach (ElectricBorder border, borderActivate) { effects->unreserveElectricBorder(border, this); } diff --git a/effects/cube/cubeslide.cpp b/effects/cube/cubeslide.cpp index 7196f1ecfa..ae050b9b18 100644 --- a/effects/cube/cubeslide.cpp +++ b/effects/cube/cubeslide.cpp @@ -54,7 +54,7 @@ bool CubeSlideEffect::supported() void CubeSlideEffect::reconfigure(ReconfigureFlags) { - CubeSlideConfig::self()->readConfig(); + CubeSlideConfig::self()->read(); // TODO: rename rotationDuration to duration rotationDuration = animationTime(CubeSlideConfig::rotationDuration() != 0 ? CubeSlideConfig::rotationDuration() : 500); timeLine.setCurveShape(QTimeLine::EaseInOutCurve); diff --git a/effects/dashboard/dashboard.cpp b/effects/dashboard/dashboard.cpp index ffed0044eb..42651ecce1 100644 --- a/effects/dashboard/dashboard.cpp +++ b/effects/dashboard/dashboard.cpp @@ -50,7 +50,7 @@ DashboardEffect::~DashboardEffect() void DashboardEffect::reconfigure(ReconfigureFlags) { - DashboardConfig::self()->readConfig(); + DashboardConfig::self()->read(); brightness = DashboardConfig::brightness()/ 100.0; saturation = DashboardConfig::saturation()/ 100.0; blur = DashboardConfig::blur(); diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp index 20a022dc9d..2b7d04f19a 100644 --- a/effects/desktopgrid/desktopgrid.cpp +++ b/effects/desktopgrid/desktopgrid.cpp @@ -95,7 +95,7 @@ DesktopGridEffect::~DesktopGridEffect() void DesktopGridEffect::reconfigure(ReconfigureFlags) { - DesktopGridConfig::self()->readConfig(); + DesktopGridConfig::self()->read(); foreach (ElectricBorder border, borderActivate) { effects->unreserveElectricBorder(border, this); diff --git a/effects/diminactive/diminactive.cpp b/effects/diminactive/diminactive.cpp index 23b56284fd..a04622c210 100644 --- a/effects/diminactive/diminactive.cpp +++ b/effects/diminactive/diminactive.cpp @@ -41,7 +41,7 @@ DimInactiveEffect::DimInactiveEffect() void DimInactiveEffect::reconfigure(ReconfigureFlags) { - DimInactiveConfig::self()->readConfig(); + DimInactiveConfig::self()->read(); dim_panels = DimInactiveConfig::dimPanels(); dim_desktop = DimInactiveConfig::dimDesktop(); dim_keepabove = DimInactiveConfig::dimKeepAbove(); diff --git a/effects/flipswitch/flipswitch.cpp b/effects/flipswitch/flipswitch.cpp index bab4d0fe6b..cdd57896fc 100644 --- a/effects/flipswitch/flipswitch.cpp +++ b/effects/flipswitch/flipswitch.cpp @@ -88,7 +88,7 @@ bool FlipSwitchEffect::supported() void FlipSwitchEffect::reconfigure(ReconfigureFlags) { - FlipSwitchConfig::self()->readConfig(); + FlipSwitchConfig::self()->read(); m_tabbox = FlipSwitchConfig::tabBox(); m_tabboxAlternative = FlipSwitchConfig::tabBoxAlternative(); const int duration = animationTime(200); diff --git a/effects/glide/glide.cpp b/effects/glide/glide.cpp index b8ef783481..35c5655fbc 100644 --- a/effects/glide/glide.cpp +++ b/effects/glide/glide.cpp @@ -60,7 +60,7 @@ bool GlideEffect::supported() void GlideEffect::reconfigure(ReconfigureFlags) { // Fetch config with KConfigXT - GlideConfig::self()->readConfig(); + GlideConfig::self()->read(); duration = animationTime(350); effect = (EffectStyle) GlideConfig::glideEffect(); angle = GlideConfig::glideAngle(); diff --git a/effects/kscreen/kscreen.cpp b/effects/kscreen/kscreen.cpp index cdab01aa2b..dc4c5bc349 100644 --- a/effects/kscreen/kscreen.cpp +++ b/effects/kscreen/kscreen.cpp @@ -67,7 +67,7 @@ void KscreenEffect::reconfigure(ReconfigureFlags flags) { Q_UNUSED(flags) - KscreenConfig::self()->readConfig(); + KscreenConfig::self()->read(); m_timeLine.setDuration(animationTime(250)); } diff --git a/effects/logout/logout.cpp b/effects/logout/logout.cpp index 3df5afefa6..1df26fb310 100644 --- a/effects/logout/logout.cpp +++ b/effects/logout/logout.cpp @@ -78,7 +78,7 @@ LogoutEffect::~LogoutEffect() void LogoutEffect::reconfigure(ReconfigureFlags) { - LogoutConfig::self()->readConfig(); + LogoutConfig::self()->read(); frameDelay = 0; useBlur = LogoutConfig::useBlur(); delete blurTexture; diff --git a/effects/lookingglass/lookingglass.cpp b/effects/lookingglass/lookingglass.cpp index 092d014e92..fe144185cf 100644 --- a/effects/lookingglass/lookingglass.cpp +++ b/effects/lookingglass/lookingglass.cpp @@ -85,7 +85,7 @@ bool LookingGlassEffect::supported() void LookingGlassEffect::reconfigure(ReconfigureFlags) { - LookingGlassConfig::self()->readConfig(); + LookingGlassConfig::self()->read(); initialradius = LookingGlassConfig::radius(); radius = initialradius; qCDebug(KWINEFFECTS) << QStringLiteral("Radius from config: %1").arg(radius) << endl; diff --git a/effects/magiclamp/magiclamp.cpp b/effects/magiclamp/magiclamp.cpp index ff15da2541..e530b43ffe 100644 --- a/effects/magiclamp/magiclamp.cpp +++ b/effects/magiclamp/magiclamp.cpp @@ -48,7 +48,7 @@ bool MagicLampEffect::supported() void MagicLampEffect::reconfigure(ReconfigureFlags) { - MagicLampConfig::self()->readConfig(); + MagicLampConfig::self()->read(); // TODO: rename animationDuration to duration mAnimationDuration = animationTime(MagicLampConfig::animationDuration() != 0 ? MagicLampConfig::animationDuration() : 250); diff --git a/effects/magnifier/magnifier.cpp b/effects/magnifier/magnifier.cpp index d436521679..0bae695d49 100644 --- a/effects/magnifier/magnifier.cpp +++ b/effects/magnifier/magnifier.cpp @@ -104,7 +104,7 @@ bool MagnifierEffect::supported() void MagnifierEffect::reconfigure(ReconfigureFlags) { - MagnifierConfig::self()->readConfig(); + MagnifierConfig::self()->read(); int width, height; width = MagnifierConfig::width(); height = MagnifierConfig::height(); diff --git a/effects/mouseclick/mouseclick.cpp b/effects/mouseclick/mouseclick.cpp index a853ff2e7c..59ec6ac77c 100644 --- a/effects/mouseclick/mouseclick.cpp +++ b/effects/mouseclick/mouseclick.cpp @@ -76,7 +76,7 @@ MouseClickEffect::~MouseClickEffect() void MouseClickEffect::reconfigure(ReconfigureFlags) { - MouseClickConfig::self()->readConfig(); + MouseClickConfig::self()->read(); m_colors[0] = MouseClickConfig::color1(); m_colors[1] = MouseClickConfig::color2(); m_colors[2] = MouseClickConfig::color3(); diff --git a/effects/mousemark/mousemark.cpp b/effects/mousemark/mousemark.cpp index e72e234f1c..d5ea0e9705 100644 --- a/effects/mousemark/mousemark.cpp +++ b/effects/mousemark/mousemark.cpp @@ -76,7 +76,7 @@ MouseMarkEffect::~MouseMarkEffect() static int width_2 = 1; void MouseMarkEffect::reconfigure(ReconfigureFlags) { - MouseMarkConfig::self()->readConfig(); + MouseMarkConfig::self()->read(); width = MouseMarkConfig::lineWidth(); width_2 = width / 2; color = MouseMarkConfig::color(); diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp index f20435c501..5a9314d374 100755 --- a/effects/presentwindows/presentwindows.cpp +++ b/effects/presentwindows/presentwindows.cpp @@ -107,7 +107,7 @@ PresentWindowsEffect::~PresentWindowsEffect() void PresentWindowsEffect::reconfigure(ReconfigureFlags) { - PresentWindowsConfig::self()->readConfig(); + PresentWindowsConfig::self()->read(); foreach (ElectricBorder border, m_borderActivate) { effects->unreserveElectricBorder(border, this); } diff --git a/effects/resize/resize.cpp b/effects/resize/resize.cpp index b7d67c4ee8..170aca3a23 100644 --- a/effects/resize/resize.cpp +++ b/effects/resize/resize.cpp @@ -135,7 +135,7 @@ void ResizeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, Window void ResizeEffect::reconfigure(ReconfigureFlags) { m_features = 0; - ResizeConfig::self()->readConfig(); + ResizeConfig::self()->read(); if (ResizeConfig::textureScale()) m_features |= TextureScale; if (ResizeConfig::outline()) diff --git a/effects/sheet/sheet.cpp b/effects/sheet/sheet.cpp index a59acc726a..78b056f687 100644 --- a/effects/sheet/sheet.cpp +++ b/effects/sheet/sheet.cpp @@ -48,7 +48,7 @@ bool SheetEffect::supported() void SheetEffect::reconfigure(ReconfigureFlags) { - SheetConfig::self()->readConfig(); + SheetConfig::self()->read(); duration = animationTime(SheetConfig::animationTime() != 0 ? SheetConfig::animationTime() : 500); } diff --git a/effects/showfps/showfps.cpp b/effects/showfps/showfps.cpp index b5eef26d72..825c99e5a3 100644 --- a/effects/showfps/showfps.cpp +++ b/effects/showfps/showfps.cpp @@ -64,7 +64,7 @@ ShowFpsEffect::ShowFpsEffect() void ShowFpsEffect::reconfigure(ReconfigureFlags) { - ShowFpsConfig::self()->readConfig(); + ShowFpsConfig::self()->read(); alpha = ShowFpsConfig::alpha(); x = ShowFpsConfig::x(); y = ShowFpsConfig::y(); diff --git a/effects/thumbnailaside/thumbnailaside.cpp b/effects/thumbnailaside/thumbnailaside.cpp index 35e677e045..c77deeba73 100644 --- a/effects/thumbnailaside/thumbnailaside.cpp +++ b/effects/thumbnailaside/thumbnailaside.cpp @@ -49,7 +49,7 @@ ThumbnailAsideEffect::ThumbnailAsideEffect() void ThumbnailAsideEffect::reconfigure(ReconfigureFlags) { - ThumbnailAsideConfig::self()->readConfig(); + ThumbnailAsideConfig::self()->read(); maxwidth = ThumbnailAsideConfig::maxWidth(); spacing = ThumbnailAsideConfig::spacing(); opacity = ThumbnailAsideConfig::opacity()/100.0; diff --git a/effects/trackmouse/trackmouse.cpp b/effects/trackmouse/trackmouse.cpp index 2ed04b90d6..d7c4100fc2 100644 --- a/effects/trackmouse/trackmouse.cpp +++ b/effects/trackmouse/trackmouse.cpp @@ -84,7 +84,7 @@ TrackMouseEffect::~TrackMouseEffect() void TrackMouseEffect::reconfigure(ReconfigureFlags) { m_modifiers = 0; - TrackMouseConfig::self()->readConfig(); + TrackMouseConfig::self()->read(); if (TrackMouseConfig::shift()) m_modifiers |= Qt::ShiftModifier; if (TrackMouseConfig::alt()) diff --git a/effects/windowgeometry/windowgeometry.cpp b/effects/windowgeometry/windowgeometry.cpp index 1a4d6e2a1b..ec2f79b515 100644 --- a/effects/windowgeometry/windowgeometry.cpp +++ b/effects/windowgeometry/windowgeometry.cpp @@ -80,7 +80,7 @@ WindowGeometry::~WindowGeometry() void WindowGeometry::reconfigure(ReconfigureFlags) { - WindowGeometryConfiguration::self()->readConfig(); + WindowGeometryConfiguration::self()->read(); iHandleMoves = WindowGeometryConfiguration::move(); iHandleResizes = WindowGeometryConfiguration::resize(); } diff --git a/effects/wobblywindows/wobblywindows.cpp b/effects/wobblywindows/wobblywindows.cpp index 92b7637ab9..1f6765b46b 100644 --- a/effects/wobblywindows/wobblywindows.cpp +++ b/effects/wobblywindows/wobblywindows.cpp @@ -170,7 +170,7 @@ WobblyWindowsEffect::~WobblyWindowsEffect() void WobblyWindowsEffect::reconfigure(ReconfigureFlags) { - WobblyWindowsConfig::self()->readConfig(); + WobblyWindowsConfig::self()->read(); QString settingsMode = WobblyWindowsConfig::settings(); if (settingsMode != QStringLiteral("Custom")) { diff --git a/effects/zoom/zoom.cpp b/effects/zoom/zoom.cpp index f0936f1a14..e255cb229d 100644 --- a/effects/zoom/zoom.cpp +++ b/effects/zoom/zoom.cpp @@ -225,7 +225,7 @@ void ZoomEffect::recreateTexture() void ZoomEffect::reconfigure(ReconfigureFlags) { - ZoomConfig::self()->readConfig(); + ZoomConfig::self()->read(); // On zoom-in and zoom-out change the zoom by the defined zoom-factor. zoomFactor = qMax(0.1, ZoomConfig::zoomFactor()); // Visibility of the mouse-pointer. diff --git a/options.cpp b/options.cpp index dc839e14ac..4315e49690 100644 --- a/options.cpp +++ b/options.cpp @@ -776,7 +776,7 @@ void Options::updateSettings() void Options::loadConfig() { - m_settings->readConfig(); + m_settings->load(); KDecorationOptions::updateSettings(m_settings->config()); // read decoration settings syncFromKcfgc(); diff --git a/screens.cpp b/screens.cpp index 48367944d6..9f49a60e66 100644 --- a/screens.cpp +++ b/screens.cpp @@ -86,7 +86,7 @@ void Screens::reconfigure() return; } Settings settings(m_config); - settings.readConfig(); + settings.read(); setCurrentFollowsMouse(settings.activeMouseScreen()); } diff --git a/scripting/scriptedeffect.cpp b/scripting/scriptedeffect.cpp index d789691904..a205d1ca22 100644 --- a/scripting/scriptedeffect.cpp +++ b/scripting/scriptedeffect.cpp @@ -405,7 +405,7 @@ bool ScriptedEffect::init(const QString &effectName, const QString &pathToScript KConfigGroup cg = effects->effectConfig(m_effectName); QFile xmlFile(kconfigXTFile); m_config = new KConfigLoader(cg, &xmlFile, this); - m_config->readConfig(); + m_config->load(); } QScriptValue effectsObject = m_engine->newQObject(effects, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater); @@ -527,7 +527,7 @@ void ScriptedEffect::reconfigure(ReconfigureFlags flags) { AnimationEffect::reconfigure(flags); if (m_config) { - m_config->readConfig(); + m_config->read(); } emit configChanged(); }