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

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