Use override
This commit is contained in:
@@ -65,7 +65,7 @@ class ObjectHelper : public QObject {
|
||||
Q_OBJECT
|
||||
public:
|
||||
ObjectHelper(QObject *sender, const char *signal, ClosureBase *closure);
|
||||
~ObjectHelper();
|
||||
~ObjectHelper() override;
|
||||
|
||||
private slots:
|
||||
void Invoked();
|
||||
@@ -113,7 +113,7 @@ class Closure : public ClosureBase {
|
||||
QObject::connect(receiver_, SIGNAL(destroyed()), helper_, SLOT(deleteLater()));
|
||||
}
|
||||
|
||||
virtual void Invoke() {
|
||||
void Invoke() override {
|
||||
function_();
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ class CallbackClosure : public ClosureBase {
|
||||
public:
|
||||
CallbackClosure(QObject *sender, const char *signal, std::function<void()> callback);
|
||||
|
||||
virtual void Invoke();
|
||||
void Invoke() override;
|
||||
|
||||
private:
|
||||
std::function<void()> callback_;
|
||||
|
||||
@@ -59,7 +59,7 @@ class ThreadFunctorBase : public QFutureInterface<ReturnType>, public QRunnable
|
||||
return future;
|
||||
}
|
||||
|
||||
virtual void run() = 0;
|
||||
void run() override = 0;
|
||||
};
|
||||
|
||||
template <typename ReturnType, typename... Args>
|
||||
@@ -69,7 +69,7 @@ class ThreadFunctor : public ThreadFunctorBase<ReturnType> {
|
||||
: function_(std::bind(function, args...)) {
|
||||
}
|
||||
|
||||
virtual void run() {
|
||||
void run() override {
|
||||
this->reportResult(function_());
|
||||
this->reportFinished();
|
||||
}
|
||||
@@ -86,7 +86,7 @@ class ThreadFunctor <void, Args...> : public ThreadFunctorBase<void> {
|
||||
: function_(std::bind(function, args...)) {
|
||||
}
|
||||
|
||||
virtual void run() {
|
||||
void run() override {
|
||||
function_();
|
||||
this->reportFinished();
|
||||
}
|
||||
|
||||
@@ -41,8 +41,8 @@ namespace logging {
|
||||
|
||||
class NullDevice : public QIODevice {
|
||||
protected:
|
||||
qint64 readData(char*, qint64) { return -1; }
|
||||
qint64 writeData(const char*, qint64 len) { return len; }
|
||||
qint64 readData(char*, qint64) override { return -1; }
|
||||
qint64 writeData(const char*, qint64 len) override { return len; }
|
||||
};
|
||||
|
||||
enum Level {
|
||||
|
||||
@@ -82,7 +82,7 @@ template <typename MT>
|
||||
class AbstractMessageHandler : public _MessageHandlerBase {
|
||||
public:
|
||||
AbstractMessageHandler(QIODevice *device, QObject *parent);
|
||||
~AbstractMessageHandler() { AbortAll(); }
|
||||
~AbstractMessageHandler() override { AbortAll(); }
|
||||
|
||||
typedef MT MessageType;
|
||||
typedef MessageReply<MT> ReplyType;
|
||||
@@ -107,8 +107,8 @@ protected:
|
||||
virtual void MessageArrived(const MessageType &message) { Q_UNUSED(message); }
|
||||
|
||||
// _MessageHandlerBase
|
||||
bool RawMessageArrived(const QByteArray &data);
|
||||
void AbortAll();
|
||||
bool RawMessageArrived(const QByteArray &data) override;
|
||||
void AbortAll() override;
|
||||
|
||||
private:
|
||||
QMap<int, ReplyType*> pending_replies_;
|
||||
|
||||
@@ -59,7 +59,7 @@ class MessageReply : public _MessageReplyBase {
|
||||
public:
|
||||
explicit MessageReply(const MessageType& request_message, QObject *parent = nullptr);
|
||||
|
||||
int id() const { return request_message_.id(); }
|
||||
int id() const override { return request_message_.id(); }
|
||||
const MessageType& request_message() const { return request_message_; }
|
||||
const MessageType& message() const { return reply_message_; }
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ template <typename HandlerType>
|
||||
class WorkerPool : public _WorkerPoolBase {
|
||||
public:
|
||||
explicit WorkerPool(QObject *parent = nullptr);
|
||||
~WorkerPool();
|
||||
~WorkerPool() override;
|
||||
|
||||
typedef typename HandlerType::MessageType MessageType;
|
||||
typedef typename HandlerType::ReplyType ReplyType;
|
||||
@@ -95,10 +95,10 @@ class WorkerPool : public _WorkerPoolBase {
|
||||
|
||||
protected:
|
||||
// These are all reimplemented slots, they are called on the WorkerPool's thread.
|
||||
void DoStart();
|
||||
void NewConnection();
|
||||
void ProcessError(QProcess::ProcessError error);
|
||||
void SendQueuedMessages();
|
||||
void DoStart() override;
|
||||
void NewConnection() override;
|
||||
void ProcessError(QProcess::ProcessError error) override;
|
||||
void SendQueuedMessages() override;
|
||||
|
||||
private:
|
||||
struct Worker {
|
||||
|
||||
@@ -33,8 +33,8 @@ public:
|
||||
explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
|
||||
|
||||
protected:
|
||||
void MessageArrived(const pb::tagreader::Message &message);
|
||||
void DeviceClosed();
|
||||
void MessageArrived(const pb::tagreader::Message &message) override;
|
||||
void DeviceClosed() override;
|
||||
|
||||
private:
|
||||
TagReader tag_reader_;
|
||||
|
||||
Reference in New Issue
Block a user