Commit 93b968bd authored by Jan Grulich's avatar Jan Grulich
Browse files

Merge branch master

parents 85f085c9 02710977
......@@ -8,11 +8,19 @@ find_package(NetworkManager "0.9.8" REQUIRED)
include(FindPkgConfig)
include(KDE4Defaults)
pkg_check_modules(MODEMMANAGERQT REQUIRED ModemManagerQt)
if (NOT MODEMMANAGERQT_FOUND)
message(FATAL_ERROR "ERROR: ModemManagerQt not found. http://projects.kde.org/libmm-qt")
endif (NOT MODEMMANAGERQT_FOUND)
pkg_check_modules(MODEMMANAGER ModemManager)
if (DISABLE_MODEMMANAGER_SUPPORT)
message(STATUS "Disabling ModemManager support")
set(WITH_MODEMMANAGER_SUPPORT 0)
else()
pkg_check_modules(MODEMMANAGERQT ModemManagerQt)
if (MODEMMANAGERQT_FOUND)
message(STATUS "Enabling ModemManager support")
set(WITH_MODEMMANAGER_SUPPORT 1)
else()
message(STATUS "ModemManagerQt not found")
set(WITH_MODEMMANAGER_SUPPORT 0)
endif()
endif()
pkg_check_modules(NETWORKMANAGERQT REQUIRED NetworkManagerQt)
if (NOT NETWORKMANAGERQT_FOUND)
......@@ -37,6 +45,7 @@ pkg_check_modules(QTNETWORK REQUIRED QtNetwork)
pkg_check_modules(NETWORKMANAGER REQUIRED NetworkManager)
add_definitions(
-DWITH_MODEMMANAGER_SUPPORT=${WITH_MODEMMANAGER_SUPPORT}
${QT_DEFINITIONS}
${KDE_DEFINITIONS}
${NETWORKMANAGERQT_CFLAGS_OTHER}
......@@ -50,7 +59,9 @@ include_directories(${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/lib/editor
${QTNETWORK_INCLUDE_DIRS}
${MODEMMANAGER_INCLUDE_DIRS}
${MODEMMANAGERQT_INCLUDE_DIRS}
if (MODEMMANAGERQT_FOUND)
${MODEMMANAGERQT_INCLUDE_DIRS}
endif()
${NETWORKMANAGERQT_INCLUDE_DIRS}
${NETWORKMANAGER_INCLUDE_DIRS}
${KDE4_INCLUDES})
......
......@@ -5,17 +5,22 @@ Plasma applet written in QML for managing network connections
Dependencies:
-------------
- libnm-qt (NM/0.9 branch)
→ requires NetworkManager 0.9.8+
Optional dependencies:
---------------------
- libmm-qt (MM/0.5 branch)
→ requires ModemManager 0.5 - 0.6 (ModemManager 0.7+ is not supported yet)
- libnm-qt (NM/0.9 branch)
→ requires NetworkManager 0.9.8+
Plasma-nm is compiled with ModemManager support by default when libmm-qt is found,
when you want to explicitly disable ModemManager support, use -DDISABLE_MODEMMANAGER_SUPPORT=true cmake parameter.
Compiling:
----------
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=/usr
cmake ../ -DCMAKE_INSTALL_PREFIX=/usr [-DDISABLE_MODEMMANAGER_SUPPORT=true]
make
# As root:
make install
......
......@@ -352,6 +352,7 @@ PlasmaComponents.ListItem {
topMargin: padding.margins.top;
}
text: i18n("Edit connection");
enabled: itemUuid;
onClicked: {
itemExpanded(itemUni, false);
......
......@@ -34,8 +34,10 @@
ConnectionIcon::ConnectionIcon(QObject* parent):
QObject(parent),
m_signal(0),
m_modemNetwork(0)
m_signal(0)
#if WITH_MODEMMANAGER_SUPPORT
,m_modemNetwork(0)
#endif
{
}
......@@ -141,12 +143,12 @@ void ConnectionIcon::setIcons()
bool vpnFound = false;
m_signal = 0;
#if WITH_MODEMMANAGER_SUPPORT
if (m_modemNetwork) {
disconnect(m_modemNetwork.data(), 0, this, 0);
m_modemNetwork.clear();
}
#endif
if (m_wirelessNetwork) {
disconnect(m_wirelessNetwork.data(), 0, this, 0);
m_wirelessNetwork.clear();
......@@ -195,13 +197,23 @@ void ConnectionIcon::setIcons()
Q_EMIT setTooltipIcon("network-wired-activated");
} else if (type == NetworkManager::Device::Modem) {
connectionFound = true;
#if WITH_MODEMMANAGER_SUPPORT
setModemIcon(device);
#else
Q_EMIT setConnectionIcon("network-mobile-0");
Q_EMIT setTooltipIcon("phone");
#endif
} else if (type == NetworkManager::Device::Bluetooth) {
NetworkManager::BluetoothDevice::Ptr btDevice = device.objectCast<NetworkManager::BluetoothDevice>();
if (btDevice) {
connectionFound = true;
if (btDevice->bluetoothCapabilities().testFlag(NetworkManager::BluetoothDevice::Dun)) {
#if WITH_MODEMMANAGER_SUPPORT
setModemIcon(device);
#else
Q_EMIT setConnectionIcon("network-mobile-0");
Q_EMIT setTooltipIcon("phone");
#endif
} else {
NMAppletDebug() << "Emit signal setConnectionIcon(bluetooth)";
Q_EMIT setConnectionIcon("bluetooth");
......@@ -270,7 +282,7 @@ void ConnectionIcon::setDisconnectedIcon()
return;
} else if (modem) {
NMAppletDebug() << "Emit signal setConnectionIcon(network-mobile)";
Q_EMIT setConnectionIcon("network-mobile");
Q_EMIT setConnectionIcon("network-mobile-0");
Q_EMIT setTooltipIcon("phone");
Q_EMIT setHoverIcon("dialog-cancel");
return;
......@@ -288,7 +300,7 @@ void ConnectionIcon::setDisconnectedIcon()
return;
}
}
#if WITH_MODEMMANAGER_SUPPORT
void ConnectionIcon::setModemIcon(const NetworkManager::Device::Ptr & device)
{
NetworkManager::ModemDevice::Ptr modemDevice = device.objectCast<NetworkManager::ModemDevice>();
......@@ -329,7 +341,7 @@ void ConnectionIcon::setModemIcon(const NetworkManager::Device::Ptr & device)
#endif
} else {
NMAppletDebug() << "Emit signal setConnectionIcon(network-mobile)";
Q_EMIT setConnectionIcon("network-mobile");
Q_EMIT setConnectionIcon("network-mobile-0");
Q_EMIT setTooltipIcon("phone");
return;
}
......@@ -445,12 +457,11 @@ void ConnectionIcon::setIconForModem()
break;
}
#endif
NMAppletDebug() << "Emit signal setConnectionIcon(" << QString(result).arg(strength) << ")";
Q_EMIT setConnectionIcon(QString(result).arg(strength));
Q_EMIT setTooltipIcon("phone");
}
#endif
void ConnectionIcon::setWirelessIcon(const NetworkManager::Device::Ptr &device, const QString& ssid)
{
NetworkManager::WirelessDevice::Ptr wirelessDevice = device.objectCast<NetworkManager::WirelessDevice>();
......
......@@ -24,10 +24,10 @@
#include <NetworkManagerQt/Manager>
#include <NetworkManagerQt/ActiveConnection>
#include <NetworkManagerQt/WirelessNetwork>
#if WITH_MODEMMANAGER_SUPPORT
#include <ModemManagerQt/modemgsmnetworkinterface.h>
#include "config.h"
#endif
class ConnectionIcon : public QObject
{
......@@ -45,12 +45,13 @@ private Q_SLOTS:
void carrierChanged(bool carrier);
void deviceAdded(const QString & device);
void deviceRemoved(const QString & device);
void modemNetworkRemoved();
void modemSignalChanged(uint signal);
void setIcons();
void setWirelessIconForSignalStrength(int strength);
#if WITH_MODEMMANAGER_SUPPORT
void modemNetworkRemoved();
void modemSignalChanged(uint signal);
void setIconForModem();
#endif
Q_SIGNALS:
void hideConnectingIndicator();
void showConnectingIndicator();
......@@ -62,15 +63,17 @@ Q_SIGNALS:
private:
uint m_signal;
NetworkManager::WirelessNetwork::Ptr m_wirelessNetwork;
void setDisconnectedIcon();
void setWirelessIcon(const NetworkManager::Device::Ptr & device, const QString & ssid);
#if WITH_MODEMMANAGER_SUPPORT
#ifdef MODEMMANAGERQT_ONE
ModemManager::ModemInterface::Ptr m_modemNetwork;
#else
ModemManager::ModemGsmNetworkInterface::Ptr m_modemNetwork;
#endif
void setDisconnectedIcon();
void setModemIcon(const NetworkManager::Device::Ptr & device);
void setWirelessIcon(const NetworkManager::Device::Ptr & device, const QString & ssid);
#endif
};
#endif // PLASMA_NM_CONNECTION_ICON_H
......@@ -63,12 +63,14 @@ Model::Model(QObject* parent):
SLOT(addWimaxNsp(QString,QString)));
connect(m_monitor, SIGNAL(addWirelessNetwork(QString,QString)),
SLOT(addWirelessNetwork(QString,QString)));
#if WITH_MODEMMANAGER_SUPPORT
connect(m_monitor, SIGNAL(modemAccessTechnologyChanged(QString)),
SLOT(modemPropertiesChanged(QString)));
connect(m_monitor, SIGNAL(modemAllowedModeChanged(QString)),
SLOT(modemPropertiesChanged(QString)));
connect(m_monitor, SIGNAL(modemSignalQualityChanged(uint, QString)),
SLOT(modemSignalQualityChanged(uint, QString)));
#endif
connect(m_monitor, SIGNAL(removeActiveConnection(uint, QString)),
SLOT(removeActiveConnection(QString)));
connect(m_monitor, SIGNAL(removeAvailableConnection(QString,QString)),
......@@ -268,7 +270,7 @@ void Model::connectionUpdated(const QString& connection)
}
}
}
#if WITH_MODEMMANAGER_SUPPORT
void Model::modemPropertiesChanged(const QString& modem)
{
foreach (ModelItem * item, m_items.itemsByDevice(modem)) {
......@@ -291,7 +293,7 @@ void Model::modemSignalQualityChanged(uint signal, const QString& modem)
}
}
}
#endif
void Model::removeActiveConnection(const QString& active)
{
ModelItem * item = m_items.itemByActiveConnection(active);
......
......@@ -57,8 +57,10 @@ private Q_SLOTS:
void addWimaxNsp(const QString& nsp, const QString& device);
void addWirelessNetwork(const QString& ssid, const QString& device);
void connectionUpdated(const QString& connection);
#if WITH_MODEMMANAGER_SUPPORT
void modemPropertiesChanged(const QString& modem);
void modemSignalQualityChanged(uint signal, const QString& modem);
#endif
void removeActiveConnection(const QString& active);
void removeAvailableConnection(const QString& connection, const QString& device);
void removeConnection(const QString& connection);
......
......@@ -35,8 +35,6 @@
#include <NetworkManagerQt/VpnSetting>
#include <NetworkManagerQt/WirelessSetting>
#include <ModemManagerQt/modemgsmnetworkinterface.h>
#include <KGlobal>
#include <KLocale>
......
......@@ -147,7 +147,7 @@ void Monitor::addDevice(const NetworkManager::Device::Ptr& device)
} else if (device->type() == NetworkManager::Device::Modem) {
NMMonitorDebug() << "Available modem device " << device->interfaceName();
NetworkManager::ModemDevice::Ptr modemDev = device.objectCast<NetworkManager::ModemDevice>();
#if WITH_MODEMMANAGER_SUPPORT
#ifdef MODEMMANAGERQT_ONE
ModemManager::ModemInterface::Ptr modemNetwork = modemDev->getModemNetworkIface();
if (modemDev->isValid()) {
......@@ -168,6 +168,7 @@ void Monitor::addDevice(const NetworkManager::Device::Ptr& device)
connect(modemNetwork.data(), SIGNAL(allowedModeChanged(ModemManager::ModemInterface::AllowedMode)),
SLOT(gsmNetworkAllowedModeChanged(ModemManager::ModemInterface::AllowedMode)), Qt::UniqueConnection);
}
#endif
#endif
}
......@@ -365,6 +366,7 @@ void Monitor::deviceRemoved(const QString& device)
Q_EMIT removeConnectionsByDevice(device);
}
#if WITH_MODEMMANAGER_SUPPORT
#ifdef MODEMMANAGERQT_ONE
void Monitor::gsmNetworkAccessTechnologyChanged(ModemManager::ModemInterface::AccessTechnologies technology)
#else
......@@ -445,7 +447,7 @@ void Monitor::gsmNetworkSignalQualityChanged(uint signal)
}
}
}
#endif
void Monitor::statusChanged(NetworkManager::Status status)
{
NMMonitorDebug() << "NetworkManager status changed to " << status;
......
......@@ -28,11 +28,10 @@
#include <NetworkManagerQt/VpnConnection>
#include <NetworkManagerQt/WirelessNetwork>
#include <NetworkManagerQt/WirelessDevice>
#if WITH_MODEMMANAGER_SUPPORT
#include <ModemManagerQt/modeminterface.h>
#include "config.h"
#endif
class Monitor : public QObject
{
Q_OBJECT
......@@ -55,6 +54,7 @@ private Q_SLOTS:
void connectionUpdated();
void deviceAdded(const QString& device);
void deviceRemoved(const QString& device);
#if WITH_MODEMMANAGER_SUPPORT
#ifdef MODEMMANAGERQT_ONE
void gsmNetworkAccessTechnologyChanged(ModemManager::ModemInterface::AccessTechnologies technology);
void gsmNetworkCurrentModesChanged();
......@@ -63,6 +63,7 @@ private Q_SLOTS:
void gsmNetworkAllowedModeChanged(ModemManager::ModemInterface::AllowedMode mode);
#endif
void gsmNetworkSignalQualityChanged(uint signal);
#endif
void statusChanged(NetworkManager::Status status);
void vpnConnectionStateChanged(NetworkManager::VpnConnection::State state, NetworkManager::VpnConnection::StateChangeReason reason);
void wimaxNspAppeared(const QString& nsp);
......@@ -83,9 +84,11 @@ Q_SIGNALS:
void addWimaxNsp(const QString& nsp, const QString& device);
void addWirelessNetwork(const QString& network, const QString& device);
void connectionUpdated(const QString& connection);
#if WITH_MODEMMANAGER_SUPPORT
void modemAccessTechnologyChanged(const QString& modem);
void modemAllowedModeChanged(const QString& modem);
void modemSignalQualityChanged(uint signal, const QString & modem);
#endif
void removeActiveConnection(const QString& active);
void removeAvailableConnection(const QString& connection, const QString& uni);
void removeConnectionsByDevice(const QString& udi);
......
......@@ -77,9 +77,11 @@ ConnectionEditor::ConnectionEditor(QWidget* parent, Qt::WindowFlags flags):
action = new QAction(i18n("InfiniBand"), this);
action->setData(NetworkManager::ConnectionSettings::Infiniband);
m_menu->addAction(action);
#if WITH_MODEMMANAGER_SUPPORT
action = new QAction(i18n("Mobile Broadband..."), this);
action->setData(NetworkManager::ConnectionSettings::Gsm);
m_menu->addAction(action);
#endif
action = new QAction(i18n("Wired"), this);
action->setData(NetworkManager::ConnectionSettings::Wired);
action->setProperty("shared", false);
......@@ -334,6 +336,7 @@ void ConnectionEditor::addConnection(QAction* action)
ConnectionSettings::ConnectionType type = static_cast<ConnectionSettings::ConnectionType>(action->data().toUInt());
if (type == NetworkManager::ConnectionSettings::Gsm) { // launch the mobile broadband wizard, both gsm/cdma
#if WITH_MODEMMANAGER_SUPPORT
QWeakPointer<MobileConnectionWizard> wizard = new MobileConnectionWizard(NetworkManager::ConnectionSettings::Unknown, this);
if (wizard.data()->exec() == QDialog::Accepted && wizard.data()->getError() == MobileProviders::Success) {
qDebug() << "Mobile broadband wizard finished:" << wizard.data()->type() << wizard.data()->args();
......@@ -343,6 +346,7 @@ void ConnectionEditor::addConnection(QAction* action)
if (wizard) {
wizard.data()->deleteLater();
}
#endif
} else {
bool shared = false;
if (type == ConnectionSettings::Wired || type == ConnectionSettings::Wireless) {
......
set(kded_networkmanagement_SRCS
notification.cpp
passworddialog.cpp
secretagent.cpp
service.cpp
pindialog.cpp
modemmonitor.cpp
bluetoothmonitor.cpp
)
if (MODEMMANAGERQT_FOUND)
set(kded_networkmanagement_SRCS
notification.cpp
passworddialog.cpp
secretagent.cpp
service.cpp
bluetoothmonitor.cpp
modemmonitor.cpp
pindialog.cpp
)
kde4_add_ui_files(kded_networkmanagement_SRCS
pinwidget.ui
passworddialog.ui
kde4_add_ui_files(kded_networkmanagement_SRCS
passworddialog.ui
pinwidget.ui
)
)
else()
set(kded_networkmanagement_SRCS
notification.cpp
passworddialog.cpp
secretagent.cpp
service.cpp
bluetoothmonitor.cpp
)
kde4_add_ui_files(kded_networkmanagement_SRCS
passworddialog.ui
)
endif()
kde4_add_plugin(kded_networkmanagement ${kded_networkmanagement_SRCS})
......
......@@ -61,8 +61,10 @@ void BluetoothMonitor::addBluetoothConnection(const QString& bdAddr, const QStri
mBdaddr = bdAddr;
mService = service.toLower();
if (mService == "dun") {
#if WITH_MODEMMANAGER_SUPPORT
connect(ModemManager::notifier(), SIGNAL(modemAdded(QString)),
SLOT(modemAdded(QString)));
#endif
}
init();
}
......@@ -213,7 +215,7 @@ void BluetoothMonitor::init()
mDunDevice = reply.value();
}
#if WITH_MODEMMANAGER_SUPPORT
void BluetoothMonitor::modemAdded(const QString &udi)
{
qDebug() << "Modem added" << udi;
......@@ -323,3 +325,4 @@ void BluetoothMonitor::modemAdded(const QString &udi)
}
}
}
#endif
......@@ -22,11 +22,11 @@
#ifndef PLASMA_NM_BLUETOOTH_MONITOR_H
#define PLASMA_NM_BLUETOOTH_MONITOR_H
#if WITH_MODEMMANAGER_SUPPORT
#include "../lib/mobileconnectionwizard.h"
#include <QDBusObjectPath>
#include <ModemManagerQt/manager.h>
#endif
#include <QDBusObjectPath>
class BluetoothMonitor: public QObject
{
......@@ -40,13 +40,17 @@ public Q_SLOTS:
Q_SCRIPTABLE void addBluetoothConnection(const QString & bdAddr, const QString & service);
private Q_SLOTS:
void init();
#if WITH_MODEMMANAGER_SUPPORT
void modemAdded(const QString &udi);
#endif
private:
QString mBdaddr;
QString mService;
QString mDunDevice;
QString mDevicePath;
QString mDeviceName;
#if WITH_MODEMMANAGER_SUPPORT
QWeakPointer<MobileConnectionWizard> mobileConnectionWizard;
#endif
};
#endif
......@@ -26,7 +26,9 @@
#include "secretagent.h"
#include "notification.h"
#if WITH_MODEMMANAGER_SUPPORT
#include "modemmonitor.h"
#endif
#include "bluetoothmonitor.h"
#include <QDBusMetaType>
......@@ -49,7 +51,9 @@ NetworkManagementService::NetworkManagementService(QObject * parent, const QVari
d->agent = new SecretAgent(this);
new Notification(this);
#if WITH_MODEMMANAGER_SUPPORT
new ModemMonitor(this);
#endif
new BluetoothMonitor(this);
}
......
set(plasmanetworkmanagement-internal_SRCS
settingwidget.cpp
vpnuiplugin.cpp
uiutils.cpp
mobileproviders.cpp
mobileconnectionwizard.cpp
hwaddrcombobox.cpp
ssidcombobox.cpp
bssidcombobox.cpp
)
if (MODEMMANAGERQT_FOUND)
set(plasmanetworkmanagement-internal_SRCS
settingwidget.cpp
vpnuiplugin.cpp
uiutils.cpp
hwaddrcombobox.cpp
ssidcombobox.cpp
bssidcombobox.cpp
mobileproviders.cpp
mobileconnectionwizard.cpp
)
else()
set(plasmanetworkmanagement-internal_SRCS
settingwidget.cpp
vpnuiplugin.cpp
uiutils.cpp
hwaddrcombobox.cpp
ssidcombobox.cpp
bssidcombobox.cpp
)
endif()
kde4_add_library(plasmanetworkmanagement-internal SHARED ${plasmanetworkmanagement-internal_SRCS})
target_link_libraries(plasmanetworkmanagement-internal NetworkManagerQt ModemManagerQt ${KDE4_SOLID_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY})
......
......@@ -37,6 +37,13 @@
#include <NetworkManagerQt/WirelessDevice>
#include <NetworkManagerQt/WirelessSetting>
#if WITH_MODEMMANAGER_SUPPORT
#ifdef MODEMMANAGERQT_ONE
#include <ModemManagerQt/modemgsmnetworkinterface.h>
#include <ModemManagerQt/modemcdmainterface.h>
#endif
#endif
// Qt
#include <QSizeF>
#include <QHostAddress>
......@@ -558,6 +565,7 @@ QString UiUtils::wirelessBandToString(NetworkManager::WirelessSetting::Frequency
return QString();
}
#if WITH_MODEMMANAGER_SUPPORT
#ifdef MODEMMANAGERQT_ONE
QString UiUtils::convertTypeToString(ModemManager::ModemInterface::InterfaceType type)
{
......@@ -680,6 +688,7 @@ QString UiUtils::convertAccessTechnologyToString(const ModemManager::ModemInterf
return i18nc("Unknown cellular access technology","Unknown");
}
#endif
#endif
QString UiUtils::convertNspTypeToString(WimaxNsp::NetworkType type)
{
......@@ -887,14 +896,14 @@ QString UiUtils::bluetoothDetails(const BluetoothDevice::Ptr& btDevice, const QS
return details;
}
#ifdef MODEMMANAGERQT_ONE
#include <ModemManagerQt/modemcdmainterface.h>
QString UiUtils::modemDetails(const ModemDevice::Ptr& modemDevice, const QStringList& keys)
{
#if WITH_MODEMMANAGER_SUPPORT
#ifdef MODEMMANAGERQT_ONE
QString format = "<tr><td align=\"right\" width=\"50%\"><b>%1</b></td><td align=\"left\" width=\"50%\">&nbsp;%2</td></tr>";
QString details;
ModemManager::ModemInterface::Ptr modemNetwork = modemDevice->getModemNetworkIface();
ModemManager::Modem3gppInterface::Ptr gsmNet = modemNetwork.objectCast<ModemManager::Modem3gppInterface>();
ModemManager::ModemCdmaInterface::Ptr cdmaNet = modemNetwork.objectCast<ModemManager::ModemCdmaInterface>();
......@@ -940,15 +949,7 @@ QString UiUtils::modemDetails(const ModemDevice::Ptr& modemDevice, const QString
}
}
}
return details;
}
#else
QString UiUtils::modemDetails(const ModemDevice::Ptr& modemDevice, const QStringList& keys)
{
QString format = "<tr><td align=\"right\" width=\"50%\"><b>%1</b></td><td align=\"left\" width=\"50%\">&nbsp;%2</td></tr>";
QString details;
ModemManager::ModemGsmNetworkInterface::Ptr modemNetwork = modemDevice->getModemNetworkIface().objectCast<ModemManager::ModemGsmNetworkInterface>();
foreach (const QString& key, keys) {
......@@ -994,10 +995,14 @@ QString UiUtils::modemDetails(const ModemDevice::Ptr& modemDevice, const QString
}
}
}
#endif
return details;
}
#else
Q_UNUSED(modemDevice)
Q_UNUSED(keys)
return QString();
#endif
}
QString UiUtils::vpnDetails(const VpnConnection::Ptr& vpnConnection, const VpnSetting::Ptr& vpnSetting, const QStringList& keys)
{
......
......@@ -36,7 +36,11 @@ class QSizeF;
#include <NetworkManagerQt/VpnConnection>
#include <NetworkManagerQt/VpnSetting>
#include <Solid/Device>
#if WITH_MODEMMANAGER_SUPPORT
#ifdef MODEMMANAGERQT_ONE
#include <ModemManager/ModemManager.h>
#endif
#endif
#include <kdemacros.h>
......@@ -67,12 +71,6 @@ public: