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

TextEditor: Fix regression introduced by recent c094592f8a

Browse Source 
Change-Id: I9fe2bc726454c8c44f59bf4c720a11765d1bb744
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-28 17:00:12 +02:00
parent b4d62d330c
commit 761f8de751
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,14 +229,10 @@ DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc)
connect(m_descriptionWidget, SIGNAL(expandBranchesRequested()), connect(m_descriptionWidget, SIGNAL(expandBranchesRequested()),
m_document->controller(), SLOT(expandBranchesRequested())); m_document->controller(), SLOT(expandBranchesRequested()));
connect(TextEditorSettings::instance(), connect(TextEditorSettings::instance(), &TextEditorSettings::displaySettingsChanged,
SIGNAL(displaySettingsChanged(TextEditor::DisplaySettings)), m_descriptionWidget, &BaseTextEditorWidget::setDisplaySettings);
m_descriptionWidget, connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged,
SLOT(setDisplaySettings(TextEditor::DisplaySettings))); m_descriptionWidget->textDocument(), &BaseTextDocument::setFontSettings);
connect(TextEditorSettings::instance(),
SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
m_descriptionWidget->textDocument(),
SLOT(setFontSettings(TextEditor::FontSettings)));
m_descriptionWidget->setDisplaySettings( m_descriptionWidget->setDisplaySettings(
TextEditorSettings::displaySettings()); TextEditorSettings::displaySettings());

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

@@ -790,9 +790,8 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
m_leftEditor = new SideDiffEditorWidget(this); m_leftEditor = new SideDiffEditorWidget(this);
m_leftEditor->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_leftEditor->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_leftEditor->setReadOnly(true); m_leftEditor->setReadOnly(true);
connect(TextEditorSettings::instance(), connect(TextEditorSettings::instance(), &TextEditorSettings::displaySettingsChanged,
SIGNAL(displaySettingsChanged(TextEditor::DisplaySettings)), m_leftEditor, &SideDiffEditorWidget::setDisplaySettings);
m_leftEditor, SLOT(setDisplaySettings(TextEditor::DisplaySettings)));
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, SIGNAL(jumpToOriginalFileRequested(int,int,int)),
@@ -803,9 +802,8 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
m_rightEditor = new SideDiffEditorWidget(this); m_rightEditor = new SideDiffEditorWidget(this);
m_rightEditor->setReadOnly(true); m_rightEditor->setReadOnly(true);
connect(TextEditorSettings::instance(), connect(TextEditorSettings::instance(), &TextEditorSettings::displaySettingsChanged,
SIGNAL(displaySettingsChanged(TextEditor::DisplaySettings)), m_rightEditor, &SideDiffEditorWidget::setDisplaySettings);
m_rightEditor, SLOT(setDisplaySettings(TextEditor::DisplaySettings)));
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, SIGNAL(jumpToOriginalFileRequested(int,int,int)),

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

@@ -91,9 +91,8 @@ UnifiedDiffEditorWidget::UnifiedDiffEditorWidget(QWidget *parent)
SelectableTextEditorWidget::setDisplaySettings(settings); SelectableTextEditorWidget::setDisplaySettings(settings);
setReadOnly(true); setReadOnly(true);
connect(TextEditorSettings::instance(), connect(TextEditorSettings::instance(), &TextEditorSettings::displaySettingsChanged,
SIGNAL(displaySettingsChanged(TextEditor::DisplaySettings)), this, &UnifiedDiffEditorWidget::setDisplaySettings);
this, SLOT(setDisplaySettings(TextEditor::DisplaySettings)));
setDisplaySettings(TextEditorSettings::displaySettings()); setDisplaySettings(TextEditorSettings::displaySettings());
setCodeStyle(TextEditorSettings::codeStyle()); setCodeStyle(TextEditorSettings::codeStyle());

13
src/plugins/texteditor/basetexteditor.h
View File

@@ -400,13 +400,14 @@ public:
virtual void format(); virtual void format();
virtual void rewrapParagraph(); virtual void rewrapParagraph();
virtual void unCommentSelection(); virtual void unCommentSelection();
virtual void setDisplaySettings(const TextEditor::DisplaySettings &); virtual void setDisplaySettings(const TextEditor::DisplaySettings &);
virtual void setMarginSettings(const TextEditor::MarginSettings &); void setMarginSettings(const TextEditor::MarginSettings &);
virtual void setBehaviorSettings(const TextEditor::BehaviorSettings &); void setBehaviorSettings(const TextEditor::BehaviorSettings &);
virtual void setTypingSettings(const TextEditor::TypingSettings &); void setTypingSettings(const TextEditor::TypingSettings &);
virtual void setStorageSettings(const TextEditor::StorageSettings &); void setStorageSettings(const TextEditor::StorageSettings &);
virtual void setCompletionSettings(const TextEditor::CompletionSettings &); void setCompletionSettings(const TextEditor::CompletionSettings &);
virtual void setExtraEncodingSettings(const TextEditor::ExtraEncodingSettings &); void setExtraEncodingSettings(const TextEditor::ExtraEncodingSettings &);
void circularPaste(); void circularPaste();
void switchUtf8bom(); void switchUtf8bom();