Commit 620d1c36 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

VCS: Remove unneeded qualifications

Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I061c7bdcade96961aed226a8348f8ab07ee95f5f
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 6bbee896
...@@ -251,15 +251,15 @@ void BazaarPlugin::createMenu(const Context &context) ...@@ -251,15 +251,15 @@ void BazaarPlugin::createMenu(const Context &context)
void BazaarPlugin::createFileActions(const Context &context) void BazaarPlugin::createFileActions(const Context &context)
{ {
m_annotateFile = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this); m_annotateFile = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this);
Core::Command *command = ActionManager::registerAction(m_annotateFile, ANNOTATE, context); Command *command = ActionManager::registerAction(m_annotateFile, ANNOTATE, context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
connect(m_annotateFile, SIGNAL(triggered()), this, SLOT(annotateCurrentFile())); connect(m_annotateFile, SIGNAL(triggered()), this, SLOT(annotateCurrentFile()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
m_diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this); m_diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_diffFile, DIFF, context); command = ActionManager::registerAction(m_diffFile, DIFF, context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+Z,Meta+D") : tr("ALT+Z,Alt+D"))); command->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+Z,Meta+D") : tr("ALT+Z,Alt+D")));
connect(m_diffFile, SIGNAL(triggered()), this, SLOT(diffCurrentFile())); connect(m_diffFile, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
...@@ -267,7 +267,7 @@ void BazaarPlugin::createFileActions(const Context &context) ...@@ -267,7 +267,7 @@ void BazaarPlugin::createFileActions(const Context &context)
m_logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this); m_logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_logFile, LOG, context); command = ActionManager::registerAction(m_logFile, LOG, context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+Z,Meta+L") : tr("ALT+Z,Alt+L"))); command->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+Z,Meta+L") : tr("ALT+Z,Alt+L")));
connect(m_logFile, SIGNAL(triggered()), this, SLOT(logCurrentFile())); connect(m_logFile, SIGNAL(triggered()), this, SLOT(logCurrentFile()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
...@@ -275,7 +275,7 @@ void BazaarPlugin::createFileActions(const Context &context) ...@@ -275,7 +275,7 @@ void BazaarPlugin::createFileActions(const Context &context)
m_statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this); m_statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_statusFile, STATUS, context); command = ActionManager::registerAction(m_statusFile, STATUS, context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+Z,Meta+S") : tr("ALT+Z,Alt+S"))); command->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+Z,Meta+S") : tr("ALT+Z,Alt+S")));
connect(m_statusFile, SIGNAL(triggered()), this, SLOT(statusCurrentFile())); connect(m_statusFile, SIGNAL(triggered()), this, SLOT(statusCurrentFile()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
...@@ -285,21 +285,21 @@ void BazaarPlugin::createFileActions(const Context &context) ...@@ -285,21 +285,21 @@ void BazaarPlugin::createFileActions(const Context &context)
m_addAction = new ParameterAction(tr("Add"), tr("Add \"%1\""), ParameterAction::EnabledWithParameter, this); m_addAction = new ParameterAction(tr("Add"), tr("Add \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_addAction, ADD, context); command = ActionManager::registerAction(m_addAction, ADD, context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile())); connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
m_deleteAction = new ParameterAction(tr("Delete..."), tr("Delete \"%1\"..."), ParameterAction::EnabledWithParameter, this); m_deleteAction = new ParameterAction(tr("Delete..."), tr("Delete \"%1\"..."), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_deleteAction, DELETE, context); command = ActionManager::registerAction(m_deleteAction, DELETE, context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile())); connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
m_revertFile = new ParameterAction(tr("Revert Current File..."), tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this); m_revertFile = new ParameterAction(tr("Revert Current File..."), tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_revertFile, REVERT, context); command = ActionManager::registerAction(m_revertFile, REVERT, context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
connect(m_revertFile, SIGNAL(triggered()), this, SLOT(revertCurrentFile())); connect(m_revertFile, SIGNAL(triggered()), this, SLOT(revertCurrentFile()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
...@@ -360,7 +360,7 @@ void BazaarPlugin::createDirectoryActions(const Context &context) ...@@ -360,7 +360,7 @@ void BazaarPlugin::createDirectoryActions(const Context &context)
{ {
auto action = new QAction(tr("Diff"), this); auto action = new QAction(tr("Diff"), this);
m_repositoryActionList.append(action); m_repositoryActionList.append(action);
Core::Command *command = ActionManager::registerAction(action, DIFFMULTI, context); Command *command = ActionManager::registerAction(action, DIFFMULTI, context);
connect(action, SIGNAL(triggered()), this, SLOT(diffRepository())); connect(action, SIGNAL(triggered()), this, SLOT(diffRepository()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
...@@ -428,7 +428,7 @@ void BazaarPlugin::createRepositoryActions(const Context &context) ...@@ -428,7 +428,7 @@ void BazaarPlugin::createRepositoryActions(const Context &context)
{ {
auto action = new QAction(tr("Pull..."), this); auto action = new QAction(tr("Pull..."), this);
m_repositoryActionList.append(action); m_repositoryActionList.append(action);
Core::Command *command = ActionManager::registerAction(action, PULL, context); Command *command = ActionManager::registerAction(action, PULL, context);
connect(action, SIGNAL(triggered()), this, SLOT(pull())); connect(action, SIGNAL(triggered()), this, SLOT(pull()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
...@@ -527,11 +527,11 @@ void BazaarPlugin::update() ...@@ -527,11 +527,11 @@ void BazaarPlugin::update()
void BazaarPlugin::createSubmitEditorActions() void BazaarPlugin::createSubmitEditorActions()
{ {
Context context(COMMIT_ID); Context context(COMMIT_ID);
Core::Command *command; Command *command;
m_editorCommit = new QAction(VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this); m_editorCommit = new QAction(VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this);
command = ActionManager::registerAction(m_editorCommit, COMMIT, context); command = ActionManager::registerAction(m_editorCommit, COMMIT, context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
connect(m_editorCommit, SIGNAL(triggered()), this, SLOT(commitFromEditor())); connect(m_editorCommit, SIGNAL(triggered()), this, SLOT(commitFromEditor()));
m_editorDiff = new QAction(VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this); m_editorDiff = new QAction(VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this);
...@@ -743,7 +743,7 @@ bool BazaarPlugin::submitEditorAboutToClose() ...@@ -743,7 +743,7 @@ bool BazaarPlugin::submitEditorAboutToClose()
return true; return true;
} }
void BazaarPlugin::updateActions(VcsBase::VcsBasePlugin::ActionState as) void BazaarPlugin::updateActions(VcsBasePlugin::ActionState as)
{ {
if (!enableMenuAction(as, m_menuAction)) { if (!enableMenuAction(as, m_menuAction)) {
m_commandLocator->setEnabled(false); m_commandLocator->setEnabled(false);
......
...@@ -407,14 +407,14 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage) ...@@ -407,14 +407,14 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
cvsMenu->addSeparator(context); cvsMenu->addSeparator(context);
m_updateDirectoryAction = new ParameterAction(tr("Update Directory"), tr("Update Directory \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); m_updateDirectoryAction = new ParameterAction(tr("Update Directory"), tr("Update Directory \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_updateDirectoryAction, CMD_ID_UPDATE_DIRECTORY, context); command = ActionManager::registerAction(m_updateDirectoryAction, CMD_ID_UPDATE_DIRECTORY, context);
command->setAttribute(Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
connect(m_updateDirectoryAction, SIGNAL(triggered()), this, SLOT(updateDirectory())); connect(m_updateDirectoryAction, SIGNAL(triggered()), this, SLOT(updateDirectory()));
cvsMenu->addAction(command); cvsMenu->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
m_commitDirectoryAction = new ParameterAction(tr("Commit Directory"), tr("Commit Directory \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); m_commitDirectoryAction = new ParameterAction(tr("Commit Directory"), tr("Commit Directory \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_commitDirectoryAction, command = ActionManager::registerAction(m_commitDirectoryAction,
CMD_ID_COMMIT_DIRECTORY, context); CMD_ID_COMMIT_DIRECTORY, context);
command->setAttribute(Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
connect(m_commitDirectoryAction, SIGNAL(triggered()), this, SLOT(startCommitDirectory())); connect(m_commitDirectoryAction, SIGNAL(triggered()), this, SLOT(startCommitDirectory()));
......
...@@ -38,7 +38,7 @@ using namespace Cvs::Internal; ...@@ -38,7 +38,7 @@ using namespace Cvs::Internal;
using namespace VcsBase; using namespace VcsBase;
CvsSubmitEditor::CvsSubmitEditor(const VcsBaseSubmitEditorParameters *parameters) : CvsSubmitEditor::CvsSubmitEditor(const VcsBaseSubmitEditorParameters *parameters) :
VcsBaseSubmitEditor(parameters, new VcsBase::SubmitEditorWidget), VcsBaseSubmitEditor(parameters, new SubmitEditorWidget),
m_msgAdded(tr("Added")), m_msgAdded(tr("Added")),
m_msgRemoved(tr("Removed")), m_msgRemoved(tr("Removed")),
m_msgModified(tr("Modified")) m_msgModified(tr("Modified"))
......
...@@ -724,7 +724,7 @@ QString BranchModel::toolTip(const QString &sha) const ...@@ -724,7 +724,7 @@ QString BranchModel::toolTip(const QString &sha) const
QStringList arguments(QLatin1String("-n1")); QStringList arguments(QLatin1String("-n1"));
arguments << sha; arguments << sha;
if (!m_client->synchronousLog(m_workingDirectory, arguments, &output, &errorMessage, if (!m_client->synchronousLog(m_workingDirectory, arguments, &output, &errorMessage,
VcsBase::VcsBasePlugin::SuppressCommandLogging)) { VcsBasePlugin::SuppressCommandLogging)) {
return errorMessage; return errorMessage;
} }
return output; return output;
......
...@@ -312,7 +312,7 @@ void QueryContext::startQuery(const QString &query) ...@@ -312,7 +312,7 @@ void QueryContext::startQuery(const QString &query)
{ {
QStringList arguments = m_baseArguments; QStringList arguments = m_baseArguments;
arguments.push_back(query); arguments.push_back(query);
VcsBase::VcsOutputWindow::appendCommand( VcsOutputWindow::appendCommand(
m_process.workingDirectory(), Utils::FileName::fromString(m_binary), arguments); m_process.workingDirectory(), Utils::FileName::fromString(m_binary), arguments);
m_timer.start(); m_timer.start();
m_process.start(m_binary, arguments); m_process.start(m_binary, arguments);
...@@ -323,7 +323,7 @@ void QueryContext::errorTermination(const QString &msg) ...@@ -323,7 +323,7 @@ void QueryContext::errorTermination(const QString &msg)
{ {
m_progress.reportCanceled(); m_progress.reportCanceled();
m_progress.reportFinished(); m_progress.reportFinished();
VcsBase::VcsOutputWindow::appendError(msg); VcsOutputWindow::appendError(msg);
emit finished(); emit finished();
} }
...@@ -333,7 +333,7 @@ void QueryContext::processError(QProcess::ProcessError e) ...@@ -333,7 +333,7 @@ void QueryContext::processError(QProcess::ProcessError e)
if (e == QProcess::FailedToStart) if (e == QProcess::FailedToStart)
errorTermination(msg); errorTermination(msg);
else else
VcsBase::VcsOutputWindow::appendError(msg); VcsOutputWindow::appendError(msg);
} }
void QueryContext::processFinished(int exitCode, QProcess::ExitStatus es) void QueryContext::processFinished(int exitCode, QProcess::ExitStatus es)
...@@ -361,7 +361,7 @@ void QueryContext::processFinished(int exitCode, QProcess::ExitStatus es) ...@@ -361,7 +361,7 @@ void QueryContext::processFinished(int exitCode, QProcess::ExitStatus es)
void QueryContext::readyReadStandardError() void QueryContext::readyReadStandardError()
{ {
VcsBase::VcsOutputWindow::appendError(QString::fromLocal8Bit(m_process.readAllStandardError())); VcsOutputWindow::appendError(QString::fromLocal8Bit(m_process.readAllStandardError()));
} }
void QueryContext::readyReadStandardOutput() void QueryContext::readyReadStandardOutput()
...@@ -597,7 +597,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters, ...@@ -597,7 +597,7 @@ static bool parseOutput(const QSharedPointer<GerritParameters> &parameters,
.arg(QString::fromLocal8Bit(line)) .arg(QString::fromLocal8Bit(line))
.arg(error.errorString()); .arg(error.errorString());
qWarning() << errorMessage; qWarning() << errorMessage;
VcsBase::VcsOutputWindow::appendError(errorMessage); VcsOutputWindow::appendError(errorMessage);
res = false; res = false;
continue; continue;
} }
......
...@@ -305,7 +305,7 @@ void GerritPlugin::updateActions(bool hasTopLevel) ...@@ -305,7 +305,7 @@ void GerritPlugin::updateActions(bool hasTopLevel)
m_pushToGerritCommand->action()->setEnabled(hasTopLevel); m_pushToGerritCommand->action()->setEnabled(hasTopLevel);
} }
void GerritPlugin::addToLocator(Core::CommandLocator *locator) void GerritPlugin::addToLocator(CommandLocator *locator)
{ {
locator->appendCommand(m_gerritCommand); locator->appendCommand(m_gerritCommand);
locator->appendCommand(m_pushToGerritCommand); locator->appendCommand(m_pushToGerritCommand);
...@@ -439,7 +439,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode) ...@@ -439,7 +439,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
QString repository; QString repository;
bool verifiedRepository = false; bool verifiedRepository = false;
if (!m_dialog.isNull() && !m_parameters.isNull() && QFile::exists(m_dialog->repositoryPath())) if (!m_dialog.isNull() && !m_parameters.isNull() && QFile::exists(m_dialog->repositoryPath()))
repository = Core::VcsManager::findTopLevelForDirectory(m_dialog->repositoryPath()); repository = VcsManager::findTopLevelForDirectory(m_dialog->repositoryPath());
if (!repository.isEmpty()) { if (!repository.isEmpty()) {
// Check if remote from a working dir is the same as remote from patch // Check if remote from a working dir is the same as remote from patch
...@@ -550,7 +550,7 @@ QString GerritPlugin::findLocalRepository(QString project, const QString &branch ...@@ -550,7 +550,7 @@ QString GerritPlugin::findLocalRepository(QString project, const QString &branch
} // branchRegexp or file name match } // branchRegexp or file name match
} // for repositories } // for repositories
// No match, do we have a projects folder? // No match, do we have a projects folder?
if (Core::DocumentManager::useProjectsDirectory()) if (DocumentManager::useProjectsDirectory())
return DocumentManager::projectsDirectory(); return DocumentManager::projectsDirectory();
return QDir::currentPath(); return QDir::currentPath();
......
...@@ -112,7 +112,7 @@ QString GitEditorWidget::changeUnderCursor(const QTextCursor &c) const ...@@ -112,7 +112,7 @@ QString GitEditorWidget::changeUnderCursor(const QTextCursor &c) const
return QString(); return QString();
} }
VcsBase::BaseAnnotationHighlighter *GitEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const BaseAnnotationHighlighter *GitEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
{ {
return new GitAnnotationHighlighter(changes); return new GitAnnotationHighlighter(changes);
} }
...@@ -181,7 +181,7 @@ void GitEditorWidget::setPlainTextFiltered(const QString &text) ...@@ -181,7 +181,7 @@ void GitEditorWidget::setPlainTextFiltered(const QString &text)
// If desired, filter out the date from annotation // If desired, filter out the date from annotation
switch (contentType()) switch (contentType())
{ {
case VcsBase::AnnotateOutput: { case AnnotateOutput: {
const bool omitAnnotationDate = plugin->settings().boolValue(GitSettings::omitAnnotationDateKey); const bool omitAnnotationDate = plugin->settings().boolValue(GitSettings::omitAnnotationDateKey);
if (omitAnnotationDate) if (omitAnnotationDate)
modText = removeAnnotationDate(text); modText = removeAnnotationDate(text);
...@@ -244,7 +244,7 @@ void GitEditorWidget::stageDiffChunk() ...@@ -244,7 +244,7 @@ void GitEditorWidget::stageDiffChunk()
{ {
const QAction *a = qobject_cast<QAction *>(sender()); const QAction *a = qobject_cast<QAction *>(sender());
QTC_ASSERT(a, return); QTC_ASSERT(a, return);
const VcsBase::DiffChunk chunk = qvariant_cast<VcsBase::DiffChunk>(a->data()); const DiffChunk chunk = qvariant_cast<DiffChunk>(a->data());
return applyDiffChunk(chunk, false); return applyDiffChunk(chunk, false);
} }
...@@ -252,11 +252,11 @@ void GitEditorWidget::unstageDiffChunk() ...@@ -252,11 +252,11 @@ void GitEditorWidget::unstageDiffChunk()
{ {
const QAction *a = qobject_cast<QAction *>(sender()); const QAction *a = qobject_cast<QAction *>(sender());
QTC_ASSERT(a, return); QTC_ASSERT(a, return);
const VcsBase::DiffChunk chunk = qvariant_cast<VcsBase::DiffChunk>(a->data()); const DiffChunk chunk = qvariant_cast<DiffChunk>(a->data());
return applyDiffChunk(chunk, true); return applyDiffChunk(chunk, true);
} }
void GitEditorWidget::applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert) void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert)
{ {
QTemporaryFile patchFile; QTemporaryFile patchFile;
if (!patchFile.open()) if (!patchFile.open())
...@@ -288,7 +288,7 @@ void GitEditorWidget::applyDiffChunk(const VcsBase::DiffChunk& chunk, bool rever ...@@ -288,7 +288,7 @@ void GitEditorWidget::applyDiffChunk(const VcsBase::DiffChunk& chunk, bool rever
void GitEditorWidget::init() void GitEditorWidget::init()
{ {
VcsBase::VcsBaseEditorWidget::init(); VcsBaseEditorWidget::init();
Core::Id editorId = textDocument()->id(); Core::Id editorId = textDocument()->id();
if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID) if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID)
textDocument()->setSyntaxHighlighter(new GitSubmitHighlighter); textDocument()->setSyntaxHighlighter(new GitSubmitHighlighter);
...@@ -296,7 +296,7 @@ void GitEditorWidget::init() ...@@ -296,7 +296,7 @@ void GitEditorWidget::init()
textDocument()->setSyntaxHighlighter(new GitRebaseHighlighter); textDocument()->setSyntaxHighlighter(new GitRebaseHighlighter);
} }
void GitEditorWidget::addDiffActions(QMenu *menu, const VcsBase::DiffChunk &chunk) void GitEditorWidget::addDiffActions(QMenu *menu, const DiffChunk &chunk)
{ {
menu->addSeparator(); menu->addSeparator();
...@@ -356,7 +356,7 @@ bool GitEditorWidget::isValidRevision(const QString &revision) const ...@@ -356,7 +356,7 @@ bool GitEditorWidget::isValidRevision(const QString &revision) const
void GitEditorWidget::addChangeActions(QMenu *menu, const QString &change) void GitEditorWidget::addChangeActions(QMenu *menu, const QString &change)
{ {
m_currentChange = change; m_currentChange = change;
if (contentType() != VcsBase::OtherContent) { if (contentType() != OtherContent) {
menu->addAction(tr("Cherry-Pick Change %1").arg(change), this, SLOT(cherryPickChange())); menu->addAction(tr("Cherry-Pick Change %1").arg(change), this, SLOT(cherryPickChange()));
menu->addAction(tr("Revert Change %1").arg(change), this, SLOT(revertChange())); menu->addAction(tr("Revert Change %1").arg(change), this, SLOT(revertChange()));
menu->addAction(tr("Checkout Change %1").arg(change), this, SLOT(checkoutChange())); menu->addAction(tr("Checkout Change %1").arg(change), this, SLOT(checkoutChange()));
......
...@@ -103,23 +103,23 @@ const char RC_GIT_MIME_XML[] = ":/git/Git.mimetypes.xml"; ...@@ -103,23 +103,23 @@ const char RC_GIT_MIME_XML[] = ":/git/Git.mimetypes.xml";
const VcsBaseEditorParameters editorParameters[] = { const VcsBaseEditorParameters editorParameters[] = {
{ {
VcsBase::OtherContent, OtherContent,
Git::Constants::GIT_COMMAND_LOG_EDITOR_ID, Git::Constants::GIT_COMMAND_LOG_EDITOR_ID,
Git::Constants::GIT_COMMAND_LOG_EDITOR_DISPLAY_NAME, Git::Constants::GIT_COMMAND_LOG_EDITOR_DISPLAY_NAME,
"text/vnd.qtcreator.git.commandlog"}, "text/vnd.qtcreator.git.commandlog"},
{ VcsBase::LogOutput, { LogOutput,
Git::Constants::GIT_LOG_EDITOR_ID, Git::Constants::GIT_LOG_EDITOR_ID,
Git::Constants::GIT_LOG_EDITOR_DISPLAY_NAME, Git::Constants::GIT_LOG_EDITOR_DISPLAY_NAME,
"text/vnd.qtcreator.git.log"}, "text/vnd.qtcreator.git.log"},
{ VcsBase::AnnotateOutput, { AnnotateOutput,
Git::Constants::GIT_BLAME_EDITOR_ID, Git::Constants::GIT_BLAME_EDITOR_ID,
Git::Constants::GIT_BLAME_EDITOR_DISPLAY_NAME, Git::Constants::GIT_BLAME_EDITOR_DISPLAY_NAME,
"text/vnd.qtcreator.git.annotation"}, "text/vnd.qtcreator.git.annotation"},
{ VcsBase::OtherContent, { OtherContent,
Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID, Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID,
Git::Constants::GIT_COMMIT_TEXT_EDITOR_DISPLAY_NAME, Git::Constants::GIT_COMMIT_TEXT_EDITOR_DISPLAY_NAME,
"text/vnd.qtcreator.git.commit"}, "text/vnd.qtcreator.git.commit"},
{ VcsBase::OtherContent, { OtherContent,
Git::Constants::GIT_REBASE_EDITOR_ID, Git::Constants::GIT_REBASE_EDITOR_ID,
Git::Constants::GIT_REBASE_EDITOR_DISPLAY_NAME, Git::Constants::GIT_REBASE_EDITOR_DISPLAY_NAME,
"text/vnd.qtcreator.git.rebase"}, "text/vnd.qtcreator.git.rebase"},
...@@ -186,10 +186,10 @@ ParameterAction *GitPlugin::createParameterAction(ActionContainer *ac, ...@@ -186,10 +186,10 @@ ParameterAction *GitPlugin::createParameterAction(ActionContainer *ac,
bool addToLocator, const QKeySequence &keys) bool addToLocator, const QKeySequence &keys)
{ {
auto action = new ParameterAction(defaultText, parameterText, ParameterAction::EnabledWithParameter, this); auto action = new ParameterAction(defaultText, parameterText, ParameterAction::EnabledWithParameter, this);
Core::Command *command = ActionManager::registerAction(action, id, context); Command *command = ActionManager::registerAction(action, id, context);
if (!keys.isEmpty()) if (!keys.isEmpty())
command->setDefaultKeySequence(keys); command->setDefaultKeySequence(keys);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
ac->addAction(command); ac->addAction(command);
if (addToLocator) if (addToLocator)
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
...@@ -227,7 +227,7 @@ QAction *GitPlugin::createRepositoryAction(ActionContainer *ac, ...@@ -227,7 +227,7 @@ QAction *GitPlugin::createRepositoryAction(ActionContainer *ac,
const QKeySequence &keys) const QKeySequence &keys)
{ {
auto action = new QAction(text, this); auto action = new QAction(text, this);
Core::Command *command = ActionManager::registerAction(action, id, context); Command *command = ActionManager::registerAction(action, id, context);
if (!keys.isEmpty()) if (!keys.isEmpty())
command->setDefaultKeySequence(keys); command->setDefaultKeySequence(keys);
if (ac) if (ac)
...@@ -293,12 +293,12 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) ...@@ -293,12 +293,12 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters,
[]() { return new GitSubmitEditor(&submitParameters); })); []() { return new GitSubmitEditor(&submitParameters); }));
auto cloneWizardFactory = new VcsBase::BaseCheckoutWizardFactory; auto cloneWizardFactory = new BaseCheckoutWizardFactory;
cloneWizardFactory->setId(QLatin1String(VcsBase::Constants::VCS_ID_GIT)); cloneWizardFactory->setId(QLatin1String(VcsBase::Constants::VCS_ID_GIT));
cloneWizardFactory->setIcon(QIcon(QLatin1String(":/git/images/git.png"))); cloneWizardFactory->setIcon(QIcon(QLatin1String(":/git/images/git.png")));
cloneWizardFactory->setDescription(tr("Clones a Git repository and tries to load the contained project.")); cloneWizardFactory->setDescription(tr("Clones a Git repository and tries to load the contained project."));
cloneWizardFactory->setDisplayName(tr("Git Repository Clone")); cloneWizardFactory->setDisplayName(tr("Git Repository Clone"));
cloneWizardFactory->setWizardCreator([this] (const Utils::FileName &path, QWidget *parent) { cloneWizardFactory->setWizardCreator([this] (const FileName &path, QWidget *parent) {
return new CloneWizard(path, parent); return new CloneWizard(path, parent);
}); });
addAutoReleasedObject(cloneWizardFactory); addAutoReleasedObject(cloneWizardFactory);
...@@ -310,7 +310,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) ...@@ -310,7 +310,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
//register actions //register actions
ActionContainer *toolsContainer = ActionManager::actionContainer(Core::Constants::M_TOOLS); ActionContainer *toolsContainer = ActionManager::actionContainer(Core::Constants::M_TOOLS);
Core::ActionContainer *gitContainer = ActionManager::createMenu("Git"); ActionContainer *gitContainer = ActionManager::createMenu("Git");
gitContainer->menu()->setTitle(tr("&Git")); gitContainer->menu()->setTitle(tr("&Git"));
toolsContainer->addMenu(gitContainer); toolsContainer->addMenu(gitContainer);
m_menuAction = gitContainer->menu()->menuAction(); m_menuAction = gitContainer->menu()->menuAction();
...@@ -624,7 +624,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) ...@@ -624,7 +624,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
context, false, SLOT(startChangeRelatedAction())); context, false, SLOT(startChangeRelatedAction()));
m_createRepositryAction = new QAction(tr("Create Repository..."), this); m_createRepositryAction = new QAction(tr("Create Repository..."), this);
Core::Command *createRepositoryCommand = ActionManager::registerAction( Command *createRepositoryCommand = ActionManager::registerAction(
m_createRepositryAction, "Git.CreateRepository", globalcontext); m_createRepositryAction, "Git.CreateRepository", globalcontext);
connect(m_createRepositryAction, SIGNAL(triggered()), this, SLOT(createRepository())); connect(m_createRepositryAction, SIGNAL(triggered()), this, SLOT(createRepository()));
gitContainer->addAction(createRepositoryCommand); gitContainer->addAction(createRepositoryCommand);
...@@ -632,8 +632,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) ...@@ -632,8 +632,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
// Submit editor // Submit editor
Context submitContext(Constants::GITSUBMITEDITOR_ID); Context submitContext(Constants::GITSUBMITEDITOR_ID);
m_submitCurrentAction = new QAction(VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this); m_submitCurrentAction = new QAction(VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this);
Core::Command *command = ActionManager::registerAction(m_submitCurrentAction, Constants::SUBMIT_CURRENT, submitContext); Command *command = ActionManager::registerAction(m_submitCurrentAction, Constants::SUBMIT_CURRENT, submitContext);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Command::CA_UpdateText);
connect(m_submitCurrentAction, SIGNAL(triggered()), this, SLOT(submitCurrentLog())); connect(m_submitCurrentAction, SIGNAL(triggered()), this, SLOT(submitCurrentLog()));
m_diffSelectedFilesAction = new QAction(VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this); m_diffSelectedFilesAction = new QAction(VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this);
......
...@@ -52,10 +52,10 @@ using namespace VcsBase; ...@@ -52,10 +52,10 @@ using namespace VcsBase;
namespace Git { namespace Git {
namespace Internal { namespace Internal {
class GitSubmitFileModel : public VcsBase::SubmitFileModel class GitSubmitFileModel : public SubmitFileModel
{ {
public: public:
GitSubmitFileModel(QObject *parent = 0) : VcsBase::SubmitFileModel(parent) GitSubmitFileModel(QObject *parent = 0) : SubmitFileModel(parent)
{ } { }
void updateSelections(SubmitFileModel *source) void updateSelections(SubmitFileModel *source)
...@@ -124,7 +124,7 @@ private: ...@@ -124,7 +124,7 @@ private:
* option for staged files. So, we sort apart the diff file lists * option for staged files. So, we sort apart the diff file lists
* according to a type flag we add to the model. */ * according to a type flag we add to the model. */
GitSubmitEditor::GitSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters) : GitSubmitEditor::GitSubmitEditor(const VcsBaseSubmitEditorParameters *parameters) :
VcsBaseSubmitEditor(parameters, new GitSubmitEditorWidget), VcsBaseSubmitEditor(parameters, new GitSubmitEditorWidget),
m_model(0), m_model(0),
m_commitEncoding(0), m_commitEncoding(0),
...@@ -178,14 +178,14 @@ void GitSubmitEditor::setCommitData(const CommitData &d) ...@@ -178,14 +178,14 @@ void GitSubmitEditor::setCommitData(const CommitData &d)
it != d.files.constEnd(); ++it) { it != d.files.constEnd(); ++it) {
const FileStates state = it->first; const FileStates state = it->first;
const QString file = it->second; const QString file = it->second;
VcsBase::CheckMode checkMode; CheckMode checkMode;
if (state & UnmergedFile) {