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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/nowplaying
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2009-05-31 10:57:23
Message-ID: 1243767443.108096.1218.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 975827 by alexmerry:

Don't nest signal blocking calls.

CCBUG: 189265



 M  +4 -9      nowplaying.cpp  
 M  +0 -1      nowplaying.h  


--- trunk/KDE/kdeplasma-addons/applets/nowplaying/nowplaying.cpp #975826:975827
@@ -205,13 +205,6 @@
     }
 }
 
-void NowPlaying::updatePositionSlider(int position)
-{
-    m_positionSlider->blockSignals(true);
-    m_positionSlider->setValue(position);
-    m_positionSlider->blockSignals(false);
-}
-
 void NowPlaying::dataUpdated(const QString &name,
                              const Plasma::DataEngine::Data &data)
 {
@@ -247,7 +240,7 @@
 
         m_positionSlider->blockSignals(true);
         if (length == 0) {
-            updatePositionSlider(0);
+            m_positionSlider->setValue(0);
         }
         m_positionSlider->setMaximum(length);
         m_positionSlider->blockSignals(false);
@@ -259,7 +252,9 @@
                    QString::number(length / 60) + ':' +
                    QString::number(length % 60).rightJustified(2, '0');
         // we assume it's changed
-        updatePositionSlider(pos);
+        m_positionSlider->blockSignals(true);
+        m_positionSlider->setValue(pos);
+        m_positionSlider->blockSignals(false);
     }
 
     QMap<QString,QString> metadata;
--- trunk/KDE/kdeplasma-addons/applets/nowplaying/nowplaying.h #975826:975827
@@ -92,7 +92,6 @@
     void findPlayer();
     void layoutPlanar();
     void layoutHorizontal();
-    void updatePositionSlider(int position);
 
     QString m_watchingPlayer;
     Plasma::Service* m_controller;

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