diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-04-19 09:20:08 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-04-19 14:12:25 +0200 |
| commit | e6da9083211ef91d52c5455ecbac32329630e02c (patch) | |
| tree | 71f8788597a5fb80197d351c046ef922d0a14858 /src/plugins/git/logchangedialog.h | |
| parent | cbfeb36ce756e51f25ce70299491a2fa87c66aed (diff) | |
| download | qt-creator-e6da9083211ef91d52c5455ecbac32329630e02c.tar.gz | |
Git: Refactor reset
Remove enum, provide the associated flag in the combobox.
Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/logchangedialog.h')
| -rw-r--r-- | src/plugins/git/logchangedialog.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/git/logchangedialog.h b/src/plugins/git/logchangedialog.h index 78f61f9cfc..f0b3b1267b 100644 --- a/src/plugins/git/logchangedialog.h +++ b/src/plugins/git/logchangedialog.h @@ -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); |