summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qtcpserver_p.h
diff options
context:
space:
mode:
authorSérgio Martins <sergio.martins@kdab.com>2015-01-30 18:20:08 +0000
committerSérgio Martins <sergio.martins@kdab.com>2015-02-03 22:52:14 +0000
commitad2ea165501c23cbd85c4ddb155f2d7ea8fc85b8 (patch)
treea6f78e3f3448418d8cac1dc6b77e9d44d8333201 /src/network/socket/qtcpserver_p.h
parentb2595bd015ef17a38af4fec301317b2621cfb5bb (diff)
Fix 1700 override warnings [-Winconsistent-missing-override]
Classes should either use or not use override, otherwise it hurts code readability. Some inline keywords were removed because of an error with MSVC2010: error C2216: 'override' cannot be used with 'inline' Change-Id: I7276d5525a92281bd0d743beb11d0dc73441443b Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/network/socket/qtcpserver_p.h')
-rw-r--r--src/network/socket/qtcpserver_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/socket/qtcpserver_p.h b/src/network/socket/qtcpserver_p.h
index 3c46cec9c4..86150dac38 100644
--- a/src/network/socket/qtcpserver_p.h
+++ b/src/network/socket/qtcpserver_p.h
@@ -91,11 +91,11 @@ public:
// from QAbstractSocketEngineReceiver
void readNotification() Q_DECL_OVERRIDE;
void closeNotification() Q_DECL_OVERRIDE { readNotification(); }
- inline void writeNotification() {}
- inline void exceptionNotification() {}
- inline void connectionNotification() {}
+ void writeNotification() Q_DECL_OVERRIDE {}
+ void exceptionNotification() Q_DECL_OVERRIDE {}
+ void connectionNotification() Q_DECL_OVERRIDE {}
#ifndef QT_NO_NETWORKPROXY
- inline void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *) {}
+ void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *) Q_DECL_OVERRIDE {}
#endif
};