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

Bazaar: Modernize

Browse Source 
override, auto, nullptr

Change-Id: I052bc2759f61129c0185e3ae196de73bf22024c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-20 00:25:36 +03:00
committed by Orgad Shaneh
parent 260750cc24
commit 7fdf1b84b7
11 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/bazaar/annotationhighlighter.h
View File

@@ -38,7 +38,7 @@ public:
QTextDocument *document = nullptr);
private:
QString changeNumber(const QString &block) const;
QString changeNumber(const QString &block) const override;
mutable QRegExp m_changeset;
};

2
src/plugins/bazaar/bazaarclient.cpp
View File

@@ -60,7 +60,7 @@ public:
settings.boolPointer(BazaarSettings::diffIgnoreBlankLinesKey));
}
QStringList arguments() const
QStringList arguments() const override
{
QStringList args;
// Bazaar wants "--diff-options=-w -B.."

18
src/plugins/bazaar/bazaarclient.h
View File

@@ -48,22 +48,22 @@ public:
const QString& revision = QString(),
const QStringList &extraOptions = QStringList());
void commit(const QString &repositoryRoot, const QStringList &files,
const QString &commitMessageFile, const QStringList &extraOptions = QStringList());
const QString &commitMessageFile, const QStringList &extraOptions = QStringList()) override;
VcsBase::VcsBaseEditorWidget *annotate(
const QString &workingDir, const QString &file, const QString &revision = QString(),
int lineNumber = -1, const QStringList &extraOptions = QStringList());
int lineNumber = -1, const QStringList &extraOptions = QStringList()) override;
bool isVcsDirectory(const Utils::FileName &fileName) const;
QString findTopLevelForFile(const QFileInfo &file) const;
QString findTopLevelForFile(const QFileInfo &file) const override;
bool managesFile(const QString &workingDirectory, const QString &fileName) const;
void view(const QString &source, const QString &id,
const QStringList &extraOptions = QStringList());
const QStringList &extraOptions = QStringList()) override;
protected:
Core::Id vcsEditorKind(VcsCommandTag cmd) const;
QString vcsCommandString(VcsCommandTag cmd) const;
Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const;
QStringList revisionSpec(const QString &revision) const;
StatusItem parseStatusLine(const QString &line) const;
Core::Id vcsEditorKind(VcsCommandTag cmd) const override;
QString vcsCommandString(VcsCommandTag cmd) const override;
Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const override;
QStringList revisionSpec(const QString &revision) const override;
StatusItem parseStatusLine(const QString &line) const override;
private:
friend class CloneWizard;

2
src/plugins/bazaar/bazaarcommitwidget.cpp
View File

@@ -57,7 +57,7 @@ class BazaarSubmitHighlighter : QSyntaxHighlighter
{
public:
explicit BazaarSubmitHighlighter(QTextEdit *parent);
void highlightBlock(const QString &text);
void highlightBlock(const QString &text) override;
private:
enum State { Header, Comment, Other };

2
src/plugins/bazaar/bazaarcontrol.h
View File

@@ -50,7 +50,7 @@ public:
bool isVcsFileOrDirectory(const Utils::FileName &fileName) const final;
bool managesDirectory(const QString &filename, QString *topLevel = 0) const final;
bool managesDirectory(const QString &filename, QString *topLevel = nullptr) const final;
bool managesFile(const QString &workingDirectory, const QString &fileName) const final;
bool isConfigured() const final;
bool supportsOperation(Operation operation) const final;

10
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -129,7 +129,7 @@ const VcsBaseSubmitEditorParameters submitEditorParameters = {
};
BazaarPlugin *BazaarPlugin::m_instance = 0;
BazaarPlugin *BazaarPlugin::m_instance = nullptr;
BazaarPlugin::BazaarPlugin()
{
@@ -139,8 +139,8 @@ BazaarPlugin::BazaarPlugin()
BazaarPlugin::~BazaarPlugin()
{
delete m_client;
m_client = 0;
m_instance = 0;
m_client = nullptr;
m_instance = nullptr;
}
bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -526,7 +526,7 @@ void BazaarPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &stat
return;
}
CommitEditor *commitEditor = qobject_cast<CommitEditor *>(editor);
auto commitEditor = qobject_cast<CommitEditor *>(editor);
if (!commitEditor) {
VcsOutputWindow::appendError(tr("Unable to create a commit editor."));
@@ -630,7 +630,7 @@ void BazaarPlugin::uncommit()
bool BazaarPlugin::submitEditorAboutToClose()
{
CommitEditor *commitEditor = qobject_cast<CommitEditor *>(submitEditor());
auto commitEditor = qobject_cast<CommitEditor *>(submitEditor());
QTC_ASSERT(commitEditor, return true);
IDocument *editorDocument = commitEditor->document();
QTC_ASSERT(editorDocument, return true);

8
src/plugins/bazaar/bazaarplugin.h
View File

@@ -58,15 +58,15 @@ class BazaarPlugin : public VcsBase::VcsBasePlugin
public:
BazaarPlugin();
~BazaarPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage);
~BazaarPlugin() override;
bool initialize(const QStringList &arguments, QString *errorMessage) override;
static BazaarPlugin *instance();
BazaarClient *client() const;
protected:
void updateActions(VcsBase::VcsBasePlugin::ActionState);
bool submitEditorAboutToClose();
void updateActions(VcsBase::VcsBasePlugin::ActionState) override;
bool submitEditorAboutToClose() override;
#ifdef WITH_TESTS
private slots:

2
src/plugins/bazaar/constants.h
View File

@@ -25,6 +25,8 @@
#pragma once
#include <QtGlobal>
namespace Bazaar {
namespace Constants {

6
src/plugins/bazaar/optionspage.h
View File

@@ -39,10 +39,10 @@ class OptionsPageWidget : public VcsBase::VcsClientOptionsPageWidget
Q_OBJECT
public:
explicit OptionsPageWidget(QWidget *parent = 0);
explicit OptionsPageWidget(QWidget *parent = nullptr);
VcsBase::VcsBaseClientSettings settings() const;
void setSettings(const VcsBase::VcsBaseClientSettings &s);
VcsBase::VcsBaseClientSettings settings() const override;
void setSettings(const VcsBase::VcsBaseClientSettings &s) override;
private:
Ui::OptionsPage m_ui;

2
src/plugins/bazaar/pullorpushdialog.h
View File

@@ -42,7 +42,7 @@ public:
PushMode
};
explicit PullOrPushDialog(Mode mode, QWidget *parent = 0);
explicit PullOrPushDialog(Mode mode, QWidget *parent = nullptr);
~PullOrPushDialog() override;
// Common parameters and options

2
src/plugins/bazaar/uncommitdialog.h
View File

@@ -37,7 +37,7 @@ class UnCommitDialog : public QDialog
Q_OBJECT
public:
explicit UnCommitDialog(QWidget *parent = 0);
explicit UnCommitDialog(QWidget *parent = nullptr);
~UnCommitDialog() override;
QStringList extraOptions() const;