forked from qt-creator/qt-creator
Git: Refactor reset
Remove enum, provide the associated flag in the combobox. Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
cbfeb36ce7
commit
e6da908321
@@ -44,13 +44,7 @@ namespace Git {
|
||||
namespace Internal {
|
||||
|
||||
// A dialog that lists SHA1 and subject of the changes
|
||||
// for reset --hard and --soft.
|
||||
|
||||
enum ResetType {
|
||||
HardReset,
|
||||
SoftReset
|
||||
};
|
||||
|
||||
// Used for reset and interactive rebased
|
||||
class LogChangeDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -60,7 +54,7 @@ public:
|
||||
bool runDialog(const QString &repository);
|
||||
|
||||
QString commit() const;
|
||||
ResetType resetType() const;
|
||||
QString resetFlag() const;
|
||||
|
||||
private:
|
||||
bool populateLog(const QString &repository);
|
||||
|
||||
Reference in New Issue
Block a user