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

DiffEditor: Use Qt5 style connects

Browse Source 
Change-Id: I051b2128620bf0317b359852007463c6601ceaca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-28 13:45:02 +01:00
parent d527b11daa
commit bdae49c474
5 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -79,7 +79,7 @@ public:
virtual QSize sizeHint() const; virtual QSize sizeHint() const;
signals: signals:
void expandBranchesRequested(); void requestBranchList();
protected: protected:
void mouseMoveEvent(QMouseEvent *e); void mouseMoveEvent(QMouseEvent *e);
@@ -194,7 +194,7 @@ void DescriptionEditorWidget::handleCurrentContents()
m_currentCursor.select(QTextCursor::LineUnderCursor); m_currentCursor.select(QTextCursor::LineUnderCursor);
m_currentCursor.removeSelectedText(); m_currentCursor.removeSelectedText();
m_currentCursor.insertText(QLatin1String("Branches: Expanding...")); m_currentCursor.insertText(QLatin1String("Branches: Expanding..."));
emit expandBranchesRequested(); emit requestBranchList();
} }
} // namespace Internal } // namespace Internal
@@ -233,24 +233,23 @@ DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc)
setWidget(splitter); setWidget(splitter);
connect(m_descriptionWidget, SIGNAL(expandBranchesRequested()),
m_document->controller(), SLOT(expandBranchesRequested()));
m_controller = m_document->controller(); m_controller = m_document->controller();
m_guiController = new DiffEditorGuiController(m_controller, this); m_guiController = new DiffEditorGuiController(m_controller, this);
connect(m_controller, SIGNAL(cleared(QString)), connect(m_descriptionWidget, &Internal::DescriptionEditorWidget::requestBranchList,
this, SLOT(slotCleared(QString))); m_controller, &DiffEditorController::expandBranchesRequested);
connect(m_controller, SIGNAL(diffFilesChanged(QList<FileData>,QString)), connect(m_controller, &DiffEditorController::cleared, this, &DiffEditor::slotCleared);
this, SLOT(slotDiffFilesChanged(QList<FileData>,QString))); connect(m_controller, &DiffEditorController::diffFilesChanged,
connect(m_controller, SIGNAL(descriptionChanged(QString)), this, &DiffEditor::slotDiffFilesChanged);
this, SLOT(slotDescriptionChanged(QString))); connect(m_controller, &DiffEditorController::descriptionChanged,
connect(m_controller, SIGNAL(descriptionEnablementChanged(bool)), this, &DiffEditor::slotDescriptionChanged);
this, SLOT(slotDescriptionVisibilityChanged())); connect(m_controller, &DiffEditorController::descriptionEnablementChanged,
connect(m_guiController, SIGNAL(descriptionVisibilityChanged(bool)), this, &DiffEditor::slotDescriptionVisibilityChanged);
this, SLOT(slotDescriptionVisibilityChanged())); connect(m_guiController, &DiffEditorGuiController::descriptionVisibilityChanged,
connect(m_guiController, SIGNAL(currentDiffFileIndexChanged(int)), this, &DiffEditor::slotDescriptionVisibilityChanged);
this, SLOT(activateEntry(int))); connect(m_guiController, &DiffEditorGuiController::currentDiffFileIndexChanged,
this, &DiffEditor::activateEntry);
slotDescriptionChanged(m_controller->description()); slotDescriptionChanged(m_controller->description());
slotDescriptionVisibilityChanged(); slotDescriptionVisibilityChanged();
@@ -314,8 +313,8 @@ QWidget *DiffEditor::toolBar()
QSizePolicy policy = m_entriesComboBox->sizePolicy(); QSizePolicy policy = m_entriesComboBox->sizePolicy();
policy.setHorizontalPolicy(QSizePolicy::Expanding); policy.setHorizontalPolicy(QSizePolicy::Expanding);
m_entriesComboBox->setSizePolicy(policy); m_entriesComboBox->setSizePolicy(policy);
connect(m_entriesComboBox, SIGNAL(activated(int)), connect(m_entriesComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
this, SLOT(entryActivated(int))); this, &DiffEditor::entryActivated);
m_toolBar->addWidget(m_entriesComboBox); m_toolBar->addWidget(m_entriesComboBox);
QToolButton *whitespaceButton = new QToolButton(m_toolBar); QToolButton *whitespaceButton = new QToolButton(m_toolBar);
@@ -362,26 +361,26 @@ QWidget *DiffEditor::toolBar()
m_toolBar->addWidget(m_diffEditorSwitcher); m_toolBar->addWidget(m_diffEditorSwitcher);
updateDiffEditorSwitcher(); updateDiffEditorSwitcher();
connect(whitespaceButton, SIGNAL(clicked(bool)), connect(whitespaceButton, &QToolButton::clicked,
m_controller, SLOT(setIgnoreWhitespace(bool))); m_controller, &DiffEditorController::setIgnoreWhitespace);
connect(m_controller, SIGNAL(ignoreWhitespaceChanged(bool)), connect(m_controller, &DiffEditorController::ignoreWhitespaceChanged,
whitespaceButton, SLOT(setChecked(bool))); whitespaceButton, &QToolButton::setChecked);
connect(contextSpinBox, SIGNAL(valueChanged(int)), connect(contextSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
m_controller, SLOT(setContextLinesNumber(int))); m_controller, &DiffEditorController::setContextLinesNumber);
connect(m_controller, SIGNAL(contextLinesNumberChanged(int)), connect(m_controller, &DiffEditorController::contextLinesNumberChanged,
contextSpinBox, SLOT(setValue(int))); contextSpinBox, &QSpinBox::setValue);
connect(toggleSync, SIGNAL(clicked(bool)), connect(toggleSync, &QAbstractButton::clicked,
m_guiController, SLOT(setHorizontalScrollBarSynchronization(bool))); m_guiController, &DiffEditorGuiController::setHorizontalScrollBarSynchronization);
connect(toggleDescription, SIGNAL(clicked(bool)), connect(toggleDescription, &QAbstractButton::clicked,
m_guiController, SLOT(setDescriptionVisible(bool))); m_guiController, &DiffEditorGuiController::setDescriptionVisible);
connect(m_diffEditorSwitcher, SIGNAL(clicked()), connect(m_diffEditorSwitcher, &QAbstractButton::clicked,
this, SLOT(slotDiffEditorSwitched())); this, &DiffEditor::slotDiffEditorSwitched);
connect(reloadButton, SIGNAL(clicked()), connect(reloadButton, &QAbstractButton::clicked,
m_controller, SLOT(requestReload())); m_controller, &DiffEditorController::requestReload);
connect(m_controller, SIGNAL(reloaderChanged()), connect(m_controller, &DiffEditorController::reloaderChanged,
this, SLOT(slotReloaderChanged())); this, &DiffEditor::slotReloaderChanged);
connect(m_controller, SIGNAL(contextLinesNumberEnablementChanged(bool)), connect(m_controller, &DiffEditorController::contextLinesNumberEnablementChanged,
this, SLOT(slotReloaderChanged())); this, &DiffEditor::slotReloaderChanged);
return m_toolBar; return m_toolBar;
} }

4
src/plugins/diffeditor/diffeditor.h
View File

@@ -48,6 +48,8 @@ namespace TextEditor { class TextEditorWidget; }
namespace DiffEditor { namespace DiffEditor {
namespace Internal { class DescriptionEditorWidget; }
class DiffEditorDocument; class DiffEditorDocument;
class DiffEditorGuiController; class DiffEditorGuiController;
class SideBySideDiffEditorWidget; class SideBySideDiffEditorWidget;
@@ -95,7 +97,7 @@ private:
void writeCurrentDiffEditorSetting(QWidget *currentEditor); void writeCurrentDiffEditorSetting(QWidget *currentEditor);
QSharedPointer<DiffEditorDocument> m_document; QSharedPointer<DiffEditorDocument> m_document;
TextEditor::TextEditorWidget *m_descriptionWidget; Internal::DescriptionEditorWidget *m_descriptionWidget;
QStackedWidget *m_stackedWidget; QStackedWidget *m_stackedWidget;
SideBySideDiffEditorWidget *m_sideBySideEditor; SideBySideDiffEditorWidget *m_sideBySideEditor;
UnifiedDiffEditorWidget *m_unifiedEditor; UnifiedDiffEditorWidget *m_unifiedEditor;

2
src/plugins/diffeditor/diffeditorcontroller.cpp
View File

@@ -246,7 +246,7 @@ void DiffEditorController::branchesForCommitReceived(const QString &output)
void DiffEditorController::expandBranchesRequested() void DiffEditorController::expandBranchesRequested()
{ {
emit expandBranchesRequested(m_description.mid(7, 8)); emit requestBranchList(m_description.mid(7, 8));
} }
QString DiffEditorController::prepareBranchesForCommit(const QString &output) QString DiffEditorController::prepareBranchesForCommit(const QString &output)

2
src/plugins/diffeditor/diffeditorcontroller.h
View File

@@ -94,7 +94,7 @@ signals:
void chunkActionsRequested(QMenu *menu, bool isValid); void chunkActionsRequested(QMenu *menu, bool isValid);
void saveStateRequested(); void saveStateRequested();
void restoreStateRequested(); void restoreStateRequested();
void expandBranchesRequested(const QString &revision); void requestBranchList(const QString &revision);
void reloaderChanged(); void reloaderChanged();
private: private:

2
src/plugins/git/gitclient.cpp
View File

@@ -757,7 +757,7 @@ GitDiffEditorReloader *GitClient::findOrCreateDiffEditor(const QString &document
connect(controller, &DiffEditor::DiffEditorController::chunkActionsRequested, connect(controller, &DiffEditor::DiffEditorController::chunkActionsRequested,
this, &GitClient::slotChunkActionsRequested, Qt::DirectConnection); this, &GitClient::slotChunkActionsRequested, Qt::DirectConnection);
connect(controller, static_cast<void (DiffEditor::DiffEditorController::*)(const QString &)>(&DiffEditor::DiffEditorController::expandBranchesRequested), connect(controller, &DiffEditor::DiffEditorController::requestBranchList,
this, &GitClient::branchesForCommit); this, &GitClient::branchesForCommit);
reloader = new GitDiffEditorReloader(); reloader = new GitDiffEditorReloader();