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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/applets/battery
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2011-01-13 18:53:40
Message-ID: 20110113185340.76CCDAC8B3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214236 by aseigo:

remove some cruft


 M  +12 -17    battery.cpp  
 M  +0 -1      battery.h  


--- trunk/KDE/kdebase/workspace/plasma/generic/applets/battery/battery.cpp \
#1214235:1214236 @@ -106,7 +106,6 @@
     setAspectRatioMode(Plasma::ConstrainedSquare );
     m_textRect = QRectF();
     m_remainingMSecs = 0;
-    m_extenderApplet = 0;
     m_theme = new Plasma::Svg(this);
     m_theme->setImagePath("widgets/battery-oxygen");
     m_theme->setContainsMultipleImages(true);
@@ -533,18 +532,18 @@
         m_controlsLayout->addItem(m_remainingInfoLabel, row, 1);
         row++;
 
-        Battery *m_extenderApplet = new Battery(0, QVariantList());
-        m_extenderApplet->setParent(m_controls);
-        m_extenderApplet->setAcceptsHoverEvents(false);
-        m_extenderApplet->setParentItem(m_controls);
-        m_extenderApplet->setEmbedded(true);
-        m_extenderApplet->setBackgroundHints(NoBackground);
-        m_extenderApplet->setFlag(QGraphicsItem::ItemIsMovable, false);
-        m_extenderApplet->init();
-        m_extenderApplet->setShowBatteryLabel(false);
-        m_extenderApplet->updateConstraints(Plasma::StartupCompletedConstraint);
-        m_extenderApplet->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-        m_controlsLayout->addItem(m_extenderApplet, 1, 2, 2, 1);
+        Battery *extenderApplet = new Battery(0, QVariantList());
+        extenderApplet->setParent(m_controls);
+        extenderApplet->setAcceptsHoverEvents(false);
+        extenderApplet->setParentItem(m_controls);
+        extenderApplet->setEmbedded(true);
+        extenderApplet->setBackgroundHints(NoBackground);
+        extenderApplet->setFlag(QGraphicsItem::ItemIsMovable, false);
+        extenderApplet->init();
+        extenderApplet->setShowBatteryLabel(false);
+        extenderApplet->updateConstraints(Plasma::StartupCompletedConstraint);
+        extenderApplet->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        m_controlsLayout->addItem(extenderApplet, 1, 2, 2, 1);
 
         m_profileLabel = createBuddyLabel(m_controls);
         m_profileLabel->setText(i18n("Power Profile:"));
@@ -635,10 +634,6 @@
 void Battery::popupEvent(bool show)
 {
     m_extenderVisible = show;
-    if (m_extenderApplet) {
-        int s = 64;
-        m_extenderApplet->setGeometry(QRectF(QPoint(m_controls->geometry().width()-s, \
                0), QSizeF(s, s)));
-    }
     updateStatus();
     PopupApplet::popupEvent(show);
 }
--- trunk/KDE/kdebase/workspace/plasma/generic/applets/battery/battery.h \
#1214235:1214236 @@ -125,7 +125,6 @@
 
         /* Prevent creating infinite loops by embedding applets inside applets */
         bool m_isEmbedded;
-        Battery *m_extenderApplet;
         bool m_extenderVisible;
 
         QGraphicsWidget *m_controls;


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