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

Move more function into diffutils, fix calculateOriginalData.

Browse Source 
Change-Id: Id7bbdbf7778d21cb9aa15148876db95e9228fab3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
jkobus
2014-03-10 12:57:48 +01:00
committed by Jarek Kobus
parent 16bfbceeba
commit b846840c52
4 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/diffeditor/sidebysidediffeditorwidget.h
View File

@@ -33,18 +33,16 @@
#include "diffeditor_global.h"
#include "differ.h"
#include "diffeditorcontroller.h"
#include <QTextEdit>
#include <QWidget>
#include <QTextCharFormat>
namespace TextEditor { class FontSettings; }
QT_BEGIN_NAMESPACE
class QSplitter;
class QTextCharFormat;
QT_END_NAMESPACE
namespace DiffEditor {
class DiffEditorGuiController;
class SideDiffEditorWidget;
@@ -100,9 +98,6 @@ private:
void handleWhitespaces(const QList<Diff> &input,
QList<Diff> *leftOutput,
QList<Diff> *rightOutput) const;
QList<QTextEdit::ExtraSelection> colorPositions(const QTextCharFormat &format,
QTextCursor &cursor,
const QMap<int, int> &positions) const;
void colorDiff(const QList<Internal::FileData> &fileDataList);
void showDiff();
void synchronizeFoldings(SideDiffEditorWidget *source, SideDiffEditorWidget *destination);
@@ -119,7 +114,6 @@ private:
QList<Internal::FileData> m_contextFileData; // ultimate data to be shown, contextLinesNumber taken into account
bool m_foldingBlocker;
QString m_source;
QTextCharFormat m_fileLineFormat;
QTextCharFormat m_chunkLineFormat;