Commit 48177602 authored by Nikolai Kosjar's avatar Nikolai Kosjar
Browse files

CppEditor: Extract CppEditorDocument



This one will get some more functionality.

Change-Id: Ifba410e32f98c28cbfbb5a72493906ab3d681225
Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@digia.com>
parent 0511ac5c
......@@ -41,7 +41,6 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <cpptools/cpptoolseditorsupport.h>
#include <cpptools/cpptoolsplugin.h>
#include <cpptools/cpptoolsconstants.h>
#include <cpptools/cppchecksymbols.h>
#include <cpptools/cppcodeformatter.h>
#include <cpptools/cppcompletionassistprovider.h>
......@@ -1840,47 +1839,4 @@ void CPPEditorWidget::showPreProcessorWidget()
}
}
CPPEditorDocument::CPPEditorDocument()
{
setId(CppEditor::Constants::CPPEDITOR_ID);
connect(this, SIGNAL(tabSettingsChanged()),
this, SLOT(invalidateFormatterCache()));
connect(this, SIGNAL(mimeTypeChanged()),
this, SLOT(onMimeTypeChanged()));
setSyntaxHighlighter(new CppHighlighter);
onMimeTypeChanged();
}
bool CPPEditorDocument::isObjCEnabled() const
{
return m_isObjCEnabled;
}
void CPPEditorDocument::applyFontSettings()
{
if (TextEditor::SyntaxHighlighter *highlighter = syntaxHighlighter()) {
// Clear all additional formats since they may have changed
QTextBlock b = document()->firstBlock();
while (b.isValid()) {
QList<QTextLayout::FormatRange> noFormats;
highlighter->setExtraAdditionalFormats(b, noFormats);
b = b.next();
}
}
BaseTextDocument::applyFontSettings(); // rehighlights and updates additional formats
}
void CPPEditorDocument::invalidateFormatterCache()
{
CppTools::QtStyleCodeFormatter formatter;
formatter.invalidateCache(document());
}
void CPPEditorDocument::onMimeTypeChanged()
{
const QString &mt = mimeType();
m_isObjCEnabled = (mt == QLatin1String(CppTools::Constants::OBJECTIVE_C_SOURCE_MIMETYPE)
|| mt == QLatin1String(CppTools::Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE));
}
#include <cppeditor.moc>
......@@ -30,6 +30,7 @@
#ifndef CPPEDITOR_H
#define CPPEDITOR_H
#include "cppeditordocument.h"
#include "cppfollowsymbolundercursor.h"
#include "cppfunctiondecldeflink.h"
......@@ -60,25 +61,6 @@ namespace Internal {
class CPPEditorWidget;
class CPPEditorDocument : public TextEditor::BaseTextDocument
{
Q_OBJECT
public:
CPPEditorDocument();
bool isObjCEnabled() const;
protected:
void applyFontSettings();
private slots:
void invalidateFormatterCache();
void onMimeTypeChanged();
private:
bool m_isObjCEnabled;
};
class CPPEditor : public TextEditor::BaseTextEditor
{
Q_OBJECT
......
......@@ -7,6 +7,7 @@ HEADERS += \
cppcodemodelinspectordialog.h \
cppeditor.h \
cppeditor_global.h \
cppeditordocument.h \
cppeditorconstants.h \
cppeditorenums.h \
cppeditorplugin.h \
......@@ -37,6 +38,7 @@ SOURCES += \
cppclasswizard.cpp \
cppcodemodelinspectordialog.cpp \
cppeditor.cpp \
cppeditordocument.cpp \
cppeditorplugin.cpp \
cppelementevaluator.cpp \
cppfilewizard.cpp \
......
......@@ -26,6 +26,7 @@ QtcPlugin {
"cppeditor.qrc",
"cppeditor_global.h",
"cppeditorconstants.h",
"cppeditordocument.cpp", "cppeditordocument.h",
"cppeditorenums.h",
"cppeditorplugin.cpp", "cppeditorplugin.h",
"cppelementevaluator.cpp", "cppelementevaluator.h",
......
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "cppeditordocument.h"
#include "cppeditorconstants.h"
#include "cpphighlighter.h"
#include <cpptools/cppcodeformatter.h>
#include <cpptools/cpptoolsconstants.h>
#include <QTextDocument>
namespace CppEditor {
namespace Internal {
CPPEditorDocument::CPPEditorDocument()
{
setId(CppEditor::Constants::CPPEDITOR_ID);
connect(this, SIGNAL(tabSettingsChanged()),
this, SLOT(invalidateFormatterCache()));
connect(this, SIGNAL(mimeTypeChanged()),
this, SLOT(onMimeTypeChanged()));
setSyntaxHighlighter(new CppHighlighter);
onMimeTypeChanged();
}
bool CPPEditorDocument::isObjCEnabled() const
{
return m_isObjCEnabled;
}
void CPPEditorDocument::applyFontSettings()
{
if (TextEditor::SyntaxHighlighter *highlighter = syntaxHighlighter()) {
// Clear all additional formats since they may have changed
QTextBlock b = document()->firstBlock();
while (b.isValid()) {
QList<QTextLayout::FormatRange> noFormats;
highlighter->setExtraAdditionalFormats(b, noFormats);
b = b.next();
}
}
BaseTextDocument::applyFontSettings(); // rehighlights and updates additional formats
}
void CPPEditorDocument::invalidateFormatterCache()
{
CppTools::QtStyleCodeFormatter formatter;
formatter.invalidateCache(document());
}
void CPPEditorDocument::onMimeTypeChanged()
{
const QString &mt = mimeType();
m_isObjCEnabled = (mt == QLatin1String(CppTools::Constants::OBJECTIVE_C_SOURCE_MIMETYPE)
|| mt == QLatin1String(CppTools::Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE));
}
} // namespace Internal
} // namespace CppEditor
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef CPPEDITORDOCUMENT_H
#define CPPEDITORDOCUMENT_H
#include <texteditor/basetextdocument.h>
namespace CppEditor {
namespace Internal {
class CPPEditorDocument : public TextEditor::BaseTextDocument
{
Q_OBJECT
public:
explicit CPPEditorDocument();
bool isObjCEnabled() const;
protected:
void applyFontSettings();
private slots:
void invalidateFormatterCache();
void onMimeTypeChanged();
private:
bool m_isObjCEnabled;
};
} // namespace Internal
} // namespace CppEditor
#endif // CPPEDITORDOCUMENT_H
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment