[Pkg-owncloud-commits] [owncloud-client] 235/470: ActivityWidget: Rename blacklistActivities to blacklistNotifications.

[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 cd3f612857c80843696cc7636b717403806cedf9
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Mar 29 16:50:58 2016 +0200

    ActivityWidget: Rename blacklistActivities to blacklistNotifications.
---
 src/gui/activitywidget.cpp | 6 +++---
 src/gui/activitywidget.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index 9b7c7cd..a79fa68 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -234,7 +234,7 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList& list)
     QString listAccountName;
 
     foreach( auto activity, list ) {
-        if( _blacklistedActivities.contains(activity)) {
+        if( _blacklistedNotifications.contains(activity)) {
             qDebug() << Q_FUNC_INFO << "Activity in blacklist, skip";
             continue;
         }
@@ -428,8 +428,8 @@ void ActivityWidget::slotNotifyServerFinished( const QString& reply, int replyCo
 // blacklist the activity coming in here.
 void ActivityWidget::slotRequestCleanupAndBlacklist(const Activity& blacklistActivity)
 {
-    if ( ! _blacklistedActivities.contains(blacklistActivity) ) {
-        _blacklistedActivities.append(blacklistActivity);
+    if ( ! _blacklistedNotifications.contains(blacklistActivity) ) {
+        _blacklistedNotifications.append(blacklistActivity);
     }
 
     NotificationWidget *widget = _widgetForNotifId[ blacklistActivity.ident() ];
diff --git a/src/gui/activitywidget.h b/src/gui/activitywidget.h
index a070a6f..acd0569 100644
--- a/src/gui/activitywidget.h
+++ b/src/gui/activitywidget.h
@@ -94,7 +94,7 @@ private:
     QMap<Activity::Identifier, NotificationWidget*> _widgetForNotifId;
     QElapsedTimer _guiLogTimer;
     QSet<int> _guiLoggedNotifications;
-    ActivityList _blacklistedActivities;
+    ActivityList _blacklistedNotifications;
 
     QSet< QPair<QDateTime, NotificationWidget*> > _widgetsToRemove;
     QTimer _removeTimer;

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