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

DiffEditor: Convert more connects to Qt5 style

Browse Source 
This helps me a lot in understanding where the signals go:-)

Change-Id: Id6ed6fccc4ca6852887b7e140deeea60252fe062
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-30 10:56:10 +01:00
parent 828ea4916c
commit 83e8a6cb27
1 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/plugins/diffeditor/unifieddiffeditorwidget.cpp
View File

@@ -95,15 +95,14 @@ UnifiedDiffEditorWidget::UnifiedDiffEditorWidget(QWidget *parent)
setDisplaySettings(TextEditorSettings::displaySettings()); setDisplaySettings(TextEditorSettings::displaySettings());
setCodeStyle(TextEditorSettings::codeStyle()); setCodeStyle(TextEditorSettings::codeStyle());
connect(TextEditorSettings::instance(), connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged,
SIGNAL(fontSettingsChanged(TextEditor::FontSettings)), this, &UnifiedDiffEditorWidget::setFontSettings);
this, SLOT(setFontSettings(TextEditor::FontSettings)));
setFontSettings(TextEditorSettings::fontSettings()); setFontSettings(TextEditorSettings::fontSettings());
clear(tr("No controller")); clear(tr("No controller"));
connect(this, SIGNAL(cursorPositionChanged()), connect(this, &QPlainTextEdit::cursorPositionChanged,
this, SLOT(slotCursorPositionChangedInEditor())); this, &UnifiedDiffEditorWidget::slotCursorPositionChangedInEditor);
} }
UnifiedDiffEditorWidget::~UnifiedDiffEditorWidget() UnifiedDiffEditorWidget::~UnifiedDiffEditorWidget()
@@ -118,17 +117,17 @@ void UnifiedDiffEditorWidget::setDiffEditorGuiController(
return; return;
if (m_guiController) { if (m_guiController) {
disconnect(m_controller, SIGNAL(cleared(QString)), disconnect(m_controller, &DiffEditorController::cleared,
this, SLOT(clearAll(QString))); this, &UnifiedDiffEditorWidget::clearAll);
disconnect(m_controller, SIGNAL(diffFilesChanged(QList<FileData>,QString)), disconnect(m_controller, &DiffEditorController::diffFilesChanged,
this, SLOT(setDiff(QList<FileData>,QString))); this, &UnifiedDiffEditorWidget::setDiff);
disconnect(m_controller, SIGNAL(saveStateRequested()), disconnect(m_controller, &DiffEditorController::saveStateRequested,
this, SLOT(saveStateRequested())); this, &UnifiedDiffEditorWidget::saveStateRequested);
disconnect(m_controller, SIGNAL(restoreStateRequested()), disconnect(m_controller, &DiffEditorController::restoreStateRequested,
this, SLOT(restoreStateRequested())); this, &UnifiedDiffEditorWidget::restoreStateRequested);
disconnect(m_guiController, SIGNAL(currentDiffFileIndexChanged(int)), disconnect(m_guiController, &DiffEditorGuiController::currentDiffFileIndexChanged,
this, SLOT(setCurrentDiffFileIndex(int))); this, &UnifiedDiffEditorWidget::setCurrentDiffFileIndex);
clear(tr("No controller")); clear(tr("No controller"));
} }
@@ -137,17 +136,17 @@ void UnifiedDiffEditorWidget::setDiffEditorGuiController(
if (m_guiController) { if (m_guiController) {
m_controller = m_guiController->controller(); m_controller = m_guiController->controller();
connect(m_controller, SIGNAL(cleared(QString)), connect(m_controller, &DiffEditorController::cleared,
this, SLOT(clearAll(QString))); this, &UnifiedDiffEditorWidget::clearAll);
connect(m_controller, SIGNAL(diffFilesChanged(QList<FileData>,QString)), connect(m_controller, &DiffEditorController::diffFilesChanged,
this, SLOT(setDiff(QList<FileData>,QString))); this, &UnifiedDiffEditorWidget::setDiff);
connect(m_controller, SIGNAL(saveStateRequested()), connect(m_controller, &DiffEditorController::saveStateRequested,
this, SLOT(saveStateRequested())); this, &UnifiedDiffEditorWidget::saveStateRequested);
connect(m_controller, SIGNAL(restoreStateRequested()), connect(m_controller, &DiffEditorController::restoreStateRequested,
this, SLOT(restoreStateRequested())); this, &UnifiedDiffEditorWidget::restoreStateRequested);
connect(m_guiController, SIGNAL(currentDiffFileIndexChanged(int)), connect(m_guiController, &DiffEditorGuiController::currentDiffFileIndexChanged,
this, SLOT(setCurrentDiffFileIndex(int))); this, &UnifiedDiffEditorWidget::setCurrentDiffFileIndex);
setDiff(m_controller->diffFiles(), m_controller->workingDirectory()); setDiff(m_controller->diffFiles(), m_controller->workingDirectory());
setCurrentDiffFileIndex(m_guiController->currentDiffFileIndex()); setCurrentDiffFileIndex(m_guiController->currentDiffFileIndex());
@@ -229,7 +228,7 @@ void UnifiedDiffEditorWidget::contextMenuEvent(QContextMenuEvent *e)
addContextMenuActions(menu, fileIndexForBlockNumber(blockNumber), addContextMenuActions(menu, fileIndexForBlockNumber(blockNumber),
chunkIndexForBlockNumber(blockNumber)); chunkIndexForBlockNumber(blockNumber));
connect(this, SIGNAL(destroyed()), menu, SLOT(deleteLater())); connect(this, &UnifiedDiffEditorWidget::destroyed, menu, &QMenu::deleteLater);
menu->exec(e->globalPos()); menu->exec(e->globalPos());
delete menu; delete menu;
} }
@@ -245,12 +244,12 @@ void UnifiedDiffEditorWidget::addContextMenuActions(QMenu *menu,
menu->addSeparator(); menu->addSeparator();
QAction *sendChunkToCodePasterAction = QAction *sendChunkToCodePasterAction =
menu->addAction(tr("Send Chunk to CodePaster...")); menu->addAction(tr("Send Chunk to CodePaster..."));
connect(sendChunkToCodePasterAction, SIGNAL(triggered()), connect(sendChunkToCodePasterAction, &QAction::triggered,
this, SLOT(slotSendChunkToCodePaster())); this, &UnifiedDiffEditorWidget::slotSendChunkToCodePaster);
QAction *applyAction = menu->addAction(tr("Apply Chunk...")); QAction *applyAction = menu->addAction(tr("Apply Chunk..."));
connect(applyAction, SIGNAL(triggered()), this, SLOT(slotApplyChunk())); connect(applyAction, &QAction::triggered, this, &UnifiedDiffEditorWidget::slotApplyChunk);
QAction *revertAction = menu->addAction(tr("Revert Chunk...")); QAction *revertAction = menu->addAction(tr("Revert Chunk..."));
connect(revertAction, SIGNAL(triggered()), this, SLOT(slotRevertChunk())); connect(revertAction, &QAction::triggered, this, &UnifiedDiffEditorWidget::slotRevertChunk);
m_contextMenuFileIndex = diffFileIndex; m_contextMenuFileIndex = diffFileIndex;
m_contextMenuChunkIndex = chunkIndex; m_contextMenuChunkIndex = chunkIndex;