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

4
src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp
View File

@@ -41,6 +41,8 @@
#include <QComboBox>
#include <utils/layoutbuilder.h>
using namespace Core;
using namespace ProjectExplorer;
@@ -69,7 +71,7 @@ QmlMainFileAspect::~QmlMainFileAspect()
delete m_fileListCombo;
}
void QmlMainFileAspect::addToLayout(LayoutBuilder &builder)
void QmlMainFileAspect::addToLayout(Utils::LayoutBuilder &builder)
{
QTC_ASSERT(!m_fileListCombo, delete m_fileListCombo);
m_fileListCombo = new QComboBox;

4
src/plugins/qmlprojectmanager/qmlmainfileaspect.h
View File

@@ -44,7 +44,7 @@ namespace QmlProjectManager {
class QmlProject;
class QmlBuildSystem;
class QMLPROJECTMANAGER_EXPORT QmlMainFileAspect : public ProjectExplorer::ProjectConfigurationAspect
class QMLPROJECTMANAGER_EXPORT QmlMainFileAspect : public Utils::BaseAspect
{
Q_OBJECT
public:
@@ -57,7 +57,7 @@ public:
FileInSettings
};
void addToLayout(ProjectExplorer::LayoutBuilder &builder) final;
void addToLayout(Utils::LayoutBuilder &builder) final;
void toMap(QVariantMap &map) const final;
void fromMap(const QVariantMap &map) final;

2
src/plugins/qmlprojectmanager/qmlmultilanguageaspect.h
View File

@@ -33,7 +33,7 @@
namespace QmlProjectManager {
class QMLPROJECTMANAGER_EXPORT QmlMultiLanguageAspect : public ProjectExplorer::BoolAspect
class QMLPROJECTMANAGER_EXPORT QmlMultiLanguageAspect : public Utils::BoolAspect
{
Q_OBJECT
public:

2
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -40,11 +40,11 @@
#include <projectexplorer/runconfigurationaspects.h>
#include <projectexplorer/target.h>
#include <projectexplorer/environmentaspect.h>
#include <projectexplorer/projectconfigurationaspects.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h>
#include <utils/aspects.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
#include <utils/mimetypes/mimedatabase.h>