fix the build (constness error) by implementing a suggestion from comments

svn path=/trunk/KDE/kdebase/workspace/; revision=1056343
This commit is contained in:
Andreas Hartmetz 2009-11-29 22:11:49 +00:00
parent 312c5b04fe
commit eab4dc6ed4
2 changed files with 5 additions and 8 deletions

View file

@ -217,21 +217,18 @@ unsigned long Options::updateSettings()
// KDE4 this probably needs to be done manually in clients
// Driver-specific config detection
// TODO: this is now a bit cumbersome.
// reloadCompositingSettings isn't use anywhere else, so the prefs should be allocated there
// and not passed as value
CompositingPrefs prefs;
reloadCompositingSettings( prefs );
reloadCompositingSettings();
return changed;
}
void Options::reloadCompositingSettings(const CompositingPrefs& prefs)
void Options::reloadCompositingSettings()
{
KSharedConfig::Ptr _config = KGlobal::config();
KConfigGroup config(_config, "Compositing");
// Compositing settings
CompositingPrefs prefs;
useCompositing = config.readEntry("Enabled", true);
if (useCompositing)
{
@ -240,7 +237,7 @@ void Options::reloadCompositingSettings(const CompositingPrefs& prefs)
}
if (!useCompositing)
return;
QString compositingBackend = config.readEntry("Backend", "OpenGL");
if( compositingBackend == "XRender" )
compositingMode = XRenderCompositing;

View file

@ -391,7 +391,7 @@ class Options : public KDecorationOptions
int animationSpeed; // 0 - instant, 5 - very slow
MouseCommand wheelToMouseCommand( MouseWheelCommand com, int delta );
void reloadCompositingSettings(const CompositingPrefs& prefs);
void reloadCompositingSettings();
};
extern Options* options;