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

Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE

Browse Source 
This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.

Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Thomas Hartmann
2014-09-24 12:49:32 +02:00
parent 652c53bf06
commit 48f19e925b
100 changed files with 985 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@
#define IOSBUILDSTEP_H
#include <projectexplorer/abstractprocessstep.h>
#include <utils/qtcoverride.h>
QT_BEGIN_NAMESPACE
class QListWidgetItem;
@@ -54,11 +53,11 @@ public:
IosBuildStep(ProjectExplorer::BuildStepList *parent);
~IosBuildStep();
bool init() QTC_OVERRIDE;
void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
bool init() Q_DECL_OVERRIDE;
void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
bool immutable() const QTC_OVERRIDE;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
bool immutable() const Q_DECL_OVERRIDE;
void setBaseArguments(const QStringList &args);
void setExtraArguments(const QStringList &extraArgs);
QStringList baseArguments() const;
@@ -69,11 +68,11 @@ public:
void setClean(bool clean);
bool isClean() const;
QVariantMap toMap() const QTC_OVERRIDE;
QVariantMap toMap() const Q_DECL_OVERRIDE;
protected:
IosBuildStep(ProjectExplorer::BuildStepList *parent, IosBuildStep *bs);
IosBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
private:
void ctor();
@@ -92,8 +91,8 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
IosBuildStepConfigWidget(IosBuildStep *buildStep);
~IosBuildStepConfigWidget();
QString displayName() const QTC_OVERRIDE;
QString summaryText() const QTC_OVERRIDE;
QString displayName() const Q_DECL_OVERRIDE;
QString summaryText() const Q_DECL_OVERRIDE;
private slots:
void buildArgumentsChanged();
@@ -114,18 +113,18 @@ class IosBuildStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosBuildStepFactory(QObject *parent = 0);
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::BuildStepList *parent,
ProjectExplorer::BuildStep *source) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *source) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
ProjectExplorer::BuildStep *source) QTC_OVERRIDE;
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *source) Q_DECL_OVERRIDE;
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
const QVariantMap &map) QTC_OVERRIDE;
const QVariantMap &map) Q_DECL_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const Q_DECL_OVERRIDE;
QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
};
} // namespace Internal

19
src/plugins/ios/iosdeployconfiguration.h
View File

@@ -30,7 +30,6 @@
#define IOSDEPLOYCONFIGURATION_H
#include <projectexplorer/deployconfiguration.h>
#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -59,22 +58,22 @@ class IosDeployConfigurationFactory : public ProjectExplorer::DeployConfiguratio
public:
explicit IosDeployConfigurationFactory(QObject *parent = 0);
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const QTC_OVERRIDE;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) QTC_OVERRIDE;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const Q_DECL_OVERRIDE;
ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) Q_DECL_OVERRIDE;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent,
const QVariantMap &map) QTC_OVERRIDE;
const QVariantMap &map) Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::Target *parent,
ProjectExplorer::DeployConfiguration *source) const QTC_OVERRIDE;
ProjectExplorer::DeployConfiguration *source) const Q_DECL_OVERRIDE;
ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent,
ProjectExplorer::DeployConfiguration *source) QTC_OVERRIDE;
ProjectExplorer::DeployConfiguration *source) Q_DECL_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const Q_DECL_OVERRIDE;
// used to translate the ids to names to display to the user
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
private:
bool canHandle(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
bool canHandle(ProjectExplorer::Target *parent) const Q_DECL_OVERRIDE;
};
} // namespace Internal

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

@@ -36,7 +36,6 @@
#include <projectexplorer/buildstep.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <qtsupport/baseqtversion.h>
#include <utils/qtcoverride.h>
#include <QFutureInterface>
#include <QProcess>
@@ -68,10 +67,10 @@ public:
~IosDeployStep();
bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
QVariantMap toMap() const QTC_OVERRIDE;
bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
QVariantMap toMap() const Q_DECL_OVERRIDE;
void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
void cleanup();
void cancel();
signals:
@@ -90,10 +89,10 @@ private slots:
private:
IosDeployStep(ProjectExplorer::BuildStepList *bc,
IosDeployStep *other);
bool init() QTC_OVERRIDE;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
bool immutable() const QTC_OVERRIDE { return true; }
bool runInGuiThread() const QTC_OVERRIDE { return true; }
bool init() Q_DECL_OVERRIDE;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
bool immutable() const Q_DECL_OVERRIDE { return true; }
bool runInGuiThread() const Q_DECL_OVERRIDE { return true; }
ProjectExplorer::IDevice::ConstPtr device() const;
IosDevice::ConstPtr iosdevice() const;
IosSimulator::ConstPtr iossimulator() const;

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

@@ -30,7 +30,6 @@
#define IOSDEPLOYSTEPFACTORY_H
#include <projectexplorer/buildstep.h>
#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -41,20 +40,20 @@ class IosDeployStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosDeployStepFactory(QObject *parent = 0);
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const Q_DECL_OVERRIDE;
QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
bool canCreate(ProjectExplorer::BuildStepList *parent,
Core::Id id) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
Core::Id id) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) QTC_OVERRIDE;
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::BuildStepList *parent,
ProjectExplorer::BuildStep *product) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *product) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
ProjectExplorer::BuildStep *product) QTC_OVERRIDE;
ProjectExplorer::BuildStep *product) Q_DECL_OVERRIDE;
};
} // namespace Internal

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

@@ -30,7 +30,6 @@
#define IOSDEPLOYSTEPWIDGET_H
#include <projectexplorer/buildstep.h>
#include <utils/qtcoverride.h>
QT_BEGIN_NAMESPACE
namespace Ui { class IosDeployStepWidget; }
@@ -49,8 +48,8 @@ public:
~IosDeployStepWidget();
private:
QString summaryText() const QTC_OVERRIDE;
QString displayName() const QTC_OVERRIDE;
QString summaryText() const Q_DECL_OVERRIDE;
QString displayName() const Q_DECL_OVERRIDE;
Ui::IosDeployStepWidget *ui;
IosDeployStep *m_step;

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

@@ -32,7 +32,6 @@
#include "iostoolhandler.h"
#include <projectexplorer/devicesupport/idevice.h>
#include <utils/qtcoverride.h>
#include <QVariantMap>
#include <QMap>
@@ -57,22 +56,22 @@ public:
typedef QSharedPointer<const IosDevice> ConstPtr;
typedef QSharedPointer<IosDevice> Ptr;
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE;
ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE;
QList<Core::Id> actionIds() const QTC_OVERRIDE;
QString displayNameForActionId(Core::Id actionId) const QTC_OVERRIDE;
void executeAction(Core::Id actionId, QWidget *parent = 0) QTC_OVERRIDE;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const QTC_OVERRIDE;
QString displayType() const QTC_OVERRIDE;
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const Q_DECL_OVERRIDE;
ProjectExplorer::IDeviceWidget *createWidget() Q_DECL_OVERRIDE;
QList<Core::Id> actionIds() const Q_DECL_OVERRIDE;
QString displayNameForActionId(Core::Id actionId) const Q_DECL_OVERRIDE;
void executeAction(Core::Id actionId, QWidget *parent = 0) Q_DECL_OVERRIDE;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const Q_DECL_OVERRIDE;
QString displayType() const Q_DECL_OVERRIDE;
ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE;
void fromMap(const QVariantMap &map) QTC_OVERRIDE;
QVariantMap toMap() const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr clone() const Q_DECL_OVERRIDE;
void fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
QVariantMap toMap() const Q_DECL_OVERRIDE;
QString uniqueDeviceID() const;
IosDevice(const QString &uid);
QString osVersion() const;
quint16 nextPort() const;
bool canAutoDetectPorts() const QTC_OVERRIDE;
bool canAutoDetectPorts() const Q_DECL_OVERRIDE;
static QString name();

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

@@ -30,7 +30,6 @@
#define IOSDEVICEFACTORY_H
#include <projectexplorer/devicesupport/idevicefactory.h>
#include <utils/qtcoverride.h>
#include <QTimer>
#include <QMap>
@@ -45,13 +44,13 @@ class IosDeviceFactory : public ProjectExplorer::IDeviceFactory
public:
IosDeviceFactory();
QString displayNameForId(Core::Id type) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds() const QTC_OVERRIDE;
QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE;
QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE;
bool canCreate() const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr create(Core::Id id) const QTC_OVERRIDE;
bool canRestore(const QVariantMap &map) const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const QTC_OVERRIDE;
bool canCreate() const Q_DECL_OVERRIDE;
ProjectExplorer::IDevice::Ptr create(Core::Id id) const Q_DECL_OVERRIDE;
bool canRestore(const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const Q_DECL_OVERRIDE;
};
} // namespace Internal

39
src/plugins/ios/iosdsymbuildstep.h
View File

@@ -30,7 +30,6 @@
#define IOSDSYMBUILDSTEP_H
#include <projectexplorer/abstractprocessstep.h>
#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -49,11 +48,11 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep
public:
~IosPresetBuildStep();
bool init() QTC_OVERRIDE;
void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
bool init() Q_DECL_OVERRIDE;
void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
bool immutable() const QTC_OVERRIDE;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
bool immutable() const Q_DECL_OVERRIDE;
void setArguments(const QStringList &args);
QStringList arguments() const;
QStringList defaultArguments() const;
@@ -64,12 +63,12 @@ public:
void setClean(bool clean);
bool isDefault() const;
QVariantMap toMap() const QTC_OVERRIDE;
QVariantMap toMap() const Q_DECL_OVERRIDE;
protected:
IosPresetBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
virtual bool completeSetup();
virtual bool completeSetupWithStep(ProjectExplorer::BuildStep *bs);
bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
virtual QStringList defaultCleanCmdList() const = 0;
virtual QStringList defaultCmdList() const = 0;
private:
@@ -85,8 +84,8 @@ class IosPresetBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWi
public:
IosPresetBuildStepConfigWidget(IosPresetBuildStep *buildStep);
~IosPresetBuildStepConfigWidget();
QString displayName() const QTC_OVERRIDE;
QString summaryText() const QTC_OVERRIDE;
QString displayName() const Q_DECL_OVERRIDE;
QString summaryText() const Q_DECL_OVERRIDE;
private slots:
void commandChanged();
@@ -107,14 +106,14 @@ class IosPresetBuildStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosPresetBuildStepFactory(QObject *parent = 0);
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::BuildStepList *parent,
ProjectExplorer::BuildStep *source) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *source) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
ProjectExplorer::BuildStep *source) QTC_OVERRIDE;
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
ProjectExplorer::BuildStep *source) Q_DECL_OVERRIDE;
bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
const QVariantMap &map) QTC_OVERRIDE;
const QVariantMap &map) Q_DECL_OVERRIDE;
protected:
virtual IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
@@ -126,8 +125,8 @@ class IosDsymBuildStep : public IosPresetBuildStep
Q_OBJECT
friend class IosDsymBuildStepFactory;
protected:
QStringList defaultCleanCmdList() const QTC_OVERRIDE;
QStringList defaultCmdList() const QTC_OVERRIDE;
QStringList defaultCleanCmdList() const Q_DECL_OVERRIDE;
QStringList defaultCmdList() const Q_DECL_OVERRIDE;
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
};
@@ -135,11 +134,11 @@ class IosDsymBuildStepFactory : public IosPresetBuildStepFactory
{
Q_OBJECT
public:
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const Q_DECL_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const Q_DECL_OVERRIDE;
QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
const Core::Id id) const QTC_OVERRIDE;
const Core::Id id) const Q_DECL_OVERRIDE;
};
} // namespace Internal

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

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

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

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

9
src/plugins/ios/iosqtversionfactory.h
View File

@@ -30,7 +30,6 @@
#define IOSQTVERSIONFACTORY_H
#include <qtsupport/qtversionfactory.h>
#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -40,13 +39,13 @@ class IosQtVersionFactory : public QtSupport::QtVersionFactory
public:
explicit IosQtVersionFactory(QObject *parent = 0);
bool canRestore(const QString &type) QTC_OVERRIDE;
QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) QTC_OVERRIDE;
bool canRestore(const QString &type) Q_DECL_OVERRIDE;
QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) Q_DECL_OVERRIDE;
int priority() const QTC_OVERRIDE;
int priority() const Q_DECL_OVERRIDE;
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false,
const QString &autoDetectionSource = QString()) QTC_OVERRIDE;
const QString &autoDetectionSource = QString()) Q_DECL_OVERRIDE;
};
} // namespace Internal

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

@@ -34,7 +34,6 @@
#include <projectexplorer/runconfiguration.h>
#include <utils/fileutils.h>
#include <utils/qtcoverride.h>
namespace QmakeProjectManager {
class QmakeProFileNode;
@@ -65,8 +64,8 @@ class IosRunConfiguration : public ProjectExplorer::RunConfiguration
public:
IosRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path);
QWidget *createConfigurationWidget() QTC_OVERRIDE;
Utils::OutputFormatter *createOutputFormatter() const QTC_OVERRIDE;
QWidget *createConfigurationWidget() Q_DECL_OVERRIDE;
Utils::OutputFormatter *createOutputFormatter() const Q_DECL_OVERRIDE;
IosDeployStep *deployStep() const;
QStringList commandLineArguments();
@@ -79,8 +78,8 @@ public:
IosDeviceType::Enum deviceType() const;
void setDeviceType(IosDeviceType::Enum deviceType);
bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
QVariantMap toMap() const QTC_OVERRIDE;
bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
QVariantMap toMap() const Q_DECL_OVERRIDE;
protected:
IosRunConfiguration(ProjectExplorer::Target *parent, IosRunConfiguration *source);

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

@@ -30,7 +30,6 @@
#define IOSRUNCONTROL_H
#include <projectexplorer/runconfiguration.h>
#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -47,10 +46,10 @@ public:
~IosRunControl();
void start() QTC_OVERRIDE;
StopResult stop() QTC_OVERRIDE;
bool isRunning() const QTC_OVERRIDE;
QString displayName() const QTC_OVERRIDE;
void start() Q_DECL_OVERRIDE;
StopResult stop() Q_DECL_OVERRIDE;
bool isRunning() const Q_DECL_OVERRIDE;
QString displayName() const Q_DECL_OVERRIDE;
private slots:
void handleRemoteProcessFinished(bool cleanEnd);

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

@@ -31,7 +31,6 @@
#include <projectexplorer/runconfiguration.h>
#include <qmakeprojectmanager/qmakerunconfigurationfactory.h>
#include <utils/qtcoverride.h>
namespace ProjectExplorer {
class RunControl;
@@ -50,27 +49,27 @@ class IosRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigura
public:
explicit IosRunConfigurationFactory(QObject *parent = 0);
QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const QTC_OVERRIDE;
QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const Q_DECL_OVERRIDE;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const QTC_OVERRIDE;
bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const Q_DECL_OVERRIDE;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::Target *parent,
ProjectExplorer::RunConfiguration *source) const QTC_OVERRIDE;
ProjectExplorer::RunConfiguration *source) const Q_DECL_OVERRIDE;
ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent,
ProjectExplorer::RunConfiguration *source) QTC_OVERRIDE;
ProjectExplorer::RunConfiguration *source) Q_DECL_OVERRIDE;
bool canHandle(ProjectExplorer::Target *t) const QTC_OVERRIDE;
bool canHandle(ProjectExplorer::Target *t) const Q_DECL_OVERRIDE;
QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,
const ProjectExplorer::Node *n
) QTC_OVERRIDE;
) Q_DECL_OVERRIDE;
private:
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent,
Core::Id id) QTC_OVERRIDE;
Core::Id id) Q_DECL_OVERRIDE;
ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
const QVariantMap &map) QTC_OVERRIDE;
const QVariantMap &map) Q_DECL_OVERRIDE;
};
class IosRunControlFactory : public ProjectExplorer::IRunControlFactory
@@ -81,10 +80,10 @@ public:
explicit IosRunControlFactory(QObject *parent = 0);
bool canRun(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode) const QTC_OVERRIDE;
ProjectExplorer::RunMode mode) const Q_DECL_OVERRIDE;
ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode,
QString *errorMessage) QTC_OVERRIDE;
QString *errorMessage) Q_DECL_OVERRIDE;
private:
mutable QMap<Core::Id, QPointer<ProjectExplorer::RunControl> > m_activeRunControls;
};

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

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

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

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

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

@@ -30,7 +30,6 @@
#define IOSSIMULATORFACTORY_H
#include <projectexplorer/devicesupport/idevicefactory.h>
#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -41,13 +40,13 @@ class IosSimulatorFactory : public ProjectExplorer::IDeviceFactory
public:
IosSimulatorFactory();
QString displayNameForId(Core::Id type) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds() const QTC_OVERRIDE;
QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE;
QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE;
bool canCreate() const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr create(Core::Id id) const QTC_OVERRIDE;
bool canRestore(const QVariantMap &map) const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const QTC_OVERRIDE;
bool canCreate() const Q_DECL_OVERRIDE;
ProjectExplorer::IDevice::Ptr create(Core::Id id) const Q_DECL_OVERRIDE;
bool canRestore(const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const Q_DECL_OVERRIDE;
};
} // namespace Internal