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

8
src/plugins/ios/iosbuildstep.h
View File

@@ -52,7 +52,7 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep
public: public:
IosBuildStep(ProjectExplorer::BuildStepList *parent); IosBuildStep(ProjectExplorer::BuildStepList *parent);
~IosBuildStep(); ~IosBuildStep() QTC_OVERRIDE;
bool init() QTC_OVERRIDE; bool init() QTC_OVERRIDE;
void run(QFutureInterface<bool> &fi) QTC_OVERRIDE; void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
@@ -92,9 +92,9 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public: public:
IosBuildStepConfigWidget(IosBuildStep *buildStep); IosBuildStepConfigWidget(IosBuildStep *buildStep);
~IosBuildStepConfigWidget(); ~IosBuildStepConfigWidget() QTC_OVERRIDE;
QString displayName() const; QString displayName() const QTC_OVERRIDE;
QString summaryText() const; QString summaryText() const QTC_OVERRIDE;
private slots: private slots:
void buildArgumentsChanged(); void buildArgumentsChanged();

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

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

7
src/plugins/ios/iosdeploystepwidget.h
View File

@@ -30,6 +30,7 @@
#define IOSDEPLOYSTEPWIDGET_H #define IOSDEPLOYSTEPWIDGET_H
#include <projectexplorer/buildstep.h> #include <projectexplorer/buildstep.h>
#include <utils/qtcoverride.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { class IosDeployStepWidget; } namespace Ui { class IosDeployStepWidget; }
@@ -45,11 +46,11 @@ class IosDeployStepWidget : public ProjectExplorer::BuildStepConfigWidget
public: public:
IosDeployStepWidget(IosDeployStep *step); IosDeployStepWidget(IosDeployStep *step);
~IosDeployStepWidget(); ~IosDeployStepWidget() QTC_OVERRIDE;
private: private:
virtual QString summaryText() const; QString summaryText() const QTC_OVERRIDE;
virtual QString displayName() const; QString displayName() const QTC_OVERRIDE;
Ui::IosDeployStepWidget *ui; Ui::IosDeployStepWidget *ui;
IosDeployStep *m_step; IosDeployStep *m_step;

25
src/plugins/ios/iosdevice.h
View File

@@ -29,11 +29,14 @@
#ifndef IOSDEVICE_H #ifndef IOSDEVICE_H
#define IOSDEVICE_H #define IOSDEVICE_H
#include "iostoolhandler.h"
#include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/idevice.h>
#include <utils/qtcoverride.h>
#include <QVariantMap> #include <QVariantMap>
#include <QMap> #include <QMap>
#include <QString> #include <QString>
#include "iostoolhandler.h"
#include <QSharedPointer> #include <QSharedPointer>
namespace ProjectExplorer{ namespace ProjectExplorer{
@@ -52,17 +55,17 @@ public:
typedef QSharedPointer<const IosDevice> ConstPtr; typedef QSharedPointer<const IosDevice> ConstPtr;
typedef QSharedPointer<IosDevice> Ptr; typedef QSharedPointer<IosDevice> Ptr;
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const; ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE;
ProjectExplorer::IDeviceWidget *createWidget(); ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE;
QList<Core::Id> actionIds() const; QList<Core::Id> actionIds() const QTC_OVERRIDE;
QString displayNameForActionId(Core::Id actionId) const; QString displayNameForActionId(Core::Id actionId) const QTC_OVERRIDE;
void executeAction(Core::Id actionId, QWidget *parent = 0); void executeAction(Core::Id actionId, QWidget *parent = 0) QTC_OVERRIDE;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const; ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const QTC_OVERRIDE;
QString displayType() const; QString displayType() const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr clone() const; ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE;
void fromMap(const QVariantMap &map); void fromMap(const QVariantMap &map) QTC_OVERRIDE;
QVariantMap toMap() const; QVariantMap toMap() const QTC_OVERRIDE;
QString uniqueDeviceID() const; QString uniqueDeviceID() const;
IosDevice(const QString &uid); IosDevice(const QString &uid);
QString osVersion() const; QString osVersion() const;

3
src/plugins/ios/iosdevicefactory.h
View File

@@ -30,10 +30,11 @@
#define IOSDEVICEFACTORY_H #define IOSDEVICEFACTORY_H
#include <projectexplorer/devicesupport/idevicefactory.h> #include <projectexplorer/devicesupport/idevicefactory.h>
#include <utils/qtcoverride.h>
#include <QTimer> #include <QTimer>
#include <QMap> #include <QMap>
#include <QString> #include <QString>
#include <utils/qtcoverride.h>
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

5
src/plugins/ios/iosplugin.h
View File

@@ -30,6 +30,7 @@
#define IOSPLUGIN_H #define IOSPLUGIN_H
#include <extensionsystem/iplugin.h> #include <extensionsystem/iplugin.h>
#include <utils/qtcoverride.h>
namespace Ios { namespace Ios {
@@ -41,8 +42,8 @@ class IosPlugin : public ExtensionSystem::IPlugin
public: public:
IosPlugin(); IosPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage); bool initialize(const QStringList &arguments, QString *errorMessage) QTC_OVERRIDE;
void extensionsInitialized(); void extensionsInitialized() QTC_OVERRIDE;
private slots: private slots:
void kitsRestored(); void kitsRestored();
}; };

21
src/plugins/ios/iosqtversion.h
View File

@@ -30,6 +30,7 @@
#define IOSQTVERSION_H #define IOSQTVERSION_H
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <utils/qtcoverride.h>
#include <QCoreApplication> #include <QCoreApplication>
@@ -45,20 +46,20 @@ public:
IosQtVersion(const Utils::FileName &path, bool isAutodetected = false, IosQtVersion(const Utils::FileName &path, bool isAutodetected = false,
const QString &autodetectionSource = QString()); const QString &autodetectionSource = QString());
IosQtVersion *clone() const; IosQtVersion *clone() const QTC_OVERRIDE;
QString type() const; QString type() const QTC_OVERRIDE;
bool isValid() const; bool isValid() const QTC_OVERRIDE;
QString invalidReason() const; QString invalidReason() const QTC_OVERRIDE;
QList<ProjectExplorer::Abi> detectQtAbis() const; QList<ProjectExplorer::Abi> detectQtAbis() const QTC_OVERRIDE;
void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const; void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const QTC_OVERRIDE;
Core::FeatureSet availableFeatures() const; Core::FeatureSet availableFeatures() const QTC_OVERRIDE;
QString platformName() const; QString platformName() const QTC_OVERRIDE;
QString platformDisplayName() const; QString platformDisplayName() const QTC_OVERRIDE;
QString description() const; QString description() const QTC_OVERRIDE;
}; };
} // namespace Internal } // namespace Internal

5
src/plugins/ios/iosrunconfiguration.h
View File

@@ -34,6 +34,7 @@
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/qtcoverride.h>
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {
@@ -50,8 +51,8 @@ class IosRunConfiguration : public ProjectExplorer::RunConfiguration
public: public:
IosRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path); IosRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path);
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() QTC_OVERRIDE;
Utils::OutputFormatter *createOutputFormatter() const; Utils::OutputFormatter *createOutputFormatter() const QTC_OVERRIDE;
IosDeployStep *deployStep() const; IosDeployStep *deployStep() const;
QStringList commandLineArguments(); QStringList commandLineArguments();

13
src/plugins/ios/iosruncontrol.h
View File

@@ -30,6 +30,7 @@
#define IOSRUNCONTROL_H #define IOSRUNCONTROL_H
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
#include <utils/qtcoverride.h>
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {
@@ -43,14 +44,14 @@ class IosRunControl : public ProjectExplorer::RunControl
public: public:
explicit IosRunControl(IosRunConfiguration *runConfig); explicit IosRunControl(IosRunConfiguration *runConfig);
~IosRunControl(); ~IosRunControl() QTC_OVERRIDE;
void start(); void start() QTC_OVERRIDE;
StopResult stop(); StopResult stop() QTC_OVERRIDE;
bool isRunning() const; bool isRunning() const QTC_OVERRIDE;
QString displayName() const; QString displayName() const QTC_OVERRIDE;
QIcon icon() const; QIcon icon() const QTC_OVERRIDE;
private slots: private slots:
void handleRemoteProcessFinished(bool cleanEnd); void handleRemoteProcessFinished(bool cleanEnd);

8
src/plugins/ios/iosrunfactories.h
View File

@@ -64,11 +64,13 @@ public:
bool canHandle(ProjectExplorer::Target *t) const QTC_OVERRIDE; bool canHandle(ProjectExplorer::Target *t) const QTC_OVERRIDE;
QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t, QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,
ProjectExplorer::Node *n) QTC_OVERRIDE; ProjectExplorer::Node *n
) QTC_OVERRIDE;
private: private:
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id); ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent,
const Core::Id id) QTC_OVERRIDE;
ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
const QVariantMap &map); const QVariantMap &map) QTC_OVERRIDE;
}; };
class IosRunControlFactory : public ProjectExplorer::IRunControlFactory class IosRunControlFactory : public ProjectExplorer::IRunControlFactory

7
src/plugins/ios/iossettingspage.h
View File

@@ -30,6 +30,7 @@
#define IOSSETTINGSPAGE_H #define IOSSETTINGSPAGE_H
#include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/dialogs/ioptionspage.h>
#include <utils/qtcoverride.h>
#include <QPointer> #include <QPointer>
@@ -45,9 +46,9 @@ class IosSettingsPage : public Core::IOptionsPage
public: public:
explicit IosSettingsPage(QObject *parent = 0); explicit IosSettingsPage(QObject *parent = 0);
QWidget *widget(); QWidget *widget() QTC_OVERRIDE;
void apply(); void apply() QTC_OVERRIDE;
void finish(); void finish() QTC_OVERRIDE;
private: private:
QPointer<IosSettingsWidget> m_widget; QPointer<IosSettingsWidget> m_widget;

21
src/plugins/ios/iossimulator.h
View File

@@ -31,6 +31,7 @@
#include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/idevice.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/qtcoverride.h>
#include <QSharedPointer> #include <QSharedPointer>
@@ -47,19 +48,19 @@ class IosSimulator : public ProjectExplorer::IDevice
public: public:
typedef QSharedPointer<const IosSimulator> ConstPtr; typedef QSharedPointer<const IosSimulator> ConstPtr;
typedef QSharedPointer<IosSimulator> Ptr; typedef QSharedPointer<IosSimulator> Ptr;
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const; ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE;
QString displayType() const; QString displayType() const QTC_OVERRIDE;
ProjectExplorer::IDeviceWidget *createWidget(); ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE;
QList<Core::Id> actionIds() const; QList<Core::Id> actionIds() const QTC_OVERRIDE;
QString displayNameForActionId(Core::Id actionId) const; QString displayNameForActionId(Core::Id actionId) const QTC_OVERRIDE;
void executeAction(Core::Id actionId, QWidget *parent = 0); void executeAction(Core::Id actionId, QWidget *parent = 0) QTC_OVERRIDE;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const; ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const QTC_OVERRIDE;
Utils::FileName simulatorPath() const; Utils::FileName simulatorPath() const;
void fromMap(const QVariantMap &map); void fromMap(const QVariantMap &map) QTC_OVERRIDE;
QVariantMap toMap() const; QVariantMap toMap() const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr clone() const; ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE;
protected: protected:
friend class IosSimulatorFactory; friend class IosSimulatorFactory;