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

equal deleted inserted replaced

-:453da2cfceef
+:71781823f776
 if (reply.isValid() && reply.value()) {
 return reply.value();
 }
 }
 #endif
-//  qDebug() << "Hal is not running";
 return false;
 }
 bool halIsAvailable;
 }
 #endif
 const QString versionPath = QLatin1String("/proc/version");
 QFile versionFile(versionPath);
 if(!versionFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-qWarning() << "File not opened";
+qDebug() << "File not opened";
 } else {
 QString  strvalue;
 strvalue = QLatin1String(versionFile.readAll().trimmed());
 strvalue = strvalue.split(QLatin1String(" ")).at(2);
 versionFile.close();
 if (ioctl(sock, SIOCGIWESSID, &wifiExchange) == 0) {
 const char *ssid = (const char *)wifiExchange.u.essid.pointer;
 netname = ssid;
 }
 } else {
-qWarning() << "no socket";
+qDebug() << "no socket";
 }
 close(sock);
 }
 break;
 case QSystemNetworkInfo::EthernetMode:
 QSystemNetworkInfo::NetworkStatus QSystemNetworkInfoLinuxCommonPrivate::getBluetoothNetStatus()
 {
 int ctl = socket(PF_BLUETOOTH,SOCK_RAW,BTPROTO_BNEP);
 if (ctl < 0) {
-qWarning() << "Cannot open bnep socket";
+qDebug() << "Cannot open bnep socket";
 return QSystemNetworkInfo::UndefinedStatus;
 }
 struct bnep_conninfo info[36];
 struct bnep_connlist_req req;
 req.ci = info;
 req.cnum = 36;
 if (ioctl(ctl,BNEPGETCONNLIST,&req) < 0) {
-qWarning() << "Cannot get bnep connection list.";
+qDebug() << "Cannot get bnep connection list.";
 return QSystemNetworkInfo::UndefinedStatus;
 }
 for (uint j = 0; j< req.cnum; j++) {
 if(info[j].state == BT_CONNECTED) {
 return QSystemNetworkInfo::Connected;
 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";
+qDebug()<<"File not opened";
 } else {
 const QString strvalue = curBrightnessFile.readAll().trimmed();
 if(strvalue.contains("levels")) {
 QStringList list = strvalue.split(" ");
 numLevels = list.at(2).toFloat();
 foreach(QString brightnessFileName, brightnessList) {
 float numLevels = 0.0;
 float curLevel = 0.0;
 QFile curBrightnessFile(backlightPath+brightnessFileName+"/brightness");
 if(!curBrightnessFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-qWarning()<<"File not opened";
+qDebug()<<"File not opened";
 } else {
 QString strvalue;
 strvalue = curBrightnessFile.readLine().trimmed();
 curBrightnessFile.close();
 curLevel = strvalue.toFloat();
 QFile maxBrightnessFile(backlightPath+brightnessFileName+"/max_brightness");
 if(!maxBrightnessFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-qWarning()<<"File not opened";
+qDebug()<<"File not opened";
 } else {
 QString strvalue;
 strvalue = maxBrightnessFile.readLine().trimmed();
 maxBrightnessFile.close();
 numLevels = strvalue.toFloat();
 dmFile = "/sys/block/"+dmFile+"/removable";
 }
 QFile file(dmFile);
 if (!file.open(QIODevice::ReadOnly)) {
-qWarning() << "Could not open sys file";
+qDebug() << "Could not open sys file";
 } else {
 QTextStream sysinfo(&file);
 QString line = sysinfo.readAll();
 if(line.contains("1")) {
 return QSystemStorageInfo::RemovableDrive;
 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";
+qDebug() << "connection malfunction";
 }
 }
 break;
 }
 }
 halIfaceDevice = new QHalDeviceInterface(dev);
 if (halIfaceDevice->isValid()) {
 if(halIfaceDevice->setConnections() ) {
 if(!connect(halIfaceDevice,SIGNAL(propertyModified(int, QVariantList)),
 this,SLOT(halChanged(int,QVariantList)))) {
-qWarning() << "connection malfunction";
+qDebug() << "connection malfunction";
 }
 }
 break;
 }
 }
 halIfaceDevice = new QHalDeviceInterface(dev);
 if (halIfaceDevice->isValid()) {
 if(halIfaceDevice->setConnections()) {
 if(!connect(halIfaceDevice,SIGNAL(propertyModified(int, QVariantList)),
 this,SLOT(halChanged(int,QVariantList)))) {
-qWarning() << "connection malfunction";
+qDebug() << "connection malfunction";
 }
 }
 break;
 }
 }
 QFile vendorId("/sys/devices/virtual/dmi/id/board_vendor");
 if (vendorId.open(QIODevice::ReadOnly)) {
 QTextStream cpuinfo(&vendorId);
 return cpuinfo.readLine().trimmed();
 } else {
-//        qWarning() << "Could not open /sys/devices/virtual/dmi/id/board_vendor";
 QFile file("/proc/cpuinfo");
 if (!file.open(QIODevice::ReadOnly)) {
-qWarning() << "Could not open /proc/cpuinfo";
+qDebug() << "Could not open /proc/cpuinfo";
 } else {
 QTextStream cpuinfo(&file);
 QString line = cpuinfo.readLine();
 while (!line.isNull()) {
 line = cpuinfo.readLine();
 }
 #endif
 }
 QFile file("/proc/cpuinfo");
 if (!file.open(QIODevice::ReadOnly)) {
-qWarning() << "Could not open /proc/cpuinfo";
+qDebug() << "Could not open /proc/cpuinfo";
 } else {
 QTextStream cpuinfo(&file);
 QString line = cpuinfo.readLine();
 while (!line.isNull()) {
 line = cpuinfo.readLine();
 } //end foreach
 }
 QFile file("/etc/issue");
 if (!file.open(QIODevice::ReadOnly)) {
-qWarning() << "Could not open /proc/cpuinfo";
+qDebug() << "Could not open /proc/cpuinfo";
 } else {
 QTextStream prodinfo(&file);
 QString line = prodinfo.readLine();
 while (!line.isNull()) {
 line = prodinfo.readLine();
 if(halIsAvailable) {
 #if !defined(QT_NO_DBUS)
 QHalInterface iface2;
 if (iface2.isValid()) {
 QStringList capList;
 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()) {
 filters << "event*";
 const QStringList inputList = inputDir.entryList( filters ,QDir::Dirs, QDir::Name);
 foreach(const QString inputFileName, inputList) {
 QFile file(inputsPath+inputFileName+"/device/name");
 if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-qWarning()<<"File not opened";
+qDebug()<<"File not opened";
 } else {
 QString strvalue;
 strvalue = file.readLine();
 file.close();
 if(strvalue.contains("keyboard",Qt::CaseInsensitive)) {
 const QStringList list = iface.findDeviceByCapability("battery");
 if(!list.isEmpty()) {
 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")
 && (ifaceDevice.getPropertyString("battery.type") != "pda"
 || ifaceDevice.getPropertyString("battery.type") != "primary")) {
-qWarning() << "XXXXXXXXXXXXX";
 return 0;
 } else {
 level = ifaceDevice.getPropertyInt("battery.charge_level.percentage");
 return level;
 }
 }
 #endif
 } else {
 QFile infofile("/proc/acpi/battery/BAT0/info");
 if (!infofile.open(QIODevice::ReadOnly)) {
-//   qWarning() << "Could not open /proc/acpi/battery/BAT0/info";
 return QSystemDeviceInfo::NoBatteryLevel;
 } else {
 QTextStream batinfo(&infofile);
 QString line = batinfo.readLine();
 while (!line.isNull()) {
 if(line.contains("design capacity")) {
 levelWhenFull = line.split(" ").at(1).trimmed().toFloat();
-//qWarning() << levelWhenFull;
 infofile.close();
 break;
 }
 line = batinfo.readLine();
 }
 infofile.close();
 }
 QFile statefile("/proc/acpi/battery/BAT0/state");
 if (!statefile.open(QIODevice::ReadOnly)) {
-//     qWarning() << "Could not open /proc/acpi/battery/BAT0/state";
 return QSystemDeviceInfo::NoBatteryLevel;
 } else {
 QTextStream batstate(&statefile);
 QString line = batstate.readLine();
 while (!line.isNull()) {
 if(line.contains("remaining capacity")) {
 level = line.split(" ").at(1).trimmed().toFloat();
-//qWarning() << level;
 statefile.close();
 break;
 }
 line = batstate.readLine();
 }
 }
 #else
 QFile statefile("/proc/acpi/battery/BAT0/state");
 if (!statefile.open(QIODevice::ReadOnly)) {
-//  qWarning() << "Could not open /proc/acpi/battery/BAT0/state";
 } else {
 QTextStream batstate(&statefile);
 QString line = batstate.readLine();
 while (!line.isNull()) {
 if(line.contains("charging state")) {
 if (!dbusConnection.connect("org.bluez",
 reply.value().path(),
 "org.bluez.Adapter",
 "PropertyChanged",
 this,SLOT(bluezPropertyChanged(QString, QDBusVariant)))) {
-qWarning() << "bluez could not connect signal";
+qDebug() << "bluez could not connect signal";
 }
 }
 }
 }
 }

changeset 8	71781823f776
parent 5	453da2cfceef
child 11	06b8e2af4411