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

BaseQtVersion: Remove setupQmakeAndId method on private object

Browse Source 
Inline it into its one user or move the code into the constructor
of the object.

Change-Id: Iae2882a6d82444b2603d4c98159c8ef95c5dd507
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2019-10-01 13:34:58 +02:00
parent b79f3c1f07
commit 0c4e2ada5c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -130,9 +130,10 @@ enum HostBinaries { Designer, Linguist, Uic, QScxmlc };
class BaseQtVersionPrivate class BaseQtVersionPrivate
{ {
public: public:
BaseQtVersionPrivate(BaseQtVersion *parent) : q(parent) {} BaseQtVersionPrivate(BaseQtVersion *parent)
: q(parent)
{}
void setupQmakePathAndId(const FilePath &path);
void updateVersionInfo(); void updateVersionInfo();
QString findHostBinary(HostBinaries binary) const; QString findHostBinary(HostBinaries binary) const;
@@ -300,13 +301,6 @@ BaseQtVersion::~BaseQtVersion()
delete d; delete d;
} }
void BaseQtVersionPrivate::setupQmakePathAndId(const FilePath &qmakeCommand)
{
m_id = QtVersionManager::getUniqueId();
QTC_CHECK(m_qmakeCommand.isEmpty()); // Should only be used once.
m_qmakeCommand = qmakeCommand;
}
QString BaseQtVersion::defaultUnexpandedDisplayName() const QString BaseQtVersion::defaultUnexpandedDisplayName() const
{ {
QString location; QString location;
@@ -2213,7 +2207,12 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath
if (!factory->m_restrictionChecker || factory->m_restrictionChecker(setup)) { if (!factory->m_restrictionChecker || factory->m_restrictionChecker(setup)) {
BaseQtVersion *ver = factory->create(); BaseQtVersion *ver = factory->create();
QTC_ASSERT(ver, continue); QTC_ASSERT(ver, continue);
ver->d->setupQmakePathAndId(qmakePath); ver->d->m_id = QtVersionManager::getUniqueId();
QTC_CHECK(ver->d->m_qmakeCommand.isEmpty()); // Should only be used once.
ver->d->m_qmakeCommand = qmakePath;
ver->d->m_unexpandedDisplayName = BaseQtVersion::defaultUnexpandedDisplayName(qmakePath,
false);
ver->d->m_autodetectionSource = autoDetectionSource; ver->d->m_autodetectionSource = autoDetectionSource;
ver->d->m_isAutodetected = isAutoDetected; ver->d->m_isAutodetected = isAutoDetected;
ver->updateDefaultDisplayName(); ver->updateDefaultDisplayName();

3
src/plugins/qtsupport/qtversionmanager.h
View File

@@ -35,8 +35,9 @@ class QTSUPPORT_EXPORT QtVersionManager : public QObject
Q_OBJECT Q_OBJECT
// for getUniqueId(); // for getUniqueId();
friend class BaseQtVersion; friend class BaseQtVersion;
friend class Internal::BaseQtVersionPrivate; friend class QtVersionFactory;
friend class Internal::QtOptionsPageWidget; friend class Internal::QtOptionsPageWidget;
public: public:
static QtVersionManager *instance(); static QtVersionManager *instance();
QtVersionManager(); QtVersionManager();