Commit 1e0a04a3 authored by David Schulz's avatar David Schulz

Editor: Fix generic highlighter test.

Change-Id: I055e8d45271faeee6933a047a6755bd834230159
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent e3471509
/****************************************************************************
**
** Copyright (C) 2013 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 "basetextdocumentlayout.h"
TextBlockUserData *BaseTextDocumentLayout::userData(const QTextBlock &block)
{
TextBlockUserData *data = static_cast<TextBlockUserData*>(block.userData());
if (!data && block.isValid())
const_cast<QTextBlock &>(block).setUserData((data = new TextBlockUserData));
return data;
}
......@@ -34,13 +34,21 @@
// Replaces the "real" basetextdocumentlayout.h file.
struct CodeFormatterData {};
struct TextBlockUserData : QTextBlockUserData
{
virtual ~TextBlockUserData(){}
TextBlockUserData() : m_data(0) {}
virtual ~TextBlockUserData() {}
void setFoldingStartIncluded(const bool) {}
void setFoldingEndIncluded(const bool) {}
void setFoldingIndent(const int) {}
void setCodeFormatterData(CodeFormatterData *data) { m_data = data; }
CodeFormatterData *codeFormatterData() { return m_data; }
CodeFormatterData *m_data;
};
namespace BaseTextDocumentLayout { TextBlockUserData *userData(const QTextBlock &block); }
#endif // BASETEXTDOCUMENTLAYOUT_H
......@@ -7,6 +7,7 @@ SOURCES += \
tst_highlighterengine.cpp \
highlightermock.cpp \
formats.cpp \
basetextdocumentlayout.cpp \
syntaxhighlighter.cpp \
$$GENERICHIGHLIGHTERDIR/highlighter.cpp \
$$GENERICHIGHLIGHTERDIR/context.cpp \
......
......@@ -31,7 +31,7 @@ Autotest {
Group {
name: "Drop-in sources for the plugin"
files: [
"basetextdocumentlayout.h",
"basetextdocumentlayout.h", "basetextdocumentlayout.cpp",
"syntaxhighlighter.h", "syntaxhighlighter.cpp",
"tabsettings.h"
]
......
Markdown is supported
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