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

Git: Modernize

Browse Source 
* pragma once
* member initialization
* s/struct/class/
* Introduce a static GitPlugin::client() method and use it

Change-Id: Ifdcac86dd16f3cdba11d564d03e9a15f00a6afdb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2016-02-10 11:19:27 +01:00
parent 7db0023e8c
commit b4195d5174
47 changed files with 229 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,8 +23,7 @@
**
****************************************************************************/
#ifndef MERGETOOL_H
#define MERGETOOL_H
#pragma once
#include <QObject>
#include <QStringList>
@@ -74,18 +73,15 @@ private:
void chooseAction();
void addButton(QMessageBox *msgBox, const QString &text, char key);
MergeToolProcess *m_process;
MergeType m_mergeType;
MergeToolProcess *m_process = nullptr;
MergeType m_mergeType = NormalMerge;
QString m_fileName;
FileState m_localState;
FileState m_localState = UnknownState;
QString m_localInfo;
FileState m_remoteState;
FileState m_remoteState = UnknownState;
QString m_remoteInfo;
GitClient *m_client;
bool m_merging;
bool m_merging = false;
};
} // namespace Internal
} // namespace Git
#endif // MERGETOOL_H