[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] kwin: Get rid of QMetaObjectPrivate warning for duplicated configChanged()
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2013-10-22 5:17:23
Message-ID: E1VYULL-0005cs-Pi () scm ! kde ! org
[Download RAW message or body]

Git commit 511dd2ed4c79a7479a3e8d31635575a3569f6740 by Casian Andrei.
Committed on 18/10/2013 at 17:01.
Pushed by casianandrei into branch 'master'.

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

M  +2    -0    kwin/options.cpp
M  +2    -3    kwin/options.h

http://commits.kde.org/kde-workspace/511dd2ed4c79a7479a3e8d31635575a3569f67=
40

diff --git a/kwin/options.cpp b/kwin/options.cpp
index f2eee2d..8fb12e8 100644
--- a/kwin/options.cpp
+++ b/kwin/options.cpp
@@ -176,6 +176,8 @@ Options::Options(QObject *parent)
 {
     m_settings->setDefaults();
     syncFromKcfgc();
+
+    connect(this, SIGNAL(focusPolicyIsResonableChanged()), this, SIGNAL(&K=
ConfigOptions::configChanged()));
 }
 =

 Options::~Options()
diff --git a/kwin/options.h b/kwin/options.h
index 8b3fde4..096a2ef 100644
--- a/kwin/options.h
+++ b/kwin/options.h
@@ -86,7 +86,7 @@ class Options : public KDecorationOptions
      **/
     Q_PROPERTY(bool separateScreenFocus READ isSeparateScreenFocus WRITE s=
etSeparateScreenFocus NOTIFY separateScreenFocusChanged)
     Q_PROPERTY(int placement READ placement WRITE setPlacement NOTIFY plac=
ementChanged)
-    Q_PROPERTY(bool focusPolicyIsReasonable READ focusPolicyIsReasonable N=
OTIFY configChanged)
+    Q_PROPERTY(bool focusPolicyIsReasonable READ focusPolicyIsReasonable N=
OTIFY 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();
[prev in list] [next in list] [prev in thread] [next in thread]