diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 9c33eeef834..bfa2a913c5f 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -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 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 diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index 1a4eec0c99e..1d1c6713deb 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -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 diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index 71d13b1fede..28a5342d2f9 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -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 \ diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index b8779225114..10d4be92e64 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -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", diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp new file mode 100644 index 00000000000..854baceb506 --- /dev/null +++ b/src/plugins/cppeditor/cppeditordocument.cpp @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** 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 +#include + +#include + +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 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 diff --git a/src/plugins/cppeditor/cppeditordocument.h b/src/plugins/cppeditor/cppeditordocument.h new file mode 100644 index 00000000000..8e2d8ec3f22 --- /dev/null +++ b/src/plugins/cppeditor/cppeditordocument.h @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** 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 + +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