diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2013-04-23 13:16:52 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-04-23 14:33:33 +0200 |
commit | 5f5b7fa4c18fc68467fab8203ec444896ae533aa (patch) | |
tree | 69a306323b4260756acb3e9e151cfe33e7f484cf /src/plugins/diffeditor/diffeditorwidget.h | |
parent | 3ab78b34599675bfd37ca68f9d81418a79801d59 (diff) | |
download | qt-creator-5f5b7fa4c18fc68467fab8203ec444896ae533aa.tar.gz |
Remove unused variables
Remove unused fields and one virtual method,
rename alwaysShows -> contextChunk and revert
its logical value.
Change-Id: I11fd60202aa5b7978b772764a40c99029cac82a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.h')
-rw-r--r-- | src/plugins/diffeditor/diffeditorwidget.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.h b/src/plugins/diffeditor/diffeditorwidget.h index e576238637..79a96c6685 100644 --- a/src/plugins/diffeditor/diffeditorwidget.h +++ b/src/plugins/diffeditor/diffeditorwidget.h @@ -72,34 +72,28 @@ struct RowData { : leftLine(l), rightLine(l), equal(true) {} RowData(const TextLineData &l, const TextLineData &r, bool e = false) : leftLine(l), rightLine(r), equal(e) {} - RowData(const QString &txt) - : text(txt), equal(true) {} TextLineData leftLine; TextLineData rightLine; - QString text; // file of context description bool equal; // true if left and right lines are equal, taking whitespaces into account (or both invalid) }; struct ChunkData { - ChunkData() : alwaysShown(true) {} + ChunkData() : contextChunk(false) {} QList<RowData> rows; - bool alwaysShown; + bool contextChunk; // <absolute position in the file, absolute position in the file> QMap<int, int> changedLeftPositions; // counting from the beginning of the chunk QMap<int, int> changedRightPositions; // counting from the beginning of the chunk - QString text; }; struct FileData { FileData() {} FileData(const ChunkData &chunkData) { chunks.append(chunkData); } QList<ChunkData> chunks; - QString text; }; struct DiffData { QList<FileData> files; - QString text; }; class DIFFEDITOR_EXPORT DiffEditorWidget : public QWidget @@ -110,7 +104,6 @@ public: ~DiffEditorWidget(); void setDiff(const QString &leftText, const QString &rightText); - void setDiff(const QList<Diff> &diffList); QTextCodec *codec() const; public slots: @@ -128,6 +121,7 @@ private slots: void rightDocumentSizeChanged(); private: + void setDiff(const QList<Diff> &diffList); bool isWhitespace(const QChar &c) const; bool isWhitespace(const Diff &diff) const; bool isEqual(const QList<Diff> &diffList, int diffNumber) const; |