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

TextEditor: Use Qt5-style connects

Browse Source 
The heavy lifting was done by clazy.

Change-Id: I380120e3419d2a3c0e272f51cc3e0d5f6aaa5e9b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-12-13 01:18:33 +02:00
committed by Orgad Shaneh
parent b6131e1b1d
commit 9d3b2f0998
53 changed files with 314 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/texteditor/snippets/snippetscollection.cpp
View File

@@ -101,7 +101,8 @@ SnippetsCollection::SnippetsCollection() :
foreach (const QFileInfo &fi, dir.entryInfoList())
m_builtInSnippetsFiles.append(fi.absoluteFilePath());
connect(Core::ICore::instance(), SIGNAL(coreOpened()), this, SLOT(identifyGroups()));
connect(Core::ICore::instance(), &Core::ICore::coreOpened,
this, &SnippetsCollection::identifyGroups);
}
SnippetsCollection::~SnippetsCollection()

3
src/plugins/texteditor/snippets/snippetscollection.h
View File

@@ -97,10 +97,9 @@ public:
void reload();
bool synchronize(QString *errorString);
private slots:
private:
void identifyGroups();
private:
SnippetsCollection();
int groupIndex(const QString &groupId) const;

63
src/plugins/texteditor/snippets/snippetssettingspage.cpp
View File

@@ -281,7 +281,7 @@ public:
QPointer<QWidget> m_widget;
private slots:
private:
void loadSnippetGroup(int index);
void markSnippetsCollection();
void addSnippet();
@@ -295,7 +295,6 @@ private slots:
void updateCurrentSnippetDependent(const QModelIndex &modelIndex = QModelIndex());
void decorateEditors(const TextEditor::FontSettings &fontSettings);
private:
SnippetEditorWidget *currentEditor() const;
SnippetEditorWidget *editorAt(int i) const;
@@ -341,7 +340,8 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w)
SnippetEditorWidget *snippetEditor = new SnippetEditorWidget(w);
provider->decorateEditor(snippetEditor);
m_ui.snippetsEditorStack->insertWidget(m_ui.groupCombo->count() - 1, snippetEditor);
connect(snippetEditor, SIGNAL(snippetContentChanged()), this, SLOT(setSnippetContent()));
connect(snippetEditor, &SnippetEditorWidget::snippetContentChanged,
this, &SnippetsSettingsPagePrivate::setSnippetContent);
}
m_ui.snippetsTable->setModel(m_model);
@@ -352,33 +352,40 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w)
loadSettings();
loadSnippetGroup(m_ui.groupCombo->currentIndex());
connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(selectSnippet(QModelIndex,int)));
connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(markSnippetsCollection()));
connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SLOT(markSnippetsCollection()));
connect(m_model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
this, SLOT(selectMovedSnippet(QModelIndex,int,int,QModelIndex,int)));
connect(m_model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
this, SLOT(markSnippetsCollection()));
connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
this, SLOT(markSnippetsCollection()));
connect(m_model, SIGNAL(modelReset()), this, SLOT(updateCurrentSnippetDependent()));
connect(m_model, SIGNAL(modelReset()), this, SLOT(markSnippetsCollection()));
connect(m_model, &QAbstractItemModel::rowsInserted,
this, &SnippetsSettingsPagePrivate::selectSnippet);
connect(m_model, &QAbstractItemModel::rowsInserted,
this, &SnippetsSettingsPagePrivate::markSnippetsCollection);
connect(m_model, &QAbstractItemModel::rowsRemoved,
this, &SnippetsSettingsPagePrivate::markSnippetsCollection);
connect(m_model, &QAbstractItemModel::rowsMoved,
this, &SnippetsSettingsPagePrivate::selectMovedSnippet);
connect(m_model, &QAbstractItemModel::rowsMoved,
this, &SnippetsSettingsPagePrivate::markSnippetsCollection);
connect(m_model, &QAbstractItemModel::dataChanged,
this, &SnippetsSettingsPagePrivate::markSnippetsCollection);
connect(m_model, &QAbstractItemModel::modelReset,
this, [this] { this->updateCurrentSnippetDependent(); });
connect(m_model, &QAbstractItemModel::modelReset,
this, &SnippetsSettingsPagePrivate::markSnippetsCollection);
connect(m_ui.groupCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(loadSnippetGroup(int)));
connect(m_ui.addButton, SIGNAL(clicked()), this, SLOT(addSnippet()));
connect(m_ui.removeButton, SIGNAL(clicked()), this, SLOT(removeSnippet()));
connect(m_ui.resetAllButton, SIGNAL(clicked()), this, SLOT(resetAllSnippets()));
connect(m_ui.restoreRemovedButton, SIGNAL(clicked()),
this, SLOT(restoreRemovedBuiltInSnippets()));
connect(m_ui.revertButton, SIGNAL(clicked()), this, SLOT(revertBuiltInSnippet()));
connect(m_ui.snippetsTable->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
this, SLOT(updateCurrentSnippetDependent(QModelIndex)));
connect(m_ui.groupCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, &SnippetsSettingsPagePrivate::loadSnippetGroup);
connect(m_ui.addButton, &QAbstractButton::clicked,
this, &SnippetsSettingsPagePrivate::addSnippet);
connect(m_ui.removeButton, &QAbstractButton::clicked,
this, &SnippetsSettingsPagePrivate::removeSnippet);
connect(m_ui.resetAllButton, &QAbstractButton::clicked,
this, &SnippetsSettingsPagePrivate::resetAllSnippets);
connect(m_ui.restoreRemovedButton, &QAbstractButton::clicked,
this, &SnippetsSettingsPagePrivate::restoreRemovedBuiltInSnippets);
connect(m_ui.revertButton, &QAbstractButton::clicked,
this, &SnippetsSettingsPagePrivate::revertBuiltInSnippet);
connect(m_ui.snippetsTable->selectionModel(), &QItemSelectionModel::currentChanged,
this, &SnippetsSettingsPagePrivate::updateCurrentSnippetDependent);
connect(TextEditorSettings::instance(), SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
this, SLOT(decorateEditors(TextEditor::FontSettings)));
connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged,
this, &SnippetsSettingsPagePrivate::decorateEditors);
}
void SnippetsSettingsPagePrivate::apply()