summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Keller <Rainer.Keller@qt.io>2016-10-24 16:18:25 +0200
committerRainer Keller <Rainer.Keller@qt.io>2016-10-31 07:56:23 +0000
commit9b4b720346c9a18f9df0a282c12c683e6f0dc703 (patch)
tree2ef693054b3048b7e1fec115b348b23029cc2e37
parentc4c34efada04666de48718561b4083adfc4ae561 (diff)
Qt does not name getter functions with 'get'
Change-Id: Ic9614ef35fbec999494f122d65f5b3afa32c54aa Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com> Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--src/networksettings/connman/qnetworksettingsmanager_p.h2
-rw-r--r--src/networksettings/qnetworksettingsmanager.cpp4
-rw-r--r--src/networksettings/qnetworksettingsmanager.h4
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h
index cb42654..5eb5470 100644
--- a/src/networksettings/connman/qnetworksettingsmanager_p.h
+++ b/src/networksettings/connman/qnetworksettingsmanager_p.h
@@ -47,7 +47,7 @@ public:
explicit QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent);
QNetworkSettingsManager *q_ptr;
void setUserAgent(QNetworkSettingsUserAgent *agent);
- QNetworkSettingsUserAgent *getUserAgent() {return m_agent;}
+ QNetworkSettingsUserAgent *userAgent() {return m_agent;}
public slots:
void getServicesFinished(QDBusPendingCallWatcher *watcher);
void getTechnologiesFinished(QDBusPendingCallWatcher *watcher);
diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp
index 787a382..ceee7ad 100644
--- a/src/networksettings/qnetworksettingsmanager.cpp
+++ b/src/networksettings/qnetworksettingsmanager.cpp
@@ -69,8 +69,8 @@ void QNetworkSettingsManager::setUserAgent(QNetworkSettingsUserAgent *agent)
d->setUserAgent(agent);
}
-QNetworkSettingsUserAgent* QNetworkSettingsManager::getUserAgent()
+QNetworkSettingsUserAgent* QNetworkSettingsManager::userAgent()
{
Q_D(QNetworkSettingsManager);
- return d->getUserAgent();
+ return d->userAgent();
}
diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h
index 79918e2..ba34974 100644
--- a/src/networksettings/qnetworksettingsmanager.h
+++ b/src/networksettings/qnetworksettingsmanager.h
@@ -43,14 +43,14 @@ class Q_DECL_EXPORT QNetworkSettingsManager : public QObject
Q_ENUMS(StateTypes NetworkTypeTypes)
Q_PROPERTY(QAbstractItemModel* services READ services NOTIFY servicesChanged)
Q_PROPERTY(QAbstractItemModel* interfaces READ interfaces NOTIFY interfacesChanged)
- Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ getUserAgent CONSTANT)
+ Q_PROPERTY(QNetworkSettingsUserAgent* userAgent READ userAgent CONSTANT)
public:
explicit QNetworkSettingsManager(QObject* parent = Q_NULLPTR);
QAbstractItemModel* services();
QAbstractItemModel* interfaces();
void setUserAgent(QNetworkSettingsUserAgent *agent);
- QNetworkSettingsUserAgent* getUserAgent();
+ QNetworkSettingsUserAgent* userAgent();
Q_INVOKABLE QNetworkSettingsService* getService(const QString& name, const int type);
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h
index d042ece..ebb4667 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h
+++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h
@@ -51,7 +51,7 @@ public:
void disconnectNetwork();
QString call(const QString &command);
bool checkedCall(const QString &command);
- QNetworkSettingsUserAgent *getUserAgent() {return m_agent;}
+ QNetworkSettingsUserAgent *userAgent() {return m_agent;}
protected:
bool event(QEvent *event);