diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-11-26 19:49:57 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-12-08 09:55:34 +0100 |
commit | f277c074675389eba0b27f2ccadddd98869fdfbb (patch) | |
tree | 80ba1ff20bd81e72f7e7e1c39340d4bcc4056478 /src/widgets/util/qsystemtrayicon_x11.cpp | |
parent | c5a43acf18c8e15f28c2b4f6fd2402317f089b89 (diff) |
Harmonize QPA TrayIcon showMessage parameter order
Parameters were misnamed in some places but still managed to pass them
through in the right order. Rename to avoid confusion, and keep the
parameter order the same as in QSystemTrayIcon::showMessage.
Change-Id: Ib4c8fff15eff15034c4ea64757803b118e487144
Reviewed-by: Marco Martin <mart@kde.org>
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/widgets/util/qsystemtrayicon_x11.cpp')
-rw-r--r-- | src/widgets/util/qsystemtrayicon_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 8fbbc96f6c..eee100d279 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -341,11 +341,11 @@ bool QSystemTrayIconPrivate::supportsMessages_sys() return true; } -void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title, +void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon icon, int msecs) { if (qpa_sys) { - showMessage_sys_qpa(message, title, icon, msecs); + showMessage_sys_qpa(title, message, icon, msecs); return; } if (!sys) |