[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/KDE/4.9] plasma/generic/applets/activitybar: Avoid name collisions
From:       David_E._Narváez <david.narvaez () computer ! org>
Date:       2012-10-22 2:00:10
Message-ID: 20121022020010.07014A6078 () git ! kde ! org
[Download RAW message or body]

Git commit 1dd76c430bad8e5e58e842134680952541812678 by David E. Narváez.
Committed on 21/10/2012 at 10:23.
Pushed by narvaez into branch 'KDE/4.9'.

Avoid name collisions

M  +2    -2    plasma/generic/applets/activitybar/activitybar.cpp

http://commits.kde.org/kde-workspace/1dd76c430bad8e5e58e842134680952541812678

diff --git a/plasma/generic/applets/activitybar/activitybar.cpp \
b/plasma/generic/applets/activitybar/activitybar.cpp index 17711fc..e66bf04 100644
--- a/plasma/generic/applets/activitybar/activitybar.cpp
+++ b/plasma/generic/applets/activitybar/activitybar.cpp
@@ -266,9 +266,9 @@ void ActivityBar::activityAdded(const QString &id)
 
 void ActivityBar::containmentDestroyed(QObject *obj)
 {
-    Plasma::Containment *containment = static_cast<Plasma::Containment *>(obj);
+    Plasma::Containment *destroyedContainment = static_cast<Plasma::Containment \
*>(obj);  
-    int index = m_containments.indexOf(containment);
+    int index = m_containments.indexOf(destroyedContainment);
     if (index != -1) {
         m_containments.removeAt(index);
         m_tabBar->blockSignals(true);


[prev in list] [next in list] [prev in thread] [next in thread]