[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 19:36:21
Message-ID: 20110113193621.510CDAC8B5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1214251 by aseigo:

version checks no longer needed


 M  +0 -7      battery.cpp  


--- trunk/KDE/kdebase/workspace/plasma/generic/applets/battery/battery.cpp #1214250:1214251
@@ -525,9 +525,7 @@
     row++;
 
     m_remainingTimeLabel = createBuddyLabel(controls);
-#if KDE_IS_VERSION(4, 5, 60)
     m_remainingTimeLabel->setText(i18nc("Label for remaining time", "Time Remaining:"));
-#endif
     m_remainingInfoLabel = createInfoLabel(controls);
     controlsLayout->addItem(m_remainingTimeLabel, row, 0);
     controlsLayout->addItem(m_remainingInfoLabel, row, 1);
@@ -706,12 +704,7 @@
             ++batteryCount;
         }
 
-    #if KDE_IS_VERSION(4, 6, 60)
         m_acLabelLabel->setText(i18n("AC Adapter:"));
-    #else
-        // Avoid breaking string freeze
-        m_acLabelLabel->setText(i18n("AC Adapter: ").trimmed());
-    #endif
         if (m_acAdapterPlugged) {
             m_acInfoLabel->setText(i18n("<b>Plugged in</b>"));
         } else {
[prev in list] [next in list] [prev in thread] [next in thread]