diff options
Diffstat (limited to 'examples/network')
-rw-r--r-- | examples/network/bearermonitor/sessionwidget.h | 2 | ||||
-rw-r--r-- | examples/network/blockingfortuneclient/fortunethread.h | 2 | ||||
-rw-r--r-- | examples/network/googlesuggest/googlesuggest.h | 2 | ||||
-rw-r--r-- | examples/network/network-chat/connection.h | 2 | ||||
-rw-r--r-- | examples/network/network-chat/server.h | 2 | ||||
-rw-r--r-- | examples/network/threadedfortuneserver/fortuneserver.h | 2 | ||||
-rw-r--r-- | examples/network/threadedfortuneserver/fortunethread.h | 2 | ||||
-rw-r--r-- | examples/network/torrent/filemanager.h | 2 | ||||
-rw-r--r-- | examples/network/torrent/mainwindow.cpp | 6 | ||||
-rw-r--r-- | examples/network/torrent/mainwindow.h | 4 | ||||
-rw-r--r-- | examples/network/torrent/peerwireclient.h | 14 | ||||
-rw-r--r-- | examples/network/torrent/torrentclient.h | 2 | ||||
-rw-r--r-- | examples/network/torrent/torrentserver.h | 2 | ||||
-rw-r--r-- | examples/network/torrent/trackerclient.h | 2 |
14 files changed, 23 insertions, 23 deletions
diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h index 6bc0aef7c1..ba352eefee 100644 --- a/examples/network/bearermonitor/sessionwidget.h +++ b/examples/network/bearermonitor/sessionwidget.h @@ -65,7 +65,7 @@ public: explicit SessionWidget(const QNetworkConfiguration &config, QWidget *parent = 0); ~SessionWidget(); - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private: void updateSessionState(QNetworkSession::State state); diff --git a/examples/network/blockingfortuneclient/fortunethread.h b/examples/network/blockingfortuneclient/fortunethread.h index 2ab1adb921..0cbc3961fc 100644 --- a/examples/network/blockingfortuneclient/fortunethread.h +++ b/examples/network/blockingfortuneclient/fortunethread.h @@ -65,7 +65,7 @@ public: ~FortuneThread(); void requestNewFortune(const QString &hostName, quint16 port); - void run() Q_DECL_OVERRIDE; + void run() override; signals: void newFortune(const QString &fortune); diff --git a/examples/network/googlesuggest/googlesuggest.h b/examples/network/googlesuggest/googlesuggest.h index 561d94efde..1d42f31571 100644 --- a/examples/network/googlesuggest/googlesuggest.h +++ b/examples/network/googlesuggest/googlesuggest.h @@ -70,7 +70,7 @@ class GSuggestCompletion : public QObject public: GSuggestCompletion(QLineEdit *parent = 0); ~GSuggestCompletion(); - bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE; + bool eventFilter(QObject *obj, QEvent *ev) override; void showCompletion(const QStringList &choices); public slots: diff --git a/examples/network/network-chat/connection.h b/examples/network/network-chat/connection.h index bcd9e889f7..67d25d4d1e 100644 --- a/examples/network/network-chat/connection.h +++ b/examples/network/network-chat/connection.h @@ -88,7 +88,7 @@ signals: void newMessage(const QString &from, const QString &message); protected: - void timerEvent(QTimerEvent *timerEvent) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *timerEvent) override; private slots: void processReadyRead(); diff --git a/examples/network/network-chat/server.h b/examples/network/network-chat/server.h index 47adfc63c7..d86ed36bce 100644 --- a/examples/network/network-chat/server.h +++ b/examples/network/network-chat/server.h @@ -66,7 +66,7 @@ signals: void newConnection(Connection *connection); protected: - void incomingConnection(qintptr socketDescriptor) Q_DECL_OVERRIDE; + void incomingConnection(qintptr socketDescriptor) override; }; #endif diff --git a/examples/network/threadedfortuneserver/fortuneserver.h b/examples/network/threadedfortuneserver/fortuneserver.h index 3922add519..dc0949bcb2 100644 --- a/examples/network/threadedfortuneserver/fortuneserver.h +++ b/examples/network/threadedfortuneserver/fortuneserver.h @@ -63,7 +63,7 @@ public: FortuneServer(QObject *parent = 0); protected: - void incomingConnection(qintptr socketDescriptor) Q_DECL_OVERRIDE; + void incomingConnection(qintptr socketDescriptor) override; private: QStringList fortunes; diff --git a/examples/network/threadedfortuneserver/fortunethread.h b/examples/network/threadedfortuneserver/fortunethread.h index 038998d9ab..0a4948e1de 100644 --- a/examples/network/threadedfortuneserver/fortunethread.h +++ b/examples/network/threadedfortuneserver/fortunethread.h @@ -62,7 +62,7 @@ class FortuneThread : public QThread public: FortuneThread(int socketDescriptor, const QString &fortune, QObject *parent); - void run() Q_DECL_OVERRIDE; + void run() override; signals: void error(QTcpSocket::SocketError socketError); diff --git a/examples/network/torrent/filemanager.h b/examples/network/torrent/filemanager.h index 73061ad059..82f9983ea6 100644 --- a/examples/network/torrent/filemanager.h +++ b/examples/network/torrent/filemanager.h @@ -100,7 +100,7 @@ signals: void pieceVerified(int pieceIndex, bool verified); protected: - void run() Q_DECL_OVERRIDE; + void run() override; private slots: bool verifySinglePiece(int pieceIndex); diff --git a/examples/network/torrent/mainwindow.cpp b/examples/network/torrent/mainwindow.cpp index 2b3d3e8b3a..efdf187174 100644 --- a/examples/network/torrent/mainwindow.cpp +++ b/examples/network/torrent/mainwindow.cpp @@ -67,8 +67,8 @@ signals: void fileDropped(const QString &fileName); protected: - void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; #endif }; @@ -80,7 +80,7 @@ public: inline TorrentViewDelegate(MainWindow *mainWindow) : QItemDelegate(mainWindow) {} void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index ) const Q_DECL_OVERRIDE + const QModelIndex &index ) const override { if (index.column() != 2) { QItemDelegate::paint(painter, option, index); diff --git a/examples/network/torrent/mainwindow.h b/examples/network/torrent/mainwindow.h index 7c18f770f8..9c55b72256 100644 --- a/examples/network/torrent/mainwindow.h +++ b/examples/network/torrent/mainwindow.h @@ -73,11 +73,11 @@ class MainWindow : public QMainWindow public: MainWindow(QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; const TorrentClient *clientForRow(int row) const; protected: - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent *event) override; private slots: void loadSettings(); diff --git a/examples/network/torrent/peerwireclient.h b/examples/network/torrent/peerwireclient.h index 6fee52bee0..e03b538f63 100644 --- a/examples/network/torrent/peerwireclient.h +++ b/examples/network/torrent/peerwireclient.h @@ -122,14 +122,14 @@ public: qint64 uploadSpeed() const; bool canTransferMore() const; - qint64 bytesAvailable() const Q_DECL_OVERRIDE { return incomingBuffer.size() + QTcpSocket::bytesAvailable(); } + qint64 bytesAvailable() const override { return incomingBuffer.size() + QTcpSocket::bytesAvailable(); } qint64 socketBytesAvailable() const { return socket.bytesAvailable(); } qint64 socketBytesToWrite() const { return socket.bytesToWrite(); } - void setReadBufferSize(qint64 size) Q_DECL_OVERRIDE; + void setReadBufferSize(qint64 size) override; void connectToHost(const QHostAddress &address, - quint16 port, OpenMode openMode = ReadWrite) Q_DECL_OVERRIDE; + quint16 port, OpenMode openMode = ReadWrite) override; void diconnectFromHost(); signals: @@ -148,11 +148,11 @@ signals: void bytesReceived(qint64 size); protected: - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 readLineData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 readLineData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; private slots: void sendHandShake(); diff --git a/examples/network/torrent/torrentclient.h b/examples/network/torrent/torrentclient.h index 4db60b9a8c..b9b88b3a07 100644 --- a/examples/network/torrent/torrentclient.h +++ b/examples/network/torrent/torrentclient.h @@ -168,7 +168,7 @@ public slots: void setupIncomingConnection(PeerWireClient *client); protected slots: - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; private slots: // File management diff --git a/examples/network/torrent/torrentserver.h b/examples/network/torrent/torrentserver.h index 884cce1db8..b0d2b3c012 100644 --- a/examples/network/torrent/torrentserver.h +++ b/examples/network/torrent/torrentserver.h @@ -68,7 +68,7 @@ public: void removeClient(TorrentClient *client); protected: - void incomingConnection(qintptr socketDescriptor) Q_DECL_OVERRIDE; + void incomingConnection(qintptr socketDescriptor) override; private slots: void removeClient(); diff --git a/examples/network/torrent/trackerclient.h b/examples/network/torrent/trackerclient.h index 787e7b2c84..323fc67eba 100644 --- a/examples/network/torrent/trackerclient.h +++ b/examples/network/torrent/trackerclient.h @@ -88,7 +88,7 @@ signals: void stopped(); protected: - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; private slots: void fetchPeerList(); |