summaryrefslogtreecommitdiffstats
path: root/src/networksettings
diff options
context:
space:
mode:
Diffstat (limited to 'src/networksettings')
-rw-r--r--src/networksettings/CMakeLists.txt38
-rw-r--r--src/networksettings/connman.pri1
-rw-r--r--src/networksettings/connman/connmancommon.h2
-rw-r--r--src/networksettings/connman/qnetworksettingsmanager_p.cpp14
-rw-r--r--src/networksettings/connman/qnetworksettingsuseragent_p.cpp2
-rw-r--r--src/networksettings/connman/qnetworksettingsuseragent_p.h1
-rw-r--r--src/networksettings/qnetworksettingsinterfacemodel.h6
-rw-r--r--src/networksettings/qnetworksettingsmanager.h9
-rw-r--r--src/networksettings/qnetworksettingsservicemodel.h6
9 files changed, 60 insertions, 19 deletions
diff --git a/src/networksettings/CMakeLists.txt b/src/networksettings/CMakeLists.txt
new file mode 100644
index 0000000..41057e5
--- /dev/null
+++ b/src/networksettings/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from networksettings.pro.
+
+#####################################################################
+## NetworkSettings Module:
+#####################################################################
+
+qt_add_module(NetworkSettings
+ SOURCES
+ connman/connmancommon.cpp connman/connmancommon.h
+ connman/qnetworksettingsinterface_p.cpp connman/qnetworksettingsinterface_p.h
+ connman/qnetworksettingsmanager_p.cpp connman/qnetworksettingsmanager_p.h
+ connman/qnetworksettingsservice_p.cpp connman/qnetworksettingsservice_p.h
+ connman/qnetworksettingsuseragent_p.cpp connman/qnetworksettingsuseragent_p.h
+ qnetworksettings.cpp qnetworksettings.h
+ qnetworksettingsaddressmodel.cpp qnetworksettingsaddressmodel.h
+ qnetworksettingsinterface.cpp qnetworksettingsinterface.h
+ qnetworksettingsinterfacemodel.cpp qnetworksettingsinterfacemodel.h
+ qnetworksettingsmanager.cpp qnetworksettingsmanager.h
+ qnetworksettingsservice.cpp qnetworksettingsservice.h
+ qnetworksettingsservicemodel.cpp qnetworksettingsservicemodel.h
+ qnetworksettingsuseragent.cpp qnetworksettingsuseragent.h
+ DBUS_INTERFACE_SOURCES
+ connman/connman_manager.xml
+ connman/connman_service.xml
+ connman/connman_technology.xml
+ DBUS_INTERFACE_FLAGS # special case
+ -iconnmancommon.h # special case
+ INCLUDE_DIRECTORIES
+ connman
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::DBus
+ Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:networksettings.pro:<TRUE>:
+# MODULE = "networksettings"
+# VERSION = "1.0"
diff --git a/src/networksettings/connman.pri b/src/networksettings/connman.pri
index 957f2f0..3f92830 100644
--- a/src/networksettings/connman.pri
+++ b/src/networksettings/connman.pri
@@ -1,6 +1,7 @@
QT += core network dbus
INCLUDEPATH += $${PWD}/connman
+DEFINES += QMAKE_BUILD
DBUS_INTERFACES = \
connman/connman_manager.xml \
diff --git a/src/networksettings/connman/connmancommon.h b/src/networksettings/connman/connmancommon.h
index 3c8aa67..4b792ce 100644
--- a/src/networksettings/connman/connmancommon.h
+++ b/src/networksettings/connman/connmancommon.h
@@ -33,7 +33,7 @@
#include <QtDBus>
#include <QtNetworkSettings/qnetworksettings.h>
-#define AgentPath "/ConnmanAgent"
+#define PropertyAgentPath QStringLiteral("/ConnmanAgent")
#define PropertyState QStringLiteral("State")
#define PropertyName QStringLiteral("Name")
#define PropertyType QStringLiteral("Type")
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
index fe62bbe..7c65018 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp
@@ -26,15 +26,17 @@
** $QT_END_LICENSE$
**
****************************************************************************/
+#include <QFile>
+#include <QNetworkInterface>
#include "qnetworksettingsmanager_p.h"
-#include "connman_manager_interface.cpp"
-#include "moc_connman_manager_interface.cpp"
#include "qnetworksettingsinterface.h"
#include "qnetworksettingsinterface_p.h"
#include "qnetworksettingsservicemodel.h"
#include "qnetworksettingsuseragent.h"
-#include <QFile>
-#include <QNetworkInterface>
+#include "moc_connman_manager_interface.cpp"
+#ifdef QMAKE_BUILD
+#include "connman_manager_interface.cpp"
+#endif
QT_BEGIN_NAMESPACE
@@ -53,6 +55,8 @@ QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsM
, m_currentWiredConnection(Q_NULLPTR)
, m_initialized(false)
{
+ qRegisterMetaType<ConnmanMapStruct>("ConnmanMapStruct");
+ qRegisterMetaType<ConnmanMapStructList>("ConnmanMapStructList");
qDBusRegisterMetaType<ConnmanMapStruct>();
qDBusRegisterMetaType<ConnmanMapStructList>();
@@ -99,7 +103,7 @@ bool QNetworkSettingsManagerPrivate::initialize()
connect(m_manager, &NetConnmanManagerInterface::TechnologyAdded, this, &QNetworkSettingsManagerPrivate::onTechnologyAdded);
connect(m_manager, &NetConnmanManagerInterface::TechnologyRemoved, this, &QNetworkSettingsManagerPrivate::onTechnologyRemoved);
- m_manager->RegisterAgent(QDBusObjectPath(AgentPath));
+ m_manager->RegisterAgent(QDBusObjectPath(PropertyAgentPath));
m_initialized = true;
} else {
delete m_manager;
diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
index 5052b74..2c1e399 100644
--- a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
+++ b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp
@@ -76,7 +76,7 @@ void QNetworkSettingsUserAgentPrivate::ReportError(const QDBusObjectPath &path,
void QNetworkSettingsUserAgentPrivate::registerAgent()
{
Q_Q(QNetworkSettingsUserAgent);
- QDBusConnection::systemBus().registerObject(QStringLiteral(AgentPath), q);
+ QDBusConnection::systemBus().registerObject(PropertyAgentPath, q);
}
QVariantMap QNetworkSettingsUserAgentPrivate::RequestInput(const QDBusObjectPath &path, const QVariantMap &params, const QDBusMessage &msg)
diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h
index 31170d3..b85ddd2 100644
--- a/src/networksettings/connman/qnetworksettingsuseragent_p.h
+++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h
@@ -49,7 +49,6 @@ class QByteArray;
template<class T> class QList;
template<class Key, class Value> class QMap;
class QString;
-class QStringList;
class QVariant;
const QString AgentPath(QStringLiteral("/ConnmanAgent"));
diff --git a/src/networksettings/qnetworksettingsinterfacemodel.h b/src/networksettings/qnetworksettingsinterfacemodel.h
index 6dd1f2a..42d40b6 100644
--- a/src/networksettings/qnetworksettingsinterfacemodel.h
+++ b/src/networksettings/qnetworksettingsinterfacemodel.h
@@ -43,9 +43,9 @@ class Q_DECL_EXPORT QNetworkSettingsInterfaceModel : public QAbstractListModel
public:
explicit QNetworkSettingsInterfaceModel(QObject *parent = Q_NULLPTR);
// from QAbstractItemModel
- int rowCount(const QModelIndex & parent = QModelIndex()) const;
- QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
- QHash<int, QByteArray> roleNames() const;
+ int rowCount(const QModelIndex & parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
+ QHash<int, QByteArray> roleNames() const override;
void append(QNetworkSettingsInterface* networkInterface);
void insert(int row, QNetworkSettingsInterface* networkInterface);
diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h
index 4d20179..8526324 100644
--- a/src/networksettings/qnetworksettingsmanager.h
+++ b/src/networksettings/qnetworksettingsmanager.h
@@ -32,14 +32,13 @@
#include <QtNetworkSettings/qnetworksettings.h>
#include <QObject>
#include <QStringListModel>
+#include "qnetworksettingsservicemodel.h"
+#include "qnetworksettingsinterfacemodel.h"
+#include "qnetworksettingsuseragent.h"
+#include "qnetworksettingsservice.h"
QT_FORWARD_DECLARE_CLASS(QNetworkSettingsManagerPrivate)
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService)
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel)
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsUserAgent)
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter)
QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterface)
-QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterfaceModel)
QT_BEGIN_NAMESPACE
diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h
index 8c34e89..01447f6 100644
--- a/src/networksettings/qnetworksettingsservicemodel.h
+++ b/src/networksettings/qnetworksettingsservicemodel.h
@@ -42,9 +42,9 @@ public:
explicit QNetworkSettingsServiceModel(QObject *parent = Q_NULLPTR);
virtual ~QNetworkSettingsServiceModel();
// from QAbstractItemModel
- int rowCount(const QModelIndex & parent = QModelIndex()) const;
- QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
- QHash<int, QByteArray> roleNames() const;
+ int rowCount(const QModelIndex & parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
+ QHash<int, QByteArray> roleNames() const override;
bool replacePlaceholder(QNetworkSettingsService* networkService);
void append(QNetworkSettingsService* networkService);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 04:34:59 +0000