diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-10 11:39:41 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-11 08:41:01 +0000 |
commit | 5a2459d1e19d9e8d62b6f8b7e0b41bd578fb7617 (patch) | |
tree | c3db38ec6c2455c42bf2160abf9ab1d0a5eae78b /src | |
parent | 7c8d20ded74bbeab6249b81b34f7078f3f385a81 (diff) | |
download | qt-creator-5a2459d1e19d9e8d62b6f8b7e0b41bd578fb7617.tar.gz |
VcsBase: Make some slots protected and update users accordingly
Change-Id: If38be72e9037126b6b697c5064a07de29a2ef8e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/git/gitplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/mercurial/mercurialplugin.cpp | 4 | ||||
-rw-r--r-- | src/plugins/perforce/perforceplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbaseplugin.h | 3 |
6 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 74a004ea64..2b52313f08 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -330,7 +330,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage) command = ActionManager::registerAction(m_deleteAction, CMD_ID_DELETE_FILE, context); command->setAttribute(Command::CA_UpdateText); - connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile())); + connect(m_deleteAction, &QAction::triggered, this, &CvsPlugin::promptToDeleteCurrentFile); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 708ca4bd37..e59b17a452 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -616,7 +616,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) m_createRepositryAction = new QAction(tr("Create Repository..."), this); Command *createRepositoryCommand = ActionManager::registerAction( m_createRepositryAction, "Git.CreateRepository"); - connect(m_createRepositryAction, SIGNAL(triggered()), this, SLOT(createRepository())); + connect(m_createRepositryAction, &QAction::triggered, this, &GitPlugin::createRepository); gitContainer->addAction(createRepositoryCommand); // Submit editor diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index e9e70c4768..bedaa8adcf 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -231,7 +231,7 @@ void MercurialPlugin::createFileActions(const Core::Context &context) m_deleteAction = new ParameterAction(tr("Delete..."), tr("Delete \"%1\"..."), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(m_deleteAction, Core::Id(Constants::DELETE), context); command->setAttribute(Core::Command::CA_UpdateText); - connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile())); + connect(m_deleteAction, &QAction::triggered, this, &MercurialPlugin::promptToDeleteCurrentFile); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); @@ -411,7 +411,7 @@ void MercurialPlugin::createRepositoryActions(const Core::Context &context) m_createRepositoryAction = new QAction(tr("Create Repository..."), this); command = Core::ActionManager::registerAction(m_createRepositoryAction, Core::Id(Constants::CREATE_REPOSITORY), context); - connect(m_createRepositoryAction, SIGNAL(triggered()), this, SLOT(createRepository())); + connect(m_createRepositoryAction, &QAction::triggered, this, &MercurialPlugin::createRepository); m_mercurialContainer->addAction(command); } diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index d303b6cd45..208530590b 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -309,7 +309,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er command = ActionManager::registerAction(m_deleteAction, CMD_ID_DELETE_FILE, context); command->setAttribute(Command::CA_UpdateText); command->setDescription(tr("Delete File")); - connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile())); + connect(m_deleteAction, &QAction::triggered, this, &PerforcePlugin::promptToDeleteCurrentFile); perforceContainer->addAction(command); m_commandLocator->appendCommand(command); diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index f83252c497..aa97766d8c 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -323,7 +323,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e command = ActionManager::registerAction(m_deleteAction, CMD_ID_DELETE_FILE, context); command->setAttribute(Command::CA_UpdateText); - connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile())); + connect(m_deleteAction, &QAction::triggered, this, &SubversionPlugin::promptToDeleteCurrentFile); subversionMenu->addAction(command); m_commandLocator->appendCommand(command); diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h index 81128df6f1..f091b5d2d2 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.h +++ b/src/plugins/vcsbase/vcsbaseplugin.h @@ -175,7 +175,7 @@ public: QTextCodec *outputCodec = 0, const QProcessEnvironment &env = QProcessEnvironment()); -public slots: +protected: // Convenience slot for "Delete current file" action. Prompts to // delete the file via VcsManager. void promptToDeleteCurrentFile(); @@ -183,7 +183,6 @@ public slots: // pointing to the current project. void createRepository(); -protected: enum ActionState { NoVcsEnabled, OtherVcsEnabled, VcsEnabled }; // Sets the current submit editor for this specific version control plugin. |