Differential D386 Diff 936 projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp

Changeset View

Standalone View

View Options

projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp

Context not available.
27 27​
28#include "ui_cmakebuildersettings.h" 28​#include "ui_cmakebuildersettings.h"
29#include "cmakebuilderconfig.h" 29​#include "cmakebuilderconfig.h"
30​#include "cmakeutils.h"
30 31​
31CMakeBuilderPreferences::CMakeBuilderPreferences(KDevelop::IPlugin* plugin, QWidget* parent) 32​CMakeBuilderPreferences::CMakeBuilderPreferences(KDevelop::IPlugin* plugin, QWidget* parent)
32 : KDevelop::ConfigPage(plugin, CMakeBuilderSettings::self(), parent) 33​ : KDevelop::ConfigPage(plugin, CMakeBuilderSettings::self(), parent)
Context not available.
40 // Visual Studio solution is the standard generator under windows, but we dont want to use 41​ // Visual Studio solution is the standard generator under windows, but we dont want to use
41 // the VS IDE, so we need nmake makefiles 42​ // the VS IDE, so we need nmake makefiles
42 m_prefsUi->generator->addItem("NMake Makefiles"); 43​ m_prefsUi->generator->addItem("NMake Makefiles");
44​ static_cast<KConfigSkeleton::ItemString *>(CMakeBuilderSettings::self()->findItem("generator"))->setDefaultValue("NMake Makefiles");
45​
46​ m_prefsUi->cmakeExe->setFilter("*.exe");
43#else 47​#else
44 m_prefsUi->generator->addItem("Unix Makefiles"); 48​ m_prefsUi->generator->addItem("Unix Makefiles");
45#endif 49​#endif
Context not available.
47 if(hasNinja) 51​ if(hasNinja)
48 m_prefsUi->generator->addItem("Ninja"); 52​ m_prefsUi->generator->addItem("Ninja");
49 53​
54​ connect(m_prefsUi->cmakeExe, &KUrlRequester::textChanged, this, &CMakeBuilderPreferences::cmakeExeChanged);
mwolffUnsubmitted
Not Done

I suggest using a lambda here

mwolff: I suggest using a lambda here
50 connect(m_prefsUi->generator, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged), this, &CMakeBuilderPreferences::generatorChanged); 55​ connect(m_prefsUi->generator, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged), this, &CMakeBuilderPreferences::generatorChanged);
51} 56​}
52 57​
Context not available.
57 62​
58void CMakeBuilderPreferences::defaults() 63​void CMakeBuilderPreferences::defaults()
59{ 64​{
65​ m_prefsUi->cmakeExe->setText(CMake::findExecutable());
60 m_prefsUi->generator->setCurrentIndex(0); 66​ m_prefsUi->generator->setCurrentIndex(0);
61 KDevelop::ConfigPage::defaults(); 67​ KDevelop::ConfigPage::defaults();
62} 68​}
63 69​
64void CMakeBuilderPreferences::apply() 70​void CMakeBuilderPreferences::apply()
65{ 71​{
72​ CMakeBuilderSettings::setCmakeExe(m_prefsUi->cmakeExe->text());
66 CMakeBuilderSettings::setGenerator(m_prefsUi->generator->currentText()); 73​ CMakeBuilderSettings::setGenerator(m_prefsUi->generator->currentText());
67 KDevelop::ConfigPage::apply(); 74​ KDevelop::ConfigPage::apply();
68 CMakeBuilderSettings::self()->save(); 75​ CMakeBuilderSettings::self()->save();
Context not available.
70 77​
71void CMakeBuilderPreferences::reset() 78​void CMakeBuilderPreferences::reset()
72{ 79​{
80​ m_prefsUi->cmakeExe->setText(CMakeBuilderSettings::self()->cmakeExe());
73 int idx = m_prefsUi->generator->findText(CMakeBuilderSettings::self()->generator()); 81​ int idx = m_prefsUi->generator->findText(CMakeBuilderSettings::self()->generator());
74 m_prefsUi->generator->setCurrentIndex(idx); 82​ m_prefsUi->generator->setCurrentIndex(idx);
75 KDevelop::ConfigPage::reset(); 83​ KDevelop::ConfigPage::reset();
76} 84​}
77 85​
86​void CMakeBuilderPreferences::cmakeExeChanged(const QString& exe)
87​{
88​ if (CMakeBuilderSettings::self()->cmakeExe() != exe) {
89​ emit changed();
90​ }
91​}
92​
78void CMakeBuilderPreferences::generatorChanged(const QString& generator) 93​void CMakeBuilderPreferences::generatorChanged(const QString& generator)
79{ 94​{
80 if (CMakeBuilderSettings::self()->generator() != generator) { 95​ if (CMakeBuilderSettings::self()->generator() != generator) {
Context not available.