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

List:       kde-commits
Subject:    [kde-workspace/KDE/4.9] plasma/generic/applets/notifications/ui: Fix namespace usage; remove obsolet
From:       Martin Koller <kollix () aon ! at>
Date:       2012-08-08 10:07:11
Message-ID: 20120808100711.2270BA6094 () git ! kde ! org
[Download RAW message or body]

Git commit ebdeaa1ae6e4116d7bb967933faea1ab67be24a9 by Martin Koller.
Committed on 08/08/2012 at 12:05.
Pushed by mkoller into branch 'KDE/4.9'.

Fix namespace usage; remove obsolete member var

M  +6    -6    plasma/generic/applets/notifications/ui/notificationgroup.cpp
M  +2    -7    plasma/generic/applets/notifications/ui/notificationgroup.h

http://commits.kde.org/kde-workspace/ebdeaa1ae6e4116d7bb967933faea1ab67be24a9

diff --git a/plasma/generic/applets/notifications/ui/notificationgroup.cpp \
b/plasma/generic/applets/notifications/ui/notificationgroup.cpp index \
                7ea9355..f27e2c3 100644
--- a/plasma/generic/applets/notifications/ui/notificationgroup.cpp
+++ b/plasma/generic/applets/notifications/ui/notificationgroup.cpp
@@ -33,7 +33,7 @@
 #include <Plasma/ExtenderItem>
 
 
-NotificationGroup::NotificationGroup(Extender *parent, uint groupId)
+NotificationGroup::NotificationGroup(Plasma::Extender *parent, uint groupId)
    : Plasma::ExtenderGroup(parent, groupId)
 {
     setTransient(true);
@@ -52,12 +52,12 @@ NotificationGroup::NotificationGroup(Extender *parent, uint \
groupId)  
 
     QGraphicsWidget *widget = new QGraphicsWidget(this);
-    m_tabsLayout = new QGraphicsLinearLayout(Qt::Horizontal, widget);
+    QGraphicsLinearLayout *tabsLayout = new QGraphicsLinearLayout(Qt::Horizontal, \
widget);  widget->setContentsMargins(0, 4, 0, 0);
-    m_tabsLayout->setContentsMargins(0, 0, 0, 0);
-    m_tabsLayout->addStretch();
-    m_tabsLayout->addItem(m_notificationBar);
-    m_tabsLayout->addStretch();
+    tabsLayout->setContentsMargins(0, 0, 0, 0);
+    tabsLayout->addStretch();
+    tabsLayout->addItem(m_notificationBar);
+    tabsLayout->addStretch();
 
     setWidget(widget);
     setCollapsed(true);
diff --git a/plasma/generic/applets/notifications/ui/notificationgroup.h \
b/plasma/generic/applets/notifications/ui/notificationgroup.h index 686442f..ffa2112 \
                100644
--- a/plasma/generic/applets/notifications/ui/notificationgroup.h
+++ b/plasma/generic/applets/notifications/ui/notificationgroup.h
@@ -34,22 +34,18 @@ namespace Plasma
 {
     class ExtenderItem;
     class TabBar;
+    class Extender;
 }
 
 class NotificationWidget;
-
-
 class Notification;
 
-//FIXME: for some reasons using Plasma::Extender directly doesn't build
-typedef Plasma::Extender Extender;
-
 class NotificationGroup : public Plasma::ExtenderGroup
 {
     Q_OBJECT
 
 public:
-    NotificationGroup(Extender *parent, uint groupId = 0);
+    NotificationGroup(Plasma::Extender *parent, uint groupId = 0);
     ~NotificationGroup();
 
     void addNotification(Notification *notification);
@@ -83,7 +79,6 @@ private:
     QHash<Plasma::ExtenderItem *, Notification *>m_notificationForExtenderItems;
 
     QString m_currentFilter;
-    QGraphicsLinearLayout *m_tabsLayout;
 };
 
 


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