Options no longer inherits from KDecorationOptions

icc-effect-5.14.5
Martin Gräßlin 2014-12-02 09:51:52 +01:00
parent cb38028d98
commit 93f414a070
2 changed files with 4 additions and 3 deletions

View File

@ -107,7 +107,7 @@ int currentRefreshRate()
}
Options::Options(QObject *parent)
: KDecorationOptions(parent)
: QObject(parent)
, m_settings(new Settings(KSharedConfig::openConfig()))
, m_focusPolicy(ClickToFocus)
, m_nextFocusPrefersMouse(false)
@ -840,7 +840,6 @@ void Options::updateSettings()
void Options::loadConfig()
{
m_settings->load();
KDecorationOptions::updateSettings(m_settings->config()); // read decoration settings
syncFromKcfgc();

View File

@ -47,7 +47,7 @@ enum HiddenPreviews {
class Settings;
class Options : public KDecorationOptions
class Options : public QObject, public KDecorationDefines
{
Q_OBJECT
Q_ENUMS(FocusPolicy)
@ -825,6 +825,8 @@ Q_SIGNALS:
void glPreferBufferSwapChanged();
void glPlatformInterfaceChanged();
void configChanged();
public Q_SLOTS:
void setColorCorrected(bool colorCorrected = false);