forked from qt-creator/qt-creator
Git: refactoring ChangeSelectionDialog
> Dialog now combines show, cherry-pick and revert > has fixed path, and no way to change it > not created on stack Change-Id: I7cee0b2e775a80941b51a4ca023064baf0d6575c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
@@ -68,7 +68,6 @@ namespace Internal {
|
||||
|
||||
class GitVersionControl;
|
||||
class GitClient;
|
||||
class ChangeSelectionDialog;
|
||||
class GitSubmitEditor;
|
||||
class CommitData;
|
||||
class StashDialog;
|
||||
@@ -117,8 +116,7 @@ private slots:
|
||||
void undoUnstagedFileChanges();
|
||||
void resetRepository();
|
||||
void startRebase();
|
||||
void startRevertCommit();
|
||||
void startCherryPickCommit();
|
||||
void startChangeRelatedAction();
|
||||
void stageFile();
|
||||
void unstageFile();
|
||||
void gitkForCurrentFile();
|
||||
@@ -129,7 +127,6 @@ private slots:
|
||||
void promptApplyPatch();
|
||||
void gitClientMemberFuncRepositoryAction();
|
||||
|
||||
void showCommit();
|
||||
void startAmendCommit();
|
||||
void stash();
|
||||
void stashSnapshot();
|
||||
@@ -201,8 +198,6 @@ private:
|
||||
Locator::CommandLocator *m_commandLocator;
|
||||
QAction *m_createRepositoryAction;
|
||||
|
||||
QAction *m_showAction;
|
||||
|
||||
QAction *m_submitCurrentAction;
|
||||
QAction *m_diffSelectedFilesAction;
|
||||
QAction *m_undoAction;
|
||||
@@ -216,7 +211,6 @@ private:
|
||||
Utils::ParameterAction *m_applyCurrentFilePatchAction;
|
||||
|
||||
GitClient *m_gitClient;
|
||||
ChangeSelectionDialog *m_changeSelectionDialog;
|
||||
QPointer<StashDialog> m_stashDialog;
|
||||
QPointer<BranchDialog> m_branchDialog;
|
||||
QPointer<RemoteDialog> m_remoteDialog;
|
||||
|
||||
Reference in New Issue
Block a user