feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

iostool: s/Q_DECL_OVERRIDE/override/g

Browse Source 
Change-Id: I05e269b56bcdc3e4555116a584c2efaaccced6e5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 15:31:24 +02:00
parent 90a5fa6079
commit 68970e9d96
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/iostool/iosdevicemanager.cpp
View File

@@ -267,8 +267,8 @@ public:
bool startService(const QString &service, ServiceSocket &fd); bool startService(const QString &service, ServiceSocket &fd);
void stopService(ServiceSocket fd); void stopService(ServiceSocket fd);
void startDeviceLookup(int timeout); void startDeviceLookup(int timeout);
bool connectToPort(quint16 port, ServiceSocket *fd) Q_DECL_OVERRIDE; bool connectToPort(quint16 port, ServiceSocket *fd) override;
int qmljsDebugPort() const Q_DECL_OVERRIDE; int qmljsDebugPort() const override;
void addError(const QString &msg); void addError(const QString &msg);
bool writeAll(ServiceSocket fd, const char *cmd, qptrdiff len = -1); bool writeAll(ServiceSocket fd, const char *cmd, qptrdiff len = -1);
bool sendGdbCommand(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(); void deviceCallbackReturned();
bool installApp(); bool installApp();
bool runApp(); bool runApp();
int qmljsDebugPort() const Q_DECL_OVERRIDE; int qmljsDebugPort() const override;
am_res_t appTransferCallback(CFDictionaryRef dict); am_res_t appTransferCallback(CFDictionaryRef dict);
am_res_t appInstallCallback(CFDictionaryRef dict); am_res_t appInstallCallback(CFDictionaryRef dict);
void reportProgress2(int progress, const QString &status); void reportProgress2(int progress, const QString &status);

4
src/tools/iostool/main.cpp
View File

@@ -127,7 +127,7 @@ class SingleRelayServer: public RelayServer
public: public:
SingleRelayServer(IosTool *parent, int serverFileDescriptor); SingleRelayServer(IosTool *parent, int serverFileDescriptor);
protected: protected:
void newRelayConnection() Q_DECL_OVERRIDE; void newRelayConnection() override;
private: private:
int m_serverFileDescriptor; int m_serverFileDescriptor;
}; };
@@ -138,7 +138,7 @@ public:
GenericRelayServer(IosTool *parent, int remotePort, GenericRelayServer(IosTool *parent, int remotePort,
Ios::DeviceSession *deviceSession); Ios::DeviceSession *deviceSession);
protected: protected:
void newRelayConnection() Q_DECL_OVERRIDE; void newRelayConnection() override;
private: private:
int m_remotePort; int m_remotePort;
Ios::DeviceSession *m_deviceSession; Ios::DeviceSession *m_deviceSession;