1 files changed, 0 insertions, 185 deletions
diff --git a/src/systeminfo/simulator/qsysteminfodata_simulator.cpp b/src/systeminfo/simulator/qsysteminfodata_simulator.cpp
index 1b8cc723..440777a1 100644
--- a/src/systeminfo/simulator/qsysteminfodata_simulator.cpp
+++ b/src/systeminfo/simulator/qsysteminfodata_simulator.cpp
@@ -39,180 +39,7 @@ QT_BEGIN_NAMESPACE
 
 void qt_registerSystemInfoTypes()
 {
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData>("QNetworkInfoData");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::BasicNetworkInfo>("QNetworkInfoData::BasicNetworkInfo");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::EthernetInfo>("QNetworkInfoData::EthernetInfo");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::WLanInfo>("QNetworkInfoData::WLanInfo");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::CellularInfo>("QNetworkInfoData::CellularInfo");
-    qRegisterMetaTypeStreamOperators<QNetworkInfoData::BluetoothInfo>("QNetworkInfoData::BluetoothInfo");
-    qRegisterMetaTypeStreamOperators<QDeviceInfoData>("QDeviceInfoData");
     qRegisterMetaTypeStreamOperators<QBatteryInfoData>("QBatteryInfoData");
-    qRegisterMetaTypeStreamOperators<QScreenSaverData>("QScreenSaverData");
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::BasicNetworkInfo &s)
-{
-    out << s.name;
-    out << static_cast<qint32>(s.signalStrength) << static_cast<qint32>(s.mode)
-        << static_cast<qint32>(s.status);
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::BasicNetworkInfo &s)
-{
-    in >> s.name;
-    qint32 signalStrength;
-    in >> signalStrength;
-    s.signalStrength = signalStrength;
-    qint32 mode, status;
-    in >> mode;
-    in >> status;
-    s.mode = static_cast<QNetworkInfo::NetworkMode>(mode);
-    s.status = static_cast<QNetworkInfo::NetworkStatus>(status);
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::EthernetInfo &s)
-{
-    out << s.basicNetworkInfo;
-    out << s.macAddress;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::EthernetInfo &s)
-{
-    in >> s.basicNetworkInfo;
-    in >> s.macAddress;
-
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::WLanInfo &s)
-{
-    out << s.basicNetworkInfo;
-    out << s.macAddress;
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::WLanInfo &s)
-{
-    in >> s.basicNetworkInfo;
-    in >> s.macAddress;
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::BluetoothInfo &s)
-{
-    out << s.basicNetworkInfo;
-    out << s.btAddress;
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::BluetoothInfo &s)
-{
-    in >> s.basicNetworkInfo;
-    in >> s.btAddress;
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData::CellularInfo &s)
-{
-    out << s.basicNetworkInfo;
-    out << s.imsi << s.cellId << s.locationAreaCode;
-    out << s.currentMobileCountryCode << s.currentMobileNetworkCode;
-    out << s.homeMobileCountryCode << s.homeMobileNetworkCode;
-    out << static_cast<qint32>(s.cellData);
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData::CellularInfo &s)
-{
-    in >> s.basicNetworkInfo;
-    qint32 cellData;
-    in >> s.imsi >> s.cellId >> s.locationAreaCode;
-    in >> s.currentMobileCountryCode >> s.currentMobileNetworkCode;
-    in >> s.homeMobileCountryCode >> s.homeMobileNetworkCode;
-    in >> cellData;
-    s.cellData = static_cast<QNetworkInfo::CellDataTechnology>(cellData);
-
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QNetworkInfoData &s)
-{
-    out << s.ethernetInfo;
-    out << s.wLanInfo;
-    out << s.cellularInfo;
-    out << s.bluetoothInfo;
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QNetworkInfoData &s)
-{
-    in >> s.ethernetInfo;
-    in >> s.wLanInfo;
-    in >> s.cellularInfo;
-    in >> s.bluetoothInfo;
-
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QDeviceInfoData &s)
-{
-    out << s.manufacturer << s.model << s.productName << s.uniqueDeviceID;
-    out << s.imeiList;
-    out << s.featureList;
-    out << s.versionList;
-    out << static_cast<qint32>(s.enabledLocks) << static_cast<qint32>(s.activatedLocks)
-        << static_cast<qint32>(s.currentThermalState);
-
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QDeviceInfoData &s)
-{
-    in >> s.manufacturer >> s.model >> s.productName >> s.uniqueDeviceID;
-    in >> s.imeiList;
-    in >> s.featureList;
-    in >> s.versionList;
-    qint32 enabledLocks, activatedLocks, currentThermalState;
-    in >> enabledLocks >> activatedLocks >> currentThermalState;
-    s.enabledLocks = static_cast<QDeviceInfo::LockTypeFlags>(enabledLocks);
-    s.activatedLocks = static_cast<QDeviceInfo::LockTypeFlags>(activatedLocks);
-    s.currentThermalState = static_cast<QDeviceInfo::ThermalState>(currentThermalState);
-
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QDeviceInfo::Feature s)
-{
-    out << static_cast<qint32>(s);
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QDeviceInfo::Feature &s)
-{
-    qint32 v;
-    in >> v;
-    s = static_cast<QDeviceInfo::Feature>(v);
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const QDeviceInfo::Version s)
-{
-    out << static_cast<qint32>(s);
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QDeviceInfo::Version &s)
-{
-    qint32 v;
-    in >> v;
-    s = static_cast<QDeviceInfo::Version>(v);
-    return in;
 }
 
 QDataStream &operator<<(QDataStream &out, const QBatteryInfoData &s)
@@ -248,18 +75,6 @@ QDataStream &operator>>(QDataStream &in, QBatteryInfoData &s)
     return in;
 }
 
-QDataStream &operator<<(QDataStream &out, const QScreenSaverData &s)
-{
-    out << s.screenSaverEnabled;
-    return out;
-}
-
-QDataStream &operator>>(QDataStream &in, QScreenSaverData &s)
-{
-    in >> s.screenSaverEnabled;
-    return in;
-}
-
 QT_END_NAMESPACE