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

CVS: Modernize

Browse Source 
override, auto, nullptr

Change-Id: I1611ca33b1c3ddd563d9e74f77dbcdc903b65b78
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-20 00:56:53 +03:00
committed by Orgad Shaneh
parent 7fdf1b84b7
commit 9cdce2ed52
8 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ class CvsAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
public:
explicit CvsAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document = 0);
QTextDocument *document = nullptr);
private:
QString changeNumber(const QString &block) const override;

2
src/plugins/cvs/cvsclient.cpp
View File

@@ -48,7 +48,7 @@ class CvsDiffConfig : public VcsBaseEditorConfig
Q_OBJECT
public:
CvsDiffConfig(VcsBaseClientSettings &settings, QToolBar *toolBar);
QStringList arguments() const;
QStringList arguments() const override;
private:
VcsBaseClientSettings &m_settings;

2
src/plugins/cvs/cvscontrol.cpp
View File

@@ -141,7 +141,7 @@ Core::ShellCommand *CvsControl::createInitialCheckoutCommand(const QString &url,
const QString &localName,
const QStringList &extraArgs)
{
QTC_ASSERT(localName == url, return 0);
QTC_ASSERT(localName == url, return nullptr);
const CvsSettings settings = CvsPlugin::instance()->client()->settings();

2
src/plugins/cvs/cvscontrol.h
View File

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

25
src/plugins/cvs/cvsplugin.cpp
View File

@@ -144,8 +144,9 @@ const VcsBaseEditorParameters editorParameters[] = {
// Utility to find a parameter set by type
static inline const VcsBaseEditorParameters *findType(int ie)
{
const EditorContentType et = static_cast<EditorContentType>(ie);
return VcsBaseEditor::findType(editorParameters, sizeof(editorParameters) / sizeof(editorParameters[0]), et);
return VcsBaseEditor::findType(editorParameters,
sizeof(editorParameters) / sizeof(*editorParameters),
static_cast<EditorContentType>(ie));
}
static inline bool messageBoxQuestion(const QString &title, const QString &question)
@@ -154,7 +155,7 @@ static inline bool messageBoxQuestion(const QString &title, const QString &quest
}
// ------------- CVSPlugin
CvsPlugin *CvsPlugin::m_cvsPluginInstance = 0;
CvsPlugin *CvsPlugin::m_cvsPluginInstance = nullptr;
CvsPlugin::~CvsPlugin()
{
@@ -416,7 +417,7 @@ bool CvsPlugin::submitEditorAboutToClose()
if (!isCommitEditorOpen())
return true;
CvsSubmitEditor *editor = qobject_cast<CvsSubmitEditor *>(submitEditor());
auto editor = qobject_cast<CvsSubmitEditor *>(submitEditor());
QTC_ASSERT(editor, return true);
IDocument *editorDocument = editor->document();
QTC_ASSERT(editorDocument, return true);
@@ -466,15 +467,15 @@ void CvsPlugin::diffCommitFiles(const QStringList &files)
static void setDiffBaseDirectory(IEditor *editor, const QString &db)
{
if (VcsBaseEditorWidget *ve = qobject_cast<VcsBaseEditorWidget*>(editor->widget()))
if (auto ve = qobject_cast<VcsBaseEditorWidget*>(editor->widget()))
ve->setWorkingDirectory(db);
}
CvsSubmitEditor *CvsPlugin::openCVSSubmitEditor(const QString &fileName)
{
IEditor *editor = EditorManager::openEditor(fileName, CVSCOMMITEDITOR_ID);
CvsSubmitEditor *submitEditor = qobject_cast<CvsSubmitEditor*>(editor);
QTC_ASSERT(submitEditor, return 0);
auto submitEditor = qobject_cast<CvsSubmitEditor*>(editor);
QTC_ASSERT(submitEditor, return nullptr);
connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
this, &CvsPlugin::diffCommitFiles);
@@ -907,7 +908,7 @@ bool CvsPlugin::status(const QString &topLevel, const QString &file, const QStri
runCvs(topLevel, args, client()->vcsTimeoutS(), 0);
const bool ok = response.result == CvsResponse::Ok;
if (ok)
showOutputInEditor(title, response.stdOut, OtherContent, topLevel, 0);
showOutputInEditor(title, response.stdOut, OtherContent, topLevel, nullptr);
return ok;
}
@@ -1027,7 +1028,7 @@ bool CvsPlugin::describe(const QString &repositoryPath,
{
// Collect logs
QString output;
QTextCodec *codec = 0;
QTextCodec *codec = nullptr;
const QList<CvsLogEntry>::iterator lend = entries.end();
for (QList<CvsLogEntry>::iterator it = entries.begin(); it != lend; ++it) {
// Before fiddling file names, try to find codec
@@ -1141,13 +1142,13 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp
QTextCodec *codec)
{
const VcsBaseEditorParameters *params = findType(editorType);
QTC_ASSERT(params, return 0);
QTC_ASSERT(params, return nullptr);
const Id id = params->id;
QString s = title;
IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8());
CvsEditorWidget *e = qobject_cast<CvsEditorWidget*>(editor->widget());
auto e = qobject_cast<CvsEditorWidget*>(editor->widget());
if (!e)
return 0;
return nullptr;
connect(e, &VcsBaseEditorWidget::annotateRevisionRequested, this, &CvsPlugin::annotate);
s.replace(QLatin1Char(' '), QLatin1Char('_'));
e->textDocument()->setFallbackSaveAsFileName(s);

4
src/plugins/cvs/cvsplugin.h
View File

@@ -79,7 +79,7 @@ public:
// IVersionControl
bool vcsAdd(const QString &workingDir, const QString &fileName);
bool vcsDelete(const QString &workingDir, const QString &fileName);
bool managesDirectory(const QString &directory, QString *topLevel = 0) const;
bool managesDirectory(const QString &directory, QString *topLevel = nullptr) const;
bool managesFile(const QString &workingDirectory, const QString &fileName) const;
// cvs 'edit' is used to implement 'open' (cvsnt).
bool edit(const QString &topLevel, const QStringList &files);
@@ -135,7 +135,7 @@ private:
const QStringList &arguments,
int timeOutS,
unsigned flags,
QTextCodec *outputCodec = 0) const;
QTextCodec *outputCodec = nullptr) const;
void annotate(const QString &workingDir, const QString &file,
const QString &revision = QString(), int lineNumber= -1);

2
src/plugins/cvs/cvssettings.h
View File

@@ -46,7 +46,7 @@ public:
QStringList addOptions(const QStringList &args) const;
protected:
void readLegacySettings(const QSettings *settings);
void readLegacySettings(const QSettings *settings) override;
};
} // namespace Internal

6
src/plugins/cvs/settingspage.h
View File

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