From 68970e9d9608afc505cfa321c1bcba0e735be415 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 3 Jun 2015 15:31:24 +0200 Subject: [PATCH] iostool: s/Q_DECL_OVERRIDE/override/g Change-Id: I05e269b56bcdc3e4555116a584c2efaaccced6e5 Reviewed-by: Eike Ziller --- src/tools/iostool/iosdevicemanager.cpp | 6 +++--- src/tools/iostool/main.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp index 1542b9c2dde..b2f6f5fa16f 100644 --- a/src/tools/iostool/iosdevicemanager.cpp +++ b/src/tools/iostool/iosdevicemanager.cpp @@ -267,8 +267,8 @@ public: bool startService(const QString &service, ServiceSocket &fd); void stopService(ServiceSocket fd); void startDeviceLookup(int timeout); - bool connectToPort(quint16 port, ServiceSocket *fd) Q_DECL_OVERRIDE; - int qmljsDebugPort() const Q_DECL_OVERRIDE; + bool connectToPort(quint16 port, ServiceSocket *fd) override; + int qmljsDebugPort() const override; void addError(const QString &msg); bool writeAll(ServiceSocket fd, const char *cmd, qptrdiff len = -1); bool sendGdbCommand(ServiceSocket fd, const char *cmd, qptrdiff len = -1); @@ -342,7 +342,7 @@ public: void deviceCallbackReturned(); bool installApp(); bool runApp(); - int qmljsDebugPort() const Q_DECL_OVERRIDE; + int qmljsDebugPort() const override; am_res_t appTransferCallback(CFDictionaryRef dict); am_res_t appInstallCallback(CFDictionaryRef dict); void reportProgress2(int progress, const QString &status); diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp index 5bdcb55b2cb..8aad4e961ad 100644 --- a/src/tools/iostool/main.cpp +++ b/src/tools/iostool/main.cpp @@ -127,7 +127,7 @@ class SingleRelayServer: public RelayServer public: SingleRelayServer(IosTool *parent, int serverFileDescriptor); protected: - void newRelayConnection() Q_DECL_OVERRIDE; + void newRelayConnection() override; private: int m_serverFileDescriptor; }; @@ -138,7 +138,7 @@ public: GenericRelayServer(IosTool *parent, int remotePort, Ios::DeviceSession *deviceSession); protected: - void newRelayConnection() Q_DECL_OVERRIDE; + void newRelayConnection() override; private: int m_remotePort; Ios::DeviceSession *m_deviceSession;