diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2014-02-28 10:40:20 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-02-28 10:42:50 +0100 |
commit | a746f6fb27720926ab37273b824c6a4c77ef0fd2 (patch) | |
tree | 793aee6bf8dab6ec83441a921d1452b41a1b61aa /src/plugins/diffeditor/diffutils.h | |
parent | c09e80b8538cf072185a076b4aaf46ed51186bda (diff) | |
download | qt-creator-a746f6fb27720926ab37273b824c6a4c77ef0fd2.tar.gz |
Move internal structures and some functions into diffutils.h
Change-Id: Ia55e556fdb8de3a2aeebf768ad9db66d840766f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffutils.h')
-rw-r--r-- | src/plugins/diffeditor/diffutils.h | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h new file mode 100644 index 0000000000..5d252d7eb8 --- /dev/null +++ b/src/plugins/diffeditor/diffutils.h @@ -0,0 +1,96 @@ +/**************************************************************************** +** +** 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 DIFFUTILS_H +#define DIFFUTILS_H + +#include <QString> +#include <QMap> +#include "diffeditorcontroller.h" + +namespace DiffEditor { + +class Diff; + +namespace Internal { + +class TextLineData { +public: + enum TextLineType { + TextLine, + Separator, + Invalid + }; + TextLineData() : textLineType(Invalid) {} + TextLineData(const QString &txt) : textLineType(TextLine), text(txt) {} + TextLineData(TextLineType t) : textLineType(t) {} + TextLineType textLineType; + QString text; +}; + +class RowData { +public: + RowData() : equal(false) {} + RowData(const TextLineData &l) + : leftLine(l), rightLine(l), equal(true) {} + RowData(const TextLineData &l, const TextLineData &r) + : leftLine(l), rightLine(r), equal(false) {} + TextLineData leftLine; + TextLineData rightLine; + bool equal; +}; + +class ChunkData { +public: + ChunkData() : contextChunk(false) {} + QList<RowData> rows; + bool contextChunk; + // start position, end position, TextLineData::Separator lines not taken into account + QMap<int, int> changedLeftPositions; // counting from the beginning of the chunk + QMap<int, int> changedRightPositions; // counting from the beginning of the chunk +}; + +class FileData { +public: + FileData() {} + FileData(const ChunkData &chunkData) { chunks.append(chunkData); } + QList<ChunkData> chunks; + DiffEditorController::DiffFileInfo leftFileInfo; + DiffEditorController::DiffFileInfo rightFileInfo; +}; + +ChunkData calculateOriginalData(const QList<Diff> &leftDiffList, + const QList<Diff> &rightDiffList); +FileData calculateContextData(const ChunkData &originalData, + int contextLinesNumber); + +} // namespace Internal +} // namespace DiffEditor + +#endif // DIFFUTILS_H |