Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schuster <48932272+misch7@users.noreply.github.com>2020-04-15 18:28:02 +0300
committerGitHub <noreply@github.com>2020-04-15 18:28:02 +0300
commitef42635c232a10f1391c39b9372fe41abf94c314 (patch)
treeabcbbde7c79f21bf86ddb62b58f68e5458bb040d /src/gui/systray.cpp
parent92afba538f3e48c4590ade7b31037e3bbb668011 (diff)
parentb84a1eeb8dbade9990b45e1b879943f98fbde978 (diff)
Merge pull request #1880 from nicolasfella/timeout
Remove timeout parameter from showMessage
Diffstat (limited to 'src/gui/systray.cpp')
-rw-r--r--src/gui/systray.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index 8edd054fc..33a07e68c 100644
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -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);
}
}