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

autotools: minor cleanup

Browse Source 
Change-Id: Ic7862a4a97e60ed016a53f5893e03e3f9ec11e53
Reviewed-by: Patricia Santana Cruz <patriciasc@openismus.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-30 15:08:34 +01:00
committed by hjk
parent 6d36577220
commit 93a4237602
30 changed files with 62 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/autotoolsprojectmanager/autogenstep.cpp
View File

@@ -54,10 +54,8 @@ using namespace AutotoolsProjectManager;
using namespace AutotoolsProjectManager::Internal; using namespace AutotoolsProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace {
const char AUTOGEN_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.AutogenStep.AdditionalArguments"; const char AUTOGEN_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.AutogenStep.AdditionalArguments";
const char AUTOGEN_STEP_ID[] = "AutotoolsProjectManager.AutogenStep"; const char AUTOGEN_STEP_ID[] = "AutotoolsProjectManager.AutogenStep";
}
///////////////////////////// /////////////////////////////
// AutogenStepFactory class // AutogenStepFactory class
@@ -67,10 +65,6 @@ AutogenStepFactory::AutogenStepFactory(QObject *parent) :
{ {
} }
AutogenStepFactory::~AutogenStepFactory()
{
}
QStringList AutogenStepFactory::availableCreationIds(BuildStepList *parent) const QStringList AutogenStepFactory::availableCreationIds(BuildStepList *parent) const
{ {
if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID)) if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
@@ -160,10 +154,6 @@ void AutogenStep::ctor()
setDefaultDisplayName(tr("Autogen")); setDefaultDisplayName(tr("Autogen"));
} }
AutogenStep::~AutogenStep()
{
}
AutotoolsBuildConfiguration *AutogenStep::autotoolsBuildConfiguration() const AutotoolsBuildConfiguration *AutogenStep::autotoolsBuildConfiguration() const
{ {
return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration()); return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration());
@@ -276,10 +266,6 @@ AutogenStepConfigWidget::AutogenStepConfigWidget(AutogenStep *autogenStep) :
this, SLOT(updateDetails())); this, SLOT(updateDetails()));
} }
AutogenStepConfigWidget::~AutogenStepConfigWidget()
{
}
QString AutogenStepConfigWidget::displayName() const QString AutogenStepConfigWidget::displayName() const
{ {
return tr("Autogen", "AutotoolsProjectManager::AutogenStepConfigWidget display name."); return tr("Autogen", "AutotoolsProjectManager::AutogenStepConfigWidget display name.");

4
src/plugins/autotoolsprojectmanager/autogenstep.h
View File

@@ -63,7 +63,6 @@ class AutogenStepFactory : public ProjectExplorer::IBuildStepFactory
public: public:
AutogenStepFactory(QObject *parent = 0); AutogenStepFactory(QObject *parent = 0);
~AutogenStepFactory();
QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const; QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const QString &id) const; QString displayNameForId(const QString &id) const;
@@ -97,7 +96,6 @@ class AutogenStep : public ProjectExplorer::AbstractProcessStep
public: public:
AutogenStep(ProjectExplorer::BuildStepList *bsl); AutogenStep(ProjectExplorer::BuildStepList *bsl);
~AutogenStep();
AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const; AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const;
bool init(); bool init();
@@ -140,12 +138,10 @@ class AutogenStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public: public:
AutogenStepConfigWidget(AutogenStep *autogenStep); AutogenStepConfigWidget(AutogenStep *autogenStep);
~AutogenStepConfigWidget();
QString displayName() const; QString displayName() const;
QString summaryText() const; QString summaryText() const;
private slots: private slots:
void updateDetails(); void updateDetails();

16
src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
View File

@@ -53,10 +53,8 @@ using namespace AutotoolsProjectManager;
using namespace AutotoolsProjectManager::Internal; using namespace AutotoolsProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace {
const char AUTORECONF_STEP_ID[] = "AutotoolsProjectManager.AutoreconfStep"; const char AUTORECONF_STEP_ID[] = "AutotoolsProjectManager.AutoreconfStep";
const char AUTORECONF_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.AutoreconfStep.AdditionalArguments"; const char AUTORECONF_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.AutoreconfStep.AdditionalArguments";
}
//////////////////////////////// ////////////////////////////////
// AutoreconfStepFactory class // AutoreconfStepFactory class
@@ -66,10 +64,6 @@ AutoreconfStepFactory::AutoreconfStepFactory(QObject *parent) :
{ {
} }
AutoreconfStepFactory::~AutoreconfStepFactory()
{
}
QStringList AutoreconfStepFactory::availableCreationIds(BuildStepList *parent) const QStringList AutoreconfStepFactory::availableCreationIds(BuildStepList *parent) const
{ {
if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID)) if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
@@ -159,10 +153,6 @@ void AutoreconfStep::ctor()
setDefaultDisplayName(tr("Autoreconf")); setDefaultDisplayName(tr("Autoreconf"));
} }
AutoreconfStep::~AutoreconfStep()
{
}
AutotoolsBuildConfiguration *AutoreconfStep::autotoolsBuildConfiguration() const AutotoolsBuildConfiguration *AutoreconfStep::autotoolsBuildConfiguration() const
{ {
return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration()); return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration());
@@ -232,7 +222,7 @@ QString AutoreconfStep::additionalArguments() const
QVariantMap AutoreconfStep::toMap() const QVariantMap AutoreconfStep::toMap() const
{ {
QVariantMap map(AbstractProcessStep::toMap()); QVariantMap map = AbstractProcessStep::toMap();
map.insert(QLatin1String(AUTORECONF_ADDITIONAL_ARGUMENTS_KEY), m_additionalArguments); map.insert(QLatin1String(AUTORECONF_ADDITIONAL_ARGUMENTS_KEY), m_additionalArguments);
return map; return map;
@@ -270,10 +260,6 @@ AutoreconfStepConfigWidget::AutoreconfStepConfigWidget(AutoreconfStep *autorecon
this, SLOT(updateDetails())); this, SLOT(updateDetails()));
} }
AutoreconfStepConfigWidget::~AutoreconfStepConfigWidget()
{
}
QString AutoreconfStepConfigWidget::displayName() const QString AutoreconfStepConfigWidget::displayName() const
{ {
return tr("Autoreconf", "AutotoolsProjectManager::AutoreconfStepConfigWidget display name."); return tr("Autoreconf", "AutotoolsProjectManager::AutoreconfStepConfigWidget display name.");

5
src/plugins/autotoolsprojectmanager/autoreconfstep.h
View File

@@ -36,7 +36,6 @@
#define AUTORECONFSTEP_H #define AUTORECONFSTEP_H
#include <projectexplorer/abstractprocessstep.h> #include <projectexplorer/abstractprocessstep.h>
#include <QtGui/QLineEdit>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QLineEdit; class QLineEdit;
@@ -63,7 +62,6 @@ class AutoreconfStepFactory : public ProjectExplorer::IBuildStepFactory
public: public:
AutoreconfStepFactory(QObject *parent = 0); AutoreconfStepFactory(QObject *parent = 0);
~AutoreconfStepFactory();
QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const; QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const QString &id) const; QString displayNameForId(const QString &id) const;
@@ -97,9 +95,7 @@ class AutoreconfStep : public ProjectExplorer::AbstractProcessStep
friend class AutoreconfStepConfigWidget; friend class AutoreconfStepConfigWidget;
public: public:
AutoreconfStep(ProjectExplorer::BuildStepList *bsl); AutoreconfStep(ProjectExplorer::BuildStepList *bsl);
~AutoreconfStep();
AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const; AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const;
bool init(); bool init();
@@ -142,7 +138,6 @@ class AutoreconfStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public: public:
AutoreconfStepConfigWidget(AutoreconfStep *autoreconfStep); AutoreconfStepConfigWidget(AutoreconfStep *autoreconfStep);
~AutoreconfStepConfigWidget();
QString displayName() const; QString displayName() const;
QString summaryText() const; QString summaryText() const;

14
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
View File

@@ -74,13 +74,9 @@ AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(AutotoolsTarget *parent
cloneSteps(source); cloneSteps(source);
} }
AutotoolsBuildConfiguration::~AutotoolsBuildConfiguration()
{
}
QVariantMap AutotoolsBuildConfiguration::toMap() const QVariantMap AutotoolsBuildConfiguration::toMap() const
{ {
QVariantMap map(ProjectExplorer::BuildConfiguration::toMap()); QVariantMap map = ProjectExplorer::BuildConfiguration::toMap();
map.insert(QLatin1String(Constants::BUILD_DIRECTORY_KEY), m_buildDirectory); map.insert(QLatin1String(Constants::BUILD_DIRECTORY_KEY), m_buildDirectory);
return map; return map;
} }
@@ -128,10 +124,6 @@ AutotoolsBuildConfigurationFactory::AutotoolsBuildConfigurationFactory(QObject *
{ {
} }
AutotoolsBuildConfigurationFactory::~AutotoolsBuildConfigurationFactory()
{
}
QStringList AutotoolsBuildConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const QStringList AutotoolsBuildConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
{ {
if (!qobject_cast<AutotoolsTarget *>(parent)) if (!qobject_cast<AutotoolsTarget *>(parent))
@@ -160,8 +152,8 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::create(ProjectE
if (!canCreate(parent, id)) if (!canCreate(parent, id))
return 0; return 0;
AutotoolsTarget *t(static_cast<AutotoolsTarget *>(parent)); AutotoolsTarget *t = static_cast<AutotoolsTarget *>(parent);
AutotoolsBuildConfiguration *bc =createDefaultConfiguration(t); AutotoolsBuildConfiguration *bc = createDefaultConfiguration(t);
bool ok; bool ok;
QString buildConfigurationName = QInputDialog::getText(0, QString buildConfigurationName = QInputDialog::getText(0,

2
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
View File

@@ -50,7 +50,6 @@ class AutotoolsBuildConfiguration : public ProjectExplorer::BuildConfiguration
public: public:
explicit AutotoolsBuildConfiguration(AutotoolsTarget *parent); explicit AutotoolsBuildConfiguration(AutotoolsTarget *parent);
~AutotoolsBuildConfiguration();
AutotoolsTarget *autotoolsTarget() const; AutotoolsTarget *autotoolsTarget() const;
QString buildDirectory() const; QString buildDirectory() const;
@@ -75,7 +74,6 @@ class AutotoolsBuildConfigurationFactory : public ProjectExplorer::IBuildConfigu
public: public:
explicit AutotoolsBuildConfigurationFactory(QObject *parent = 0); explicit AutotoolsBuildConfigurationFactory(QObject *parent = 0);
~AutotoolsBuildConfigurationFactory();
QStringList availableCreationIds(ProjectExplorer::Target *parent) const; QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
QString displayNameForId(const QString &id) const; QString displayNameForId(const QString &id) const;

6
src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp
View File

@@ -82,10 +82,6 @@ AutotoolsBuildSettingsWidget::AutotoolsBuildSettingsWidget(AutotoolsTarget *targ
this, SLOT(updateToolChainList())); this, SLOT(updateToolChainList()));
} }
AutotoolsBuildSettingsWidget::~AutotoolsBuildSettingsWidget()
{
}
QString AutotoolsBuildSettingsWidget::displayName() const QString AutotoolsBuildSettingsWidget::displayName() const
{ {
return QLatin1String("Autotools Manager"); return QLatin1String("Autotools Manager");
@@ -113,7 +109,7 @@ void AutotoolsBuildSettingsWidget::toolChainSelected(int index)
void AutotoolsBuildSettingsWidget::toolChainChanged(ProjectExplorer::ToolChain *tc) void AutotoolsBuildSettingsWidget::toolChainChanged(ProjectExplorer::ToolChain *tc)
{ {
for (int i = 0; i < m_toolChainChooser->count(); ++i) { for (int i = 0; i < m_toolChainChooser->count(); ++i) {
ToolChain * currentTc = static_cast<ToolChain *>(m_toolChainChooser->itemData(i).value<void *>()); ToolChain *currentTc = static_cast<ToolChain *>(m_toolChainChooser->itemData(i).value<void *>());
if (currentTc != tc) if (currentTc != tc)
continue; continue;
m_toolChainChooser->setCurrentIndex(i); m_toolChainChooser->setCurrentIndex(i);

7
src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h
View File

@@ -63,16 +63,15 @@ class AutotoolsBuildSettingsWidget : public ProjectExplorer::BuildConfigWidget
Q_OBJECT Q_OBJECT
public: public:
AutotoolsBuildSettingsWidget(AutotoolsTarget* target); explicit AutotoolsBuildSettingsWidget(AutotoolsTarget *target);
~AutotoolsBuildSettingsWidget();
QString displayName() const; QString displayName() const;
void init(ProjectExplorer::BuildConfiguration* bc); void init(ProjectExplorer::BuildConfiguration *bc);
private slots: private slots:
void buildDirectoryChanged(); void buildDirectoryChanged();
void toolChainSelected(int index); void toolChainSelected(int index);
void toolChainChanged(ProjectExplorer::ToolChain *); void toolChainChanged(ProjectExplorer::ToolChain *tc);
void updateToolChainList(); void updateToolChainList();
private: private:

16
src/plugins/autotoolsprojectmanager/autotoolsmanager.cpp
View File

@@ -43,17 +43,10 @@
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
using namespace AutotoolsProjectManager::Internal; namespace AutotoolsProjectManager {
namespace Internal {
AutotoolsManager::AutotoolsManager() ProjectExplorer::Project *AutotoolsManager::openProject(const QString &fileName, QString *errorString)
{
}
AutotoolsManager::~AutotoolsManager()
{
}
ProjectExplorer::Project *AutotoolsManager::openProject(const QString& fileName, QString *errorString)
{ {
QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath(); QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath();
@@ -81,3 +74,6 @@ QString AutotoolsManager::mimeType() const
{ {
return QLatin1String(Constants::MAKEFILE_MIMETYPE); return QLatin1String(Constants::MAKEFILE_MIMETYPE);
} }
} // namespace Internal
} // namespace AutotoolsProjectManager

5
src/plugins/autotoolsprojectmanager/autotoolsmanager.h
View File

@@ -52,10 +52,9 @@ class AutotoolsManager : public ProjectExplorer::IProjectManager
Q_OBJECT Q_OBJECT
public: public:
AutotoolsManager(); AutotoolsManager() {}
~AutotoolsManager();
ProjectExplorer::Project *openProject(const QString& fileName, QString *errorString); ProjectExplorer::Project *openProject(const QString &fileName, QString *errorString);
QString mimeType() const; QString mimeType() const;
}; };

4
src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp
View File

@@ -61,10 +61,6 @@ AutotoolsOpenProjectWizard::AutotoolsOpenProjectWizard(AutotoolsManager *manager
init(); init();
} }
AutotoolsOpenProjectWizard::~AutotoolsOpenProjectWizard()
{
}
void AutotoolsOpenProjectWizard::init() void AutotoolsOpenProjectWizard::init()
{ {
setOption(QWizard::NoBackButtonOnStartPage); setOption(QWizard::NoBackButtonOnStartPage);

6
src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h
View File

@@ -46,6 +46,7 @@ class AutotoolsManager;
class AutotoolsOpenProjectWizard : public Utils::Wizard class AutotoolsOpenProjectWizard : public Utils::Wizard
{ {
Q_OBJECT Q_OBJECT
public: public:
enum PageId enum PageId
{ {
@@ -56,8 +57,6 @@ public:
const QString &sourceDirectory, const QString &sourceDirectory,
QWidget *parent = 0); QWidget *parent = 0);
~AutotoolsOpenProjectWizard();
QString buildDirectory() const; QString buildDirectory() const;
QString sourceDirectory() const; QString sourceDirectory() const;
void setBuildDirectory(const QString &directory); void setBuildDirectory(const QString &directory);
@@ -73,10 +72,13 @@ private:
class BuildPathPage : public QWizardPage class BuildPathPage : public QWizardPage
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit BuildPathPage(AutotoolsOpenProjectWizard *wizard); explicit BuildPathPage(AutotoolsOpenProjectWizard *wizard);
private slots: private slots:
void buildDirectoryChanged(); void buildDirectoryChanged();
private: private:
AutotoolsOpenProjectWizard *m_wizard; AutotoolsOpenProjectWizard *m_wizard;
Utils::PathChooser *m_pc; Utils::PathChooser *m_pc;

54
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -65,9 +65,7 @@ using namespace AutotoolsProjectManager;
using namespace AutotoolsProjectManager::Internal; using namespace AutotoolsProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace {
const char TOOLCHAIN_KEY[] = "AutotoolsProjectManager.AutotoolsProject.Toolchain"; const char TOOLCHAIN_KEY[] = "AutotoolsProjectManager.AutotoolsProject.Toolchain";
}
AutotoolsProject::AutotoolsProject(AutotoolsManager *manager, const QString &fileName) : AutotoolsProject::AutotoolsProject(AutotoolsManager *manager, const QString &fileName) :
m_manager(manager), m_manager(manager),
@@ -135,7 +133,7 @@ QString AutotoolsProject::id() const
return QLatin1String(Constants::AUTOTOOLS_PROJECT_ID); return QLatin1String(Constants::AUTOTOOLS_PROJECT_ID);
} }
Core::IFile* AutotoolsProject::file() const Core::IFile *AutotoolsProject::file() const
{ {
return m_file; return m_file;
} }
@@ -150,7 +148,7 @@ AutotoolsTarget *AutotoolsProject::activeTarget() const
return static_cast<AutotoolsTarget *>(Project::activeTarget()); return static_cast<AutotoolsTarget *>(Project::activeTarget());
} }
QList<ProjectExplorer::Project*> AutotoolsProject::dependsOn() QList<ProjectExplorer::Project *> AutotoolsProject::dependsOn()
{ {
return QList<Project *>(); return QList<Project *>();
} }
@@ -185,7 +183,7 @@ QString AutotoolsProject::sourceDirectory() const
QVariantMap AutotoolsProject::toMap() const QVariantMap AutotoolsProject::toMap() const
{ {
QVariantMap map(Project::toMap()); QVariantMap map = Project::toMap();
map.insert(QLatin1String(TOOLCHAIN_KEY), m_toolChain ? m_toolChain->id() : QString()); map.insert(QLatin1String(TOOLCHAIN_KEY), m_toolChain ? m_toolChain->id() : QString());
return map; return map;
} }
@@ -321,7 +319,7 @@ void AutotoolsProject::makefileParsingFinished()
// Watch for changes of Makefile.am files. If a Makefile.am file // Watch for changes of Makefile.am files. If a Makefile.am file
// has been changed, the project tree must be reparsed. // has been changed, the project tree must be reparsed.
const QStringList makefiles = m_makefileParserThread->makefiles(); const QStringList makefiles = m_makefileParserThread->makefiles();
foreach (const QString& makefile, makefiles) { foreach (const QString &makefile, makefiles) {
files.append(makefile); files.append(makefile);
const QString watchedFile = dir.absoluteFilePath(makefile); const QString watchedFile = dir.absoluteFilePath(makefile);
@@ -329,7 +327,7 @@ void AutotoolsProject::makefileParsingFinished()
m_watchedFiles.append(watchedFile); m_watchedFiles.append(watchedFile);
} }
// Add configure.ac file to project and watch for changes // Add configure.ac file to project and watch for changes.
const QLatin1String configureAc(QLatin1String("configure.ac")); const QLatin1String configureAc(QLatin1String("configure.ac"));
const QFile configureAcFile(fileInfo.absolutePath() + QChar('/') + configureAc); const QFile configureAcFile(fileInfo.absolutePath() + QChar('/') + configureAc);
if (configureAcFile.exists()) { if (configureAcFile.exists()) {
@@ -366,17 +364,17 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
// Get all existing nodes and remember them in a hash table. // Get all existing nodes and remember them in a hash table.
// This allows to reuse existing nodes and to remove obsolete // This allows to reuse existing nodes and to remove obsolete
// nodes later. // nodes later.
QHash<QString, ProjectExplorer::Node*> nodeHash; QHash<QString, ProjectExplorer::Node *> nodeHash;
foreach (ProjectExplorer::Node* node, nodes(m_rootNode)) foreach (ProjectExplorer::Node * node, nodes(m_rootNode))
nodeHash.insert(node->path(), node); nodeHash.insert(node->path(), node);
// Add the sources to the filenode project tree. Sources // Add the sources to the filenode project tree. Sources
// inside the same directory are grouped into a folder-node. // inside the same directory are grouped into a folder-node.
const QString baseDir = directory.absolutePath(); const QString baseDir = directory.absolutePath();
QList<ProjectExplorer::FileNode*> fileNodes; QList<ProjectExplorer::FileNode *> fileNodes;
ProjectExplorer::FolderNode* parentFolder = 0; ProjectExplorer::FolderNode *parentFolder = 0;
ProjectExplorer::FolderNode* oldParentFolder = 0; ProjectExplorer::FolderNode *oldParentFolder = 0;
foreach (const QString& file, files) { foreach (const QString& file, files) {
if (file.contains(QLatin1String(".moc"))) if (file.contains(QLatin1String(".moc")))
@@ -417,7 +415,7 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
if (nodeHash.contains(filePath)) { if (nodeHash.contains(filePath)) {
nodeHash.remove(filePath); nodeHash.remove(filePath);
} else { } else {
ProjectExplorer::FileNode* node = ProjectExplorer::FileNode *node =
new ProjectExplorer::FileNode(filePath, new ProjectExplorer::FileNode(filePath,
ProjectExplorer::ResourceType, ProjectExplorer::ResourceType,
false); false);
@@ -429,16 +427,16 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
m_rootNode->addFileNodes(fileNodes, parentFolder); m_rootNode->addFileNodes(fileNodes, parentFolder);
// Remove unused file nodes and empty folder nodes // Remove unused file nodes and empty folder nodes
QHash<QString, ProjectExplorer::Node*>::const_iterator it = nodeHash.constBegin(); QHash<QString, ProjectExplorer::Node *>::const_iterator it = nodeHash.constBegin();
while (it != nodeHash.constEnd()) { while (it != nodeHash.constEnd()) {
if ((*it)->nodeType() == ProjectExplorer::FileNodeType) { if ((*it)->nodeType() == ProjectExplorer::FileNodeType) {
ProjectExplorer::FileNode* fileNode = static_cast<ProjectExplorer::FileNode*>(*it); ProjectExplorer::FileNode *fileNode = static_cast<ProjectExplorer::FileNode *>(*it);
ProjectExplorer::FolderNode* parent = fileNode->parentFolderNode(); ProjectExplorer::FolderNode* parent = fileNode->parentFolderNode();
m_rootNode->removeFileNodes(QList<ProjectExplorer::FileNode*>() << fileNode, parent); m_rootNode->removeFileNodes(QList<ProjectExplorer::FileNode *>() << fileNode, parent);
// Remove all empty parent folders // Remove all empty parent folders
while (parent->subFolderNodes().isEmpty() && parent->fileNodes().isEmpty()) { while (parent->subFolderNodes().isEmpty() && parent->fileNodes().isEmpty()) {
ProjectExplorer::FolderNode* grandParent = parent->parentFolderNode(); ProjectExplorer::FolderNode *grandParent = parent->parentFolderNode();
m_rootNode->removeFolderNodes(QList<ProjectExplorer::FolderNode *>() << parent, grandParent); m_rootNode->removeFolderNodes(QList<ProjectExplorer::FolderNode *>() << parent, grandParent);
parent = grandParent; parent = grandParent;
if (parent == m_rootNode) if (parent == m_rootNode)
@@ -449,8 +447,8 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
} }
} }
ProjectExplorer::FolderNode* AutotoolsProject::insertFolderNode(const QDir &nodeDir, ProjectExplorer::FolderNode *AutotoolsProject::insertFolderNode(const QDir &nodeDir,
QHash<QString, ProjectExplorer::Node*> &nodes) QHash<QString, ProjectExplorer::Node *> &nodes)
{ {
const QString nodePath = nodeDir.absolutePath(); const QString nodePath = nodeDir.absolutePath();
QFileInfo rootInfo(m_rootNode->path()); QFileInfo rootInfo(m_rootNode->path());
@@ -460,41 +458,41 @@ ProjectExplorer::FolderNode* AutotoolsProject::insertFolderNode(const QDir &node
if (rootPath == nodePath) if (rootPath == nodePath)
return 0; return 0;
ProjectExplorer::FolderNode* folder = new ProjectExplorer::FolderNode(nodePath); ProjectExplorer::FolderNode *folder = new ProjectExplorer::FolderNode(nodePath);
QDir dir(nodeDir); QDir dir(nodeDir);
folder->setDisplayName(dir.dirName()); folder->setDisplayName(dir.dirName());
// Get parent-folder. If it does not exist, create it recursively. // Get parent-folder. If it does not exist, create it recursively.
// Take care that the m_rootNode is considered as top folder. // Take care that the m_rootNode is considered as top folder.
ProjectExplorer::FolderNode* parentFolder = m_rootNode; ProjectExplorer::FolderNode *parentFolder = m_rootNode;
if ((rootPath != folder->path()) && dir.cdUp()) { if ((rootPath != folder->path()) && dir.cdUp()) {
const QString parentDir = dir.absolutePath(); const QString parentDir = dir.absolutePath();
if (!nodes.contains(parentDir)) { if (!nodes.contains(parentDir)) {
ProjectExplorer::FolderNode* insertedFolder = insertFolderNode(parentDir, nodes); ProjectExplorer::FolderNode *insertedFolder = insertFolderNode(parentDir, nodes);
if (insertedFolder != 0) if (insertedFolder != 0)
parentFolder = insertedFolder; parentFolder = insertedFolder;
} else { } else {
QTC_ASSERT(nodes[parentDir]->nodeType() == ProjectExplorer::FolderNodeType, return 0); QTC_ASSERT(nodes[parentDir]->nodeType() == ProjectExplorer::FolderNodeType, return 0);
parentFolder = static_cast<ProjectExplorer::FolderNode*>(nodes[parentDir]); parentFolder = static_cast<ProjectExplorer::FolderNode *>(nodes[parentDir]);
} }
} }
m_rootNode->addFolderNodes(QList<ProjectExplorer::FolderNode*>() << folder, parentFolder); m_rootNode->addFolderNodes(QList<ProjectExplorer::FolderNode *>() << folder, parentFolder);
nodes.insert(nodePath, folder); nodes.insert(nodePath, folder);
return folder; return folder;
} }
QList<ProjectExplorer::Node*> AutotoolsProject::nodes(ProjectExplorer::FolderNode *parent) const QList<ProjectExplorer::Node *> AutotoolsProject::nodes(ProjectExplorer::FolderNode *parent) const
{ {
QList<ProjectExplorer::Node*> list; QList<ProjectExplorer::Node *> list;
QTC_ASSERT(parent != 0, return list); QTC_ASSERT(parent != 0, return list);
foreach (ProjectExplorer::FolderNode* folder, parent->subFolderNodes()) { foreach (ProjectExplorer::FolderNode *folder, parent->subFolderNodes()) {
list.append(nodes(folder)); list.append(nodes(folder));
list.append(folder); list.append(folder);
} }
foreach (ProjectExplorer::FileNode* file, parent->fileNodes()) foreach (ProjectExplorer::FileNode *file, parent->fileNodes())
list.append(file); list.append(file);
return list; return list;

10
src/plugins/autotoolsprojectmanager/autotoolsproject.h
View File

@@ -84,7 +84,7 @@ public:
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets(); QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
ProjectExplorer::ProjectNode *rootProjectNode() const; ProjectExplorer::ProjectNode *rootProjectNode() const;
QStringList files(FilesMode fileMode) const; QStringList files(FilesMode fileMode) const;
QList<ProjectExplorer::Project*> dependsOn(); QList<ProjectExplorer::Project *> dependsOn();
QString defaultBuildDirectory() const; QString defaultBuildDirectory() const;
QString sourceDirectory() const; QString sourceDirectory() const;
QStringList buildTargets() const; QStringList buildTargets() const;
@@ -93,7 +93,7 @@ public:
QVariantMap toMap() const; QVariantMap toMap() const;
signals: signals:
void toolChainChanged(ProjectExplorer::ToolChain *); void toolChainChanged(ProjectExplorer::ToolChain *tc);
protected: protected:
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map);
@@ -137,13 +137,13 @@ private:
* the directory \p nodeDir and inserts it into \p nodes. If no parent * the directory \p nodeDir and inserts it into \p nodes. If no parent
* folder exists, it will be created recursively. * folder exists, it will be created recursively.
*/ */
ProjectExplorer::FolderNode* insertFolderNode(const QDir &nodeDir, ProjectExplorer::FolderNode *insertFolderNode(const QDir &nodeDir,
QHash<QString, ProjectExplorer::Node*> &nodes); QHash<QString, ProjectExplorer::Node *> &nodes);
/** /**
* @return All nodes (including sub-folder- and file-nodes) for the given parent folder. * @return All nodes (including sub-folder- and file-nodes) for the given parent folder.
*/ */
QList<ProjectExplorer::Node*> nodes(ProjectExplorer::FolderNode *parent) const; QList<ProjectExplorer::Node *> nodes(ProjectExplorer::FolderNode *parent) const;
/** /**
* This function is in charge of the code completion. * This function is in charge of the code completion.

4
src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp
View File

@@ -46,10 +46,6 @@ AutotoolsProjectFile::AutotoolsProjectFile(AutotoolsProject *project, const QStr
{ {
} }
AutotoolsProjectFile::~AutotoolsProjectFile()
{
}
bool AutotoolsProjectFile::save(QString *errorString, const QString &fileName, bool autoSave) bool AutotoolsProjectFile::save(QString *errorString, const QString &fileName, bool autoSave)
{ {
Q_UNUSED(errorString); Q_UNUSED(errorString);

1
src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h
View File

@@ -58,7 +58,6 @@ class AutotoolsProjectFile : public Core::IFile
public: public:
AutotoolsProjectFile(AutotoolsProject *project, const QString &fileName); AutotoolsProjectFile(AutotoolsProject *project, const QString &fileName);
~AutotoolsProjectFile();
bool save(QString *errorString, const QString &fileName, bool autoSave); bool save(QString *errorString, const QString &fileName, bool autoSave);
QString fileName() const; QString fileName() const;

4
src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
View File

@@ -45,10 +45,6 @@ AutotoolsProjectNode::AutotoolsProjectNode(AutotoolsProject *project, Core::IFil
{ {
} }
AutotoolsProjectNode::~AutotoolsProjectNode()
{
}
bool AutotoolsProjectNode::hasBuildTargets() const bool AutotoolsProjectNode::hasBuildTargets() const
{ {
return true; return true;

3
src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
View File

@@ -58,7 +58,6 @@ class AutotoolsProjectNode : public ProjectExplorer::ProjectNode
public: public:
AutotoolsProjectNode(AutotoolsProject *project, Core::IFile *projectFile); AutotoolsProjectNode(AutotoolsProject *project, Core::IFile *projectFile);
~AutotoolsProjectNode();
bool hasBuildTargets() const; bool hasBuildTargets() const;
QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions(Node *node) const; QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions(Node *node) const;
@@ -69,7 +68,7 @@ public:
const QStringList &filePaths, const QStringList &filePaths,
QStringList *notAdded = 0); QStringList *notAdded = 0);
bool removeFiles(const ProjectExplorer::FileType fileType, bool removeFiles(const ProjectExplorer::FileType fileType,
const QStringList& filePaths, const QStringList &filePaths,
QStringList *notRemoved = 0); QStringList *notRemoved = 0);
bool deleteFiles(const ProjectExplorer::FileType fileType, bool deleteFiles(const ProjectExplorer::FileType fileType,
const QStringList &filePaths); const QStringList &filePaths);

14
src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
View File

@@ -54,10 +54,6 @@ AutotoolsProjectPlugin::AutotoolsProjectPlugin()
{ {
} }
AutotoolsProjectPlugin::~AutotoolsProjectPlugin()
{
}
void AutotoolsProjectPlugin::extensionsInitialized() void AutotoolsProjectPlugin::extensionsInitialized()
{ {
} }
@@ -73,11 +69,11 @@ bool AutotoolsProjectPlugin::initialize(const QStringList &arguments,
addAutoReleasedObject(new AutotoolsTargetFactory); addAutoReleasedObject(new AutotoolsTargetFactory);
addAutoReleasedObject(new AutotoolsBuildConfigurationFactory); addAutoReleasedObject(new AutotoolsBuildConfigurationFactory);
addAutoReleasedObject(new MakeStepFactory()); addAutoReleasedObject(new MakeStepFactory);
addAutoReleasedObject(new AutogenStepFactory()); addAutoReleasedObject(new AutogenStepFactory);
addAutoReleasedObject(new ConfigureStepFactory()); addAutoReleasedObject(new ConfigureStepFactory);
addAutoReleasedObject(new AutoreconfStepFactory()); addAutoReleasedObject(new AutoreconfStepFactory);
addAutoReleasedObject(new AutotoolsManager()); addAutoReleasedObject(new AutotoolsManager);
return true; return true;
} }

1
src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
View File

@@ -72,7 +72,6 @@ class AutotoolsProjectPlugin : public ExtensionSystem::IPlugin
{ {
public: public:
AutotoolsProjectPlugin(); AutotoolsProjectPlugin();
~AutotoolsProjectPlugin();
void extensionsInitialized(); void extensionsInitialized();
bool initialize(const QStringList &arguments, QString *errorString); bool initialize(const QStringList &arguments, QString *errorString);

14
src/plugins/autotoolsprojectmanager/autotoolstarget.cpp
View File

@@ -53,15 +53,13 @@
using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager;
using namespace AutotoolsProjectManager::Internal; using namespace AutotoolsProjectManager::Internal;
namespace { static QString displayNameForId(const QString &id)
{
QString displayNameForId(const QString &id) {
if (id == QLatin1String(Constants::DEFAULT_AUTOTOOLS_TARGET_ID)) if (id == QLatin1String(Constants::DEFAULT_AUTOTOOLS_TARGET_ID))
return QApplication::translate("AutotoolsProjectManager::Internal::AutotoolsTarget", return QApplication::translate("AutotoolsProjectManager::Internal::AutotoolsTarget",
"Desktop", "Autotools Default target display name"); "Desktop", "Autotools Default target display name");
return QString(); return QString();
} }
}
////////////////////////// //////////////////////////
// AutotoolsTarget class // AutotoolsTarget class
@@ -75,10 +73,6 @@ AutotoolsTarget::AutotoolsTarget(AutotoolsProject *parent) :
setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon)); setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
} }
AutotoolsTarget::~AutotoolsTarget()
{
}
ProjectExplorer::BuildConfigWidget *AutotoolsTarget::createConfigWidget() ProjectExplorer::BuildConfigWidget *AutotoolsTarget::createConfigWidget()
{ {
return new AutotoolsBuildSettingsWidget(this); return new AutotoolsBuildSettingsWidget(this);
@@ -118,10 +112,6 @@ AutotoolsTargetFactory::AutotoolsTargetFactory(QObject *parent) :
{ {
} }
AutotoolsTargetFactory::~AutotoolsTargetFactory()
{
}
bool AutotoolsTargetFactory::supportsTargetId(const QString &id) const bool AutotoolsTargetFactory::supportsTargetId(const QString &id) const
{ {
return id == QLatin1String(Constants::DEFAULT_AUTOTOOLS_TARGET_ID); return id == QLatin1String(Constants::DEFAULT_AUTOTOOLS_TARGET_ID);

2
src/plugins/autotoolsprojectmanager/autotoolstarget.h
View File

@@ -57,7 +57,6 @@ class AutotoolsTarget : public ProjectExplorer::Target
public: public:
explicit AutotoolsTarget(AutotoolsProject *parent); explicit AutotoolsTarget(AutotoolsProject *parent);
~AutotoolsTarget();
ProjectExplorer::BuildConfigWidget *createConfigWidget(); ProjectExplorer::BuildConfigWidget *createConfigWidget();
AutotoolsProject *autotoolsProject() const; AutotoolsProject *autotoolsProject() const;
@@ -82,7 +81,6 @@ class AutotoolsTargetFactory : public ProjectExplorer::ITargetFactory
public: public:
explicit AutotoolsTargetFactory(QObject *parent = 0); explicit AutotoolsTargetFactory(QObject *parent = 0);
~AutotoolsTargetFactory();
bool supportsTargetId(const QString &id) const; bool supportsTargetId(const QString &id) const;

16
src/plugins/autotoolsprojectmanager/configurestep.cpp
View File

@@ -54,10 +54,8 @@ using namespace AutotoolsProjectManager;
using namespace AutotoolsProjectManager::Internal; using namespace AutotoolsProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace {
const char CONFIGURE_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.ConfigureStep.AdditionalArguments"; const char CONFIGURE_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.ConfigureStep.AdditionalArguments";
const char CONFIGURE_STEP_ID[] = "AutotoolsProjectManager.ConfigureStep"; const char CONFIGURE_STEP_ID[] = "AutotoolsProjectManager.ConfigureStep";
}
//////////////////////////////// ////////////////////////////////
// ConfigureStepFactory Class // ConfigureStepFactory Class
@@ -67,10 +65,6 @@ ConfigureStepFactory::ConfigureStepFactory(QObject *parent) :
{ {
} }
ConfigureStepFactory::~ConfigureStepFactory()
{
}
QStringList ConfigureStepFactory::availableCreationIds(BuildStepList *parent) const QStringList ConfigureStepFactory::availableCreationIds(BuildStepList *parent) const
{ {
if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID)) if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
@@ -160,10 +154,6 @@ void ConfigureStep::ctor()
setDefaultDisplayName(tr("Configure")); setDefaultDisplayName(tr("Configure"));
} }
ConfigureStep::~ConfigureStep()
{
}
AutotoolsBuildConfiguration *ConfigureStep::autotoolsBuildConfiguration() const AutotoolsBuildConfiguration *ConfigureStep::autotoolsBuildConfiguration() const
{ {
return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration()); return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration());
@@ -236,7 +226,7 @@ QString ConfigureStep::additionalArguments() const
QVariantMap ConfigureStep::toMap() const QVariantMap ConfigureStep::toMap() const
{ {
QVariantMap map(AbstractProcessStep::toMap()); QVariantMap map = AbstractProcessStep::toMap();
map.insert(QLatin1String(CONFIGURE_ADDITIONAL_ARGUMENTS_KEY), m_additionalArguments); map.insert(QLatin1String(CONFIGURE_ADDITIONAL_ARGUMENTS_KEY), m_additionalArguments);
return map; return map;
@@ -274,10 +264,6 @@ ConfigureStepConfigWidget::ConfigureStepConfigWidget(ConfigureStep *configureSte
this, SLOT(updateDetails())); this, SLOT(updateDetails()));
} }
ConfigureStepConfigWidget::~ConfigureStepConfigWidget()
{
}
QString ConfigureStepConfigWidget::displayName() const QString ConfigureStepConfigWidget::displayName() const
{ {
return tr("Configure", "AutotoolsProjectManager::ConfigureStepConfigWidget display name."); return tr("Configure", "AutotoolsProjectManager::ConfigureStepConfigWidget display name.");

5
src/plugins/autotoolsprojectmanager/configurestep.h
View File

@@ -62,7 +62,6 @@ class ConfigureStepFactory : public ProjectExplorer::IBuildStepFactory
public: public:
ConfigureStepFactory(QObject *parent = 0); ConfigureStepFactory(QObject *parent = 0);
~ConfigureStepFactory();
QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const; QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const QString &id) const; QString displayNameForId(const QString &id) const;
@@ -95,9 +94,7 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep
friend class ConfigureStepConfigWidget; friend class ConfigureStepConfigWidget;
public: public:
ConfigureStep(ProjectExplorer::BuildStepList *bsl); ConfigureStep(ProjectExplorer::BuildStepList *bsl);
~ConfigureStep();
AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const; AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const;
bool init(); bool init();
@@ -140,12 +137,10 @@ class ConfigureStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public: public:
ConfigureStepConfigWidget(ConfigureStep *configureStep); ConfigureStepConfigWidget(ConfigureStep *configureStep);
~ConfigureStepConfigWidget();
QString displayName() const; QString displayName() const;
QString summaryText() const; QString summaryText() const;
private slots: private slots:
void updateDetails(); void updateDetails();

4
src/plugins/autotoolsprojectmanager/makefileparser.cpp
View File

@@ -57,10 +57,6 @@ MakefileParser::MakefileParser(const QString &makefile) :
{ {
} }
MakefileParser::~MakefileParser()
{
}
bool MakefileParser::parse() bool MakefileParser::parse()
{ {
m_mutex.lock(); m_mutex.lock();

1
src/plugins/autotoolsprojectmanager/makefileparser.h
View File

@@ -64,7 +64,6 @@ public:
* makefile that should be parsed. * makefile that should be parsed.
*/ */
MakefileParser(const QString &makefile); MakefileParser(const QString &makefile);
~MakefileParser();
/** /**
* Parses the makefile. Must be invoked at least once, otherwise * Parses the makefile. Must be invoked at least once, otherwise

4
src/plugins/autotoolsprojectmanager/makefileparserthread.cpp
View File

@@ -51,10 +51,6 @@ MakefileParserThread::MakefileParserThread(const QString &makefile) :
connect(&m_parser, SIGNAL(status(QString)), this, SIGNAL(status(QString))); connect(&m_parser, SIGNAL(status(QString)), this, SIGNAL(status(QString)));
} }
MakefileParserThread::~MakefileParserThread()
{
}
QStringList MakefileParserThread::sources() const QStringList MakefileParserThread::sources() const
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);

1
src/plugins/autotoolsprojectmanager/makefileparserthread.h
View File

@@ -57,7 +57,6 @@ class MakefileParserThread : public QThread
public: public:
MakefileParserThread(const QString &makefile); MakefileParserThread(const QString &makefile);
~MakefileParserThread();
/** @see QThread::run() */ /** @see QThread::run() */
void run(); void run();

18
src/plugins/autotoolsprojectmanager/makestep.cpp
View File

@@ -53,12 +53,10 @@ using namespace AutotoolsProjectManager;
using namespace AutotoolsProjectManager::Internal; using namespace AutotoolsProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace {
const char MAKE_STEP_ID[] = "AutotoolsProjectManager.MakeStep"; const char MAKE_STEP_ID[] = "AutotoolsProjectManager.MakeStep";
const char CLEAN_KEY[] = "AutotoolsProjectManager.MakeStep.Clean"; const char CLEAN_KEY[] = "AutotoolsProjectManager.MakeStep.Clean";
const char BUILD_TARGETS_KEY[] = "AutotoolsProjectManager.MakeStep.BuildTargets"; const char BUILD_TARGETS_KEY[] = "AutotoolsProjectManager.MakeStep.BuildTargets";
const char MAKE_STEP_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.MakeStep.AdditionalArguments"; const char MAKE_STEP_ADDITIONAL_ARGUMENTS_KEY[] = "AutotoolsProjectManager.MakeStep.AdditionalArguments";
}
////////////////////////// //////////////////////////
// MakeStepFactory class // MakeStepFactory class
@@ -68,10 +66,6 @@ MakeStepFactory::MakeStepFactory(QObject *parent) :
{ {
} }
MakeStepFactory::~MakeStepFactory()
{
}
QStringList MakeStepFactory::availableCreationIds(BuildStepList *parent) const QStringList MakeStepFactory::availableCreationIds(BuildStepList *parent) const
{ {
if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID)) if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
@@ -164,10 +158,6 @@ void MakeStep::ctor()
setDefaultDisplayName(tr("Make")); setDefaultDisplayName(tr("Make"));
} }
MakeStep::~MakeStep()
{
}
AutotoolsBuildConfiguration *MakeStep::autotoolsBuildConfiguration() const AutotoolsBuildConfiguration *MakeStep::autotoolsBuildConfiguration() const
{ {
return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration()); return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration());
@@ -208,7 +198,7 @@ void MakeStep::run(QFutureInterface<bool> &interface)
AbstractProcessStep::run(interface); AbstractProcessStep::run(interface);
} }
ProjectExplorer::BuildStepConfigWidget* MakeStep::createConfigWidget() ProjectExplorer::BuildStepConfigWidget *MakeStep::createConfigWidget()
{ {
return new MakeStepConfigWidget(this); return new MakeStepConfigWidget(this);
} }
@@ -246,7 +236,7 @@ QString MakeStep::additionalArguments() const
QVariantMap MakeStep::toMap() const QVariantMap MakeStep::toMap() const
{ {
QVariantMap map(AbstractProcessStep::toMap()); QVariantMap map = AbstractProcessStep::toMap();
map.insert(QLatin1String(BUILD_TARGETS_KEY), m_buildTargets); map.insert(QLatin1String(BUILD_TARGETS_KEY), m_buildTargets);
map.insert(QLatin1String(MAKE_STEP_ADDITIONAL_ARGUMENTS_KEY), m_additionalArguments); map.insert(QLatin1String(MAKE_STEP_ADDITIONAL_ARGUMENTS_KEY), m_additionalArguments);
@@ -288,10 +278,6 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) :
this, SLOT(updateDetails())); this, SLOT(updateDetails()));
} }
MakeStepConfigWidget::~MakeStepConfigWidget()
{
}
QString MakeStepConfigWidget::displayName() const QString MakeStepConfigWidget::displayName() const
{ {
return tr("Make", "AutotoolsProjectManager::MakeStepConfigWidget display name."); return tr("Make", "AutotoolsProjectManager::MakeStepConfigWidget display name.");

4
src/plugins/autotoolsprojectmanager/makestep.h
View File

@@ -62,7 +62,6 @@ class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
public: public:
MakeStepFactory(QObject *parent = 0); MakeStepFactory(QObject *parent = 0);
~MakeStepFactory();
QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const; QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
QString displayNameForId(const QString &id) const; QString displayNameForId(const QString &id) const;
@@ -95,9 +94,7 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep
friend class MakeStepConfigWidget; friend class MakeStepConfigWidget;
public: public:
MakeStep(ProjectExplorer::BuildStepList *bsl); MakeStep(ProjectExplorer::BuildStepList *bsl);
~MakeStep();
AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const; AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const;
bool init(); bool init();
@@ -143,7 +140,6 @@ class MakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public: public:
MakeStepConfigWidget(MakeStep *makeStep); MakeStepConfigWidget(MakeStep *makeStep);
~MakeStepConfigWidget();
QString displayName() const; QString displayName() const;
QString summaryText() const; QString summaryText() const;