vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of QMetaObjectPrivate warning for duplicated configChanged() 

The configChanged() signal was declared in both KDecorationOptions and
Options, while Options recently became derived from KDecorationOptions.
This created confusion for QMetaObjectPrivate which was spitting a
couple of error messages.

Remove configChanged() signal declaration from Options, rely on the one
from the base class Options.

Create a special notify signal for focusPolicyIsResonableChanged,
directly connected to the configChanged() signal.

REVIEW: 113336
icc-effect-5.14.5
Casian Andrei 2013-10-18 20:01:04 +03:00
parent b2aad6a693
commit 1333d9d4d1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options.cpp
View File

@ -176,6 +176,8 @@ Options::Options(QObject *parent)
{
m_settings->setDefaults();
syncFromKcfgc();
connect(this, SIGNAL(focusPolicyIsResonableChanged()), this, SIGNAL(&KConfigOptions::configChanged()));
}
Options::~Options()

5
options.h
View File

@ -86,7 +86,7 @@ class Options : public KDecorationOptions
**/
Q_PROPERTY(bool separateScreenFocus READ isSeparateScreenFocus WRITE setSeparateScreenFocus NOTIFY separateScreenFocusChanged)
Q_PROPERTY(int placement READ placement WRITE setPlacement NOTIFY placementChanged)
Q_PROPERTY(bool focusPolicyIsReasonable READ focusPolicyIsReasonable NOTIFY configChanged)
Q_PROPERTY(bool focusPolicyIsReasonable READ focusPolicyIsReasonable NOTIFY focusPolicyIsResonableChanged)
/**
* the size of the zone that triggers snapping on desktop borders
*/
@ -743,10 +743,9 @@ public:
//----------------------
Q_SIGNALS:
void configChanged();
// for properties
void focusPolicyChanged();
void focusPolicyIsResonableChanged();
void nextFocusPrefersMouseChanged();
void clickRaiseChanged();
void autoRaiseChanged();