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

Git: Remove setting for side-by-side diff

Browse Source 
Use the diff switcher state as a permanent setting

Change-Id: I6c3669090082787ae750596cf3e62973c04d94c3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-09-29 23:30:22 +03:00
committed by Orgad Shaneh
parent 003e25d488
commit 63e7fe19b9
4 changed files with 75 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/git/gitclient.h
View File

@@ -127,12 +127,6 @@ public:
StashFlag m_flags;
};
enum DiffEditorType {
DefaultDiffEditor, // value taken from settings
SideBySideDiffEditor,
SimpleTextDiffEditor
};
static const char *stashNamePrefix;
explicit GitClient(GitSettings *settings);
@@ -144,17 +138,13 @@ public:
QString findRepositoryForDirectory(const QString &dir);
QString findGitDirForRepository(const QString &repositoryDir) const;
void diff(const QString &workingDirectory,
const QString &fileName,
DiffEditorType editorType = DefaultDiffEditor);
void diff(const QString &workingDirectory, const QString &fileName);
void diff(const QString &workingDirectory,
const QStringList &unstagedFileNames,
const QStringList &stagedFileNames = QStringList(),
DiffEditorType editorType = DefaultDiffEditor);
const QStringList &stagedFileNames = QStringList());
void diffBranch(const QString &workingDirectory,
const QStringList &diffArgs,
const QString &branchName,
DiffEditorType editorType = DefaultDiffEditor);
const QString &branchName);
void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList());
void status(const QString &workingDirectory);
@@ -341,8 +331,7 @@ public slots:
void show(const QString &source,
const QString &id,
const QStringList &args = QStringList(),
const QString &name = QString(),
DiffEditorType editorType = DefaultDiffEditor);
const QString &name = QString());
void saveSettings();
private slots: