diff options
| author | hjk <qtc-committer@nokia.com> | 2010-06-25 17:37:59 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-06-25 17:38:25 +0200 |
| commit | 2f5f358ff420bf4fa2fdc09d105463bd1e0e792f (patch) | |
| tree | a826357ccde587a1cce12749ff5fbb0ae8ac6f79 /src/plugins/subversion | |
| parent | 2bdf10ce1077fc21f6a3835de1f103f87c75eebf (diff) | |
| download | qt-creator-2f5f358ff420bf4fa2fdc09d105463bd1e0e792f.tar.gz | |
Core::Context: compile hot fix for Windows.
Diffstat (limited to 'src/plugins/subversion')
| -rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index fe2ac398db..089b1c38a1 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -49,7 +49,6 @@ #include <coreplugin/filemanager.h> #include <coreplugin/messagemanager.h> #include <coreplugin/mimedatabase.h> -#include <coreplugin/uniqueidmanager.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> @@ -304,8 +303,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e subversionMenu->menu()->setTitle(tr("&Subversion")); toolsContainer->addMenu(subversionMenu); m_menuAction = subversionMenu->menu()->menuAction(); - Core::Context globalcontext(core->uniqueIDManager()->uniqueIdentifier(C_GLOBAL)); - + Core::Context globalcontext(C_GLOBAL); Core::Command *command; m_diffCurrentAction = new Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); @@ -456,8 +454,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e m_commandLocator->appendCommand(command); // Actions of the submit editor - Core::Context svncommitcontext; - svncommitcontext << Core::UniqueIDManager::instance()->uniqueIdentifier(Constants::SUBVERSIONCOMMITEDITOR); + Core::Context svncommitcontext(Constants::SUBVERSIONCOMMITEDITOR); m_submitCurrentLogAction = new QAction(VCSBase::VCSBaseSubmitEditor::submitIcon(), tr("Commit"), this); command = ami->registerAction(m_submitCurrentLogAction, Constants::SUBMIT_CURRENT, svncommitcontext); |