diff options
| author | Serge Lysenko <sergii.lysenko@avid.com> | 2016-08-29 13:16:39 +0300 |
|---|---|---|
| committer | Serge Lysenko <lserge@auster.in.ua> | 2016-09-12 09:29:23 +0000 |
| commit | efe6efe627a3253c7e2283378b2b5c268c9b6199 (patch) | |
| tree | 2a5ae4fc54c97cfc02caf4d6dd2c128ded868a9d /src/widgets/util/qsystemtrayicon_x11.cpp | |
| parent | e8892c7e7a0bdebca9ff491a9446c0b4192fe7fd (diff) | |
QSystemTrayIconPrivate: replace inline _qpa_ stubs with direct calls
Change-Id: If82381199ed9fadc2dfacc84e63d5e3b05ae336c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/util/qsystemtrayicon_x11.cpp')
| -rw-r--r-- | src/widgets/util/qsystemtrayicon_x11.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index db5269201c..20ab0f6377 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -284,7 +284,7 @@ void QSystemTrayIconPrivate::install_sys() QRect QSystemTrayIconPrivate::geometry_sys() const { if (qpa_sys) - return geometry_sys_qpa(); + return qpa_sys->geometry(); if (!sys) return QRect(); return sys->globalGeometry(); @@ -307,7 +307,7 @@ void QSystemTrayIconPrivate::remove_sys() void QSystemTrayIconPrivate::updateIcon_sys() { if (qpa_sys) { - updateIcon_sys_qpa(); + qpa_sys->updateIcon(icon); return; } if (sys) @@ -316,14 +316,16 @@ void QSystemTrayIconPrivate::updateIcon_sys() void QSystemTrayIconPrivate::updateMenu_sys() { - if (qpa_sys) - updateMenu_sys_qpa(); + if (qpa_sys && menu) { + addPlatformMenu(menu); + qpa_sys->updateMenu(menu->platformMenu()); + } } void QSystemTrayIconPrivate::updateToolTip_sys() { if (qpa_sys) { - updateToolTip_sys_qpa(); + qpa_sys->updateToolTip(toolTip); return; } if (!sys) @@ -360,7 +362,8 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QString const QIcon &icon, QSystemTrayIcon::MessageIcon msgIcon, int msecs) { if (qpa_sys) { - showMessage_sys_qpa(title, message, icon, msgIcon, msecs); + qpa_sys->showMessage(title, message, icon, + static_cast<QPlatformSystemTrayIcon::MessageIcon>(msgIcon), msecs); return; } if (!sys) |