Commit ce62c4bf authored by Daniel Teske's avatar Daniel Teske
Browse files

CMakeProjectManager: Remove outdated todos



Most of them are done, or are not really todos but just notes on
the code.

Change-Id: Idc4836844ee7bc1444e1251f97118bd9103a6019
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 3d915007
......@@ -30,15 +30,6 @@
**
**************************************************************************/
/// TODO
/// To check
/// a) with an old cmake
/// => should not show combobox always use mingw generator
/// b) with an new cmake
/// always show combo box, defaulting if there's already a existing build
#include "cmakeopenprojectwizard.h"
#include "cmakeprojectmanager.h"
......@@ -419,7 +410,7 @@ void CMakeRunPage::initializePage()
}
// Build the list of generators/toolchains we want to offer
// todo restrict toolchains based on CMAKE_CXX_COMPILER ?
// restrict toolchains based on CMAKE_CXX_COMPILER ?
Q_UNUSED(cmakeCxxCompiler);
m_generatorComboBox->clear();
bool hasCodeBlocksGenerator = m_cmakeWizard->cmakeManager()->hasCodeBlocksMsvcGenerator();
......@@ -554,7 +545,6 @@ void CMakeRunPage::cmakeFinished()
m_cmakeProcess->deleteLater();
m_cmakeProcess = 0;
m_cmakeWizard->setArguments(m_argumentsLineEdit->text());
//TODO Actually test that running cmake was finished, for setting this bool
emit completeChanged();
}
......
......@@ -816,7 +816,6 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeTarget *target)
fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
setLayout(fl);
// TODO add action to Build menu?
QPushButton *runCmakeButton = new QPushButton(tr("Run cmake"));
connect(runCmakeButton, SIGNAL(clicked()),
this, SLOT(runCMake()));
......
......@@ -164,7 +164,7 @@ bool CMakeManager::hasCodeBlocksMsvcGenerator() const
return m_settingsPage->hasCodeBlocksMsvcGenerator();
}
// TODO need to refactor this out
// need to refactor this out
// we probably want the process instead of this function
// cmakeproject then could even run the cmake process in the background, adding the files afterwards
// sounds like a plan
......@@ -178,8 +178,6 @@ void CMakeManager::createXmlFile(Utils::QtcProcess *proc, const QString &argumen
// All of that is not really nice.
// The mid term plan is to move away from the CodeBlocks Generator and use our own
// QtCreator generator, which actually can be very similar to the CodeBlock Generator
// TODO we need to pass on the same paremeters as the cmakestep
QString buildDirectoryPath = buildDirectory.absolutePath();
buildDirectory.mkpath(buildDirectoryPath);
proc->setWorkingDirectory(buildDirectoryPath);
......@@ -198,7 +196,7 @@ void CMakeManager::createXmlFile(Utils::QtcProcess *proc, const QString &argumen
QString CMakeManager::findCbpFile(const QDir &directory)
{
// Find the cbp file
// TODO the cbp file is named like the project() command in the CMakeList.txt file
// the cbp file is named like the project() command in the CMakeList.txt file
// so this method below could find the wrong cbp file, if the user changes the project()
// 2name
QDateTime t;
......
......@@ -63,8 +63,6 @@ const char * const BUILD_TARGETS_KEY("CMakeProjectManager.MakeStep.BuildTargets"
const char * const ADDITIONAL_ARGUMENTS_KEY("CMakeProjectManager.MakeStep.AdditionalArguments");
}
// TODO: Move progress information into an IOutputParser!
MakeStep::MakeStep(BuildStepList *bsl) :
AbstractProcessStep(bsl, Core::Id(MS_ID)), m_clean(false),
m_futureInterface(0)
......@@ -248,7 +246,6 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
fl->addRow(tr("Targets:"), m_buildTargetsList);
// TODO update this list also on rescans of the CMakeLists.txt
// TODO shouldn't be accessing project
CMakeProject *pro = static_cast<CMakeProject *>(m_makeStep->target()->project());
foreach (const QString& buildTarget, pro->buildTargetTitles()) {
QListWidgetItem *item = new QListWidgetItem(buildTarget, m_buildTargetsList);
......@@ -305,7 +302,7 @@ void MakeStepConfigWidget::updateDetails()
bc = static_cast<CMakeBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
ProjectExplorer::ToolChain *tc = bc->toolChain();
if (tc) {
QString arguments = Utils::QtcProcess::joinArgs(m_makeStep->m_buildTargets);
QString arguments = Utils::QtcProcess::joinArgs(m_makeStep->buildTargets());
Utils::QtcProcess::addArgs(&arguments, m_makeStep->additionalArguments());
ProcessParameters param;
......
......@@ -51,8 +51,6 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep
{
Q_OBJECT
friend class MakeStepFactory;
friend class MakeStepConfigWidget; // TODO remove
// This is for modifying internal data
public:
MakeStep(ProjectExplorer::BuildStepList *bsl);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment