summaryrefslogtreecommitdiffstats
path: root/src/networksettings/qnetworksettingsinterfacemodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/networksettings/qnetworksettingsinterfacemodel.cpp')
-rw-r--r--src/networksettings/qnetworksettingsinterfacemodel.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/networksettings/qnetworksettingsinterfacemodel.cpp b/src/networksettings/qnetworksettingsinterfacemodel.cpp
index 045d3ff..95eff25 100644
--- a/src/networksettings/qnetworksettingsinterfacemodel.cpp
+++ b/src/networksettings/qnetworksettingsinterfacemodel.cpp
@@ -46,9 +46,9 @@ QT_BEGIN_NAMESPACE
\brief This enum type holds information about a network interface.
\value Type
- Network interface \l{QNetworkSettingsType::Types}{type}.
+ Network interface \l{QNetworkSettingsType::Type}{type}.
\value Status
- Network interface \l{QNetworkSettingsState::States}{state}.
+ Network interface \l{QNetworkSettingsState::State}{state}.
\value Name
Network interface name.
\value Powered
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
QNetworkSettingsInterfaceModel::QNetworkSettingsInterfaceModel(QObject *parent)
: QAbstractListModel(parent)
{
- m_roleNames.insert(Qt::UserRole, "modelData");
+ m_roleNames.insert(Qt::UserRole, "entry");
m_roleNames.insert(Type, "type");
m_roleNames.insert(Status, "status");
m_roleNames.insert(Name, "name");
@@ -122,12 +122,7 @@ QVariant QNetworkSettingsInterfaceModel::data(const QModelIndex & index, int rol
*/
void QNetworkSettingsInterfaceModel::append(QNetworkSettingsInterface* item)
{
- item->setParent(this);
- connectStateChanges(item);
-
- beginInsertRows(QModelIndex(), rowCount(), rowCount());
- m_items.append(item);
- endInsertRows();
+ insert(rowCount(), item);
}
/*!
@@ -155,7 +150,7 @@ void QNetworkSettingsInterfaceModel::connectStateChanges(QNetworkSettingsInterfa
void QNetworkSettingsInterfaceModel::remove(int row)
{
beginRemoveRows(QModelIndex(), row, row);
- m_items.removeFirst();
+ m_items.takeAt(row)->deleteLater();
endRemoveRows();
}
@@ -196,7 +191,7 @@ void QNetworkSettingsInterfaceModel::connectionStatusChanged()
QNetworkSettingsInterface *s = qobject_cast<QNetworkSettingsInterface*>(sender());
int row = 0;
- foreach (QNetworkSettingsInterface* item, m_items) {
+ for (QNetworkSettingsInterface* item : m_items) {
if (item == s) {
updated(row);
break;
@@ -210,7 +205,7 @@ void QNetworkSettingsInterfaceModel::poweredChanged()
{
QNetworkSettingsInterface *s = qobject_cast<QNetworkSettingsInterface*>(sender());
int row = 0;
- foreach (QNetworkSettingsInterface* item, m_items) {
+ for (QNetworkSettingsInterface* item : m_items) {
if (item == s) {
updated(row);
break;