[Pkg-owncloud-commits] [owncloud-client] 239/470: NotificationHandling: Use QByteArray for the verb.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 8166c52f4a21062f3d7a5081b7a3a4bb0fede730
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Mar 29 17:18:02 2016 +0200

    NotificationHandling: Use QByteArray for the verb.
---
 src/gui/activitydata.h                | 8 ++++----
 src/gui/activitywidget.cpp            | 4 ++--
 src/gui/activitywidget.h              | 2 +-
 src/gui/notificationconfirmjob.cpp    | 4 ++--
 src/gui/notificationconfirmjob.h      | 4 ++--
 src/gui/notificationwidget.h          | 2 +-
 src/gui/servernotificationhandler.cpp | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/gui/activitydata.h b/src/gui/activitydata.h
index 5dada0a..d6ba7d7 100644
--- a/src/gui/activitydata.h
+++ b/src/gui/activitydata.h
@@ -26,10 +26,10 @@ namespace OCC {
 class ActivityLink
 {
 public:
-    QString _label;
-    QString _link;
-    QString _verb;
-    bool _isPrimary;
+    QString    _label;
+    QString    _link;
+    QByteArray _verb;
+    bool       _isPrimary;
 };
 
 /* ==================================================================== */
diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index a79fa68..59219e8 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -245,8 +245,8 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
             widget = _widgetForNotifId[activity.ident()];
         } else {
             widget = new NotificationWidget(this);
-            connect(widget, SIGNAL(sendNotificationRequest(QString, QString, QString)),
-                    this, SLOT(slotSendNotificationRequest(QString, QString, QString)));
+            connect(widget, SIGNAL(sendNotificationRequest(QString, QString, QByteArray)),
+                    this, SLOT(slotSendNotificationRequest(QString, QString, QByteArray)));
             connect(widget, SIGNAL(requestCleanupAndBlacklist(Activity)),
                     this, SLOT(slotRequestCleanupAndBlacklist(Activity)));
 
diff --git a/src/gui/activitywidget.h b/src/gui/activitywidget.h
index acd0569..d5bed91 100644
--- a/src/gui/activitywidget.h
+++ b/src/gui/activitywidget.h
@@ -77,7 +77,7 @@ signals:
 
 private slots:
     void slotBuildNotificationDisplay(const ActivityList& list);
-    void slotSendNotificationRequest(const QString &accountName, const QString& link, const QString& verb);
+    void slotSendNotificationRequest(const QString &accountName, const QString& link, const QByteArray &verb);
     void slotNotifyNetworkError( QNetworkReply* );
     void slotNotifyServerFinished( const QString& reply, int replyCode );
     void endNotificationRequest(NotificationWidget *widget , int replyCode);
diff --git a/src/gui/notificationconfirmjob.cpp b/src/gui/notificationconfirmjob.cpp
index 8bcbbea..84959e7 100644
--- a/src/gui/notificationconfirmjob.cpp
+++ b/src/gui/notificationconfirmjob.cpp
@@ -27,7 +27,7 @@ NotificationConfirmJob::NotificationConfirmJob(AccountPtr account)
     setIgnoreCredentialFailure(true);
 }
 
-void NotificationConfirmJob::setLinkAndVerb(const QUrl& link, const QString &verb)
+void NotificationConfirmJob::setLinkAndVerb(const QUrl& link, const QByteArray &verb)
 {
     _link = link;
     _verb = verb;
@@ -53,7 +53,7 @@ void NotificationConfirmJob::start()
     req.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
 
     QIODevice *iodevice = 0;
-    setReply(davRequest(_verb.toAscii(), _link, req, iodevice));
+    setReply(davRequest(_verb, _link, req, iodevice));
     setupConnections(reply());
 
     AbstractNetworkJob::start();
diff --git a/src/gui/notificationconfirmjob.h b/src/gui/notificationconfirmjob.h
index 7ae57bb..12f7fa8 100644
--- a/src/gui/notificationconfirmjob.h
+++ b/src/gui/notificationconfirmjob.h
@@ -46,7 +46,7 @@ public:
      *
      * @param verb currently supported GET PUT POST DELETE
      */
-    void setLinkAndVerb(const QUrl& link, const QString &verb);
+    void setLinkAndVerb(const QUrl& link, const QByteArray &verb);
 
     /**
      * @brief Start the OCS request
@@ -80,7 +80,7 @@ private slots:
     virtual bool finished() Q_DECL_OVERRIDE;
 
 private:
-    QString _verb;
+    QByteArray _verb;
     QUrl _link;
     NotificationWidget *_widget;
 };
diff --git a/src/gui/notificationwidget.h b/src/gui/notificationwidget.h
index 6f19284..166d5b5 100644
--- a/src/gui/notificationwidget.h
+++ b/src/gui/notificationwidget.h
@@ -36,7 +36,7 @@ public:
     Activity activity() const;
 
 signals:
-    void sendNotificationRequest( const QString&, const QString& link, const QString& verb);
+    void sendNotificationRequest( const QString&, const QString& link, const QByteArray& verb);
     void requestCleanupAndBlacklist( const Activity& activity );
 
 public slots:
diff --git a/src/gui/servernotificationhandler.cpp b/src/gui/servernotificationhandler.cpp
index 5606520..5b8cefe 100644
--- a/src/gui/servernotificationhandler.cpp
+++ b/src/gui/servernotificationhandler.cpp
@@ -88,7 +88,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QVariantMap& jso
             ActivityLink al;
             al._label = QUrl::fromPercentEncoding(actionJson.value("label").toByteArray());
             al._link  = actionJson.value("link").toString();
-            al._verb  = actionJson.value("type").toString();
+            al._verb  = actionJson.value("type").toByteArray();
             al._isPrimary = actionJson.value("primary").toBool();
 
             a._links.append(al);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git