diff options
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r-- | src/plugins/bearer/generic/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bearer/generic/qgenericengine.h | 18 | ||||
-rw-r--r-- | src/plugins/bearer/linux_common/qofonoservice_linux.cpp | 8 | ||||
-rw-r--r-- | src/plugins/bearer/linux_common/qofonoservice_linux_p.h | 4 | ||||
-rw-r--r-- | src/plugins/bearer/qnetworksession_impl.h | 44 |
5 files changed, 36 insertions, 40 deletions
diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp index e825cd494b..57c5589e1b 100644 --- a/src/plugins/bearer/generic/main.cpp +++ b/src/plugins/bearer/generic/main.cpp @@ -50,7 +50,7 @@ public: QGenericEnginePlugin(); ~QGenericEnginePlugin(); - QBearerEngine *create(const QString &key) const; + QBearerEngine *create(const QString &key) const Q_DECL_OVERRIDE; }; QGenericEnginePlugin::QGenericEnginePlugin() diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h index f688cae3d0..b56ce9ae29 100644 --- a/src/plugins/bearer/generic/qgenericengine.h +++ b/src/plugins/bearer/generic/qgenericengine.h @@ -54,24 +54,24 @@ public: QGenericEngine(QObject *parent = 0); ~QGenericEngine(); - QString getInterfaceFromId(const QString &id); - bool hasIdentifier(const QString &id); + QString getInterfaceFromId(const QString &id) Q_DECL_OVERRIDE; + bool hasIdentifier(const QString &id) Q_DECL_OVERRIDE; - void connectToId(const QString &id); - void disconnectFromId(const QString &id); + void connectToId(const QString &id) Q_DECL_OVERRIDE; + void disconnectFromId(const QString &id) Q_DECL_OVERRIDE; Q_INVOKABLE void initialize(); Q_INVOKABLE void requestUpdate(); - QNetworkSession::State sessionStateForId(const QString &id); + QNetworkSession::State sessionStateForId(const QString &id) Q_DECL_OVERRIDE; - QNetworkConfigurationManager::Capabilities capabilities() const; + QNetworkConfigurationManager::Capabilities capabilities() const Q_DECL_OVERRIDE; - QNetworkSessionPrivate *createSessionBackend(); + QNetworkSessionPrivate *createSessionBackend() Q_DECL_OVERRIDE; - QNetworkConfigurationPrivatePointer defaultConfiguration(); + QNetworkConfigurationPrivatePointer defaultConfiguration() Q_DECL_OVERRIDE; - bool requiresPolling() const; + bool requiresPolling() const Q_DECL_OVERRIDE; private Q_SLOTS: void doRequestUpdate(); diff --git a/src/plugins/bearer/linux_common/qofonoservice_linux.cpp b/src/plugins/bearer/linux_common/qofonoservice_linux.cpp index abbfd445a5..f4460c1be0 100644 --- a/src/plugins/bearer/linux_common/qofonoservice_linux.cpp +++ b/src/plugins/bearer/linux_common/qofonoservice_linux.cpp @@ -295,14 +295,10 @@ QString QOfonoDataConnectionManagerInterface::bearer() QVariant QOfonoDataConnectionManagerInterface::getProperty(const QString &property) { - QVariant var; - QVariantMap map = getProperties(); - if (map.contains(property)) - var = map.value(property); - return var; + return getProperties().value(property); } -QVariantMap QOfonoDataConnectionManagerInterface::getProperties() +QVariantMap &QOfonoDataConnectionManagerInterface::getProperties() { if (propertiesMap.isEmpty()) { QList<QVariant> argumentList; diff --git a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h b/src/plugins/bearer/linux_common/qofonoservice_linux_p.h index 3b97e06dd3..8adb8db19c 100644 --- a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h +++ b/src/plugins/bearer/linux_common/qofonoservice_linux_p.h @@ -160,11 +160,11 @@ public: Q_SIGNALS: void roamingAllowedChanged(bool); private: - QVariantMap getProperties(); + QVariantMap &getProperties(); QVariantMap propertiesMap; QStringList contextList; PathPropertiesList contextListProperties; -private slots: +private Q_SLOTS: void propertyChanged(const QString &, const QDBusVariant &value); }; diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h index f5c9ab393f..3570166b11 100644 --- a/src/plugins/bearer/qnetworksession_impl.h +++ b/src/plugins/bearer/qnetworksession_impl.h @@ -71,31 +71,31 @@ public: //that the state is immediately updated (w/o actually opening //a session). Also this function should take care of //notification hooks to discover future state changes. - void syncStateWithInterface(); + void syncStateWithInterface() Q_DECL_OVERRIDE; #ifndef QT_NO_NETWORKINTERFACE - QNetworkInterface currentInterface() const; + QNetworkInterface currentInterface() const Q_DECL_OVERRIDE; #endif - QVariant sessionProperty(const QString& key) const; - void setSessionProperty(const QString& key, const QVariant& value); - - void open(); - void close(); - void stop(); - void migrate(); - void accept(); - void ignore(); - void reject(); - - QString errorString() const; //must return translated string - QNetworkSession::SessionError error() const; - - quint64 bytesWritten() const; - quint64 bytesReceived() const; - quint64 activeTime() const; - - QNetworkSession::UsagePolicies usagePolicies() const; - void setUsagePolicies(QNetworkSession::UsagePolicies); + QVariant sessionProperty(const QString& key) const Q_DECL_OVERRIDE; + void setSessionProperty(const QString& key, const QVariant& value) Q_DECL_OVERRIDE; + + void open() Q_DECL_OVERRIDE; + void close() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; + void migrate() Q_DECL_OVERRIDE; + void accept() Q_DECL_OVERRIDE; + void ignore() Q_DECL_OVERRIDE; + void reject() Q_DECL_OVERRIDE; + + QString errorString() const Q_DECL_OVERRIDE; //must return translated string + QNetworkSession::SessionError error() const Q_DECL_OVERRIDE; + + quint64 bytesWritten() const Q_DECL_OVERRIDE; + quint64 bytesReceived() const Q_DECL_OVERRIDE; + quint64 activeTime() const Q_DECL_OVERRIDE; + + QNetworkSession::UsagePolicies usagePolicies() const Q_DECL_OVERRIDE; + void setUsagePolicies(QNetworkSession::UsagePolicies) Q_DECL_OVERRIDE; private Q_SLOTS: void networkConfigurationsChanged(); |