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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/battery
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-01-25 0:09:10
Message-ID: 1201219750.250121.27310.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 765977 by aseigo:

good by code duplication, hello setRemainSquare


 M  +1 -35     battery.cpp  
 M  +0 -2      battery.h  


--- trunk/KDE/kdebase/workspace/plasma/applets/battery/battery.cpp #765976:765977
@@ -51,6 +51,7 @@
     kDebug() << "Loading applet battery";
     setAcceptsHoverEvents(true);
     setHasConfigurationInterface(true);
+    setRemainSquare(true);
     // TODO: minimum size causes size on panel to be huge (do not use for now)
     //setMinimumContentSize(m_smallPixelSize, m_smallPixelSize);
     setContentSize(64, 64);
@@ -131,41 +132,6 @@
     }
 }
 
-QSizeF Battery::contentSizeHint() const
-{
-    QSizeF sizeHint = contentSize();
-    //kDebug() << "SizeHintIn: " << sizeHint;
-    switch (formFactor()) {
-        case Plasma::Vertical:
-            if (m_numOfBattery > 1 && m_showMultipleBatteries) {
-                sizeHint.setHeight(sizeHint.width()*m_numOfBattery);
-            }
-            else {
-                sizeHint.setHeight(sizeHint.width());
-            }
-            break;
-        case Plasma::Horizontal:
-        case Plasma::Planar:
-        case Plasma::MediaCenter:
-            if (m_numOfBattery > 1 && m_showMultipleBatteries) {
-                sizeHint.setWidth(sizeHint.height()*m_numOfBattery);
-            } else {
-                sizeHint.setWidth(sizeHint.height());
-            }
-            break;
-        default:
-            break;
-    }
-    //kDebug() << "SizeHintOut: " << sizeHint;
-    return sizeHint;
-}
-
-Qt::Orientations Battery::expandingDirections() const
-{
-    // no use of additional space in any direction
-    return 0;
-}
-
 void Battery::dataUpdated(const QString& source, const Plasma::DataEngine::Data &data)
 {
     if (source.startsWith(I18N_NOOP("Battery"))) {
--- trunk/KDE/kdebase/workspace/plasma/applets/battery/battery.h #765976:765977
@@ -48,8 +48,6 @@
         void paintInterface(QPainter *painter, const QStyleOptionGraphicsItem *option,
                             const QRect &contents);
         void setPath(const QString&);
-        QSizeF contentSizeHint() const;
-        Qt::Orientations expandingDirections() const;
 
         void constraintsUpdated(Plasma::Constraints constraints);
 
[prev in list] [next in list] [prev in thread] [next in thread]