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

BaseTextEditor: Un-slot most widget actions

Browse Source 
Change-Id: Id642fc518d03dad5202e0d7bbb6b8b6325abbbab
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-27 16:59:03 +02:00
parent 0e81b718d9
commit c094592f8a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -626,7 +626,7 @@ void BaseTextEditorWidgetPrivate::ctor(const QSharedPointer<BaseTextDocument> &d
QObject::connect(q, &QPlainTextEdit::blockCountChanged,
this, &BaseTextEditorWidgetPrivate::slotUpdateExtraAreaWidth);
QObject::connect(q, &BaseTextEditorWidget::modificationChanged, m_extraArea,
QObject::connect(q, &QPlainTextEdit::modificationChanged, m_extraArea,
static_cast<void (QWidget::*)()>(&QWidget::update));
QObject::connect(q, &QPlainTextEdit::cursorPositionChanged,
@@ -981,10 +981,10 @@ bool BaseTextEditorWidget::open(QString *errorString, const QString &fileName, c
moveCursor(QTextCursor::Start);
d->updateCannotDecodeInfo();
if (d->m_fileEncodingLabel) {
connect(d->m_fileEncodingLabel, SIGNAL(clicked()), this,
SLOT(selectEncoding()), Qt::UniqueConnection);
connect(d->m_document->document(), SIGNAL(modificationChanged(bool)), this,
SLOT(updateTextCodecLabel()), Qt::UniqueConnection);
connect(d->m_fileEncodingLabel, &LineColumnLabel::clicked,
this, &BaseTextEditorWidget::selectEncoding, Qt::UniqueConnection);
connect(d->m_document->document(), &QTextDocument::modificationChanged,
this, &BaseTextEditorWidget::updateTextCodecLabel, Qt::UniqueConnection);
updateTextCodecLabel();
}
return true;

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

@@ -392,7 +392,6 @@ public:
enum Side { Left, Right };
void insertExtraToolBarWidget(Side side, QWidget *widget);
public slots:
virtual void copy();
virtual void paste();
virtual void cut();
@@ -495,7 +494,8 @@ public slots:
void configureMimeType(const QString &mimeType);
void configureMimeType(const Core::MimeType &mimeType);
void inSnippetMode(bool *active);
Q_INVOKABLE void inSnippetMode(bool *active); // Used by FakeVim.
signals:
void assistFinished();