From f277c074675389eba0b27f2ccadddd98869fdfbb Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 26 Nov 2014 19:49:57 +0100 Subject: Harmonize QPA TrayIcon showMessage parameter order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jørgen Lind --- src/gui/kernel/qplatformsystemtrayicon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/kernel/qplatformsystemtrayicon.h') diff --git a/src/gui/kernel/qplatformsystemtrayicon.h b/src/gui/kernel/qplatformsystemtrayicon.h index 499b5fca17..9bbaf5e9ca 100644 --- a/src/gui/kernel/qplatformsystemtrayicon.h +++ b/src/gui/kernel/qplatformsystemtrayicon.h @@ -69,7 +69,7 @@ public: virtual void updateToolTip(const QString &tooltip) = 0; virtual void updateMenu(QPlatformMenu *menu) = 0; virtual QRect geometry() const = 0; - virtual void showMessage(const QString &msg, const QString &title, + virtual void showMessage(const QString &title, const QString &msg, const QIcon &icon, MessageIcon iconType, int secs) = 0; virtual bool isSystemTrayAvailable() const = 0; -- cgit v1.2.3