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/gui/kernel | |
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/gui/kernel')
-rw-r--r-- | src/gui/kernel/qplatformsystemtrayicon.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformsystemtrayicon.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformsystemtrayicon.cpp b/src/gui/kernel/qplatformsystemtrayicon.cpp index 7bc61e6e6e..ae87805856 100644 --- a/src/gui/kernel/qplatformsystemtrayicon.cpp +++ b/src/gui/kernel/qplatformsystemtrayicon.cpp @@ -118,7 +118,7 @@ QPlatformSystemTrayIcon::~QPlatformSystemTrayIcon() */ /*! - \fn void QPlatformSystemTrayIcon::showMessage(const QString &msg, const QString &title, + \fn void QPlatformSystemTrayIcon::showMessage(const QString &title, const QString &msg, const QIcon &icon, MessageIcon iconType, int secs) Shows a balloon message for the entry with the given \a title, message \a msg and \a icon for the time specified in \a secs. \a iconType is used as a hint for the implementing platform. 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; |