From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Fri, 20 Mar 2020 23:38:57 +0000 (+0100)
Subject: Remove timeout parameter from showMessage
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~286^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b84a1eeb8dbade9990b45e1b879943f98fbde978;p=nextcloud-desktop.git

Remove timeout parameter from showMessage

It it never set by calling code so the default value of 10000 is used. It is only used in the call to QSystemTrayIcon, which uses 10000 as default value too.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
---

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index 081a90b0e..08c40ef10 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()) {
@@ -134,7 +134,7 @@ void Systray::showMessage(const QString &title, const QString &message, MessageI
     } else
 #endif
     {
-        QSystemTrayIcon::showMessage(title, message, icon, millisecondsTimeoutHint);
+        QSystemTrayIcon::showMessage(title, message, icon);
     }
 }
 
diff --git a/src/gui/systray.h b/src/gui/systray.h
index d562dcf42..8af3b5352 100644
--- a/src/gui/systray.h
+++ b/src/gui/systray.h
@@ -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();