Ignore:
Timestamp:
07/24/14 06:41:54 (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.3, releng/10.1
Children:
1891777
Parents:
733da14
Message:

Update lumina-desktop to use the new abilities in LuminaOS instead of the GLobals.h file. Now all the OS-specific stuff is contained in a single location.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lumina/lumina-desktop/panel-plugins/battery/LBattery.cpp

    r0e77750 r9d0ec76  
    3030  // Get current state of charge 
    3131  //QStringList result = LUtils::getCmdOutput("/usr/sbin/apm", QStringList() << "-al"); 
    32   int charge = SYSTEM::batteryCharge(); //result.at(1).toInt(); 
     32  int charge = LOS::batteryCharge(); //result.at(1).toInt(); 
    3333//qDebug() << "1: " << result.at(0).toInt() << " 2: " << result.at(1).toInt(); 
    3434  int icon = -1; 
     
    3838  else if (charge > 30) { icon = 1; } 
    3939  else if (charge > 0 ) { icon = 0; } 
    40   if(SYSTEM::batteryIsCharging()){ icon = icon+10; } 
     40  if(LOS::batteryIsCharging()){ icon = icon+10; } 
    4141  //icon = icon + result.at(0).toInt() * 10; 
    4242  if (icon != iconOld || force) { 
     
    8787 
    8888QString LBattery::getRemainingTime(){ 
    89   int secs = SYSTEM::batterySecondsLeft(); 
     89  int secs = LOS::batterySecondsLeft(); 
    9090  if(secs < 0){ return "??"; } 
    9191  QString rem; //remaining 
Note: See TracChangeset for help on using the changeset viewer.