Skip to content

Commit

Permalink
Rename VpnCoreModel class to VpnModel
Browse files Browse the repository at this point in the history 
To better align with the overall libconnman-qt naming scheme.
  • Loading branch information
@llewelld
llewelld committed Oct 9, 2019
1 parent 2adfe8a commit d4d3189
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 75 deletions.
6 changes: 3 additions & 3 deletions libconnman-qt/libconnman-qt.pro
View file
Expand Up @@ -65,8 +65,8 @@ PUBLIC_HEADERS += \
vpnconnection_p.h \
vpnmanager.h \
vpnmanager_p.h \
vpncoremodel.h \
vpncoremodel_p.h
vpnmodel.h \
vpnmodel_p.h

HEADERS += \
$$PUBLIC_HEADERS \
Expand All @@ -90,7 +90,7 @@ SOURCES += \
counter.cpp \
vpnconnection.cpp \
vpnmanager.cpp \
vpncoremodel.cpp
vpnmodel.cpp

target.path = $$INSTALL_ROOT$$PREFIX/lib

Expand Down
4 changes: 2 additions & 2 deletions libconnman-qt/vpnconnection.cpp
View file
Expand Up @@ -221,7 +221,7 @@ void VpnConnection::update(const QVariantMap &updateProperties)
}
}

int oldState(d->m_state);
ConnectionState oldState(d->m_state);
QQueue<void(VpnConnection::*)()> emissions;

d->checkChanged(properties, emissions, "name", &VpnConnection::nameChanged);
Expand Down Expand Up @@ -296,7 +296,7 @@ void VpnConnection::setAutoConnect(bool autoConnect)
}
}

int VpnConnection::state() const
VpnConnection::ConnectionState VpnConnection::state() const
{
Q_D(const VpnConnection);

Expand Down
4 changes: 2 additions & 2 deletions libconnman-qt/vpnconnection.h
View file
Expand Up @@ -50,7 +50,7 @@ class VpnConnection : public QObject
Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged)
Q_PROPERTY(bool autoConnect READ autoConnect WRITE setAutoConnect NOTIFY autoConnectChanged)
Q_PROPERTY(bool storeCredentials READ storeCredentials WRITE setStoreCredentials NOTIFY storeCredentialsChanged)
Q_PROPERTY(int state READ state NOTIFY stateChanged)
Q_PROPERTY(ConnectionState state READ state NOTIFY stateChanged)

Q_PROPERTY(QString type READ type WRITE setType NOTIFY typeChanged)
Q_PROPERTY(bool immutable READ immutable WRITE setImmutable NOTIFY immutableChanged)
Expand Down Expand Up @@ -103,7 +103,7 @@ class VpnConnection : public QObject
bool storeCredentials() const;
void setStoreCredentials(bool storeCredentials);

int state() const;
ConnectionState state() const;

QString type() const;
void setType(const QString &type);
Expand Down
2 changes: 1 addition & 1 deletion libconnman-qt/vpnconnection_p.h
View file
Expand Up @@ -55,7 +55,7 @@ class VpnConnectionPrivate
NetConnmanServiceInterface m_serviceProxy;
QString m_path;
bool m_autoConnect;
int m_state;
VpnConnection::ConnectionState m_state;
QVariantMap m_properties;

VpnConnection *q_ptr;
Expand Down
90 changes: 45 additions & 45 deletions libconnman-qt/vpncoremodel.cpp → libconnman-qt/vpnmodel.cpp
View file
Expand Up @@ -34,66 +34,66 @@
#include <vpnmanager.h>
#include <vpnconnection.h>

#include "vpncoremodel.h"
#include "vpncoremodel_p.h"
#include "vpnmodel.h"
#include "vpnmodel_p.h"

const QHash<int, QByteArray> VpnCoreModelPrivate::m_roles({{VpnCoreModel::VpnRole, "vpnService"}});
const QHash<int, QByteArray> VpnModelPrivate::m_roles({{VpnModel::VpnRole, "vpnService"}});

// ==========================================================================
// VpnCoreModel
// VpnModel
// ==========================================================================

VpnCoreModelPrivate::VpnCoreModelPrivate(VpnCoreModel &qq)
VpnModelPrivate::VpnModelPrivate(VpnModel &qq)
: m_manager(nullptr)
, q_ptr(&qq)
{
}

void VpnCoreModelPrivate::init()
void VpnModelPrivate::init()
{
Q_Q(VpnCoreModel);
Q_Q(VpnModel);

m_manager = VpnManagerFactory::createInstance();

emit q->vpnManagerChanged();

VpnCoreModel::connect(m_manager, &VpnManager::connectionsChanged, q, &VpnCoreModel::connectionsChanged);
VpnCoreModel::connect(m_manager, &VpnManager::populatedChanged, q, &VpnCoreModel::populatedChanged);
VpnModel::connect(m_manager, &VpnManager::connectionsChanged, q, &VpnModel::connectionsChanged);
VpnModel::connect(m_manager, &VpnManager::populatedChanged, q, &VpnModel::populatedChanged);

q->connectionsChanged();
}

VpnCoreModel::VpnCoreModel(QObject* parent)
VpnModel::VpnModel(QObject* parent)
: QAbstractListModel(parent)
, d_ptr(new VpnCoreModelPrivate(*this))
, d_ptr(new VpnModelPrivate(*this))
{
Q_D(VpnCoreModel);
Q_D(VpnModel);
d->init();
}

VpnCoreModel::VpnCoreModel(VpnCoreModelPrivate &dd, QObject *parent)
VpnModel::VpnModel(VpnModelPrivate &dd, QObject *parent)
: QAbstractListModel(parent)
, d_ptr(&dd)
{
Q_D(VpnCoreModel);
Q_D(VpnModel);
d->init();
}

VpnCoreModel::~VpnCoreModel()
VpnModel::~VpnModel()
{
Q_D(VpnCoreModel);
Q_D(VpnModel);

disconnect(d->m_manager, &VpnManager::connectionsChanged, this, &VpnCoreModel::connectionsChanged);
disconnect(d->m_manager, &VpnManager::connectionsChanged, this, &VpnModel::connectionsChanged);
}

QHash<int, QByteArray> VpnCoreModel::roleNames() const
QHash<int, QByteArray> VpnModel::roleNames() const
{
return VpnCoreModelPrivate::m_roles;
return VpnModelPrivate::m_roles;
}

QVariant VpnCoreModel::data(const QModelIndex &index, int role) const
QVariant VpnModel::data(const QModelIndex &index, int role) const
{
Q_D(const VpnCoreModel);
Q_D(const VpnModel);

if (index.isValid() && index.row() >= 0 && index.row() < d->m_connections.count()) {
switch (role) {
Expand All @@ -105,45 +105,45 @@ QVariant VpnCoreModel::data(const QModelIndex &index, int role) const
return QVariant();
}

int VpnCoreModel::rowCount(const QModelIndex &parent) const
int VpnModel::rowCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
Q_D(const VpnCoreModel);
Q_D(const VpnModel);

return d->m_connections.size();
}

QModelIndex VpnCoreModel::index(int row, int column, const QModelIndex &parent) const
QModelIndex VpnModel::index(int row, int column, const QModelIndex &parent) const
{
Q_D(const VpnCoreModel);
Q_D(const VpnModel);

return !parent.isValid() && column == 0 && row >= 0 && row < d->m_connections.count()
? createIndex(row, column)
: QModelIndex();
}

int VpnCoreModel::count() const
int VpnModel::count() const
{
Q_D(const VpnCoreModel);
Q_D(const VpnModel);

return d->m_connections.size();
}

bool VpnCoreModel::isConnected() const
bool VpnModel::isConnected() const
{
return false;
}

void VpnCoreModel::connectionsChanged()
void VpnModel::connectionsChanged()
{
Q_D(VpnCoreModel);
Q_D(VpnModel);

// Update the connections list
const int num_old = d->m_connections.size();

for (const VpnConnection *connection: d->m_connections) {
disconnect(connection, &VpnConnection::destroyed,
this, &VpnCoreModel::connectionDestroyed);
this, &VpnModel::connectionDestroyed);
}

QVector<VpnConnection *> new_connections(d->m_manager->connections());
Expand All @@ -157,7 +157,7 @@ void VpnCoreModel::connectionsChanged()
// about removed/deleted services, connect destroyed.
for (const VpnConnection *connection: new_connections) {
connect(connection, &VpnConnection::destroyed,
this, &VpnCoreModel::connectionDestroyed);
this, &VpnModel::connectionDestroyed);
}

for (int i = 0; i < num_new; i++) {
Expand Down Expand Up @@ -190,9 +190,9 @@ void VpnCoreModel::connectionsChanged()
Q_EMIT countChanged();
}

void VpnCoreModel::connectionDestroyed(QObject *connection)
void VpnModel::connectionDestroyed(QObject *connection)
{
Q_D(VpnCoreModel);
Q_D(VpnModel);

int ind = d->m_connections.indexOf(dynamic_cast<VpnConnection*>(connection));
if (ind >= 0) {
Expand All @@ -204,23 +204,23 @@ void VpnCoreModel::connectionDestroyed(QObject *connection)
}
}

bool VpnCoreModel::populated() const
bool VpnModel::populated() const
{
Q_D(const VpnCoreModel);
Q_D(const VpnModel);

return d->m_manager->populated();
}

VpnManager * VpnCoreModel::vpnManager() const
VpnManager * VpnModel::vpnManager() const
{
Q_D(const VpnCoreModel);
Q_D(const VpnModel);

return d->m_manager;
}

QVariantMap VpnCoreModel::connectionSettings(const QString &path) const
QVariantMap VpnModel::connectionSettings(const QString &path) const
{
Q_D(const VpnCoreModel);
Q_D(const VpnModel);

QVariantMap properties;
if (VpnConnection *conn = d->m_manager->connection(path)) {
Expand All @@ -229,15 +229,15 @@ QVariantMap VpnCoreModel::connectionSettings(const QString &path) const
return properties;
}

void VpnCoreModel::orderConnections(QVector<VpnConnection*> &connections)
void VpnModel::orderConnections(QVector<VpnConnection*> &connections)
{
Q_UNUSED(connections)
// Do nothing - no ordering
}

void VpnCoreModel::moveItem(int oldIndex, int newIndex)
void VpnModel::moveItem(int oldIndex, int newIndex)
{
Q_D(VpnCoreModel);
Q_D(VpnModel);

if (oldIndex >= 0 && oldIndex < d->m_connections.size() && newIndex >= 0 && newIndex < d->m_connections.size()) {
beginMoveRows(QModelIndex(), oldIndex, oldIndex, QModelIndex(), (newIndex > oldIndex) ? (newIndex + 1) : newIndex);
Expand All @@ -246,9 +246,9 @@ void VpnCoreModel::moveItem(int oldIndex, int newIndex)
}
}

QVector<VpnConnection*> VpnCoreModel::connections() const
QVector<VpnConnection*> VpnModel::connections() const
{
Q_D(const VpnCoreModel);
Q_D(const VpnModel);

return d->m_connections;
}
24 changes: 12 additions & 12 deletions libconnman-qt/vpncoremodel.h → libconnman-qt/vpnmodel.h
View file
Expand Up @@ -30,23 +30,23 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
*/

#ifndef VPNCOREMODEL_H
#define VPNCOREMODEL_H
#ifndef VPNMODEL_H
#define VPNMODEL_H

#include <QAbstractListModel>

class VpnCoreModelPrivate;
class VpnModelPrivate;
class VpnManager;
class VpnConnection;

/*
* VpnCoreModel is a basic list model for connman VPN services.
* VpnModel is a basic list model for connman VPN services.
*/
class VpnCoreModel : public QAbstractListModel
class VpnModel : public QAbstractListModel
{
Q_OBJECT
Q_DECLARE_PRIVATE(VpnCoreModel)
Q_DISABLE_COPY(VpnCoreModel)
Q_DECLARE_PRIVATE(VpnModel)
Q_DISABLE_COPY(VpnModel)

Q_PROPERTY(bool connected READ isConnected NOTIFY connectedChanged)
Q_PROPERTY(int count READ count NOTIFY countChanged)
Expand All @@ -58,9 +58,9 @@ class VpnCoreModel : public QAbstractListModel
VpnRole = Qt::UserRole + 1
};

explicit VpnCoreModel(QObject* parent = nullptr);
explicit VpnCoreModel(VpnCoreModelPrivate &dd, QObject *parent);
~VpnCoreModel() Q_DECL_OVERRIDE;
explicit VpnModel(QObject* parent = nullptr);
explicit VpnModel(VpnModelPrivate &dd, QObject *parent);
~VpnModel() Q_DECL_OVERRIDE;

QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
Expand Down Expand Up @@ -88,7 +88,7 @@ protected Q_SLOTS:
QVector<VpnConnection*> connections() const;

private:
QScopedPointer<VpnCoreModelPrivate> d_ptr;
QScopedPointer<VpnModelPrivate> d_ptr;
};

#endif // VPNCOREMODEL_H
#endif // VPNMODEL_H
16 changes: 8 additions & 8 deletions libconnman-qt/vpncoremodel_p.h → libconnman-qt/vpnmodel_p.h
View file
Expand Up @@ -30,25 +30,25 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
*/

#ifndef VPNCOREMODEL_P_H
#define VPNCOREMODEL_P_H
#ifndef VPNMODEL_P_H
#define VPNMODEL_P_H

#include "vpncoremodel.h"
#include "vpnmodel.h"

class VpnCoreModelPrivate
class VpnModelPrivate
{
Q_DECLARE_PUBLIC(VpnCoreModel)
Q_DECLARE_PUBLIC(VpnModel)

public:
VpnCoreModelPrivate(VpnCoreModel &qq);
VpnModelPrivate(VpnModel &qq);
void init();

public:
VpnManager * m_manager;
QVector<VpnConnection*> m_connections;
static const QHash<int, QByteArray> m_roles;

VpnCoreModel *q_ptr;
VpnModel *q_ptr;
};

#endif // VPNCOREMODEL_P_H
#endif // VPNMODEL_P_H
4 changes: 2 additions & 2 deletions plugin/plugin.cpp
View file
Expand Up @@ -23,7 +23,7 @@
#include "counter.h"
#include "vpnmanager.h"
#include "vpnconnection.h"
#include "vpncoremodel.h"
#include "vpnmodel.h"

template<typename T>
static QObject *singleton_api_factory(QQmlEngine *, QJSEngine *)
Expand Down Expand Up @@ -58,7 +58,7 @@ void ConnmanPlugin::registerTypes(const char *uri)
qmlRegisterType<Counter>(uri,0,2,"NetworkCounter");
qmlRegisterSingletonType<VpnManager>(uri,0,2,"VpnManager", singleton_api_factory<VpnManager>);
qmlRegisterType<VpnConnection>(uri,0,2,"VpnConnection");
qmlRegisterSingletonType<VpnCoreModel>(uri, 0, 2, "VpnCoreModel", singleton_api_factory<VpnCoreModel>);
qmlRegisterSingletonType<VpnModel>(uri, 0, 2, "VpnModel", singleton_api_factory<VpnModel>);
}

void ConnmanPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
Expand Down

0 comments on commit d4d3189

Please sign in to comment.