← Back to branch summary

~ubuntu-branches/debian/sid/kdevelop/sid

« back to all changes in this revision

Viewing changes to languages/plugins/custom-definesandincludes/kcm_widget/compilerswidget.cpp

  • Committer: Package Import Robot
  • Author(s): Lisandro Damián Nicanor Pérez Meyer, Pino Toscano, Sune Vuorela, Lisandro Damián Nicanor Pérez Meyer
  • Date: 2015-09-02 21:10:24 UTC
  • mfrom: (1.3.24)
  • Revision ID: package-import@ubuntu.com-20150902211024-ntruxcyb574f3xuk
Tags: 4:4.7.1-1
* Team upload.

[ Pino Toscano ]
* Change section of kdevelop-dev to libdevel.
* Add ${misc:Depends} in kdevelop-dbg and kdevelop-l10n.

[ Sune Vuorela ]
* Make KDevelop recommend kapptemplate to have more meaningful project
  templates available.

[ Lisandro Damián Nicanor Pérez Meyer ]
* New upstream release.
  - Bump kdevplatform-dev build dependency to 1.7.1.
* Remove kde-workspace from build dependencies. We no longer provide
  a KDE 4 based workspace.
  - Add libsoprano-dev as a build dependency, it was probably previously
    pulled in by kde-workspace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
languages/plugins/custom-definesandincludes/kcm_widget/compilerswidget.cpp
30
30
#include "ui_compilerswidget.h"
31
31
#include "compilersmodel.h"
32
32
#include "debugarea.h"
33
 
 
34
 
#include <interfaces/icore.h>
35
 
#include <interfaces/iplugincontroller.h>
36
 
 
37
 
#include "../compilerprovider/icompilerprovider.h"
38
 
 
39
 
namespace
40
 
{
41
 
ICompilerProvider* compilerProvider()
42
 
{
43
 
    auto compilerProvider = KDevelop::ICore::self()->pluginController()->pluginForExtension("org.kdevelop.ICompilerProvider");
44
 
    if (!compilerProvider || !compilerProvider->extension<ICompilerProvider>()) {
45
 
        return {};
46
 
    }
47
 
 
48
 
    return compilerProvider->extension<ICompilerProvider>();
49
 
}
50
 
}
 
33
#include "../compilerprovider/settingsmanager.h"
 
34
#include "../compilerprovider/compilerprovider.h"
 
35
 
 
36
using namespace KDevelop;
51
37
 
52
38
CompilersWidget::CompilersWidget(QWidget* parent)
53
39
    : QDialog(parent), m_ui(new Ui::CompilersWidget)
63
49
 
64
50
    m_addMenu->clear();
65
51
 
66
 
    if (auto cp = compilerProvider()) {
67
 
        foreach (const auto& factory, cp->compilerFactories()) {
68
 
            QAction* action = new QAction(m_addMenu);
69
 
            action->setText(factory->name());
70
 
            connect(action, SIGNAL(triggered()), m_mapper, SLOT(map()));
71
 
            m_mapper->setMapping(action, factory->name());
72
 
            m_addMenu->addAction(action);
73
 
        }
74
 
        m_ui->addButton->setMenu(m_addMenu);
 
52
    auto settings = SettingsManager::globalInstance();
 
53
    auto provider = settings->provider();
 
54
    foreach (const auto& factory, provider->compilerFactories()) {
 
55
        QAction* action = new QAction(m_addMenu);
 
56
        action->setText(factory->name());
 
57
        connect(action, SIGNAL(triggered()), m_mapper, SLOT(map()));
 
58
        m_mapper->setMapping(action, factory->name());
 
59
        m_addMenu->addAction(action);
75
60
    }
 
61
    m_ui->addButton->setMenu(m_addMenu);
76
62
 
77
63
    connect(m_ui->removeButton, SIGNAL(clicked()), SLOT(deleteCompiler()));
78
64
 
104
90
 
105
91
void CompilersWidget::addCompiler(const QString& factoryName)
106
92
{
107
 
   foreach (const auto& factory, compilerProvider()->compilerFactories()) {
 
93
    auto settings = SettingsManager::globalInstance();
 
94
    auto provider = settings->provider();
 
95
    foreach (const auto& factory, provider->compilerFactories()) {
108
96
        if (factoryName == factory->name()) {
109
97
            //add compiler without any information, the user will fill the data in later
110
98
            m_compilersModel->addCompiler(factory->createCompiler(QString(), QString()));