andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'add_override' into 'master' 

Mark override members as such

See merge request kde/kpmcore!1
This commit is contained in:
Andrius Štikonas 2019-02-15 23:34:56 +00:00
parent ecb78121f3 7f6fa41bce
commit 6f703b9309
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/operationrunner.h
View File

@ -44,7 +44,7 @@ public:
OperationRunner(QObject* parent, OperationStack& ostack); OperationRunner(QObject* parent, OperationStack& ostack);
public: public:
void run(); void run() override;
qint32 numJobs() const; qint32 numJobs() const;
qint32 numOperations() const; qint32 numOperations() const;
qint32 numProgressSub() const; qint32 numProgressSub() const;

10
src/gui/partresizerwidget.h
View File

@ -142,11 +142,11 @@ protected:
m_Device = &d; m_Device = &d;
} }
void paintEvent(QPaintEvent* event); void paintEvent(QPaintEvent* event) override;
void resizeEvent(QResizeEvent* event); void resizeEvent(QResizeEvent* event) override;
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event); void mouseMoveEvent(QMouseEvent* event) override;
void mouseReleaseEvent(QMouseEvent* event); void mouseReleaseEvent(QMouseEvent* event) override;
PartWidget& partWidget() { PartWidget& partWidget() {
Q_ASSERT(m_PartWidget); Q_ASSERT(m_PartWidget);

4
src/gui/partwidget.h
View File

@ -64,8 +64,8 @@ public:
void setFileSystemColorCode( const std::vector<QColor>& colorCode ); void setFileSystemColorCode( const std::vector<QColor>& colorCode );
protected: protected:
void paintEvent(QPaintEvent* event); void paintEvent(QPaintEvent* event) override;
void resizeEvent(QResizeEvent* event); void resizeEvent(QResizeEvent* event) override;
QColor activeColor(const QColor& col) const; QColor activeColor(const QColor& col) const;

4
test/testexternalcommand.cpp
View File

@ -29,7 +29,7 @@
class runcmd : public QThread { class runcmd : public QThread {
public: public:
void run() void run() override
{ {
ExternalCommand blkidCmd(QStringLiteral("blkid"), {}); ExternalCommand blkidCmd(QStringLiteral("blkid"), {});
blkidCmd.run(); blkidCmd.run();
@ -41,7 +41,7 @@ void run()
class runcmd2 : public QThread { class runcmd2 : public QThread {
public: public:
void run() void run() override
{ {
ExternalCommand lsblkCmd(QStringLiteral("lsblk"), { QStringLiteral("--nodeps"), QStringLiteral("--json") }); ExternalCommand lsblkCmd(QStringLiteral("lsblk"), { QStringLiteral("--nodeps"), QStringLiteral("--json") });
lsblkCmd.run(); lsblkCmd.run();