Browse Source

Avoid Windows poll macro collision in activity monitor

master
evgeny 6 days ago
parent
commit
376695e410
  1. 6
      tools/chatgui/src/user_activity_monitor.cpp
  2. 2
      tools/chatgui/src/user_activity_monitor.h

6
tools/chatgui/src/user_activity_monitor.cpp

@ -29,7 +29,7 @@
UserActivityMonitor::UserActivityMonitor(QObject* parent) : QObject(parent) {
m_pollTimer.setInterval(250);
connect(&m_pollTimer, &QTimer::timeout, this, &UserActivityMonitor::poll);
connect(&m_pollTimer, &QTimer::timeout, this, &UserActivityMonitor::pollIdleTime);
}
UserActivityMonitor::~UserActivityMonitor() {
@ -51,7 +51,7 @@ void UserActivityMonitor::start() {
if (wayland && !m_gnomeUnavailable) {
m_useGnome = true;
m_pollTimer.start();
poll();
pollIdleTime();
return;
}
#endif
@ -107,7 +107,7 @@ void UserActivityMonitor::checkIdleTime(qint64 idleMs, qint64 elapsedMs) {
emit activity();
}
void UserActivityMonitor::poll() {
void UserActivityMonitor::pollIdleTime() {
#ifdef UTUN_ACTIVITY_DBUS
if (m_useGnome) {
if (m_dbusPending) return;

2
tools/chatgui/src/user_activity_monitor.h

@ -22,7 +22,7 @@ protected:
virtual qint64 systemIdleTime();
private:
void poll();
void pollIdleTime();
void checkIdleTime(qint64 idleMs, qint64 elapsedMs);
void useLocalActivity();
void startWaylandFallback();

Loading…
Cancel
Save