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

Git: Use Qt5-style connects

Browse Source 
The heavy lifting was done by clazy.

Change-Id: I60dcd378419b92f96dc681921701c9231ef8ee57
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-11-19 16:48:37 +01:00
parent 8f8c1052a2
commit 7b3aa16dc6
19 changed files with 98 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/mergetool.h
View File

@@ -69,11 +69,10 @@ public:
SymbolicLinkMerge
};
private slots:
private:
void readData();
void done();
private:
FileState waitAndReadStatus(QString &extraInfo);
QString mergeTypeName();
QString stateName(FileState state, const QString &extraInfo);