diff options
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/KvsObject_xmlreader.cpp | 20 | ||||
| -rw-r--r-- | src/modules/objects/qthttp/qhttp.cpp | 46 |
2 files changed, 33 insertions, 33 deletions
diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp index 6cdd96b54..1e1c892c6 100644 --- a/src/modules/objects/KvsObject_xmlreader.cpp +++ b/src/modules/objects/KvsObject_xmlreader.cpp @@ -130,7 +130,7 @@ public: { m_pReader = pReader; } - ~KviXmlHandler() + ~KviXmlHandler() override { } @@ -162,7 +162,7 @@ private: } public: - virtual bool startDocument() + bool startDocument() override { KviKvsVariant ret; if(!m_pReader->callFunction(m_pReader, "onDocumentStart", &ret)) @@ -170,7 +170,7 @@ public: return handleKvsCallReturnValue(&ret); } - virtual bool endDocument() + bool endDocument() override { KviKvsVariant ret; if(!m_pReader->callFunction(m_pReader, "onDocumentEnd", &ret)) @@ -178,7 +178,7 @@ public: return handleKvsCallReturnValue(&ret); } - virtual bool startElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName, const QXmlAttributes & attrs) + bool startElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName, const QXmlAttributes & attrs) override { KviKvsVariant ret; KviKvsVariantList par; @@ -196,7 +196,7 @@ public: return handleKvsCallReturnValue(&ret); } - virtual bool endElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName) + bool endElement(const QString & szNamespaceUri, const QString & szLocalName, const QString & szQualifiedName) override { KviKvsVariant ret; KviKvsVariantList par; @@ -209,7 +209,7 @@ public: return handleKvsCallReturnValue(&ret); } - virtual bool characters(const QString & szChars) + bool characters(const QString & szChars) override { KviKvsVariant ret; KviKvsVariantList par; @@ -220,7 +220,7 @@ public: return handleKvsCallReturnValue(&ret); } - virtual bool warning(const QXmlParseException & exception) + bool warning(const QXmlParseException & exception) override { // recoverable QString szMsg; @@ -235,7 +235,7 @@ public: return handleKvsCallReturnValue(&ret); } - virtual bool error(const QXmlParseException & exception) + bool error(const QXmlParseException & exception) override { // recoverable QString szMsg; @@ -250,7 +250,7 @@ public: return handleKvsCallReturnValue(&ret); } - virtual bool fatalError(const QXmlParseException & exception) + bool fatalError(const QXmlParseException & exception) override { QString szMsg; decodeException(szMsg, true, exception); @@ -258,7 +258,7 @@ public: return true; } - virtual QString errorString() const + QString errorString() const override { return m_szErrorString; } diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp index ad865d31a..1f22a67ee 100644 --- a/src/modules/objects/qthttp/qhttp.cpp +++ b/src/modules/objects/qthttp/qhttp.cpp @@ -216,19 +216,19 @@ public: data.ba = d; } - ~QHttpNormalRequest() + ~QHttpNormalRequest() override { if(is_ba) delete data.ba; } - void start(QHttp *); - bool hasRequestHeader(); - QHttpRequestHeader requestHeader(); + void start(QHttp *) override; + bool hasRequestHeader() override; + QHttpRequestHeader requestHeader() override; inline void setRequestHeader(const QHttpRequestHeader & h) { header = h; } - QIODevice * sourceDevice(); - QIODevice * destinationDevice(); + QIODevice * sourceDevice() override; + QIODevice * destinationDevice() override; protected: QHttpRequestHeader header; @@ -324,11 +324,11 @@ public: { } - ~QHttpPGHRequest() + ~QHttpPGHRequest() override { } - void start(QHttp *); + void start(QHttp *) override; }; void QHttpPGHRequest::start(QHttp * http) @@ -354,13 +354,13 @@ public: { } - void start(QHttp *); + void start(QHttp *) override; - QIODevice * sourceDevice() + QIODevice * sourceDevice() override { return nullptr; } - QIODevice * destinationDevice() + QIODevice * destinationDevice() override { return nullptr; } @@ -403,13 +403,13 @@ public: { } - void start(QHttp *); + void start(QHttp *) override; - QIODevice * sourceDevice() + QIODevice * sourceDevice() override { return nullptr; } - QIODevice * destinationDevice() + QIODevice * destinationDevice() override { return nullptr; } @@ -442,7 +442,7 @@ public: this->proxy = proxy; } - inline void start(QHttp * http) + inline void start(QHttp * http) override { http->d->proxy = proxy; QString user = proxy.user(); @@ -454,11 +454,11 @@ public: http->d->finishedWithSuccess(); } - inline QIODevice * sourceDevice() + inline QIODevice * sourceDevice() override { return nullptr; } - inline QIODevice * destinationDevice() + inline QIODevice * destinationDevice() override { return nullptr; } @@ -482,13 +482,13 @@ public: { } - void start(QHttp *); + void start(QHttp *) override; - QIODevice * sourceDevice() + QIODevice * sourceDevice() override { return nullptr; } - QIODevice * destinationDevice() + QIODevice * destinationDevice() override { return nullptr; } @@ -515,13 +515,13 @@ public: QHttpCloseRequest() { } - void start(QHttp *); + void start(QHttp *) override; - QIODevice * sourceDevice() + QIODevice * sourceDevice() override { return nullptr; } - QIODevice * destinationDevice() + QIODevice * destinationDevice() override { return nullptr; } |