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

VCS: Devirtualize diff-related functions

Browse Source 
They are not overridden anywhere, nor such an override seems useful

Change-Id: I1f255b90280d1df37c734789b14086467a469806
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-29 22:57:19 +02:00
committed by Orgad Shaneh
parent 7cb80f0e16
commit 7fb9f7b802
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/vcsbase/vcsbaseeditor.h
View File

@@ -235,13 +235,8 @@ protected:
* source and version control. */ * source and version control. */
virtual QString findDiffFile(const QString &f) const; virtual QString findDiffFile(const QString &f) const;
virtual bool canApplyDiffChunk(const DiffChunk &dc) const;
// Revert a patch chunk. Default implementation uses patch.exe
virtual bool applyDiffChunk(const DiffChunk &dc, bool revert = false) const;
virtual void addChangeActions(QMenu *menu, const QString &change); virtual void addChangeActions(QMenu *menu, const QString &change);
private:
// Implement to return a set of change identifiers in // Implement to return a set of change identifiers in
// annotation mode // annotation mode
virtual QSet<QString> annotationChanges() const = 0; virtual QSet<QString> annotationChanges() const = 0;
@@ -263,6 +258,10 @@ private:
virtual bool isValidRevision(const QString &revision) const; virtual bool isValidRevision(const QString &revision) const;
private: private:
bool canApplyDiffChunk(const DiffChunk &dc) const;
// Revert a patch chunk. Default implementation uses patch.exe
bool applyDiffChunk(const DiffChunk &dc, bool revert = false) const;
// Indicates if the editor has diff contents. If true, an appropriate // Indicates if the editor has diff contents. If true, an appropriate
// highlighter is used and double-click inside a diff chunk jumps to // highlighter is used and double-click inside a diff chunk jumps to
// the relevant file and line // the relevant file and line