aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/perforce/perforceplugin.h
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-08-28 10:24:13 +0200
committerEike Ziller <eike.ziller@qt.io>2018-08-28 09:04:20 +0000
commitbd59472f40a0537cbd8f9458be1429cc88644708 (patch)
tree013f8b1567b5c7fec28bf373d6b175fea2cbfe9b /src/plugins/perforce/perforceplugin.h
parentf06f9122d72a2fbfab0d4d705e9e0258999bd1c1 (diff)
Perforce: Fix warnings and modernize
Change-Id: Id43718869aaf2bc24e6a6614bcddcc35715502fe Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/perforce/perforceplugin.h')
-rw-r--r--src/plugins/perforce/perforceplugin.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h
index c7824c0548..6c1e773357 100644
--- a/src/plugins/perforce/perforceplugin.h
+++ b/src/plugins/perforce/perforceplugin.h
@@ -77,10 +77,10 @@ class PerforcePlugin : public VcsBase::VcsBasePlugin
public:
PerforcePlugin() = default;
- bool initialize(const QStringList &arguments, QString *errorMessage);
- void extensionsInitialized();
+ bool initialize(const QStringList &arguments, QString *errorMessage) override;
+ void extensionsInitialized() override;
- bool managesDirectory(const QString &directory, QString *topLevel = 0);
+ bool managesDirectory(const QString &directory, QString *topLevel = nullptr);
bool managesFile(const QString &workingDirectory, const QString &fileName) const;
bool vcsOpen(const QString &workingDir, const QString &fileName, bool silently = false);
bool vcsAdd(const QString &workingDir, const QString &fileName);
@@ -104,8 +104,8 @@ public:
const QString &revision, int lineNumber);
protected:
- void updateActions(VcsBase::VcsBasePlugin::ActionState);
- bool submitEditorAboutToClose();
+ void updateActions(VcsBase::VcsBasePlugin::ActionState) override;
+ bool submitEditorAboutToClose() override;
#ifdef WITH_TESTS
private slots:
@@ -157,7 +157,7 @@ private:
Core::IEditor *showOutputInEditor(const QString &title, const QString &output,
int editorType, const QString &source,
- QTextCodec *codec = 0);
+ QTextCodec *codec = nullptr);
// Flags for runP4Cmd.
enum RunFlags { CommandToWindow = 0x1, StdOutToWindow = 0x2,
@@ -178,7 +178,7 @@ private:
unsigned flags = CommandToWindow|StdErrToWindow|ErrorToWindow,
const QStringList &extraArgs = QStringList(),
const QByteArray &stdInput = QByteArray(),
- QTextCodec *outputCodec = 0);
+ QTextCodec *outputCodec = nullptr);
static PerforceResponse synchronousProcess(const QString &workingDir,
const QStringList &args,