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

ios: use QTC_OVERRIDE consistently

Browse Source 
Change-Id: I154b70896b359e09f53607bedd968a5e7a0ab148
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-02-05 15:30:52 +01:00
parent 2d4cfc90fc
commit 242b839375
12 changed files with 77 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/ios/iosdeploystep.h
View File

@@ -36,6 +36,7 @@
#include <projectexplorer/buildstep.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <qtsupport/baseqtversion.h>
#include <utils/qtcoverride.h>
#include <QFutureInterface>
#include <QProcess>
@@ -65,12 +66,12 @@ public:
friend class IosDeployStepFactory;
IosDeployStep(ProjectExplorer::BuildStepList *bc);
virtual ~IosDeployStep();
~IosDeployStep() QTC_OVERRIDE;
bool fromMap(const QVariantMap &map);
QVariantMap toMap() const;
bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
QVariantMap toMap() const QTC_OVERRIDE;
virtual void run(QFutureInterface<bool> &fi);
void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
void cleanup();
ProjectExplorer::IDevice::ConstPtr device() const;
IosDevice::ConstPtr iosdevice() const;
@@ -92,10 +93,10 @@ private slots:
private:
IosDeployStep(ProjectExplorer::BuildStepList *bc,
IosDeployStep *other);
bool init();
ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
bool immutable() const { return true; }
bool runInGuiThread() const { return true; }
bool init() QTC_OVERRIDE;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
bool immutable() const QTC_OVERRIDE { return true; }
bool runInGuiThread() const QTC_OVERRIDE { return true; }
void ctor();
QString deviceId() const;