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

PathChooser: Use a std::function as callback

Browse Source 
... instead of a SLOT(...)

Change-Id: I32ed3ea014d1efde54bac2d5153f3083e37ef7ec
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
hjk
2015-04-30 15:22:57 +02:00
parent 9ff6cfdde4
commit 5b7e8f42c1
6 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -278,7 +278,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
}
m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File);
m_ui->licenseTemplatePathChooser->setHistoryCompleter(QLatin1String("Cpp.LicenseTemplate.History"));
m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit()));
m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, [this] { slotEdit(); });
}
CppFileSettingsWidget::~CppFileSettingsWidget()

8
src/plugins/cpptools/cppfilesettingspage.h
View File

@@ -83,12 +83,10 @@ public:
CppFileSettings settings() const;
void setSettings(const CppFileSettings &s);
private slots:
void slotEdit();
private:
inline QString licenseTemplatePath() const;
inline void setLicenseTemplatePath(const QString &);
void slotEdit();
QString licenseTemplatePath() const;
void setLicenseTemplatePath(const QString &);
Ui::CppFileSettingsPage *m_ui;
};