diff --git a/plasma/animator.h b/plasma/animator.h index 32ed24c9..4fb963f9 100644 --- a/plasma/animator.h +++ b/plasma/animator.h @@ -88,9 +88,6 @@ public: /** * Singleton accessor **/ -#ifndef KDE_NO_DEPRECATED - static KDE_DEPRECATED Animator *self(); -#endif /** * Factory to build new animation objects. To control their behavior, @@ -120,9 +117,6 @@ public: * @return the id of the animation * @deprecated use new Animator API with Qt Kinetic **/ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE int animateItem(QGraphicsItem *item,Animation anim); -#endif /** * Stops an item animation before the animation is complete. @@ -132,9 +126,6 @@ public: * @param id the id of the animation as returned by animateItem * @deprecated use new Animator API with Qt Kinetic */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE void stopItemAnimation(int id); -#endif /** * Starts a standard animation on a QGraphicsItem. @@ -144,9 +135,6 @@ public: * @return the id of the animation * @deprecated use new Animator API with Qt Kinetic **/ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE int moveItem(QGraphicsItem *item, Movement movement, const QPoint &destination); -#endif /** * Stops an item movement before the animation is complete. @@ -156,9 +144,6 @@ public: * @param id the id of the animation as returned by moveItem * @deprecated use new Animator API with Qt Kinetic */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE void stopItemMovement(int id); -#endif /** * Starts a custom animation, preventing the need to create a timeline @@ -178,10 +163,6 @@ public: * @return an id that can be used to identify this animation. * @deprecated use new Animator API with Qt Kinetic */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE int customAnimation(int frames, int duration, - Animator::CurveShape curve, QObject *receiver, const char *method); -#endif /** * Stops a custom animation. Note that it is not necessary to call @@ -191,22 +172,7 @@ public: * @param id the id of the animation as returned by customAnimation * @deprecated use new Animator API with Qt Kinetic */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE void stopCustomAnimation(int id); -#endif -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE int animateElement(QGraphicsItem *obj, Animation); -#endif -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE void stopElementAnimation(int id); -#endif -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE void setInitialPixmap(int id, const QPixmap &pixmap); -#endif -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE QPixmap currentPixmap(int id); -#endif /** * Can be used to query if there are other animations happening. This way @@ -215,9 +181,6 @@ public: * @since 4.1 * @deprecated use new Animator API with Qt Kinetic */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE bool isAnimating() const; -#endif /** * Register a widget as a scrolling widget. @@ -227,9 +190,6 @@ public: * @param widget the widget that offers a scrolling behaviour * @since 4.4 */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED void registerScrollingManager(QGraphicsWidget *widget); -#endif /** * unregister the scrolling manager of a certain widget @@ -238,40 +198,16 @@ public: * @param widget the widget we don't want no longer animated * @since 4.4 */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED void unregisterScrollingManager(QGraphicsWidget *widget); -#endif Q_SIGNALS: void animationFinished(QGraphicsItem *item, Plasma::Animator::Animation anim); void movementFinished(QGraphicsItem *item); void elementAnimationFinished(int id); void customAnimationFinished(int id); -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED void scrollStateChanged(QGraphicsWidget *widget, QAbstractAnimation::State newState, - QAbstractAnimation::State oldState); -#endif -#ifndef KDE_NO_DEPRECATED -protected: - void timerEvent(QTimerEvent *event); -#endif private: -#ifndef KDE_NO_DEPRECATED - friend class AnimatorSingleton; - explicit Animator(QObject * parent = 0); - ~Animator(); - - Q_PRIVATE_SLOT(d, void animatedItemDestroyed(QObject*)) - Q_PRIVATE_SLOT(d, void movingItemDestroyed(QObject*)) - Q_PRIVATE_SLOT(d, void animatedElementDestroyed(QObject*)) - Q_PRIVATE_SLOT(d, void customAnimReceiverDestroyed(QObject*)) - Q_PRIVATE_SLOT(d, void scrollStateChanged(QAbstractAnimation::State, - QAbstractAnimation::State)) -#else Animator(); -#endif friend class AnimatorPrivate; AnimatorPrivate * const d; diff --git a/plasma/containment.cpp b/plasma/containment.cpp index ca5b0197..d461c2f4 100644 --- a/plasma/containment.cpp +++ b/plasma/containment.cpp @@ -1604,12 +1604,6 @@ void ContainmentPrivate::mimeTypeRetrieved(KIO::Job *job, const QString &mimetyp #endif // PLASMA_NO_KIO } -#ifndef KDE_NO_DEPRECATED -const QGraphicsItem *Containment::toolBoxItem() const -{ - return d->toolBox.data(); -} -#endif void Containment::setToolBox(AbstractToolBox *toolBox) { diff --git a/plasma/containment.h b/plasma/containment.h index e725a99e..37f1ae22 100644 --- a/plasma/containment.h +++ b/plasma/containment.h @@ -610,9 +610,6 @@ Q_SIGNALS: /** * @returns the toolbox associated with this containment, or a null pointer if none */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED const QGraphicsItem *toolBoxItem() const; -#endif /** * Sets a custom ToolBox diff --git a/plasma/corona.cpp b/plasma/corona.cpp index 590647a6..ea94de6d 100644 --- a/plasma/corona.cpp +++ b/plasma/corona.cpp @@ -286,12 +286,6 @@ QList Corona::importLayout(const KConfigGroup &conf) return d->importLayout(conf, true); } -#ifndef KDE_NO_DEPRECATED -QList Corona::importLayout(const KConfigBase &conf) -{ - return d->importLayout(conf, true); -} -#endif Containment *Corona::containmentForScreen(int screen, int desktop) const { diff --git a/plasma/corona.h b/plasma/corona.h index 6152514b..5dc2e1c7 100644 --- a/plasma/corona.h +++ b/plasma/corona.h @@ -306,9 +306,6 @@ public: * @return the list of containments that were loaded * @since 4.5 */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED QList importLayout(const KConfigBase &config); -#endif /** * Returns the name of the preferred plugin to be used as containment toolboxes. diff --git a/plasma/widgets/scrollwidget.cpp b/plasma/widgets/scrollwidget.cpp index ff469664..c481e6c6 100644 --- a/plasma/widgets/scrollwidget.cpp +++ b/plasma/widgets/scrollwidget.cpp @@ -1233,21 +1233,7 @@ void ScrollWidget::ensureItemVisible(QGraphicsItem *item) } } -#ifndef KDE_NO_DEPRECATED -void ScrollWidget::registerAsDragHandle(QGraphicsWidget *item) -{ - Q_UNUSED(item); - return; -} -#endif -#ifndef KDE_NO_DEPRECATED -void ScrollWidget::unregisterAsDragHandle(QGraphicsWidget *item) -{ - Q_UNUSED(item); - return; -} -#endif QRectF ScrollWidget::viewportGeometry() const { diff --git a/plasma/widgets/scrollwidget.h b/plasma/widgets/scrollwidget.h index 5ea476b2..1a6f7370 100644 --- a/plasma/widgets/scrollwidget.h +++ b/plasma/widgets/scrollwidget.h @@ -181,9 +181,6 @@ public: * it's not necessary to call this function. * @since 4.4 */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE void registerAsDragHandle(QGraphicsWidget *item); -#endif /** * Unregister the given item as drag handle (if it was registered) @@ -193,9 +190,6 @@ public: * * @since 4.4 */ -#ifndef KDE_NO_DEPRECATED - KDE_DEPRECATED Q_INVOKABLE void unregisterAsDragHandle(QGraphicsWidget *item); -#endif /** * The geometry of the viewport.