aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlad Zagorodniy <[email protected]>2018-10-09 18:44:07 +0300
committerVlad Zagorodniy <[email protected]>2018-10-09 19:06:04 +0300
commit5d5816be2bac29a7196a05d981d979bab6072ce6 (patch)
tree6057cf596051f043f1f901342a84f7d8b1262b36
parent27bf348583cd3e40eccc6b85f186a0c2946ea271 (diff)
[libkwineffects] Don't expose the fullscreen effect lock to the public API
Summary: The fullscreen effect lock is purely an implementation detail of the AnimationEffect, we don't need to have it in the public API. Test Plan: KWin still compiles. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D16075
-rw-r--r--libkwineffects/anidata.cpp10
-rw-r--r--libkwineffects/anidata_p.h14
-rw-r--r--libkwineffects/kwinanimationeffect.cpp10
-rw-r--r--libkwineffects/kwinanimationeffect.h14
4 files changed, 24 insertions, 24 deletions
diff --git a/libkwineffects/anidata.cpp b/libkwineffects/anidata.cpp
index 399e3e0..edab6da 100644
--- a/libkwineffects/anidata.cpp
+++ b/libkwineffects/anidata.cpp
@@ -31,6 +31,16 @@ QDebug operator<<(QDebug dbg, const KWin::AniData &a)
using namespace KWin;
static const int Gaussian = 46;
+FullScreenEffectLock::FullScreenEffectLock(Effect *effect)
+{
+ effects->setActiveFullScreenEffect(effect);
+}
+
+FullScreenEffectLock::~FullScreenEffectLock()
+{
+ effects->setActiveFullScreenEffect(nullptr);
+}
+
AniData::AniData()
: attribute(AnimationEffect::Opacity)
, customCurve(0) // Linear
diff --git a/libkwineffects/anidata_p.h b/libkwineffects/anidata_p.h
index 741ea0e..0f53c16 100644
--- a/libkwineffects/anidata_p.h
+++ b/libkwineffects/anidata_p.h
@@ -27,6 +27,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin {
+/**
+ * Wraps effects->setActiveFullScreenEffect for the duration of it's lifespan
+ */
+class FullScreenEffectLock
+{
+public:
+ FullScreenEffectLock(Effect *effect);
+ ~FullScreenEffectLock();
+private:
+ Q_DISABLE_COPY(FullScreenEffectLock)
+ void *d; //unused currently
+};
+typedef QSharedPointer<FullScreenEffectLock> FullScreenEffectLockPtr;
+
class KWINEFFECTS_EXPORT AniData {
public:
AniData();
diff --git a/libkwineffects/kwinanimationeffect.cpp b/libkwineffects/kwinanimationeffect.cpp
index 5fc1d03..5f0d8dc 100644
--- a/libkwineffects/kwinanimationeffect.cpp
+++ b/libkwineffects/kwinanimationeffect.cpp
@@ -965,14 +965,4 @@ AnimationEffect::AniMap AnimationEffect::state() const
return d->m_animations;
}
-FullScreenEffectLock::FullScreenEffectLock(Effect *effect)
-{
- effects->setActiveFullScreenEffect(effect);
-}
-
-FullScreenEffectLock::~FullScreenEffectLock()
-{
- effects->setActiveFullScreenEffect(nullptr);
-}
-
#include "moc_kwinanimationeffect.cpp"
diff --git a/libkwineffects/kwinanimationeffect.h b/libkwineffects/kwinanimationeffect.h
index 4736dc5..ce46f34 100644
--- a/libkwineffects/kwinanimationeffect.h
+++ b/libkwineffects/kwinanimationeffect.h
@@ -88,20 +88,6 @@ private:
bool valid;
};
-/**
- * Wraps effects->setActiveFullScreenEffect for the duration of it's lifespan
- */
-class FullScreenEffectLock
-{
-public:
- FullScreenEffectLock(Effect *effect);
- ~FullScreenEffectLock();
-private:
- Q_DISABLE_COPY(FullScreenEffectLock)
- void *d; //unused currently
-};
-typedef QSharedPointer<FullScreenEffectLock> FullScreenEffectLockPtr;
-
class AniData;
class AnimationEffectPrivate;
class KWINEFFECTS_EXPORT AnimationEffect : public Effect