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

VcsBase: Convert VcsBaseSubmitEditor to Qt5 style connects

Browse Source 
Change-Id: I18919e963e1bb477dd81088344d1b86001a0e8e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-02-16 14:44:29 +01:00
parent fc2c615c6a
commit 75a823a7d2
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -203,8 +203,10 @@ VcsBaseSubmitEditor::VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *pa
d->m_file->setModified(false); d->m_file->setModified(false);
// We are always clean to prevent the editor manager from asking to save. // We are always clean to prevent the editor manager from asking to save.
connect(d->m_widget, SIGNAL(diffSelected(QList<int>)), this, SLOT(slotDiffSelectedVcsFiles(QList<int>))); connect(d->m_widget, &SubmitEditorWidget::diffSelected,
connect(descriptionEdit, SIGNAL(textChanged()), this, SLOT(slotDescriptionChanged())); this, &VcsBaseSubmitEditor::slotDiffSelectedVcsFiles);
connect(descriptionEdit, &QTextEdit::textChanged,
this, &VcsBaseSubmitEditor::slotDescriptionChanged);
const CommonVcsSettings settings = VcsPlugin::instance()->settings(); const CommonVcsSettings settings = VcsPlugin::instance()->settings();
// Add additional context menu settings // Add additional context menu settings
@@ -215,13 +217,14 @@ VcsBaseSubmitEditor::VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *pa
// Run check action // Run check action
if (!settings.submitMessageCheckScript.isEmpty()) { if (!settings.submitMessageCheckScript.isEmpty()) {
auto checkAction = new QAction(tr("Check Message"), this); auto checkAction = new QAction(tr("Check Message"), this);
connect(checkAction, SIGNAL(triggered()), this, SLOT(slotCheckSubmitMessage())); connect(checkAction, &QAction::triggered,
this, &VcsBaseSubmitEditor::slotCheckSubmitMessage);
d->m_widget->addDescriptionEditContextMenuAction(checkAction); d->m_widget->addDescriptionEditContextMenuAction(checkAction);
} }
// Insert nick // Insert nick
if (!settings.nickNameMailMap.isEmpty()) { if (!settings.nickNameMailMap.isEmpty()) {
auto insertAction = new QAction(tr("Insert Name..."), this); auto insertAction = new QAction(tr("Insert Name..."), this);
connect(insertAction, SIGNAL(triggered()), this, SLOT(slotInsertNickName())); connect(insertAction, &QAction::triggered, this, &VcsBaseSubmitEditor::slotInsertNickName);
d->m_widget->addDescriptionEditContextMenuAction(insertAction); d->m_widget->addDescriptionEditContextMenuAction(insertAction);
} }
} }
@@ -231,14 +234,19 @@ VcsBaseSubmitEditor::VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *pa
// wrapping. etc // wrapping. etc
slotUpdateEditorSettings(settings); slotUpdateEditorSettings(settings);
connect(VcsPlugin::instance(), connect(VcsPlugin::instance(), &VcsPlugin::settingsChanged,
SIGNAL(settingsChanged(VcsBase::Internal::CommonVcsSettings)), this, &VcsBaseSubmitEditor::slotUpdateEditorSettings);
this, SLOT(slotUpdateEditorSettings(VcsBase::Internal::CommonVcsSettings)));
// Commit data refresh might lead to closing the editor, so use a queued connection // Commit data refresh might lead to closing the editor, so use a queued connection
connect(Core::EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)), connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged,
this, SLOT(slotRefreshCommitData()), Qt::QueuedConnection); this, [this]() {
connect(Core::ICore::mainWindow(), SIGNAL(windowActivated()), if (Core::EditorManager::currentEditor() == this)
this, SLOT(slotRefreshCommitData()), Qt::QueuedConnection); updateFileModel();
}, Qt::QueuedConnection);
connect(qApp, &QApplication::applicationStateChanged,
this, [this](Qt::ApplicationState state) {
if (state == Qt::ApplicationActive)
updateFileModel();
}, Qt::QueuedConnection);
auto aggregate = new Aggregation::Aggregate; auto aggregate = new Aggregation::Aggregate;
aggregate->add(new Core::BaseTextFind(descriptionEdit)); aggregate->add(new Core::BaseTextFind(descriptionEdit));
@@ -258,12 +266,6 @@ void VcsBaseSubmitEditor::slotUpdateEditorSettings(const CommonVcsSettings &s)
setLineWrap(s.lineWrap); setLineWrap(s.lineWrap);
} }
void VcsBaseSubmitEditor::slotRefreshCommitData()
{
if (Core::EditorManager::currentEditor() == this)
updateFileModel();
}
// Return a trimmed list of non-empty field texts // Return a trimmed list of non-empty field texts
static inline QStringList fieldTexts(const QString &fileContents) static inline QStringList fieldTexts(const QString &fileContents)
{ {
@@ -291,8 +293,8 @@ void VcsBaseSubmitEditor::createUserFields(const QString &fieldConfigFile)
auto completer = new QCompleter(NickNameDialog::nickNameList(nickNameModel), this); auto completer = new QCompleter(NickNameDialog::nickNameList(nickNameModel), this);
auto fieldWidget = new SubmitFieldWidget; auto fieldWidget = new SubmitFieldWidget;
connect(fieldWidget, SIGNAL(browseButtonClicked(int,QString)), connect(fieldWidget, &SubmitFieldWidget::browseButtonClicked,
this, SLOT(slotSetFieldNickName(int))); this, &VcsBaseSubmitEditor::slotSetFieldNickName);
fieldWidget->setCompleter(completer); fieldWidget->setCompleter(completer);
fieldWidget->setAllowDuplicateFields(true); fieldWidget->setAllowDuplicateFields(true);
fieldWidget->setHasBrowseButton(true); fieldWidget->setHasBrowseButton(true);

1
src/plugins/vcsbase/vcsbasesubmiteditor.h
View File

@@ -147,7 +147,6 @@ private slots:
void slotInsertNickName(); void slotInsertNickName();
void slotSetFieldNickName(int); void slotSetFieldNickName(int);
void slotUpdateEditorSettings(const VcsBase::Internal::CommonVcsSettings &); void slotUpdateEditorSettings(const VcsBase::Internal::CommonVcsSettings &);
void slotRefreshCommitData();
protected: protected:
/* These hooks allow for modifying the contents that goes to /* These hooks allow for modifying the contents that goes to