diff options
Diffstat (limited to 'src/network/socket/qlocalsocket.h')
| -rw-r--r-- | src/network/socket/qlocalsocket.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 9cf76d1022..ae78c86b3c 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -97,12 +97,7 @@ public: virtual bool canReadLine() const override; virtual bool open(OpenMode openMode = ReadWrite) override; virtual void close() override; - -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_X("Use socketError()") LocalSocketError error() const; -#endif // QT_DEPRECATED_SINCE(5, 15) - - LocalSocketError socketError() const; + LocalSocketError error() const; bool flush(); bool isValid() const; qint64 readBufferSize() const; @@ -122,7 +117,11 @@ public: Q_SIGNALS: void connected(); void disconnected(); +#if QT_DEPRECATED_SINCE(5,15) + QT_DEPRECATED_X("Use QLocalSocket::errorOccurred(QLocalSocket::LocalSocketError) instead") void error(QLocalSocket::LocalSocketError socketError); +#endif + void errorOccurred(QLocalSocket::LocalSocketError socketError); void stateChanged(QLocalSocket::LocalSocketState socketState); protected: |