ProjectManagers: Cleanup

Remove unused class members, declarations, includes, unneeded
::projectManager overloads etc.

Change-Id: I0f4ae87414faca226554722e2a9147cb5512495d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-02-28 16:31:07 +01:00
parent 6fc03ac621
commit 8fd17a84b5
18 changed files with 21 additions and 128 deletions

View File

@@ -227,7 +227,7 @@ void QbsBuildStep::setQbsConfiguration(const QVariantMap &config)
QbsProject *pro = static_cast<QbsProject *>(project());
QVariantMap tmp = config;
tmp.insert(QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY), pro->projectManager()->profileForKit(target()->kit()));
tmp.insert(QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY), pro->profileForTarget(target()));
if (!tmp.contains(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)))
tmp.insert(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY),
QString::fromLatin1(Constants::QBS_VARIANT_DEBUG));

View File

@@ -29,7 +29,6 @@
#include "qbslogsink.h"
#include "qbspmlogging.h"
#include "qbsprojectfile.h"
#include "qbsprojectmanager.h"
#include "qbsprojectparser.h"
#include "qbsprojectmanagerconstants.h"
#include "qbsnodes.h"
@@ -67,7 +66,6 @@
#include <qbs.h>
#include <QCoreApplication>
#include <QDir>
#include <QElapsedTimer>
#include <QFileInfo>
#include <QMessageBox>
@@ -168,11 +166,6 @@ QString QbsProject::displayName() const
return m_projectName;
}
QbsManager *QbsProject::projectManager() const
{
return static_cast<QbsManager *>(Project::projectManager());
}
QbsRootProjectNode *QbsProject::rootProjectNode() const
{
return static_cast<QbsRootProjectNode *>(Project::rootProjectNode());
@@ -433,7 +426,7 @@ qbs::InstallJob *QbsProject::install(const qbs::InstallOptions &opts)
QString QbsProject::profileForTarget(const Target *t) const
{
return projectManager()->profileForKit(t->kit());
return static_cast<QbsManager *>(projectManager())->profileForKit(t->kit());
}
bool QbsProject::isParsing() const

View File

@@ -40,7 +40,6 @@
#include <qbs.h>
#include <QFuture>
#include <QHash>
#include <QTimer>
@@ -50,8 +49,7 @@ namespace ProjectExplorer { class BuildConfiguration; }
namespace QbsProjectManager {
namespace Internal {
class QbsBaseProjectNode;
class QbsProjectNode;
class QbsProjectParser;
class QbsBuildConfiguration;
@@ -64,7 +62,6 @@ public:
~QbsProject() override;
QString displayName() const override;
QbsManager *projectManager() const override;
QbsRootProjectNode *rootProjectNode() const override;
QStringList files(FilesMode fileMode) const override;

View File

@@ -30,26 +30,20 @@
#include <projectexplorer/iprojectmanager.h>
#include <QList>
namespace qbs {
class Settings;
class Preferences;
} // namespace qbs
#include <QString>
#include <QVariantMap>
namespace qbs { class Settings; }
namespace ProjectExplorer {
class Kit;
class Project;
class ProjectExplorerPlugin;
} // namespace ProjectExplorer
namespace QbsProjectManager {
namespace Internal {
class DefaultPropertyProvider;
class QbsLogSink;
class QbsProject;
class QbsManager : public ProjectExplorer::IProjectManager
{