Merge pull request #1880 from nicolasfella/timeout

Remove timeout parameter from showMessage
This commit is contained in:
Michael Schuster 2020-04-15 17:28:02 +02:00 committed by GitHub
commit ef42635c23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -117,7 +117,7 @@ Q_INVOKABLE void Systray::setClosed()
_isOpen = false;
}
void Systray::showMessage(const QString &title, const QString &message, MessageIcon icon, int millisecondsTimeoutHint)
void Systray::showMessage(const QString &title, const QString &message, MessageIcon icon)
{
#ifdef USE_FDO_NOTIFICATIONS
if (QDBusInterface(NOTIFICATIONS_SERVICE, NOTIFICATIONS_PATH, NOTIFICATIONS_IFACE).isValid()) {
@ -135,7 +135,7 @@ void Systray::showMessage(const QString &title, const QString &message, MessageI
} else
#endif
{
QSystemTrayIcon::showMessage(title, message, icon, millisecondsTimeoutHint);
QSystemTrayIcon::showMessage(title, message, icon);
}
}

View file

@ -47,7 +47,7 @@ public:
virtual ~Systray() {};
void create();
void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int millisecondsTimeoutHint = 10000);
void showMessage(const QString &title, const QString &message, MessageIcon icon = Information);
void setToolTip(const QString &tip);
bool isOpen();