summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2019-03-12 10:58:35 +0200
committerTarja Sundqvist <tarja.sundqvist@qt.io>2019-03-20 10:10:09 +0000
commitf73704b4c5ddcf3122ccd25b9e6684cf0ab8bc55 (patch)
treee28fc6f5354717b8762640d8cb355545e607df88
parentfb3675ae9a5f96b7e8b50a9731a5fd126b8e6a40 (diff)
Fix documentation build warning
Some build warnings fixed. The documentation was built with Qt 5.9. Change-Id: I8f988c1267a6a6ed925cfac1f0cd40547ffc8160 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
-rw-r--r--src/localesettings/localemodel.cpp12
-rw-r--r--src/networksettings/qnetworksettings.cpp36
-rw-r--r--src/networksettings/qnetworksettingsinterfacemodel.cpp6
3 files changed, 51 insertions, 3 deletions
diff --git a/src/localesettings/localemodel.cpp b/src/localesettings/localemodel.cpp
index 37eb2ee..043376a 100644
--- a/src/localesettings/localemodel.cpp
+++ b/src/localesettings/localemodel.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Device Utilities module of the Qt Toolkit.
@@ -161,6 +161,12 @@ QString LocaleItem::code() const
*/
/*!
+ \fn LocaleModel::ready()
+
+ This signal is emitted when the locale model has been reset.
+*/
+
+/*!
Creates a locale model with the parent \a parent.
*/
LocaleModel::LocaleModel(QObject *parent)
@@ -233,7 +239,7 @@ QHash<int, QByteArray> LocaleModel::roleNames() const
}
/*!
- Returns the number of rows in the locale model.
+ Returns the number of rows in the locale model that has \a parent.
*/
int LocaleModel::rowCount(const QModelIndex & parent) const
{
@@ -285,7 +291,7 @@ bool LocaleModel::variantLessThan(const LocaleItem* v1, const LocaleItem* v2)
}
/*!
- Sets the sorting order of the items in the locale model to \a order.
+ Sets the sorting order of the \a column items in the locale model to \a order.
The sort order can be either \l {Qt::AscendingOrder}{ascending} or
\l {Qt::DescendingOrder}{descending}.
diff --git a/src/networksettings/qnetworksettings.cpp b/src/networksettings/qnetworksettings.cpp
index 49f210e..e4ddbad 100644
--- a/src/networksettings/qnetworksettings.cpp
+++ b/src/networksettings/qnetworksettings.cpp
@@ -465,6 +465,14 @@ void QNetworkSettingsIPv6::setPrefixLength(const int& prefixLength) {
*/
/*!
+ \property QNetworkSettingsProxy::servers
+ \readonly
+ \brief The model containing the proxy exclusion list.
+
+ This property holds the list of proxy server names.
+*/
+
+/*!
Creates a new proxy configuration with the parent \a parent.
*/
QNetworkSettingsProxy::QNetworkSettingsProxy(QObject *parent)
@@ -486,6 +494,13 @@ QAbstractItemModel* QNetworkSettingsProxy::servers(void) {
return &m_servers;
}
+/*!
+ Sets the proxy server list.
+ \a servers lists the server names.
+
+ The QNetworkSettingsProxy::serversChanged signal is emitted when the server list
+ is set.
+*/
void QNetworkSettingsProxy::setServers(const QStringList& servers) {
m_servers.setStringList(servers);
emit serversChanged();
@@ -503,6 +518,13 @@ QStringList QNetworkSettingsProxy::excludes() const {
return m_excludes.stringList();
}
+/*!
+ Sets the proxy exclusion list.
+ \a excludes lists the addresses on the exclustion list.
+
+ The QNetworkSettingsProxy::excludesChanged signal is emitted when the proxy
+ exclusion list is set.
+*/
void QNetworkSettingsProxy::setExcludes(const QStringList& excludes) {
m_excludes.setStringList(excludes);
emit excludesChanged();
@@ -555,6 +577,11 @@ void QNetworkSettingsProxy::setMethod(const MethodType& method) {
\brief Holds whether the Wifi access point is out of range.
*/
+/*!
+ \fn void QNetworkSettingsWireless::passwordChanged()
+
+ This signal is sent when the password has changed.
+*/
/*!
Creates a new Wifi network configuration with the parent \a parent.
@@ -580,6 +607,12 @@ bool QNetworkSettingsWireless::hidden() const {
return m_hidden;
}
+/*!
+ Sets \a hidden status.
+
+ The QNetworkSettingsWireless::hiddenChanged signal is emitted when the
+ hidden status is changed.
+*/
void QNetworkSettingsWireless::setHidden(const bool hidden) {
m_hidden = hidden;
emit hiddenChanged();
@@ -594,6 +627,9 @@ void QNetworkSettingsWireless::setSignalStrength(const int signalStrength) {
emit signalStrengthChanged();
}
+/*!
+ Sets \a security flags.
+*/
void QNetworkSettingsWireless::setSecurity(const SecurityFlags security) {
if (security == None) {
m_securityFlags = None;
diff --git a/src/networksettings/qnetworksettingsinterfacemodel.cpp b/src/networksettings/qnetworksettingsinterfacemodel.cpp
index d35aaf2..045d3ff 100644
--- a/src/networksettings/qnetworksettingsinterfacemodel.cpp
+++ b/src/networksettings/qnetworksettingsinterfacemodel.cpp
@@ -159,6 +159,9 @@ void QNetworkSettingsInterfaceModel::remove(int row)
endRemoveRows();
}
+/*!
+ Returns whether the interface with the \a name was removed successfully.
+*/
bool QNetworkSettingsInterfaceModel::removeInterface(const QString &name)
{
bool ret = false;
@@ -172,6 +175,9 @@ bool QNetworkSettingsInterfaceModel::removeInterface(const QString &name)
return ret;
}
+/*!
+ Notifies that the \a row has been updated.
+*/
void QNetworkSettingsInterfaceModel::updated(int row)
{
dataChanged(createIndex(row, 0), createIndex(row, 0));