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

equal deleted inserted replaced

-:2b40d63a9c3d
+:90517678cc4f
 #include <QSize>
 #include <QFile>
 #include <QTextStream>
 #include <QLocale>
 #include <QLibraryInfo>
-#include <QtGui>
 #include <QDebug>
 #include <QTimer>
 #include <QDir>
 #include <QTimer>
 #include <QMapIterator>
+#include <QSettings>
 #ifndef QT_NO_NETWORKMANAGER
 #include <qnetworkmanagerservice_linux_p.h>
 #include <QtDBus/QtDBus>
 #include <QtDBus/QDBusConnection>
 QStringList langList;
 if(transDir.exists()) {
 QStringList localeList = transDir.entryList( QStringList() << QLatin1String("qt_*.qm") ,QDir::Files
 | QDir::NoDotAndDotDot, QDir::Name);
-foreach(QString localeName, localeList) {
+foreach(const QString localeName, localeList) {
-QString lang = localeName.mid(3,2);
+const QString lang = localeName.mid(3,2);
 if(!langList.contains(lang) && !lang.isEmpty() && !lang.contains(QLatin1String("help"))) {
 langList <<lang;
 }
 }
 if(langList.count() > 0) {
 : QSystemNetworkInfoLinuxCommonPrivate(parent)
 {
 #if !defined(QT_NO_NETWORKMANAGER)
 setupNmConnections();
 updateActivePaths();
-QTimer::singleShot(200, this,SLOT(getPrimaryMode()));
 #endif
 }
 QSystemNetworkInfoPrivate::~QSystemNetworkInfoPrivate()
 {
 #if !defined(QT_NO_NETWORKMANAGER)
 void QSystemNetworkInfoPrivate::setupNmConnections()
 {
 iface = new QNetworkManagerInterface(this);
-foreach(QDBusObjectPath path, iface->getDevices()) {
+foreach(const QDBusObjectPath path, iface->getDevices()) {
 QNetworkManagerInterfaceDevice *devIface = new QNetworkManagerInterfaceDevice(path.path(), this);
 switch(devIface->deviceType()) {
 case DEVICE_TYPE_802_3_ETHERNET:
 {
 }
 }
 return isDefault;
 }
-void QSystemNetworkInfoPrivate::getPrimaryMode()
+void QSystemNetworkInfoPrivate::primaryModeChanged()
 {
-// try to see if there are any default route
+emit networkModeChanged(currentMode());
-bool anyDefaultRoute = false;
-QMapIterator<QString, QString> i(activePaths);
-QString devicepath;
-while (i.hasNext()) {
-i.next();
-QScopedPointer<QNetworkManagerConnectionActive> activeCon;
-activeCon.reset(new QNetworkManagerConnectionActive(i.key(), this));
-if(activeCon->defaultRoute()) {
-anyDefaultRoute = activeCon->defaultRoute();
-QNetworkManagerInterfaceDevice *devIface = new QNetworkManagerInterfaceDevice(i.value(), this);
-emit networkModeChanged(deviceTypeToMode(devIface->deviceType()));
-}
-devicepath = i.value();
-}
-if(!anyDefaultRoute) {
-emit networkModeChanged(QSystemNetworkInfo::UnknownMode);
-}
 }
 QString QSystemNetworkInfoPrivate::getNmNetName(QSystemNetworkInfo::NetworkMode mode)
 {
 activeCon.reset(new QNetworkManagerConnectionActive(i.key()));
 if(i.value() == path) {
 QScopedPointer<QNetworkManagerSettingsConnection> settingsConIface;
 settingsConIface.reset(new QNetworkManagerSettingsConnection(activeCon->serviceName(),activeCon->connection().path(), this));
 if(settingsConIface->isValid()) {
-qWarning() << settingsConIface->getId();
 return settingsConIface->getId();
-} else {
-//qWarning() << "not valid";
 }
 }
 }
 return QLatin1String("");
 }
 {
 activePaths.clear();
 QScopedPointer<QNetworkManagerInterface> dbIface;
 dbIface.reset(new QNetworkManagerInterface(this));
-QList <QDBusObjectPath> connections = dbIface->activeConnections();
+const QList <QDBusObjectPath> connections = dbIface->activeConnections();
-foreach(QDBusObjectPath activeconpath, connections) {
+foreach(const QDBusObjectPath activeconpath, connections) {
 QScopedPointer<QNetworkManagerConnectionActive> activeCon;
 activeCon.reset(new QNetworkManagerConnectionActive(activeconpath.path(), this));
-QList<QDBusObjectPath> devices = activeCon->devices();
+const QList<QDBusObjectPath> devices = activeCon->devices();
-foreach(QDBusObjectPath device, devices) {
+foreach(const QDBusObjectPath device, devices) {
 activePaths.insert(activeconpath.path(),device.path());
 }
 }
 }
 accessPointIface = new QNetworkManagerInterfaceAccessPoint(path, this);
 accessPointIface->setConnections();
 if(!connect(accessPointIface, SIGNAL(propertiesChanged(const QString &,QMap<QString,QVariant>)),
 this,SLOT(nmAPPropertiesChanged( const QString &, QMap<QString,QVariant>)))) {
-//   qWarning() << "connect is false";
 }
 }
 if( i.key() == QLatin1String("Carrier")) {
 int strength = 0;
 };
 emit networkSignalStrengthChanged(QSystemNetworkInfo::EthernetMode, strength);
 }
 if( i.key() == QLatin1String("Ip4Config")) {
 // || i.key() == "Ip46Config") {
-getPrimaryMode();
+primaryModeChanged();
 }
 }
 }
 void QSystemNetworkInfoPrivate::nmAPPropertiesChanged( const QString & /*path*/, QMap<QString,QVariant> map)
 {
 switch(mode) {
 case QSystemNetworkInfo::WlanMode:
 {
 QString result;
-QString baseSysDir = QLatin1String("/sys/class/net/");
+const QString baseSysDir = QLatin1String("/sys/class/net/");
-QDir wDir(baseSysDir);
+const QDir wDir(baseSysDir);
-QStringList dirs = wDir.entryList(QStringList() << QLatin1String("*"), QDir::AllDirs | QDir::NoDotAndDotDot);
+const QStringList dirs = wDir.entryList(QStringList() << QLatin1String("*"), QDir::AllDirs | QDir::NoDotAndDotDot);
-foreach(QString dir, dirs) {
+foreach(const QString dir, dirs) {
 QString devFile = baseSysDir + dir;
 QFileInfo fi(devFile + QLatin1String("/wireless/link"));
 if(fi.exists()) {
 QFile rx(fi.absoluteFilePath());
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
 }
 break;
 case QSystemNetworkInfo::EthernetMode:
 {
 QString result;
-QString baseSysDir = QLatin1String("/sys/class/net/");
+const QString baseSysDir = QLatin1String("/sys/class/net/");
-QDir eDir(baseSysDir);
+const QDir eDir(baseSysDir);
-QStringList dirs = eDir.entryList(QStringList() << QLatin1String("eth*"), QDir::AllDirs | QDir::NoDotAndDotDot);
+const QStringList dirs = eDir.entryList(QStringList() << QLatin1String("eth*"), QDir::AllDirs | QDir::NoDotAndDotDot);
-foreach(QString dir, dirs) {
+foreach(const QString dir, dirs) {
 QString devFile = baseSysDir + dir;
 QFileInfo fi(devFile + QLatin1String("/carrier"));
 if(fi.exists()) {
 QFile rx(fi.absoluteFilePath());
 if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
 QString QSystemNetworkInfoPrivate::homeMobileNetworkCode()
 {
 return QString();
 }
+QSystemNetworkInfo::NetworkMode QSystemNetworkInfoPrivate::currentMode()
+{
+QSystemNetworkInfo::NetworkMode mode = QSystemNetworkInfo::UnknownMode;
+#if !defined(QT_NO_NETWORKMANAGER)
+bool anyDefaultRoute = false;
+QMapIterator<QString, QString> i(activePaths);
+QString devicepath;
+while (i.hasNext()) {
+i.next();
+QScopedPointer<QNetworkManagerConnectionActive> activeCon;
+activeCon.reset(new QNetworkManagerConnectionActive(i.key(), this));
+if(activeCon->defaultRoute()) {
+anyDefaultRoute = activeCon->defaultRoute();
+QNetworkManagerInterfaceDevice *devIface = new QNetworkManagerInterfaceDevice(i.value(), this);
+return deviceTypeToMode(devIface->deviceType());
+}
+devicepath = i.value();
+}
+#endif
+return mode;
+}
 QSystemDisplayInfoPrivate::QSystemDisplayInfoPrivate(QSystemDisplayInfoLinuxCommonPrivate *parent)
 : QSystemDisplayInfoLinuxCommonPrivate(parent)
 {
 }
 return QSystemDeviceInfo::UnknownProfile;
 }
 QString QSystemDeviceInfoPrivate::imei()
 {
-return QLatin1String("Sim Not Available");
+return QLatin1String("");
 }
 QString QSystemDeviceInfoPrivate::imsi()
 {
-return QLatin1String("Sim Not Available");
+return QLatin1String("");
 }
 QSystemDeviceInfo::SimStatus QSystemDeviceInfoPrivate::simStatus()
 {
 return QSystemDeviceInfo::SimNotAvailable;
 return false;
 }
 QSystemScreenSaverPrivate::QSystemScreenSaverPrivate(QSystemScreenSaverLinuxCommonPrivate *parent)
-: QSystemScreenSaverLinuxCommonPrivate(parent)
+: QSystemScreenSaverLinuxCommonPrivate(parent), currentPid(0)
 {
 kdeIsRunning = false;
 gnomeIsRunning = false;
 whichWMRunning();
 }
 QSystemScreenSaverPrivate::~QSystemScreenSaverPrivate()
 {
+if(currentPid != 0) {
+#if !defined(QT_NO_DBUS)
+QDBusConnection dbusConnection = QDBusConnection::sessionBus();
+QStringList ifaceList;
+ifaceList <<  QLatin1String("org.freedesktop.ScreenSaver");
+ifaceList << QLatin1String("org.gnome.ScreenSaver");
+QDBusInterface *connectionInterface;
+foreach(const QString iface, ifaceList) {
+connectionInterface = new QDBusInterface(QLatin1String(iface.toLatin1()),
+QLatin1String("/ScreenSaver"),
+QLatin1String(iface.toLatin1()),
+dbusConnection);
+if(connectionInterface->isValid()) {
+QDBusReply<uint> reply =  connectionInterface->call(QLatin1String("UnInhibit"),
+currentPid);
+}
+}
+#endif
+}
 }
 bool QSystemScreenSaverPrivate::setScreenSaverInhibit()
 {
 if(kdeIsRunning || gnomeIsRunning) {
 #if !defined(QT_NO_DBUS)
-pid_t pid = getppid();
+const pid_t pid = getppid();
 QDBusConnection dbusConnection = QDBusConnection::sessionBus();
 QStringList ifaceList;
 ifaceList <<  QLatin1String("org.freedesktop.ScreenSaver");
 ifaceList << QLatin1String("org.gnome.ScreenSaver");
 QDBusInterface *connectionInterface;
-foreach(QString iface, ifaceList) {
+foreach(const QString iface, ifaceList) {
 connectionInterface = new QDBusInterface(QLatin1String(iface.toLatin1()),
 QLatin1String("/ScreenSaver"),
 QLatin1String(iface.toLatin1()),
 dbusConnection);
-QDBusReply<uint> reply =  connectionInterface->call(QLatin1String("Inhibit"),
+if(connectionInterface->isValid()) {
-QString::number((int)pid),
+QDBusReply<uint> reply =  connectionInterface->call(QLatin1String("Inhibit"),
-QLatin1String("QSystemScreenSaver"));
+QString::number((int)pid),
-if(reply.isValid()) {
+QLatin1String("QSystemScreenSaver"));
-currentPid = reply.value();
+if(reply.isValid()) {
-qWarning() << "Inhibit" << currentPid;
+currentPid = reply.value();
 return reply.isValid();
-} else {
+}
-qWarning() << reply.error();
 }
 }
 #endif
 } else {
 #ifdef Q_WS_X11
 }
 bool QSystemScreenSaverPrivate::screenSaverInhibited()
 {
-if(kdeIsRunning) {
+if(kdeIsRunning || gnomeIsRunning) {
-QString kdeSSConfig;
+if(currentPid != 0) {
-if(QDir( QDir::homePath()+QLatin1String("/.kde4/")).exists()) {
+return true;
-kdeSSConfig = QDir::homePath()+QLatin1String("/.kde4/share/config/kscreensaverrc");
+} else {
-} else if(QDir(QDir::homePath()+QLatin1String("/.kde/")).exists()) {
+return false;
-kdeSSConfig = QDir::homePath()+QLatin1String("/.kde/share/config/kscreensaverrc");
+}
-}
-QSettings kdeScreenSaveConfig(kdeSSConfig, QSettings::IniFormat);
-kdeScreenSaveConfig.beginGroup(QLatin1String("ScreenSaver"));
-if(kdeScreenSaveConfig.status() == QSettings::NoError) {
-if(kdeScreenSaveConfig.value(QLatin1String("Enabled")).toBool() == false) {
-} else {
-return true;
-}
-}
-} else if(gnomeIsRunning) {
 }
 #ifdef Q_WS_X11
 int timeout;
 int interval;
 bool QSystemScreenSaverPrivate::isScreenSaverActive()
 {
 if(kdeIsRunning || gnomeIsRunning) {
 #if !defined(QT_NO_DBUS)
-pid_t pid = getppid();
+const pid_t pid = getppid();
 QDBusConnection dbusConnection = QDBusConnection::sessionBus();
 QStringList ifaceList;
 ifaceList <<  QLatin1String("org.freedesktop.ScreenSaver");
 ifaceList << QLatin1String("org.gnome.ScreenSaver");
 QDBusInterface *connectionInterface;
-foreach(QString iface, ifaceList) {
+foreach(const QString iface, ifaceList) {
 connectionInterface = new QDBusInterface(QLatin1String(iface.toLatin1()),
 QLatin1String("/ScreenSaver"),
 QLatin1String(iface.toLatin1()),
 dbusConnection);
-QDBusReply<bool> reply =  connectionInterface->call(QLatin1String("GetActive"),
+const QDBusReply<bool> reply =  connectionInterface->call(QLatin1String("GetActive"),
 QString::number((int)pid),
 QLatin1String("QSystemScreenSaver"));
 if(reply.isValid()) {
 return reply.value();
 }

changeset 4	90517678cc4f
parent 1	2b40d63a9c3d
child 11	06b8e2af4411