From 5f5b7fa4c18fc68467fab8203ec444896ae533aa Mon Sep 17 00:00:00 2001 From: jkobus Date: Tue, 23 Apr 2013 13:16:52 +0200 Subject: 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 --- src/plugins/diffeditor/diffeditorwidget.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/plugins/diffeditor/diffeditorwidget.h') 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 rows; - bool alwaysShown; + bool contextChunk; // QMap changedLeftPositions; // counting from the beginning of the chunk QMap changedRightPositions; // counting from the beginning of the chunk - QString text; }; struct FileData { FileData() {} FileData(const ChunkData &chunkData) { chunks.append(chunkData); } QList chunks; - QString text; }; struct DiffData { QList 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 &diffList); QTextCodec *codec() const; public slots: @@ -128,6 +121,7 @@ private slots: void rightDocumentSizeChanged(); private: + void setDiff(const QList &diffList); bool isWhitespace(const QChar &c) const; bool isWhitespace(const Diff &diff) const; bool isEqual(const QList &diffList, int diffNumber) const; -- cgit v1.2.1