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 
Change-Id: Ie1da8e093bd28f0a2ad0fe34b860008a7484ed5f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-28 14:08:42 +01:00
parent 9bdb2a69be
commit ae6730d76d
1 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -568,7 +568,7 @@ void SideDiffEditorWidget::contextMenuEvent(QContextMenuEvent *e)
emit contextMenuRequested(menu, fileIndexForBlockNumber(blockNumber), emit contextMenuRequested(menu, fileIndexForBlockNumber(blockNumber),
chunkIndexForBlockNumber(blockNumber)); chunkIndexForBlockNumber(blockNumber));
connect(this, SIGNAL(destroyed()), menu, SLOT(deleteLater())); connect(this, &SideDiffEditorWidget::destroyed, menu, &QMenu::deleteLater);
menu->exec(e->globalPos()); menu->exec(e->globalPos());
delete menu; delete menu;
} }
@@ -762,10 +762,10 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
m_leftEditor, &SideDiffEditorWidget::setDisplaySettings); m_leftEditor, &SideDiffEditorWidget::setDisplaySettings);
m_leftEditor->setDisplaySettings(TextEditorSettings::displaySettings()); m_leftEditor->setDisplaySettings(TextEditorSettings::displaySettings());
m_leftEditor->setCodeStyle(TextEditorSettings::codeStyle()); m_leftEditor->setCodeStyle(TextEditorSettings::codeStyle());
connect(m_leftEditor, SIGNAL(jumpToOriginalFileRequested(int,int,int)), connect(m_leftEditor, &SideDiffEditorWidget::jumpToOriginalFileRequested,
this, SLOT(slotLeftJumpToOriginalFileRequested(int,int,int))); this, &SideBySideDiffEditorWidget::slotLeftJumpToOriginalFileRequested);
connect(m_leftEditor, SIGNAL(contextMenuRequested(QMenu*,int,int)), connect(m_leftEditor, &SideDiffEditorWidget::contextMenuRequested,
this, SLOT(slotLeftContextMenuRequested(QMenu*,int,int)), this, &SideBySideDiffEditorWidget::slotLeftContextMenuRequested,
Qt::DirectConnection); Qt::DirectConnection);
m_rightEditor = new SideDiffEditorWidget(this); m_rightEditor = new SideDiffEditorWidget(this);
@@ -774,44 +774,44 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
m_rightEditor, &SideDiffEditorWidget::setDisplaySettings); m_rightEditor, &SideDiffEditorWidget::setDisplaySettings);
m_rightEditor->setDisplaySettings(TextEditorSettings::displaySettings()); m_rightEditor->setDisplaySettings(TextEditorSettings::displaySettings());
m_rightEditor->setCodeStyle(TextEditorSettings::codeStyle()); m_rightEditor->setCodeStyle(TextEditorSettings::codeStyle());
connect(m_rightEditor, SIGNAL(jumpToOriginalFileRequested(int,int,int)), connect(m_rightEditor, &SideDiffEditorWidget::jumpToOriginalFileRequested,
this, SLOT(slotRightJumpToOriginalFileRequested(int,int,int))); this, &SideBySideDiffEditorWidget::slotRightJumpToOriginalFileRequested);
connect(m_rightEditor, SIGNAL(contextMenuRequested(QMenu*,int,int)), connect(m_rightEditor, &SideDiffEditorWidget::contextMenuRequested,
this, SLOT(slotRightContextMenuRequested(QMenu*,int,int)), this, &SideBySideDiffEditorWidget::slotRightContextMenuRequested,
Qt::DirectConnection); Qt::DirectConnection);
connect(TextEditorSettings::instance(), connect(TextEditorSettings::instance(),
SIGNAL(fontSettingsChanged(TextEditor::FontSettings)), &TextEditorSettings::fontSettingsChanged,
this, SLOT(setFontSettings(TextEditor::FontSettings))); this, &SideBySideDiffEditorWidget::setFontSettings);
setFontSettings(TextEditorSettings::fontSettings()); setFontSettings(TextEditorSettings::fontSettings());
connect(m_leftEditor->verticalScrollBar(), SIGNAL(valueChanged(int)), connect(m_leftEditor->verticalScrollBar(), &QAbstractSlider::valueChanged,
this, SLOT(leftVSliderChanged())); this, &SideBySideDiffEditorWidget::leftVSliderChanged);
connect(m_leftEditor->verticalScrollBar(), SIGNAL(actionTriggered(int)), connect(m_leftEditor->verticalScrollBar(), &QAbstractSlider::actionTriggered,
this, SLOT(leftVSliderChanged())); this, &SideBySideDiffEditorWidget::leftVSliderChanged);
connect(m_leftEditor->horizontalScrollBar(), SIGNAL(valueChanged(int)), connect(m_leftEditor->horizontalScrollBar(), &QAbstractSlider::valueChanged,
this, SLOT(leftHSliderChanged())); this, &SideBySideDiffEditorWidget::leftHSliderChanged);
connect(m_leftEditor->horizontalScrollBar(), SIGNAL(actionTriggered(int)), connect(m_leftEditor->horizontalScrollBar(), &QAbstractSlider::actionTriggered,
this, SLOT(leftHSliderChanged())); this, &SideBySideDiffEditorWidget::leftHSliderChanged);
connect(m_leftEditor, SIGNAL(cursorPositionChanged()), connect(m_leftEditor, &QPlainTextEdit::cursorPositionChanged,
this, SLOT(leftCursorPositionChanged())); this, &SideBySideDiffEditorWidget::leftCursorPositionChanged);
// connect(m_leftEditor->document()->documentLayout(), SIGNAL(documentSizeChanged(QSizeF)), // connect(m_leftEditor->document()->documentLayout(), SIGNAL(documentSizeChanged(QSizeF)),
// this, SLOT(leftDocumentSizeChanged())); // this, SLOT(leftDocumentSizeChanged()));
connect(m_rightEditor->verticalScrollBar(), SIGNAL(valueChanged(int)), connect(m_rightEditor->verticalScrollBar(), &QAbstractSlider::valueChanged,
this, SLOT(rightVSliderChanged())); this, &SideBySideDiffEditorWidget::rightVSliderChanged);
connect(m_rightEditor->verticalScrollBar(), SIGNAL(actionTriggered(int)), connect(m_rightEditor->verticalScrollBar(), &QAbstractSlider::actionTriggered,
this, SLOT(rightVSliderChanged())); this, &SideBySideDiffEditorWidget::rightVSliderChanged);
connect(m_rightEditor->horizontalScrollBar(), SIGNAL(valueChanged(int)), connect(m_rightEditor->horizontalScrollBar(), &QAbstractSlider::valueChanged,
this, SLOT(rightHSliderChanged())); this, &SideBySideDiffEditorWidget::rightHSliderChanged);
connect(m_rightEditor->horizontalScrollBar(), SIGNAL(actionTriggered(int)), connect(m_rightEditor->horizontalScrollBar(), &QAbstractSlider::actionTriggered,
this, SLOT(rightHSliderChanged())); this, &SideBySideDiffEditorWidget::rightHSliderChanged);
connect(m_rightEditor, SIGNAL(cursorPositionChanged()), connect(m_rightEditor, &QPlainTextEdit::cursorPositionChanged,
this, SLOT(rightCursorPositionChanged())); this, &SideBySideDiffEditorWidget::rightCursorPositionChanged);
// connect(m_rightEditor->document()->documentLayout(), SIGNAL(documentSizeChanged(QSizeF)), // connect(m_rightEditor->document()->documentLayout(), SIGNAL(documentSizeChanged(QSizeF)),
// this, SLOT(rightDocumentSizeChanged())); // this, SLOT(rightDocumentSizeChanged()));
@@ -838,21 +838,21 @@ void SideBySideDiffEditorWidget::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, &SideBySideDiffEditorWidget::clearAll);
disconnect(m_controller, SIGNAL(diffFilesChanged(QList<FileData>,QString)), disconnect(m_controller, &DiffEditorController::diffFilesChanged,
this, SLOT(setDiff(QList<FileData>,QString))); this, &SideBySideDiffEditorWidget::setDiff);
disconnect(m_controller, SIGNAL(saveStateRequested()), disconnect(m_controller, &DiffEditorController::saveStateRequested,
m_leftEditor, SLOT(saveStateRequested())); m_leftEditor, &SideDiffEditorWidget::saveStateRequested);
disconnect(m_controller, SIGNAL(saveStateRequested()), disconnect(m_controller, &DiffEditorController::saveStateRequested,
m_rightEditor, SLOT(saveStateRequested())); m_rightEditor, &SideDiffEditorWidget::saveStateRequested);
disconnect(m_controller, SIGNAL(restoreStateRequested()), disconnect(m_controller, &DiffEditorController::restoreStateRequested,
m_leftEditor, SLOT(restoreStateRequested())); m_leftEditor, &SideDiffEditorWidget::restoreStateRequested);
disconnect(m_controller, SIGNAL(restoreStateRequested()), disconnect(m_controller, &DiffEditorController::restoreStateRequested,
m_rightEditor, SLOT(restoreStateRequested())); m_rightEditor, &SideDiffEditorWidget::restoreStateRequested);
disconnect(m_guiController, SIGNAL(currentDiffFileIndexChanged(int)), disconnect(m_guiController, &DiffEditorGuiController::currentDiffFileIndexChanged,
this, SLOT(setCurrentDiffFileIndex(int))); this, &SideBySideDiffEditorWidget::setCurrentDiffFileIndex);
clearAll(tr("No controller")); clearAll(tr("No controller"));
} }
@@ -861,21 +861,21 @@ void SideBySideDiffEditorWidget::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, &SideBySideDiffEditorWidget::clearAll);
connect(m_controller, SIGNAL(diffFilesChanged(QList<FileData>,QString)), connect(m_controller, &DiffEditorController::diffFilesChanged,
this, SLOT(setDiff(QList<FileData>,QString))); this, &SideBySideDiffEditorWidget::setDiff);
connect(m_controller, SIGNAL(saveStateRequested()), connect(m_controller, &DiffEditorController::saveStateRequested,
m_leftEditor, SLOT(saveStateRequested())); m_leftEditor, &SideDiffEditorWidget::saveStateRequested);
connect(m_controller, SIGNAL(saveStateRequested()), connect(m_controller, &DiffEditorController::saveStateRequested,
m_rightEditor, SLOT(saveStateRequested())); m_rightEditor, &SideDiffEditorWidget::saveStateRequested);
connect(m_controller, SIGNAL(restoreStateRequested()), connect(m_controller, &DiffEditorController::restoreStateRequested,
m_leftEditor, SLOT(restoreStateRequested())); m_leftEditor, &SideDiffEditorWidget::restoreStateRequested);
connect(m_controller, SIGNAL(restoreStateRequested()), connect(m_controller, &DiffEditorController::restoreStateRequested,
m_rightEditor, SLOT(restoreStateRequested())); m_rightEditor, &SideDiffEditorWidget::restoreStateRequested);
connect(m_guiController, SIGNAL(currentDiffFileIndexChanged(int)), connect(m_guiController, &DiffEditorGuiController::currentDiffFileIndexChanged,
this, SLOT(setCurrentDiffFileIndex(int))); this, &SideBySideDiffEditorWidget::setCurrentDiffFileIndex);
setDiff(m_controller->diffFiles(), m_controller->workingDirectory()); setDiff(m_controller->diffFiles(), m_controller->workingDirectory());
setCurrentDiffFileIndex(m_guiController->currentDiffFileIndex()); setCurrentDiffFileIndex(m_guiController->currentDiffFileIndex());
@@ -1237,11 +1237,11 @@ void SideBySideDiffEditorWidget::slotLeftContextMenuRequested(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, &SideBySideDiffEditorWidget::slotSendChunkToCodePaster);
menu->addSeparator(); menu->addSeparator();
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, &SideBySideDiffEditorWidget::slotApplyChunk);
applyAction->setEnabled(false); applyAction->setEnabled(false);
m_contextMenuFileIndex = diffFileIndex; m_contextMenuFileIndex = diffFileIndex;
@@ -1272,11 +1272,11 @@ void SideBySideDiffEditorWidget::slotRightContextMenuRequested(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, &SideBySideDiffEditorWidget::slotSendChunkToCodePaster);
menu->addSeparator(); menu->addSeparator();
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, &SideBySideDiffEditorWidget::slotRevertChunk);
revertAction->setEnabled(false); revertAction->setEnabled(false);
m_contextMenuFileIndex = diffFileIndex; m_contextMenuFileIndex = diffFileIndex;