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

Utils/ProjectExplorer: Move re-usabled bits of aspects to Utils

Browse Source 
Classes involved are BaseAspect and some derived classes,
LayoutBuilder and VariableChooser.

This is mostly mechanical, with various include/using changes
to make it compile.

Change-Id: I624a457f3555f102e541c4c71e33a9423af32250
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-09-18 12:11:40 +02:00
parent 834cb8d114
commit cec468d78a
108 changed files with 751 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/ios/iosbuildconfiguration.cpp
View File

@@ -47,6 +47,7 @@
using namespace QmakeProjectManager;
using namespace ProjectExplorer;
using namespace Utils;
namespace Ios {
namespace Internal {

6
src/plugins/ios/iosbuildconfiguration.h
View File

@@ -26,7 +26,7 @@
#include "qmakeprojectmanager/qmakebuildconfiguration.h"
#include <projectexplorer/projectconfigurationaspects.h>
#include <utils/aspects.h>
namespace Ios {
namespace Internal {
@@ -46,8 +46,8 @@ private:
void updateQmakeCommand();
ProjectExplorer::StringAspect *m_signingIdentifier = nullptr;
ProjectExplorer::BoolAspect *m_autoManagedSigning = nullptr;
Utils::StringAspect *m_signingIdentifier = nullptr;
Utils::BoolAspect *m_autoManagedSigning = nullptr;
};
class IosBuildConfigurationFactory : public QmakeProjectManager::QmakeBuildConfigurationFactory

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

@@ -43,6 +43,7 @@
#include <utils/fileutils.h>
#include <utils/qtcprocess.h>
#include <utils/qtcassert.h>
#include <utils/layoutbuilder.h>
#include <QAction>
#include <QApplication>
@@ -77,14 +78,14 @@ static IosDeviceType toIosDeviceType(const SimulatorInfo &device)
return iosDeviceType;
}
class IosDeviceTypeAspect : public ProjectConfigurationAspect
class IosDeviceTypeAspect : public BaseAspect
{
public:
IosDeviceTypeAspect(IosRunConfiguration *runConfiguration);
void fromMap(const QVariantMap &map) override;
void toMap(QVariantMap &map) const override;
void addToLayout(ProjectExplorer::LayoutBuilder &builder) override;
void addToLayout(LayoutBuilder &builder) override;
IosDeviceType deviceType() const;
void setDeviceType(const IosDeviceType &deviceType);