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

Git: Add override

Browse Source 
Change-Id: Iae0779c1efa8b3b46cf504f7bda00d614a4a157e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2015-04-12 22:55:59 +03:00
committed by Orgad Shaneh
parent aedfbd5710
commit 4eb2224f47
22 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/mergetool.cpp
View File

@@ -56,7 +56,7 @@ public:
}
protected:
qint64 readData(char *data, qint64 maxlen)
qint64 readData(char *data, qint64 maxlen) override
{
qint64 res = QProcess::readData(data, maxlen);
if (res > 0)
@@ -64,7 +64,7 @@ protected:
return res;
}
qint64 writeData(const char *data, qint64 len)
qint64 writeData(const char *data, qint64 len) override
{
if (len > 0)
VcsOutputWindow::append(QString::fromLocal8Bit(data, len));