Fixes: NB#182543 - plainQt - Weird haptic feedback

RevBy: Bernd Lamecker

1 files changed, 7 insertions, 8 deletions

diff --git a/plainqt/style/qtmaemo6styleeventfilter.cpp b/plainqt/style/qtmaemo6styleeventfilter.cpp
index c0556dba..746f2bc8 100644
--- a/plainqt/style/qtmaemo6styleeventfilter.cpp
+++ b/plainqt/style/qtmaemo6styleeventfilter.cpp
@@ -160,11 +160,11 @@ bool QtMaemo6StyleEventFilter::eventFilter(QObject *obj, QEvent *event)
     case QEvent::MouseButtonDblClick:
     case QEvent::MouseButtonPress: {
         // now send press feedback
-        MFeedbackPlayer *feedbackPlayer = MComponentData::feedbackPlayer();
-
-        if (feedbackPlayer) {
-            feedbackPlayer->play(MFeedbackPlayer::Press);
+        if(QtMaemo6Style* style = qobject_cast<QtMaemo6Style*>(widget->style())) {
+            const MFeedback *  feedback = style->feedback(MFeedbackPlayer::Press, widget);
+            if ( feedback ) feedback->play();
         }
+
         if(QComboBox* comboBox = qobject_cast<QComboBox*>(widget)) {
             //done in mousePress, because in this way the original popup is completely suppressed
             QtMaemo6ComboBoxPopup *comboBoxPopup = new QtMaemo6ComboBoxPopup(comboBox, NULL);
@@ -179,10 +179,9 @@ bool QtMaemo6StyleEventFilter::eventFilter(QObject *obj, QEvent *event)
         //qCritical( "eventFilter got mouseRelease" );
 
         // now send release feedback
-        MFeedbackPlayer *feedbackPlayer = MComponentData::feedbackPlayer();
-
-        if (feedbackPlayer) {
-            feedbackPlayer->play(MFeedbackPlayer::Release);
+        if(QtMaemo6Style* style = qobject_cast<QtMaemo6Style*>(widget->style())) {
+            const MFeedback *  feedback = style->feedback(MFeedbackPlayer::Release, widget);
+            if ( feedback ) feedback->play();
         }
     }
     break;