OSDN Git Service

generic: fix build against Katie
authorIvailo Monev <xakepa10@gmail.com>
Sat, 23 Jan 2016 14:27:47 +0000 (16:27 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Sat, 23 Jan 2016 14:27:47 +0000 (16:27 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
14 files changed:
amarok/src/context/widgets/ContainmentArrow.cpp
amarok/src/context/widgets/ContainmentSelectionLayer.cpp
kdeplasma-addons/applets/bubblemon/src/bubble.cpp
kdeplasma-addons/applets/frame/frame.cpp
kdeplasma-addons/applets/icontasks/abstracttaskitem.cpp
kdeplasma-addons/applets/lancelot/launcher/LancelotApplet.cpp
kdeplasma-addons/applets/notes/notes.cpp
kdeplasma-addons/applets/rssnow/scroller.cpp
kdeplasma-addons/applets/webslice/plasma/webslice.cpp
kdeplasma-addons/containments/groupingdesktop/lib/freehandle.cpp
kdeplasma-addons/containments/groupingdesktop/lib/handle.cpp
kdeplasma-addons/libs/lancelot/widgets/BasicWidget.cpp
kdeplasma-addons/libs/lancelot/widgets/ResizeBordersPanel.cpp
kdeplasma-addons/libs/lancelot/widgets/ScrollPane.cpp

index dcac3b8..4d2c9e7 100644 (file)
@@ -45,7 +45,7 @@ ContainmentArrow::ContainmentArrow( QGraphicsItem *parent, int direction ) :
     setFlag( ItemClipsToShape, false );
     setFlag( ItemClipsChildrenToShape, false );
     setFlag( ItemIgnoresTransformations, true );
-    setAcceptsHoverEvents( true );
+    setAcceptHoverEvents( true );
 
     m_timer = new QTimer( this );
     connect( m_timer, SIGNAL(timeout()), this, SLOT(timeToHide()) );
index e6af3e8..b2ba6da 100644 (file)
@@ -33,7 +33,7 @@ ContainmentSelectionLayer::ContainmentSelectionLayer( QGraphicsItem *parent )
     , m_mouseHover( 0 )
 {
     m_containment = static_cast<Plasma::Containment *>( parent );
-    setAcceptsHoverEvents( true );
+    setAcceptHoverEvents( true );
     m_zoomInText = new QGraphicsSimpleTextItem( i18n( "Zoom In" ), this );
     
     QFont font;
index b69eac4..4d60d19 100644 (file)
@@ -57,7 +57,7 @@ Bubble::Bubble(QObject *parent, const QVariantList &args)
 
     connect(m_svg, SIGNAL(repaintNeeded()), this, SLOT(repaintNeeded()));
 
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     setAspectRatioMode(Plasma::Square);
     setBackgroundHints(NoBackground);
     
index dfacd7f..5159790 100644 (file)
@@ -64,7 +64,7 @@ Frame::Frame(QObject *parent, const QVariantList &args)
 {
     setHasConfigurationInterface(true);
     setAcceptDrops(true);
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     setCacheMode(QGraphicsItem::DeviceCoordinateCache);
     resize(400, 300);
     //make size()==contentssize(), resolves auto-shrinking once for all
index ea53c47..d51ca9a 100644 (file)
@@ -354,7 +354,7 @@ AbstractTaskItem::AbstractTaskItem(QGraphicsWidget *parent, Tasks *applet)
     m_layoutAnimation->setDuration(250);
 
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     setAcceptDrops(true);
     setFocusPolicy(Qt::StrongFocus);
     setFlag(QGraphicsItem::ItemIsFocusable);
index ead554a..be30b90 100644 (file)
@@ -194,7 +194,7 @@ LancelotApplet::LancelotApplet(QObject * parent,
 {
     setHasConfigurationInterface(true);
     setBackgroundHints(NoBackground);
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
 
     d->waitClick.setInterval(500); // 1/2 sec
     d->waitClick.setSingleShot(true);
@@ -282,7 +282,7 @@ void LancelotApplet::iconSizeChanged(int group)
 void LancelotApplet::init()
 {
     d->lancelot->addClient();
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     loadConfig();
     applyConfig();
     connect(
index 8eb58fb..7b1294a 100644 (file)
@@ -109,7 +109,7 @@ Notes::Notes(QObject *parent, const QVariantList &args)
     setAspectRatioMode(Plasma::IgnoreAspectRatio);
     setHasConfigurationInterface(true);
     setAcceptDrops(true);
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     setBackgroundHints(Plasma::Applet::NoBackground);
     m_saveTimer.setSingleShot(true);
     connect(&m_saveTimer, SIGNAL(timeout()), this, SLOT(saveNote()));
index 6107d4a..a0e286c 100644 (file)
@@ -52,7 +52,7 @@ Scroller::Scroller(QGraphicsItem *parent) :
 {
 
     setAcceptedMouseButtons(Qt::LeftButton);
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     setFlag(QGraphicsItem::ItemClipsChildrenToShape, true);
 
     m_hovered = false;
index f78c6e7..bbdc2f4 100644 (file)
@@ -47,7 +47,7 @@ WebSlice::WebSlice(QObject *parent, const QVariantList &args)
     setPopupIcon("internet-web-browser");
     setAspectRatioMode(Plasma::IgnoreAspectRatio );
     setAcceptDrops(true);
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
 
     setMinimumSize(64, 64);
     resize(800, 600);
index e62d8ee..11fd865 100644 (file)
@@ -112,7 +112,7 @@ void FreeHandle::init()
     connect(m_leaveTimer, SIGNAL(timeout()), this, SLOT(leaveTimeout()));
     connect(widget(), SIGNAL(destroyed(QObject*)), this, SLOT(widgetDestroyed()));
 
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     m_hoverTimer->start();
 
     //icons
@@ -1005,7 +1005,7 @@ void FreeHandle::startFading(FadeType anim, const QPointF &hoverPos, bool preser
 
 void FreeHandle::forceDisappear()
 {
-    setAcceptsHoverEvents(false);
+    setAcceptHoverEvents(false);
     startFading(FadeOut, m_entryPos);
 }
 
index be76210..1d5b99a 100644 (file)
@@ -56,7 +56,7 @@ Handle::Handle(GroupingContainment *parent, Plasma::Applet *applet)
         m_widget(applet),
         m_currentView(applet->view())
 {
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     setAcceptTouchEvents(true);
 }
 
index fcbaf64..67a3fe7 100644 (file)
@@ -67,7 +67,7 @@ class BasicWidget::Private {
 
     void init(BasicWidget * parent)
     {
-        parent->setAcceptsHoverEvents(true);
+        parent->setAcceptHoverEvents(true);
         // parent->resize(140, 38);
         parent->setGroupByName("BasicWidget");
     }
index 1c24c56..bc929e3 100644 (file)
@@ -35,7 +35,7 @@ public:
         BorderItem(QGraphicsItem * parent = 0, ResizeBordersPanel::Private * d = 0, int position = 0)
             : Widget(parent), m_position(position), m_d(d)
         {
-            setAcceptsHoverEvents(true);
+            setAcceptHoverEvents(true);
         }
 
     protected:
index a4d709b..450c2bc 100644 (file)
@@ -92,7 +92,7 @@ public:
 ScrollPane::ScrollPane(QGraphicsItem * parent) //>
     : Widget(parent), d(new Private(this))
 {
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     d->layout = new /*FlipLayout <*/ FullBorderLayout /*>*/ (this);
     // d->layout->setParentLayoutItem(this);
 
@@ -104,7 +104,7 @@ ScrollPane::ScrollPane(QGraphicsItem * parent) //>
     d->horizontal->setZValue(1);
 
     d->centerContainer = new QGraphicsWidget(this);
-    d->centerContainer->setAcceptsHoverEvents(true);
+    d->centerContainer->setAcceptHoverEvents(true);
     d->centerContainer->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
 
     connect (d->vertical, SIGNAL(valueChanged(int)),