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

List:       kde-commits
Subject:    KDE/kdelibs/kutils/kidletime
From:       Dario Freddi <drf () kde ! org>
Date:       2009-07-30 12:44:10
Message-ID: 1248957850.916885.31625.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1004531 by dafre:

CCMAIL: kurt.hindenburg@gmail.com

Fixing macpoller. Kurt, can you please confirm me if it builds? If you could also run \
the example and verify if it works on Mac, I'd really appreciate it



 M  +4 -4      macpoller.cpp  
 M  +3 -1      macpoller.h  


--- trunk/KDE/kdelibs/kutils/kidletime/macpoller.cpp #1004530:1004531
@@ -88,7 +88,7 @@
         break;
     case kEventLoopIdleTimerIdling:
         // Called every time the timer fires (i.e. every second).
-        ((MacPoller*)inUserData)->mSecondsIdle++;
+        ((MacPoller*)inUserData)->m_secondsIdle++;
         ((MacPoller*)inUserData)->poll();
         break;
     }
@@ -127,7 +127,7 @@
 bool MacPoller::setUpPoller()
 {
     // May already be init'ed.
-    if (mTimerRef) {
+    if (m_timerRef) {
         return true;
     }
 
@@ -150,8 +150,8 @@
         return false;
     }
 
-    EventLoopIdleTimerUPP timerUPP = \
                NewEventLoopIdleTimerUPP(Private::IdleTimerAction);
-    if ((*myInstallEventLoopIdleTimer)(GetMainEventLoop(), kEventDurationSecond, \
kEventDurationSecond, timerUPP, 0, &d->mTimerRef)) { +    EventLoopIdleTimerUPP \
timerUPP = NewEventLoopIdleTimerUPP(IdleTimerAction); +    if \
((*myInstallEventLoopIdleTimer)(GetMainEventLoop(), kEventDurationSecond, \
kEventDurationSecond, timerUPP, 0, &m_timerRef)) {  return true;
     }
 
--- trunk/KDE/kdelibs/kutils/kidletime/macpoller.h #1004530:1004531
@@ -25,6 +25,8 @@
 
 class MacPoller: public AbstractSystemPoller
 {
+    Q_OBJECT
+
 public:
     MacPoller(QWidget *parent = 0);
     virtual ~MacPoller();
@@ -46,7 +48,7 @@
     void triggerResume();
 
 private slots:
-    void poll();
+    int poll();
 
 signals:
     void resumingFromIdle();


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