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

QmakePM: De-slot

Browse Source 
Change-Id: Ib782dc0436cbefc4792f5221f5512c462436e312
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-03-18 23:56:13 +02:00
committed by Orgad Shaneh
parent 23fdc4bddc
commit 0170e10af1
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
View File

@@ -32,6 +32,12 @@
namespace QmakeProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
// Determine name for Q_EXPORT_PLUGIN
static inline QString createPluginName(const QString &prefix)
{
return prefix.toLower() + QLatin1String("plugin");
}
CustomWidgetPluginWizardPage::CustomWidgetPluginWizardPage(QWidget *parent) : CustomWidgetPluginWizardPage::CustomWidgetPluginWizardPage(QWidget *parent) :
QWizardPage(parent), QWizardPage(parent),
m_ui(new Ui::CustomWidgetPluginWizardPage), m_ui(new Ui::CustomWidgetPluginWizardPage),
@@ -39,8 +45,19 @@ CustomWidgetPluginWizardPage::CustomWidgetPluginWizardPage(QWidget *parent) :
m_complete(false) m_complete(false)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
connect(m_ui->collectionClassEdit, &QLineEdit::textEdited, this, &CustomWidgetPluginWizardPage::slotCheckCompleteness); connect(m_ui->collectionClassEdit, &QLineEdit::textEdited,
connect(m_ui->pluginNameEdit, &QLineEdit::textEdited, this, &CustomWidgetPluginWizardPage::slotCheckCompleteness); this, &CustomWidgetPluginWizardPage::slotCheckCompleteness);
connect(m_ui->collectionClassEdit, &QLineEdit::textChanged,
this, [this](const QString &collectionClass) {
m_ui->collectionHeaderEdit->setText(m_fileNamingParameters.headerFileName(collectionClass));
m_ui->pluginNameEdit->setText(createPluginName(collectionClass));
});
connect(m_ui->pluginNameEdit, &QLineEdit::textEdited,
this, &CustomWidgetPluginWizardPage::slotCheckCompleteness);
connect(m_ui->collectionHeaderEdit, &QLineEdit::textChanged,
this, [this](const QString &text) {
m_ui->collectionSourceEdit->setText(m_fileNamingParameters.headerToSourceFileName(text));
});
setProperty(Utils::SHORT_TITLE_PROPERTY, tr("Plugin Details")); setProperty(Utils::SHORT_TITLE_PROPERTY, tr("Plugin Details"));
} }
@@ -60,12 +77,6 @@ QString CustomWidgetPluginWizardPage::pluginName() const
return m_ui->pluginNameEdit->text(); return m_ui->pluginNameEdit->text();
} }
// Determine name for Q_EXPORT_PLUGIN
static inline QString createPluginName(const QString &prefix)
{
return prefix.toLower() + QLatin1String("plugin");
}
void CustomWidgetPluginWizardPage::init(const CustomWidgetWidgetsWizardPage *widgetsPage) void CustomWidgetPluginWizardPage::init(const CustomWidgetWidgetsWizardPage *widgetsPage)
{ {
m_classCount = widgetsPage->classCount(); m_classCount = widgetsPage->classCount();
@@ -94,18 +105,6 @@ void CustomWidgetPluginWizardPage::setCollectionEnabled(bool enColl)
m_ui->collectionSourceEdit->setEnabled(enColl); m_ui->collectionSourceEdit->setEnabled(enColl);
} }
void CustomWidgetPluginWizardPage::on_collectionClassEdit_textChanged()
{
const QString collectionClass = collectionClassName();
m_ui->collectionHeaderEdit->setText(m_fileNamingParameters.headerFileName(collectionClass));
m_ui->pluginNameEdit->setText(createPluginName(collectionClass));
}
void CustomWidgetPluginWizardPage::on_collectionHeaderEdit_textChanged()
{
m_ui->collectionSourceEdit->setText(m_fileNamingParameters.headerToSourceFileName(m_ui->collectionHeaderEdit->text()));
}
QSharedPointer<PluginOptions> CustomWidgetPluginWizardPage::basicPluginOptions() const QSharedPointer<PluginOptions> CustomWidgetPluginWizardPage::basicPluginOptions() const
{ {
QSharedPointer<PluginOptions> po(new PluginOptions); QSharedPointer<PluginOptions> po(new PluginOptions);

6
src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h
View File

@@ -56,12 +56,8 @@ public:
// Fills the plugin fields, excluding widget list. // Fills the plugin fields, excluding widget list.
QSharedPointer<PluginOptions> basicPluginOptions() const; QSharedPointer<PluginOptions> basicPluginOptions() const;
private slots:
void on_collectionClassEdit_textChanged();
void on_collectionHeaderEdit_textChanged();
void slotCheckCompleteness();
private: private:
void slotCheckCompleteness();
inline QString collectionClassName() const; inline QString collectionClassName() const;
inline QString pluginName() const; inline QString pluginName() const;
void setCollectionEnabled(bool enColl); void setCollectionEnabled(bool enColl);