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

Git: Remove last user of Core::Id::fromUniqueIdentifier

Browse Source 
Change-Id: I049a89a17341205275f68b22fe18234c756dec78
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2015-06-23 12:26:27 +02:00
parent 0f8c181eae
commit 56f9729a10
2 changed files with 74 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/git/gitplugin.h
View File

@@ -33,6 +33,8 @@
#include "gitsettings.h"
#include <coreplugin/id.h>
#include <vcsbase/vcsbaseplugin.h>
#include <QStringList>
@@ -40,6 +42,8 @@
#include <QKeySequence>
#include <QVector>
#include <functional>
QT_BEGIN_NAMESPACE
class QFile;
class QAction;
@@ -108,7 +112,7 @@ private slots:
void undoUnstagedFileChanges();
void resetRepository();
void startRebase();
void startChangeRelatedAction();
void startChangeRelatedAction(const Core::Id &id);
void stageFile();
void unstageFile();
void gitkForCurrentFile();
@@ -178,8 +182,13 @@ private:
QAction *createRepositoryAction(Core::ActionContainer *ac,
const QString &text, Core::Id id,
const Core::Context &context,
bool addToLocator, const char *pluginSlot,
bool addToLocator, const std::function<void()> &callback,
const QKeySequence &keys = QKeySequence());
QAction *createChangeRelatedRepositoryAction(Core::ActionContainer *ac,
const QString &text, Core::Id id,
const Core::Context &context,
bool addToLocator, const std::function<void(Core::Id)> &callback,
const QKeySequence &keys = QKeySequence());
QAction *createRepositoryAction(Core::ActionContainer *ac,
const QString &text, Core::Id id,
const Core::Context &context,