FCL/sf/mw/qtextensions: comparison qtmobility/src/systeminfo/qsysteminfo_linux

equal deleted inserted replaced

-:2b40d63a9c3d
+:90517678cc4f
 {
 bool featureSupported = false;
 switch (feature) {
 case QSystemInfo::BluetoothFeature :
 {
-QString sysPath = "/sys/class/bluetooth/";
+const QString sysPath = "/sys/class/bluetooth/";
-QDir sysDir(sysPath);
+const QDir sysDir(sysPath);
 QStringList filters;
 filters << "*";
-QStringList sysList = sysDir.entryList( filters ,QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+const QStringList sysList = sysDir.entryList( filters ,QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
-foreach(QString dir, sysList) {
+foreach(const QString dir, sysList) {
-QFileInfo btFile(sysPath + dir+"/address");
+const QFileInfo btFile(sysPath + dir+"/address");
 if(btFile.exists()) {
 return true;
 }
 }
 }
 featureSupported = hasSysFeature("video");
 }
 break;
 case QSystemInfo::FmradioFeature :
 {
-QString sysPath = "/sys/class/video4linux/";
+const QString sysPath = "/sys/class/video4linux/";
-QDir sysDir(sysPath);
+const QDir sysDir(sysPath);
 QStringList filters;
 filters << "*";
 QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
-if(sysList.contains("radio")) {
+foreach(const QString dir, sysList) {
-featureSupported = true;
+if (dir.contains("radio")) {
-}
+featureSupported = true;
+}
+}
 }
 break;
 case QSystemInfo::IrFeature :
 {
 #if !defined(QT_NO_DBUS)
 {
 #if !defined(QT_NO_DBUS)
 QHalInterface iface;
 if (iface.isValid()) {
 QHalInterface halIface;
-QStringList halDevices = halIface.getAllDevices();
+const QStringList halDevices = halIface.getAllDevices();
-foreach(QString device, halDevices) {
+foreach(const QString device, halDevices) {
 QHalDeviceInterface ifaceDevice(device);
 if (ifaceDevice.isValid()) {
 if(ifaceDevice.getPropertyString("info.subsystem") == "mmc_host") {
 return true;
 }
 case QSystemInfo::WlanFeature :
 {
 #if !defined(QT_NO_DBUS)
 QHalInterface iface;
 if (iface.isValid()) {
-QStringList list = iface.findDeviceByCapability("net.80211");
+const QStringList list = iface.findDeviceByCapability("net.80211");
 if(!list.isEmpty()) {
 featureSupported = true;
 break;
 }
 }
 #endif
 break;
 case QSystemInfo::VideoOutFeature :
 {
-QString sysPath = "/sys/class/video4linux/";
+const QString sysPath = "/sys/class/video4linux/";
-QDir sysDir(sysPath);
+const QDir sysDir(sysPath);
 QStringList filters;
 filters << "*";
-QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
+const QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
 if(sysList.contains("video")) {
 featureSupported = true;
 }
 }
 break;
 #if !defined(QT_NO_DBUS)
 bool QSystemInfoLinuxCommonPrivate::hasHalDeviceFeature(const QString &param)
 {
 QHalInterface halIface;
-QStringList halDevices = halIface.getAllDevices();
+const QStringList halDevices = halIface.getAllDevices();
-foreach(QString device, halDevices) {
+foreach(const QString device, halDevices) {
 if(device.contains(param)) {
 return true;
 }
 }
 return false;
 }
 bool QSystemInfoLinuxCommonPrivate::hasHalUsbFeature(qint32 usbClass)
 {
 QHalInterface halIface;
-QStringList halDevices = halIface.getAllDevices();
+const QStringList halDevices = halIface.getAllDevices();
-foreach(QString device, halDevices) {
+foreach(const QString device, halDevices) {
 QHalDeviceInterface ifaceDevice(device);
 if (ifaceDevice.isValid()) {
 if(ifaceDevice.getPropertyString("info.subsystem") == "usb_device") {
 if(ifaceDevice.getPropertyInt("usb.interface.class") == usbClass) {
 return true;
 if(!str.isEmpty()) {
 return str;
 }
 }
 #endif
-QString versionPath = QLatin1String("/proc/version");
+const QString versionPath = QLatin1String("/proc/version");
 QFile versionFile(versionPath);
 if(!versionFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
 qWarning() << "File not opened";
 } else {
 QString  strvalue;
 return QLocale::system().name().mid(3,2);
 }
 bool QSystemInfoLinuxCommonPrivate::hasSysFeature(const QString &featureStr)
 {
-QString sysPath = QLatin1String("/sys/class/");
+const QString sysPath = QLatin1String("/sys/class/");
-QDir sysDir(sysPath);
+const QDir sysDir(sysPath);
 QStringList filters;
 filters << QLatin1String("*");
-QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
+const QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
-foreach(QString dir, sysList) {
+foreach(const QString dir, sysList) {
-QDir sysDir2(sysPath + dir);
+const QDir sysDir2(sysPath + dir);
 if(dir.contains(featureStr)) {
-QStringList sysList2 = sysDir2.entryList( filters ,QDir::Dirs, QDir::Name);
+const QStringList sysList2 = sysDir2.entryList( filters ,QDir::Dirs, QDir::Name);
 if(!sysList2.isEmpty()) {
 return true;
 }
 }
 }
 return false;
 }
 QSystemNetworkInfoLinuxCommonPrivate::QSystemNetworkInfoLinuxCommonPrivate(QObject *parent) : QObject(parent)
 {
-// QTimer::singleShot(200, this,SLOT(getPrimaryMode()));
 }
 QSystemNetworkInfoLinuxCommonPrivate::~QSystemNetworkInfoLinuxCommonPrivate()
 {
 }
-//void QSystemNetworkInfoLinuxCommonPrivate::getPrimaryMode()
-//{
-//    // try to see if there are any default route
-////    bool anyDefaultRoute = false;
-//
-//    QFileInfo fi("/proc/net/route");
-//    if(fi.exists()) {
-//        QFile rx(fi.absoluteFilePath());
-//        if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
-//            QString result;
-//            QTextStream out(&rx);
-//            do {
-//                result = out.readLine().simplified();
-//                if(!result.isEmpty()) {
-//                    QStringList tokens = result.split(" ");
-//
-//                    if(tokens.at(2).toLocal8Bit() != "Gateway"
-//                       && tokens.at(2).toLocal8Bit() != "00000000") {
-//
-//                        qWarning() <<"found default!" << tokens.at(0);
-//           //             emit networkModeChanged(tokens.at(0)));
-//                    }
-//                }
-//            } while (!result.isNull());
-//        }
-//    }
-//    //    QMapIterator<QString, QString> i(activePaths);
-////    QString devicepath;
-////    while (i.hasNext()) {
-////        i.next();
-////        QScopedPointer<QNetworkManagerConnectionActive> activeCon;
-////        activeCon.reset(new QNetworkManagerConnectionActive(i.key()));
-////
-////        if(activeCon->defaultRoute()) {
-////            anyDefaultRoute = activeCon->defaultRoute();
-////            QNetworkManagerInterfaceDevice *devIface = new QNetworkManagerInterfaceDevice(i.value());
-////            emit networkModeChanged(deviceTypeToMode(devIface->deviceType()));
-////        }
-////        devicepath = i.value();
-////    }
-////
-////    if(!anyDefaultRoute) {
-////        emit networkModeChanged(QSystemNetworkInfo::UnknownMode);
-////    }
-//}
 QSystemNetworkInfo::NetworkStatus QSystemNetworkInfoLinuxCommonPrivate::networkStatus(QSystemNetworkInfo::NetworkMode mode)
 {
 switch(mode) {
 case QSystemNetworkInfo::WlanMode:
 {
-qWarning() << __PRETTY_FUNCTION__ << "WLAN";
+const QString baseSysDir = "/sys/class/net/";
+const QDir wDir(baseSysDir);
-QString baseSysDir = "/sys/class/net/";
+const QStringList dirs = wDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
-QDir wDir(baseSysDir);
+foreach(const QString dir, dirs) {
-QStringList dirs = wDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
+const QString devFile = baseSysDir + dir;
-foreach(QString dir, dirs) {
+const QFileInfo wiFi(devFile + "/wireless");
-QString devFile = baseSysDir + dir;
+const QFileInfo fi("/proc/net/route");
-QFileInfo wiFi(devFile + "/wireless");
-QFileInfo fi("/proc/net/route");
 if(wiFi.exists() && fi.exists()) {
 QFile rx(fi.absoluteFilePath());
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
-QString result = rx.readAll();
+const QString result = rx.readAll();
 if(result.contains(dir)) {
 return QSystemNetworkInfo::Connected;
 } else {
 return QSystemNetworkInfo::NoNetworkAvailable;
 }
 }
 }
 break;
 case QSystemNetworkInfo::EthernetMode:
 {
-qWarning() << __PRETTY_FUNCTION__ << "Ethernet";
+const QString baseSysDir = "/sys/class/net/";
-QString baseSysDir = "/sys/class/net/";
+const QDir eDir(baseSysDir);
-QDir eDir(baseSysDir);
+const QString dir = QSystemNetworkInfoLinuxCommonPrivate::interfaceForMode(mode).name();
-QString dir = QSystemNetworkInfoLinuxCommonPrivate::interfaceForMode(mode).name();
+const QString devFile = baseSysDir + dir;
-QString devFile = baseSysDir + dir;
+const QFileInfo fi("/proc/net/route");
-qWarning() << devFile;
-QFileInfo fi("/proc/net/route");
 if(fi.exists()) {
 QFile rx(fi.absoluteFilePath());
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
-QString result = rx.readAll();
+const QString result = rx.readAll();
 if(result.contains(dir)) {
 return QSystemNetworkInfo::Connected;
 } else {
 return QSystemNetworkInfo::NoNetworkAvailable;
 }
 switch(mode) {
 case QSystemNetworkInfo::WlanMode:
 {
 if(networkStatus(mode) != QSystemNetworkInfo::Connected) {
-qWarning() << "not connected";
 return netname;
 }
 QString wlanInterface;
-QString baseSysDir = "/sys/class/net/";
+const QString baseSysDir = "/sys/class/net/";
-QDir wDir(baseSysDir);
+const QDir wDir(baseSysDir);
-QStringList dirs = wDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
+const QStringList dirs = wDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
-foreach(QString dir, dirs) {
+foreach(const QString dir, dirs) {
-QString devFile = baseSysDir + dir;
+const QString devFile = baseSysDir + dir;
-QFileInfo fi(devFile + "/wireless");
+const QFileInfo fi(devFile + "/wireless");
 if(fi.exists()) {
 wlanInterface = dir;
-qWarning() << "interface is" << wlanInterface;
 }
 }
 int sock = socket(PF_INET, SOCK_DGRAM, 0);
 if (sock > 0) {
 const char* someRandomBuffer[IW_ESSID_MAX_SIZE + 1];
 {
 switch(mode) {
 case QSystemNetworkInfo::WlanMode:
 {
 QString result;
-QString baseSysDir = "/sys/class/net/";
+const QString baseSysDir = "/sys/class/net/";
-QDir wDir(baseSysDir);
+const QDir wDir(baseSysDir);
-QStringList dirs = wDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
+const QStringList dirs = wDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
-foreach(QString dir, dirs) {
+foreach(const QString dir, dirs) {
-QString devFile = baseSysDir + dir;
+const QString devFile = baseSysDir + dir;
-QFileInfo fi(devFile + "/wireless");
+const QFileInfo fi(devFile + "/wireless");
 if(fi.exists()) {
 QFile rx(devFile + "/address");
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
 QTextStream in(&rx);
 in >> result;
 }
 break;
 case QSystemNetworkInfo::EthernetMode:
 {
 QString result;
-QString baseSysDir = "/sys/class/net/";
+const QString baseSysDir = "/sys/class/net/";
-QDir eDir(baseSysDir);
+const QDir eDir(baseSysDir);
-QStringList dirs = eDir.entryList(QStringList() << "eth*", QDir::AllDirs | QDir::NoDotAndDotDot);
+const QStringList dirs = eDir.entryList(QStringList() << "eth*", QDir::AllDirs | QDir::NoDotAndDotDot);
-foreach(QString dir, dirs) {
+foreach(const QString dir, dirs) {
-QString devFile = baseSysDir + dir;
+const QString devFile = baseSysDir + dir;
-QFileInfo fi(devFile + "/address");
+const QFileInfo fi(devFile + "/address");
 if(fi.exists()) {
 QFile rx(fi.absoluteFilePath());
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
 QTextStream in(&rx);
 in >> result;
 if (ioctl(ctl,BNEPGETCONNLIST,&req) < 0) {
 qWarning() << "Cannot get bnep connection list.";
 return QSystemNetworkInfo::UndefinedStatus;
 }
-qWarning() << req.cnum;
 for (uint j = 0; j< req.cnum; j++) {
-qWarning() << info[j].state;
 if(info[j].state == BT_CONNECTED) {
 return QSystemNetworkInfo::Connected;
 }
 }
 close(ctl);
 {
 switch(mode) {
 case QSystemNetworkInfo::WlanMode:
 {
 QString result;
-QString baseSysDir = "/sys/class/net/";
+const QString baseSysDir = "/sys/class/net/";
-QDir wDir(baseSysDir);
+const QDir wDir(baseSysDir);
-QStringList dirs = wDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
+const QStringList dirs = wDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
-foreach(QString dir, dirs) {
+foreach(const QString dir, dirs) {
-QString devFile = baseSysDir + dir;
+const QString devFile = baseSysDir + dir;
-QFileInfo fi(devFile + "/wireless/link");
+const QFileInfo fi(devFile + "/wireless/link");
 if(fi.exists()) {
 QFile rx(fi.absoluteFilePath());
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
 QTextStream in(&rx);
 in >> result;
 }
 break;
 case QSystemNetworkInfo::EthernetMode:
 {
 QString result;
-QString baseSysDir = "/sys/class/net/";
+const QString baseSysDir = "/sys/class/net/";
-QDir eDir(baseSysDir);
+const QDir eDir(baseSysDir);
-QStringList dirs = eDir.entryList(QStringList() << "eth*", QDir::AllDirs | QDir::NoDotAndDotDot);
+const QStringList dirs = eDir.entryList(QStringList() << "eth*", QDir::AllDirs | QDir::NoDotAndDotDot);
-foreach(QString dir, dirs) {
+foreach(const QString dir, dirs) {
-QString devFile = baseSysDir + dir;
+const QString devFile = baseSysDir + dir;
-QFileInfo fi(devFile + "/carrier");
+const QFileInfo fi(devFile + "/carrier");
 if(fi.exists()) {
 QFile rx(fi.absoluteFilePath());
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
 QTextStream in(&rx);
 in >> result;
 switch(mode) {
 case QSystemNetworkInfo::WlanMode:
 {
 QHalInterface iface;
 if (iface.isValid()) {
-QStringList list = iface.findDeviceByCapability("net.80211");
+const QStringList list = iface.findDeviceByCapability("net.80211");
 if(!list.isEmpty()) {
-foreach(QString netDev, list) {
+foreach(const QString netDev, list) {
-QString deviceName ;
 QHalDeviceInterface ifaceDevice(netDev);
-deviceName  = ifaceDevice.getPropertyString("net.interface");
+const QString deviceName  = ifaceDevice.getPropertyString("net.interface");
 if(list.count() > 1) {
-QString baseFIle = "/sys/class/net/" + deviceName+"/operstate";
+const QString baseFIle = "/sys/class/net/" + deviceName+"/operstate";
 QFile rx(baseFIle);
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
 QString operatingState;
 QTextStream in(&rx);
 in >> operatingState;
 break;
 case QSystemNetworkInfo::EthernetMode:
 {
 QHalInterface iface;
 if (iface.isValid()) {
-QStringList list = iface.findDeviceByCapability("net.80203");
+const QStringList list = iface.findDeviceByCapability("net.80203");
 if(!list.isEmpty()) {
-foreach(QString netDev, list) {
+foreach(const QString netDev, list) {
-QString deviceName ;
 QHalDeviceInterface ifaceDevice(netDev);
-deviceName  = ifaceDevice.getPropertyString("net.interface");
+const QString deviceName  = ifaceDevice.getPropertyString("net.interface");
 if(list.count() > 1) {
-QString baseFIle = "/sys/class/net/" + deviceName+"/operstate";
+const QString baseFIle = "/sys/class/net/" + deviceName+"/operstate";
 QFile rx(baseFIle);
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
 QString operatingState;
 QTextStream in(&rx);
 in >> operatingState;
 default:
 break;
 };
 #else
 QString result;
-QString baseSysDir = "/sys/class/net/";
+const QString baseSysDir = "/sys/class/net/";
-QDir eDir(baseSysDir);
+const QDir eDir(baseSysDir);
-QStringList dirs = eDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
+const QStringList dirs = eDir.entryList(QStringList() << "*", QDir::AllDirs | QDir::NoDotAndDotDot);
-foreach(QString dir, dirs) {
+foreach(const QString dir, dirs) {
-QString devFile = baseSysDir + dir;
+const QString devFile = baseSysDir + dir;
-QFileInfo devfi(devFile + "/device");
+const QFileInfo devfi(devFile + "/device");
 if(!devfi.exists()) {
 continue;
 }
-QString baseFIle = "/sys/class/net/" + devFile+"/operstate";
+const QString baseFIle = "/sys/class/net/" + devFile+"/operstate";
 QFile rx(baseFIle);
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
 QString operatingState;
 QTextStream in(&rx);
 in >> operatingState;
 }
 }
 switch(mode) {
 case QSystemNetworkInfo::WlanMode:
 {
-QFileInfo fi(devFile + "/wireless");
+const QFileInfo fi(devFile + "/wireless");
 if(fi.exists()) {
 return QNetworkInterface::interfaceFromName(dir);
 }
 }
 break;
 case QSystemNetworkInfo::EthernetMode:
 {
-QFileInfo fi(devFile + "/wireless");
+const QFileInfo fi(devFile + "/wireless");
 if(!fi.exists()) {
 return QNetworkInterface::interfaceFromName(dir);
 }
 }
 break;
 if(routeFilex.exists() && routeFilex.open(QIODevice::ReadOnly
 | QIODevice::Text)) {
 QTextStream rin(&routeFilex);
 QString line = rin.readLine();
 while (!line.isNull()) {
-QString lineSection = line.section("\t",2,2,QString::SectionSkipEmpty);
+const QString lineSection = line.section("\t",2,2,QString::SectionSkipEmpty);
 if(lineSection != "00000000" && lineSection!="Gateway")
 if(line.section("\t",0,0,QString::SectionSkipEmpty) == deviceName) {
 routeFilex.close();
 return true;
 }
 return 0;
 }
 QString QSystemNetworkInfoLinuxCommonPrivate::getBluetoothInfo(const QString &file)
 {
-QString sysPath = "/sys/class/bluetooth/";
+const QString sysPath = "/sys/class/bluetooth/";
-QDir sysDir(sysPath);
+const QDir sysDir(sysPath);
 QStringList filters;
 filters << "*";
-QStringList sysList = sysDir.entryList( filters ,QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+const QStringList sysList = sysDir.entryList( filters ,QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
-foreach(QString dir, sysList) {
+foreach(const QString dir, sysList) {
 QFile btFile(sysPath + dir+"/"+file);
 if(btFile.exists()) {
 if (btFile.open(QIODevice::ReadOnly)) {
 QTextStream btFileStream(&btFile);
 QString line = btFileStream.readAll();
 Q_UNUSED(screen);
 if(halIsAvailable) {
 #if !defined(QT_NO_DBUS)
 QHalInterface iface;
 if (iface.isValid()) {
-QStringList list = iface.findDeviceByCapability("laptop_panel");
+const QStringList list = iface.findDeviceByCapability("laptop_panel");
 if(!list.isEmpty()) {
-foreach(QString lapDev, list) {
+foreach(const QString lapDev, list) {
 QHalDeviceInterface ifaceDevice(lapDev);
 QHalDeviceLaptopPanelInterface lapIface(lapDev);
-float numLevels = ifaceDevice.getPropertyInt("laptop_panel.num_levels") - 1;
+const float numLevels = ifaceDevice.getPropertyInt("laptop_panel.num_levels") - 1;
-float curLevel = lapIface.getBrightness();
+const float curLevel = lapIface.getBrightness();
 return curLevel / numLevels * 100;
 }
 }
 }
 #endif
 } else {
-QString backlightPath = "/proc/acpi/video/";
+const QString backlightPath = "/proc/acpi/video/";
-QDir videoDir(backlightPath);
+const QDir videoDir(backlightPath);
 QStringList filters;
 filters << "*";
-QStringList brightnessList = videoDir.entryList(filters,
+const QStringList brightnessList = videoDir.entryList(filters,
 QDir::Dirs
 | QDir::NoDotAndDotDot,
 QDir::Name);
-foreach(QString brightnessFileName, brightnessList) {
+foreach(const QString brightnessFileName, brightnessList) {
 float numLevels = 0.0;
 float curLevel = 0.0;
 QFile curBrightnessFile(backlightPath+brightnessFileName+"/LCD/brightness");
 if(!curBrightnessFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
 qWarning()<<"File not opened";
 } else {
-QString  strvalue;
+const QString strvalue = curBrightnessFile.readAll().trimmed();
-strvalue = curBrightnessFile.readAll().trimmed();
 if(strvalue.contains("levels")) {
 QStringList list = strvalue.split(" ");
 numLevels = list.at(2).toFloat();
 }
 if(strvalue.contains("current")) {
 return 0;
 }
 mountEntries();
 struct statfs fs;
 if(statfs(mountEntriesMap[driveVolume].toLatin1(), &fs ) == 0 ) {
-long blockSize = fs.f_bsize;
+const long blockSize = fs.f_bsize;
-long totalBlocks = fs.f_blocks;
+const long totalBlocks = fs.f_blocks;
 return (double)totalBlocks * blockSize;
 }
 return 0;
 }
 {
 if(halIsAvailable) {
 #if !defined(QT_NO_DBUS)
 QStringList mountedVol;
 QHalInterface iface;
-QStringList list = iface.findDeviceByCapability("volume");
+const QStringList list = iface.findDeviceByCapability("volume");
 if(!list.isEmpty()) {
-foreach(QString vol, list) {
+foreach(const QString vol, list) {
 QHalDeviceInterface ifaceDevice(vol);
 if(driveVolume == ifaceDevice.getPropertyString("block.device")) {
 QHalDeviceInterface ifaceDeviceParent(ifaceDevice.getPropertyString("info.parent"), this);
 if(ifaceDeviceParent.getPropertyBool("storage.removable")
 #if !defined(QT_NO_DBUS)
 QHalInterface iface;
 QStringList list = iface.findDeviceByCapability("battery");
 if(!list.isEmpty()) {
-foreach(QString dev, list) {
+foreach(const QString dev, list) {
 halIfaceDevice = new QHalDeviceInterface(dev);
 if (halIfaceDevice->isValid()) {
-QString batType = halIfaceDevice->getPropertyString("battery.type");
+const QString batType = halIfaceDevice->getPropertyString("battery.type");
 if(batType == "primary" || batType == "pda") {
 if(halIfaceDevice->setConnections() ) {
 if(!connect(halIfaceDevice,SIGNAL(propertyModified(int, QVariantList)),
 this,SLOT(halChanged(int,QVariantList)))) {
 qWarning() << "connection malfunction";
 }
 }
 list = iface.findDeviceByCapability("ac_adapter");
 if(!list.isEmpty()) {
-foreach(QString dev, list) {
+foreach(const QString dev, list) {
 halIfaceDevice = new QHalDeviceInterface(dev);
 if (halIfaceDevice->isValid()) {
 if(halIfaceDevice->setConnections() ) {
 if(!connect(halIfaceDevice,SIGNAL(propertyModified(int, QVariantList)),
 this,SLOT(halChanged(int,QVariantList)))) {
 }
 }
 list = iface.findDeviceByCapability("battery");
 if(!list.isEmpty()) {
-foreach(QString dev, list) {
+foreach(const QString dev, list) {
 halIfaceDevice = new QHalDeviceInterface(dev);
 if (halIfaceDevice->isValid()) {
 if(halIfaceDevice->setConnections()) {
 if(!connect(halIfaceDevice,SIGNAL(propertyModified(int, QVariantList)),
 this,SLOT(halChanged(int,QVariantList)))) {
 #if !defined(QT_NO_DBUS)
 void QSystemDeviceInfoLinuxCommonPrivate::halChanged(int,QVariantList map)
 {
 for(int i=0; i < map.count(); i++) {
-//       qWarning() << __FUNCTION__ << map.at(i).toString();
 if(map.at(i).toString() == "battery.charge_level.percentage") {
-int level = batteryLevel();
+const int level = batteryLevel();
 emit batteryLevelChanged(level);
 if(level < 4) {
 emit batteryStatusChanged(QSystemDeviceInfo::BatteryCritical);
 } else if(level < 11) {
 emit batteryStatusChanged(QSystemDeviceInfo::BatteryVeryLow);
 return productName;
 }
 }
 #endif
 }
-QDir dir("/etc");
+const QDir dir("/etc");
 if(dir.exists()) {
 QStringList langList;
 QFileInfoList localeList = dir.entryInfoList(QStringList() << "*release",
 QDir::Files | QDir::NoDotAndDotDot,
 QDir::Name);
-foreach(QFileInfo fileInfo, localeList) {
+foreach(const QFileInfo fileInfo, localeList) {
-QString filepath = fileInfo.filePath();
+const QString filepath = fileInfo.filePath();
 QFile file(filepath);
 if (file.open(QIODevice::ReadOnly)) {
 QTextStream prodinfo(&file);
 QString line = prodinfo.readLine();
 while (!line.isNull()) {
 if(halIsAvailable) {
 #if !defined(QT_NO_DBUS)
 QHalInterface iface2;
 if (iface2.isValid()) {
 QStringList capList;
-capList << "input.keyboard" << "input.keys" << "input.keypad" << "input.mouse" << "input.tablet";
+capList << QLatin1String("input.keyboard")
+<< QLatin1String("input.keys")
+<< QLatin1String("input.keypad")
+<< QLatin1String("input.mouse")
+<< QLatin1String("input.tablet")
+<< QLatin1String("input.touchpad");
 for(int i = 0; i < capList.count(); i++) {
 QStringList list = iface2.findDeviceByCapability(capList.at(i));
 if(!list.isEmpty()) {
 switch(i) {
 case 0:
 methods = (methods | QSystemDeviceInfo::Mouse);
 break;
 case 4:
 methods = (methods | QSystemDeviceInfo::SingleTouch);
 break;
-};
+case 5:
+methods = (methods | QSystemDeviceInfo::SingleTouch);
+break;
+}
 }
 }
 if(methods != 0)
 return methods;
 }
 #endif
 }
-QString inputsPath = "/sys/class/input/";
+const QString inputsPath = "/sys/class/input/";
-QDir inputDir(inputsPath);
+const QDir inputDir(inputsPath);
 QStringList filters;
 filters << "event*";
-QStringList inputList = inputDir.entryList( filters ,QDir::Dirs, QDir::Name);
+const QStringList inputList = inputDir.entryList( filters ,QDir::Dirs, QDir::Name);
-foreach(QString inputFileName, inputList) {
+foreach(const QString inputFileName, inputList) {
 QFile file(inputsPath+inputFileName+"/device/name");
 if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
 qWarning()<<"File not opened";
 } else {
 QString strvalue;
 float levelWhenFull = 0.0;
 float level = 0.0;
 if(halIsAvailable) {
 #if !defined(QT_NO_DBUS)
 QHalInterface iface;
-QStringList list = iface.findDeviceByCapability("battery");
+const QStringList list = iface.findDeviceByCapability("battery");
 if(!list.isEmpty()) {
-foreach(QString dev, list) {
+foreach(const QString dev, list) {
 QHalDeviceInterface ifaceDevice(dev);
 if (ifaceDevice.isValid()) {
 //                    qWarning() << ifaceDevice.getPropertyString("battery.type")
 //                            << ifaceDevice.getPropertyInt("battery.charge_level.percentage");
 if(!ifaceDevice.getPropertyBool("battery.present")
 QTextStream batinfo(&infofile);
 QString line = batinfo.readLine();
 while (!line.isNull()) {
 if(line.contains("design capacity")) {
 levelWhenFull = line.split(" ").at(1).trimmed().toFloat();
-qWarning() << levelWhenFull;
+//qWarning() << levelWhenFull;
 infofile.close();
 break;
 }
 line = batinfo.readLine();
 }
 QTextStream batstate(&statefile);
 QString line = batstate.readLine();
 while (!line.isNull()) {
 if(line.contains("remaining capacity")) {
 level = line.split(" ").at(1).trimmed().toFloat();
-qWarning() << level;
+//qWarning() << level;
 statefile.close();
 break;
 }
 line = batstate.readLine();
 }
 {
 #if !defined(QT_NO_DBUS)
 QHalInterface iface;
 QStringList list = iface.findDeviceByCapability("battery");
 if(!list.isEmpty()) {
-foreach(QString dev, list) {
+foreach(const QString dev, list) {
 QHalDeviceInterface ifaceDevice(dev);
 if (iface.isValid()) {
 if (ifaceDevice.getPropertyBool("battery.rechargeable.is_charging")) {
 return QSystemDeviceInfo::WallPowerChargingBattery;
 }
 }
 }
 list = iface.findDeviceByCapability("ac_adapter");
 if(!list.isEmpty()) {
-foreach(QString dev, list) {
+foreach(const QString dev, list) {
 QHalDeviceInterface ifaceDevice(dev);
 if (ifaceDevice.isValid()) {
 if(ifaceDevice.getPropertyBool("ac_adapter.present")) {
 return QSystemDeviceInfo::WallPower;
 } else {

changeset 4	90517678cc4f
parent 1	2b40d63a9c3d
child 5	453da2cfceef